Commit 5f0141c4 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Get rid of the "pane" view. Its really not needed anymore, and it

makes formatting super wide tables really hard to do in a cross
browser manner (that I can tolerate). Also improve visual separation
of the top banner from the content title area.
parent a5d2d482
......@@ -12,9 +12,9 @@ h5,h6 { font-weight: normal; }
p { text-indent: 1em; }
body, html {
top: 0px;
margin: 0px;
color: #000000;
padding: 0px;
border: 0px;
font-family: arial, helvetica, sans-serif; }
/* FAQ questions and answers. */
......
......@@ -775,10 +775,10 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
<!-- do not import full style sheet into NS47, since it does bad job
of handling it. NS47 does not understand '@import'. -->
<style type='text/css' media='all'>
<!-- @import url($BASEPATH/style-new.css); -->
<!-- @import url($BASEPATH/style.css); -->
<!-- @import url($BASEPATH/cssmenu.css); -->";
if (1 && !$MAINPAGE) {
if (0 && !$MAINPAGE) {
echo "<!-- @import url($BASEPATH/style-nonmain.css); -->";
}
echo "</style>\n";
......@@ -801,10 +801,7 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
echo "<script type='text/javascript'
src='${BASEPATH}/js/inline-console.js'></script>\n";
}
echo "</head>
<body bgcolor='#FFFFFF' ".
($nocontent ? "" : "id='maincontent' ") .
"topmargin='0' leftmargin='0' marginheight='0' marginwidth='0'>\n";
echo "</head><body>\n";
if ($autorefresh) {
echo "<meta HTTP-EQUIV=\"Refresh\" content=\"$autorefresh\">\n";
......@@ -1032,7 +1029,7 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL,
# clear that the web interface is disabled.
if (NOLOGINS() && ISADMIN()) {
echo "<div class=webmessage>";
echo "Web Interface Temporarily Unavailable</div\n";
echo "Web Interface Temporarily Unavailable</div>\n";
}
else {
$message = TBGetSiteVar("web/message");
......@@ -1046,10 +1043,11 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL,
echo "<!-- content body -->\n";
if ($login_user)
echo "<div class='fullcontentbody'>";
else
echo "<div id='contentheader'>";
else {
echo "<div class='contentbody'>";
echo "<div id=foo>";
echo "<div id='rightcontentheader'>";
}
echo "<div id='logintime'>";
echo "<span class='loggedin'>";
$now = date("D M d g:ia T");
......@@ -1080,27 +1078,18 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL,
else
echo "<h2 class='rightcontenttitle'>\n";
echo "$title</h2>";
echo "</div>";
if (0 && $login_user) {
echo "<div class=pagenotworking>Page not working properly? ";
echo "<a href=pagenotworking.php target=_blank>Click here</a></div>";
# Close off 'contentheader' (rightcontentheader);
echo "</div>\n";
if ($login_user) {
# And start the contentbody.
echo "<div id='fullcontentbody'>";
}
echo "<div class='cbody'>";
echo "<!-- begin content -->";
if (VIEWSET($view, 'show_topbar', "plab")) {
WRITEPLABTOPBAR();
}
}
#
# ENDPAGE(): This terminates the div started above.
#
function ENDPAGE() {
echo "</div>";
}
#
# Spit out a vanilla page footer.
#
......@@ -1121,9 +1110,6 @@ function PAGEFOOTER($view = NULL) {
$today = getdate();
$year = $today["year"];
echo "<!-- end content -->\n";
echo "</div>\n";
if (VIEWSET($view, 'show_bottombar', "plab")) {
WRITEPLABBOTTOMBAR();
}
......@@ -1169,10 +1155,8 @@ function PAGEFOOTER($view = NULL) {
echo "<div id='inline-console'></div>\n";
}
ENDPAGE();
# Plug the home site from all others.
echo "\n<p><a href=\"www.emulab.net/netemu.php3\"></a>\n";
echo "\n<a href=\"www.emulab.net/netemu.php3\"></a>\n";
# Prime all the sortable tables.
if (count($sortedtables)) {
......@@ -1188,6 +1172,10 @@ function PAGEFOOTER($view = NULL) {
"</script>";
echo $bodyclosestring;
echo "\n";
if ($login_user) {
# This closes the fullcontentbody div.
echo "</div>\n";
}
echo "</body></html>\n";
}
......
......@@ -5,11 +5,7 @@
*/
body {
/* behavior:url("csshover.htc"); IE hack to make :hover work. */
}
#maincontent {
/*min-width: 950px; */
overflow: scroll;
background-color: #FFF;
}
td, th {
......@@ -275,9 +271,8 @@ div.midtopcell table#navmenus td#spacer {
}
a.midtopcell:link, a.midtopcell:visited { color: #FFF; text-decoration: none;}
div.cbody {
div#cbody {
clear: left;
overflow: visible;
padding: 6px;
}
......@@ -411,7 +406,9 @@ ul.navmenu li.newgroup {
position: static;
font-weight: bold;
padding: 0px;
margin: 0px;
# Counteract bottom margin of topcell so that we take less room.
margin-top: -3px;
margin-bottom: 2px;
text-align: center;
font-size: 10pt;
clear: left;
......@@ -444,7 +441,6 @@ ul.navmenu li.newgroup {
/* Definition for regular pages that have a menu. */
.content {
padding-top: 0px;
margin-top: 1px;
}
.rightcontent {
position: absolute;
......@@ -457,54 +453,62 @@ ul.navmenu li.newgroup {
margin: 0px;
}
/*
* For fullwidth pages, the content header is under the topcell, all the
* way across.
*/
#contentheader {
background-color: #DDD;
color: #000;
border: 0;
margin: 0;
padding: 0px 6px 0px 6px;
}
#rightcontentheader {
background-color: #000;
color: #FFF;
}
/* BEGIN Content */
.contentbody, .fullcontentbody {
.contentbody, #fullcontentbody {
background-color: #FFF;
border: solid 2px black;
/*
* XXX Very important. We float the body so that any tables that are wider
* than the viewport will cause the div to expand. This works so long as the
* wide table is the direct descendent of this div, otherwise, no joy.
*/
float: left;
margin-bottom: 8px;
min-width: 95%; /* XXX Safari doesn't expand the div to fill the viewport. */
padding-bottom: 10px;
margin-bottom: 0px;
padding-bottom: 0px;
}
.contentbody {
float: left;
min-width: 95%; /* XXX Safari doesn't expand the div to fill the viewport. */
border: solid 2px black;
padding-left: 16px;
padding-right: 16px;
margin-left: 0px;
margin-right: 0px;
}
.fullcontentbody {
padding-left: 0px;
padding-right: 0px;
margin-left: 8px;
margin-right: 8px;
margin-top: 4px;
#fullcontentbody {
padding: 6px;
margin: 0px;
}
/* The black bar containing the page title. */
.contenttitle, .rightcontenttitle {
background-color: #000;
color: #FFF;
margin: 0px;
padding: 0px;
line-height: 30px;
clear: none; /* Let the version/login floats share the line. XXX IE6 */
}
.contenttitle {
/* Counteract the padding of the contentbody. */
margin-left: 0px;
margin-right: 0px;
margin-bottom: 4px; /* Simulate padding for the actual content. */
padding-left: 0px;
padding-bottom: 0px;
}
.rightcontenttitle {
background-color: #000;
color: #FFF;
margin-left: -16px;
margin-right: -16px;
margin-bottom: 16px; /* Simulate padding for the actual content. */
......@@ -514,7 +518,7 @@ ul.navmenu li.newgroup {
.headernotice {
color: red;
font-size: 14pt;
width: 40%; /* This is how it gets centered */
width: 50%; /* This is how it gets centered */
float: right;
display: inline;
margin-right: 10px;
......@@ -523,7 +527,7 @@ ul.navmenu li.newgroup {
}
#versioninfo {
color: #FFF;
/* color: #FFF; */
font-size: x-small;
/* Float the version info and add some space between #logintime. */
float: right;
......@@ -533,7 +537,7 @@ ul.navmenu li.newgroup {
/* vertically centered. */
}
#logintime {
color: #FFF;
/* color: #FFF; */
/* Also float the login and timestamp to the right. */
float: right;
display: inline;
......@@ -550,7 +554,7 @@ ul.navmenu li.newgroup {
content: "'"; /* XXX Doesn't work in IE6. */
}
.loggedin {
color: #FFF;
/* color: #FFF; */
display: block; /* Break the line between login and timestamp. */
margin: 0px;
padding: 0px;
......@@ -593,7 +597,7 @@ ul.submenu li.newgroup {
/* The footer with a list of links, contact, and copyright. */
.contentfooter {
background-color: #FFF;
padding: 16px;
padding: 8px 16px 8px 16px;
margin: 0px;
text-align: center;
clear: both;
......@@ -671,8 +675,6 @@ ul.submenu li.newgroup {
.picture { float: right; margin: 4px; }
body { background-image: url("wallpaper1.png"); }
a { color: #2222BB; text-decoration: underline; }
a:link { color: #2222BB; text-decoration: none; }
......@@ -762,7 +764,7 @@ span.printable {
color: #667;
}
# outline property gets rid of the dashed outline after clicking.
/* outline property gets rid of the dashed outline after clicking. */
#topnavbar li a.topnavbar:link { color: #667; background: #DDE}
#topnavbar li a.topnavbar:active { color: #667; background: #DDE;
outline: none;}
......
......@@ -8,23 +8,6 @@ span.devpagename {
font-weight: bold;
font-size: large;
}
#.menuheader, .submenuheader, .contenttitle {
# background-color: #060;
#}
.leftcell {
border: solid 2px black;
}
.leftcell, #searchrow form, #searchrow table, #searchrow table td {
background-color: #dfe;
}
#ul.submenu, .submenuheader, #searchrow {
# border-color: #060;
#}
#ul.menu, ul.submenu {
# background-color: #CED;
#}
body { background-image: url("wallpaper0.jpg"); }
th { background-color: #E1EAE1; }
......
......@@ -5,11 +5,7 @@
*/
body {
/* behavior:url("csshover.htc"); IE hack to make :hover work. */
}
#maincontent {
/*min-width: 950px; */
overflow: scroll;
background-color: #FFF;
}
td, th {
......@@ -275,9 +271,8 @@ div.midtopcell table#navmenus td#spacer {
}
a.midtopcell:link, a.midtopcell:visited { color: #FFF; text-decoration: none;}
div.cbody {
div#cbody {
clear: left;
overflow: visible;
padding: 6px;
}
......@@ -411,7 +406,9 @@ ul.navmenu li.newgroup {
position: static;
font-weight: bold;
padding: 0px;
margin: 0px;
# Counteract bottom margin of topcell so that we take less room.
margin-top: -3px;
margin-bottom: 2px;
text-align: center;
font-size: 10pt;
clear: left;
......@@ -444,7 +441,6 @@ ul.navmenu li.newgroup {
/* Definition for regular pages that have a menu. */
.content {
padding-top: 0px;
margin-top: 1px;
}
.rightcontent {
position: absolute;
......@@ -457,54 +453,62 @@ ul.navmenu li.newgroup {
margin: 0px;
}
/*
* For fullwidth pages, the content header is under the topcell, all the
* way across.
*/
#contentheader {
background-color: #DDD;
color: #000;
border: 0;
margin: 0;
padding: 0px 6px 0px 6px;
}
#rightcontentheader {
background-color: #000;
color: #FFF;
}
/* BEGIN Content */
.contentbody, .fullcontentbody {
.contentbody, #fullcontentbody {
background-color: #FFF;
border: solid 2px black;
/*
* XXX Very important. We float the body so that any tables that are wider
* than the viewport will cause the div to expand. This works so long as the
* wide table is the direct descendent of this div, otherwise, no joy.
*/
float: left;
margin-bottom: 8px;
min-width: 95%; /* XXX Safari doesn't expand the div to fill the viewport. */
padding-bottom: 10px;
margin-bottom: 0px;
padding-bottom: 0px;
}
.contentbody {
float: left;
min-width: 95%; /* XXX Safari doesn't expand the div to fill the viewport. */
border: solid 2px black;
padding-left: 16px;
padding-right: 16px;
margin-left: 0px;
margin-right: 0px;
}
.fullcontentbody {
padding-left: 0px;
padding-right: 0px;
margin-left: 8px;
margin-right: 8px;
margin-top: 4px;
#fullcontentbody {
padding: 6px;
margin: 0px;
}
/* The black bar containing the page title. */
.contenttitle, .rightcontenttitle {
background-color: #000;
color: #FFF;
margin: 0px;
padding: 0px;
line-height: 30px;
clear: none; /* Let the version/login floats share the line. XXX IE6 */
}
.contenttitle {
/* Counteract the padding of the contentbody. */
margin-left: 0px;
margin-right: 0px;
margin-bottom: 4px; /* Simulate padding for the actual content. */
padding-left: 0px;
padding-bottom: 0px;
}
.rightcontenttitle {
background-color: #000;
color: #FFF;
margin-left: -16px;
margin-right: -16px;
margin-bottom: 16px; /* Simulate padding for the actual content. */
......@@ -514,7 +518,7 @@ ul.navmenu li.newgroup {
.headernotice {
color: red;
font-size: 14pt;
width: 40%; /* This is how it gets centered */
width: 50%; /* This is how it gets centered */
float: right;
display: inline;
margin-right: 10px;
......@@ -523,7 +527,7 @@ ul.navmenu li.newgroup {
}
#versioninfo {
color: #FFF;
/* color: #FFF; */
font-size: x-small;
/* Float the version info and add some space between #logintime. */
float: right;
......@@ -533,7 +537,7 @@ ul.navmenu li.newgroup {
/* vertically centered. */
}
#logintime {
color: #FFF;
/* color: #FFF; */
/* Also float the login and timestamp to the right. */
float: right;
display: inline;
......@@ -550,7 +554,7 @@ ul.navmenu li.newgroup {
content: "'"; /* XXX Doesn't work in IE6. */
}
.loggedin {
color: #FFF;
/* color: #FFF; */
display: block; /* Break the line between login and timestamp. */
margin: 0px;
padding: 0px;
......@@ -593,7 +597,7 @@ ul.submenu li.newgroup {
/* The footer with a list of links, contact, and copyright. */
.contentfooter {
background-color: #FFF;
padding: 16px;
padding: 8px 16px 8px 16px;
margin: 0px;
text-align: center;
clear: both;
......@@ -671,8 +675,6 @@ ul.submenu li.newgroup {
.picture { float: right; margin: 4px; }
body { background-image: url("wallpaper1.png"); }
a { color: #2222BB; text-decoration: underline; }
a:link { color: #2222BB; text-decoration: none; }
......@@ -762,7 +764,7 @@ span.printable {
color: #667;
}
# outline property gets rid of the dashed outline after clicking.
/* outline property gets rid of the dashed outline after clicking. */
#topnavbar li a.topnavbar:link { color: #667; background: #DDE}
#topnavbar li a.topnavbar:active { color: #667; background: #DDE;
outline: none;}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment