Commit 2ac99d41 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Change the submenu definitions so that the inner menus are in the same

font, font size, etc as the main menus.

The non-main style (devel trees) is a little broken; style files are
really a pain, or maybe its just our style files that are impossible
to understand. Or maybe I'm just a dope.
parent af1963ae
...@@ -1011,15 +1011,24 @@ function WRITESUBMENUBUTTON($text, $link, $target = "") { ...@@ -1011,15 +1011,24 @@ function WRITESUBMENUBUTTON($text, $link, $target = "") {
echo "<!-- Table row for button $text --> echo "<!-- Table row for button $text -->
<tr> <tr>
<td valign=center align=left nowrap> <td class=submenuopt nowrap>
<b> <a href='$link' $targettext>$text</a>
<a class=sidebarbutton href='$link' $targettext>$text</a>\n";
echo " </b>
</td> </td>
</tr>\n"; </tr>\n";
} }
function WRITESUBMENUDIVIDER() {
global $BASEPATH;
echo "<tr>";
echo "<td class=\"submenuoptdiv\">";
# We have to put something in this cell, or IE ignores it. But, we do not
# want to make the table row full line-height, so a space will not do.
echo "<img src=\"$BASEPATH/1px.gif\" border=0 height=1 width=1 />";
echo "</td>";
echo "</tr>";
echo "\n";
}
# #
# Start/End a page within a page. # Start/End a page within a page.
# #
...@@ -1045,8 +1054,7 @@ function SUBPAGEEND() { ...@@ -1045,8 +1054,7 @@ function SUBPAGEEND() {
function SUBMENUSTART($title) { function SUBMENUSTART($title) {
?> ?>
<!-- begin submenu --> <!-- begin submenu -->
<table class='menu' cellpadding="0" cellspacing="0" <table class="submenu" cellpadding="0" cellspacing="0">
style="margin-right: 6px;" >
<tr> <tr>
<td class="menuheader"><b><?php echo "$title";?></b></td> <td class="menuheader"><b><?php echo "$title";?></b></td>
</tr> </tr>
......
...@@ -125,6 +125,8 @@ if ($expstate) { ...@@ -125,6 +125,8 @@ if ($expstate) {
WRITESUBMENUBUTTON("Download NS File", WRITESUBMENUBUTTON("Download NS File",
"spitnsdata.php3?pid=$exp_pid&eid=$exp_eid"); "spitnsdata.php3?pid=$exp_pid&eid=$exp_eid");
WRITESUBMENUDIVIDER();
if (!$lockdown) { if (!$lockdown) {
# Swap option. # Swap option.
if ($isbatch) { if ($isbatch) {
...@@ -175,19 +177,21 @@ if ($expstate) { ...@@ -175,19 +177,21 @@ if ($expstate) {
if ($expstate == $TB_EXPTSTATE_ACTIVE) { if ($expstate == $TB_EXPTSTATE_ACTIVE) {
WRITESUBMENUBUTTON("Modify Traffic Shaping", WRITESUBMENUBUTTON("Modify Traffic Shaping",
"delaycontrol.php3?pid=$exp_pid&eid=$exp_eid"); "delaycontrol.php3?pid=$exp_pid&eid=$exp_eid");
WRITESUBMENUBUTTON("Link Tracing/Monitoring",
"linkmon_list.php3?pid=$exp_pid&eid=$exp_eid");
} }
} }
WRITESUBMENUBUTTON("Edit Experiment Metadata", WRITESUBMENUBUTTON("Modify Experiment Metadata",
"editexp.php3?pid=$exp_pid&eid=$exp_eid"); "editexp.php3?pid=$exp_pid&eid=$exp_eid");
# WRITESUBMENUDIVIDER();
# Admin and project/experiment leader get this option.
#
if ($expstate == $TB_EXPTSTATE_ACTIVE) { if ($expstate == $TB_EXPTSTATE_ACTIVE) {
WRITESUBMENUBUTTON("Link Tracing/Monitoring",
"linkmon_list.php3?pid=$exp_pid&eid=$exp_eid");
#
# Admin and project/experiment leaders get this option.
#
if (TBExptAccessCheck($uid, $exp_pid, $exp_eid, $TB_EXPT_UPDATE)) { if (TBExptAccessCheck($uid, $exp_pid, $exp_eid, $TB_EXPT_UPDATE)) {
WRITESUBMENUBUTTON("Update All Nodes", WRITESUBMENUBUTTON("Update All Nodes",
"updateaccounts.php3?pid=$exp_pid&eid=$exp_eid"); "updateaccounts.php3?pid=$exp_pid&eid=$exp_eid");
...@@ -236,6 +240,8 @@ if ($wireless) { ...@@ -236,6 +240,8 @@ if ($wireless) {
"?pid=$exp_pid&eid=$exp_eid" : "")); "?pid=$exp_pid&eid=$exp_eid" : ""));
} }
WRITESUBMENUDIVIDER();
# History # History
WRITESUBMENUBUTTON("Show History", WRITESUBMENUBUTTON("Show History",
"showstats.php3?showby=expt&which=$expindex"); "showstats.php3?showby=expt&which=$expindex");
......
td, th {
border: solid 0px #696;
background-color: #F1FAF1;
}
.leftcell { .leftcell {
background-image: url(wallpaper0.jpg); background-image: url(wallpaper0.jpg);
background-color: #9BBBAC; background-color: #9BBBAC;
...@@ -14,8 +19,8 @@ ...@@ -14,8 +19,8 @@
background-color: #acb; background-color: #acb;
} }
.menuopt,.menuoptb,.menuoptdiv, .menuopts, .menuoptst, .menuoptsb { .menuopt, .menuoptb, .menuoptdiv, .menuopts, .menuoptst, .menuoptsb, .submenuopt, .submenuoptdiv {
background-color: #ced; background-color: #CED;
} }
.menuopts, .menuoptst, .menuoptsb { .menuopts, .menuoptst, .menuoptsb {
...@@ -28,14 +33,10 @@ ...@@ -28,14 +33,10 @@
body { background-image: url(wallpaper0.jpg); } body { background-image: url(wallpaper0.jpg); }
td, th {
border: solid 0px #696;
background-color: #F1FAF1;
}
th { background-color: #E1EAE1; } th { background-color: #E1EAE1; }
table { border: 0px; background-color: #9A9} table { border: 0px; background-color: #9A9; }
table.nogrid { border: solid 1px #696; background-color:#9A9; } table.nogrid { border: solid 1px #696; background-color:#9A9; }
span.topbaroption { background-color:#E1EAE1; } span.topbaroption { background-color:#E1EAE1; }
...@@ -58,6 +58,11 @@ td.paddedcell2 { padding: 0.5em; } ...@@ -58,6 +58,11 @@ td.paddedcell2 { padding: 0.5em; }
border: solid 2px black; border: solid 2px black;
margin: 0px; margin: 0px;
padding: 0px; } padding: 0px; }
.submenu {
border: solid 2px black;
margin: 0px;
margin-right: 6px;
padding: 0px; }
.menuheader { .menuheader {
background-color: #000; background-color: #000;
color: #FFF; color: #FFF;
...@@ -74,7 +79,7 @@ td.paddedcell2 { padding: 0.5em; } ...@@ -74,7 +79,7 @@ td.paddedcell2 { padding: 0.5em; }
padding-bottom: 0px; padding-bottom: 0px;
margin: 0px; margin: 0px;
border: 0px; } border: 0px; }
.menuopt,.menuoptb, .menuoptdiv, .menuopts, .menuoptst, .menuoptsb { .menuopt, .menuoptb, .menuoptdiv, .menuopts, .menuoptst, .menuoptsb, .submenuopt, .submenuoptdiv {
background-color: #cde; background-color: #cde;
padding-left: 6px; padding-left: 6px;
padding-top: 2px; padding-top: 2px;
...@@ -83,6 +88,10 @@ td.paddedcell2 { padding: 0.5em; } ...@@ -83,6 +88,10 @@ td.paddedcell2 { padding: 0.5em; }
border: 0px; border: 0px;
font-size: 10pt; } font-size: 10pt; }
.submenuopt, .submenuoptdiv {
background-color: #F1FAFA;
}
td.menuoptusage { td.menuoptusage {
background-color: #cde; background-color: #cde;
padding-left: 6px; padding-left: 6px;
...@@ -100,7 +109,7 @@ td.menuoptusage { ...@@ -100,7 +109,7 @@ td.menuoptusage {
text-align: center; text-align: center;
} }
.menuopt, .menuoptb { .menuopt, .menuoptb, .submenuopt {
padding-left: 14px; padding-left: 14px;
text-indent: -8px; text-indent: -8px;
} }
......
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