Commit c3f5a56f authored by Leigh B. Stoller's avatar Leigh B. Stoller

Reorder main menu options slightly.

parent 3fbbdec5
...@@ -112,10 +112,6 @@ function WRITESIDEBAR() { ...@@ -112,10 +112,6 @@ function WRITESIDEBAR() {
if ($admin) { if ($admin) {
WRITESIDEBARBUTTON("New Project Approval", WRITESIDEBARBUTTON("New Project Approval",
$TBBASE, "approveproject_list.php3"); $TBBASE, "approveproject_list.php3");
WRITESIDEBARBUTTON("Node Control",
$TBBASE, "nodecontrol_list.php3");
WRITESIDEBARBUTTON("User List",
$TBBASE, "showuser_list.php3");
} }
if ($trusted) { if ($trusted) {
# Only group leaders can do these options # Only group leaders can do these options
...@@ -129,6 +125,14 @@ function WRITESIDEBAR() { ...@@ -129,6 +125,14 @@ function WRITESIDEBAR() {
# #
WRITESIDEBARBUTTON("Project Information", WRITESIDEBARBUTTON("Project Information",
$TBBASE, "showproject_list.php3"); $TBBASE, "showproject_list.php3");
if ($admin) {
WRITESIDEBARBUTTON("User List",
$TBBASE, "showuser_list.php3");
WRITESIDEBARBUTTON("Node Control",
$TBBASE, "nodecontrol_list.php3");
}
WRITESIDEBARBUTTON("Begin an Experiment", WRITESIDEBARBUTTON("Begin an Experiment",
$TBBASE, "beginexp_form.php3"); $TBBASE, "beginexp_form.php3");
WRITESIDEBARBUTTON("Experiment Information", WRITESIDEBARBUTTON("Experiment Information",
...@@ -382,11 +386,6 @@ function PAGEHEADER($title) { ...@@ -382,11 +386,6 @@ function PAGEHEADER($title) {
<head> <head>
<title>Emulab.Net - $title</title>\n"; <title>Emulab.Net - $title</title>\n";
#
# Shove the Jave code through to the output.
#
readfile("java.html");
# #
# If logged in, initialize the refresh process. # If logged in, initialize the refresh process.
# #
...@@ -398,11 +397,17 @@ function PAGEHEADER($title) { ...@@ -398,11 +397,17 @@ function PAGEHEADER($title) {
$timeo *= 1000; $timeo *= 1000;
echo "<script language=\"JavaScript\"> echo "<script language=\"JavaScript\">
<!-- <!--
var sURL = \"$TBDOCBASE/index.php3\";
function doLoad() { function doLoad() {
setTimeout(\"refresh()\", $timeo ); setTimeout(\"refresh()\", $timeo );
} }
//--> //-->
</script>\n"; </script>\n";
#
# Shove the rest of the Java code through to the output.
#
readfile("java.html");
} }
echo " <meta HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\"> echo " <meta HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">
......
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