Commit fbe6687e authored by Leigh Stoller's avatar Leigh Stoller

Revamp the web pages. NO MORE FRAMES! YIPPIE!

parent e8bbfa95
......@@ -37,6 +37,8 @@ DOCFILES += $(wildcard $(SRCDIR)/doc/*.gif)
TUTFILES = $(wildcard $(SRCDIR)/tutorial/*.html)
TUTFILES += $(wildcard $(SRCDIR)/tutorial/*.jpg)
TUTFILES += $(wildcard $(SRCDIR)/tutorial/*.gif)
TUTFILES += $(wildcard $(SRCDIR)/tutorial/*.php3)
TUTFILES += $(wildcard $(SRCDIR)/tutorial/*.ns)
TUTFILES += $(SRCDIR)/tutorial/tb_compat.tcl
#
......
<?php
include("defs.php3");
PAGEHEADER("New User");
PAGEHEADER("Apply for Project Membership");
#
# Get current user.
......@@ -44,11 +44,6 @@ else {
?>
<table align="center" border="1">
<tr>
<td colspan="2">
<h1 align="center">Apply for Project Membership</h1></td>
</tr>
<tr>
<td align="center" colspan="2">
Fields marked with * are required.</td>
......
......@@ -28,8 +28,6 @@ if (!isset($pid) ||
USERERROR("You must provide a project ID.", 1);
}
echo "<center><h1>Approve a Project</h1></center>\n";
#
# Check to make sure thats this is a valid PID.
#
......
......@@ -12,8 +12,6 @@ PAGEHEADER("New Project Approval List");
$uid = GETLOGIN();
LOGGEDINORDIE($uid);
echo "<center><h1>Approve New Projects List</h1></center>\n";
#
# Of course verify that this uid has admin privs!
#
......
......@@ -12,10 +12,6 @@ PAGEHEADER("New Users Approved");
$uid = GETLOGIN();
LOGGEDINORDIE($uid);
echo "<center><h1>
Project Membership Results
</h1></center>";
#
# Walk the list of post variables, looking for the special post format.
# See approveuser_form.php3:
......
<html>
<head>
<title>Utah Network Testbed - Policy</title>
<link rel='stylesheet' href='tbstyle-doc.css' type='text/css'>
<title>Utah Network Testbed - Policies</title>
<link rel='stylesheet' href='tbstyle.css' type='text/css'>
</head>
<body>
<basefont size=4>
......@@ -57,7 +57,8 @@ reserve and configure nodes, etc.
<p>
More detailed information on this
process can be found in the <a href="faq.html">FAQ</a>.
process can be found in the
<a href="docwrapper.php3?docname=faq.html">Emulab FAQ</a>.
<h3>Another way of saying the same thing</h3>
......@@ -117,25 +118,3 @@ You will also receive an account on the users' master host
"users.emulab.net", and from there will be able to access the test
nodes' serial line consoles via 'tip' as well as access console log
files.
<hr size=2 noshade>
<center>
<!-- Force full window! -->
<base target=_top>
[<a href="https://www.emulab.net/">Emulab.Net Home</a>]<br>
[<a href="http://www.cs.utah.edu/flux/testbed/">Utah Network Testbed</a>]
[<a href="http://www.cs.utah.edu/flux/">Flux Research Group</a>]
[<a href="http://www.cs.utah.edu/">School of Computing</a>]
[<a href="http://www.utah.edu/">University of Utah</a>]
</center>
<p align=right>
<font size="-1">
<a href="mailto:testbed-ops@flux.cs.utah.edu">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>
<br>
Last modified on Apr 4, 2001
</font>
</p>
</body>
</html>
......@@ -4,7 +4,7 @@ include("defs.php3");
#
# Standard Testbed Header
#
PAGEHEADER("Create a Batch Mode Experiment");
PAGEHEADER("Creating a Batch Mode Experiment");
$mydebug = 0;
......
......@@ -30,12 +30,6 @@ if (mysql_num_rows($query_result) == 0) {
?>
<table align="center" border="1">
<tr>
<td align="center" colspan="2">
<h1>Create a new Batch Mode Experiment on the Testbed</h1>
</td>
</tr>
<tr>
<td align="center" colspan="3">
<em>(Fields marked with * are required)</em>
......
......@@ -4,7 +4,7 @@ include("defs.php3");
#
# Standard Testbed Header
#
PAGEHEADER("Begin an Experiment Form");
PAGEHEADER("Begin a new Testbed Experiment");
#
# Only known and logged in users can begin experiments.
......@@ -30,11 +30,6 @@ if (mysql_num_rows($query_result) == 0) {
?>
<table align="center" border="1">
<tr>
<td align="center" colspan="2">
<h1>Begin a new Experiment on the Testbed</h1>
</td>
</tr>
<tr>
<td align="center" colspan="3">
......
......@@ -4,7 +4,7 @@ include("defs.php3");
#
# Standard Testbed Header
#
PAGEHEADER("Begin an Experiment");
PAGEHEADER("Beginning a Testbed Experiment");
$mydebug = 0;
......
<?php
#
# Standard definitions!
# Standard definitions!
#
$TBDIR = "@prefix@/";
$WWWDEFS = "@WWWDEFS@";
......@@ -32,6 +32,19 @@ $TBAUTHTIMEOUT = 21600;
$HTTPTAG = "http://";
#
# Menu Formatting Stuff
#
# Color for the title on each page.
$TITLECOLOR = "#E04050";
$BANNERCOLOR = "#ABABE0";
$THISHOMEBASE = "Emulab.Net";
$THISPROJECT = "The Utah Network Testbed";
#
# Links back to Flux web Pages
#
#
# Database constants and the like.
#
......@@ -66,6 +79,9 @@ function TBERROR ($message, $death) {
sleep(2);
if ($death) {
ENDPAGE();
echo "</body>
</html>";
die("<br><br><h3>".
"$message <p>".
"Could not continue. Please contact ".
......@@ -91,6 +107,7 @@ function USERERROR($message, $death) {
if you feel this message is an error.";
if ($death) {
ENDPAGE();
echo "</body>
</html>";
die("");
......@@ -125,52 +142,14 @@ function ISADMIN($uid) {
return $admin;
}
#
# Spit out a vanilla page header.
#
function PAGEHEADER($title) {
echo "<html>
<head>
<title>$title</title>
<link rel=\"stylesheet\" href=\"tbstyle.css\" type=\"text/css\">
</head>
<body>
<basefont size=4>
\n";
}
#
# Spit out a vanilla page footer.
#
function PAGEFOOTER() {
global $TBBASE;
echo "<br><hr>
<!-- Force full window! -->
<base target=_top>
<center>[<a href=\"$TBBASE\">Emulab.Net Home</a>]</center>
<center>
[<a href=\"http://www.cs.utah.edu/flux/testbed/\">
Utah Network Testbed</a>]
[<a href=\"http://www.cs.utah.edu/flux/\">Flux Research Group</a>]
[<a href=\"http://www.cs.utah.edu/\">School of Computing</a>]
[<a href=\"http://www.utah.edu/\">University of Utah</a>]
</center>
<p align=right>
<font size=-2>
Problems? Contact
<a href=\"mailto:testbed-ops@flux.cs.utah.edu\">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>
</body>
</html>\n";
}
#
# Run a program as a user.
#
function SUEXEC($uid, $gid, $cmdandargs, $die) {
global $TBSUEXEC_PATH;
ignore_user_abort(1);
$output = array();
$retval = 0;
$result = exec("$TBSUEXEC_PATH $uid $gid $cmdandargs",
......@@ -219,4 +198,9 @@ function VERIFYURL($url) {
# Beware empty spaces (cookies)!
#
require("tbauth.php3");
#
# Okay, this is what checks the login and spits out the menu.
#
require("menu.php3");
?>
......@@ -4,7 +4,7 @@ include("defs.php3");
#
# Standard Testbed Header
#
PAGEHEADER("Terminate Project and Remove all Trace");
PAGEHEADER("Terminating Project and Remove all Trace");
#
# Only known and logged in users can end experiments.
......
<?php
require("defs.php3");
#
# Standard Testbed Header
#
PAGEHEADER("Documentation");
?>
<ul>
<li> <a href="docwrapper.php3?docname=tutorial/tutorial.html">
Emulab `Getting Started' Tutorial</a>.
<p>
<li> <a href="docwrapper.php3?docname=faq.html">
Emulab Frequently Asked Questions (FAQ)</a>.
<p>
<li> <a href="docwrapper.php3?docname=doc/tmcd.html">
Testbed Master Control Daemon (TMCD) Reference Manual</a>
<p>
<li><b><a href = "docwrapper.php3?docname=auth.html">
Authorization Scheme, Policy, and "How To Get Started"</a></b>
<p>
<li><b><a href = "docwrapper.php3?docname=hardware.html">
Hardware Overview</a></b>
<p>
<li><b><a href = "docwrapper.php3?docname=software.html">
Software Overview</a></b>
<p>
<li><b><a href = "docwrapper.php3?docname=security.html">
Security Issues</a></b>
<p>
<li><b><a href = "docwrapper.php3?docname=policies.html">
Administrative Policies and Disclaimer</a></b>
<p>
<li><b><a href = "docwrapper.php3?docname=sponsors.html">
Emulab Sponsors</a></b>
</ul>
<?php
#
# Standard Testbed Footer
#
PAGEFOOTER();
?>
<html>
<head>
<title>Emulab - Documentation</title>
<link rel='stylesheet' href='../tbstyle-doc.css' type='text/css'>
</head>
<body>
<basefont size=4>
<center>
<h1>
Documentation
</h1>
</center>
<ul>
<li> <a href="../tutorial/tutorial.html">
Emulab `Getting Started' Tutorial</a>.
<p>
<li> <a href="../faq.html">Emulab Frequently Asked Questions (FAQ)</a>.
<p>
<li> <a href="tmcd.html">Testbed Master Control Daemon (TMCD)
Reference Manual</a>
<p>
</ul>
<hr size=2 noshade>
<center>
<!-- Force full window! -->
<base target=_top>
[<a href="https://www.emulab.net/">Emulab.Net Home</a>]<br>
[<a href="http://www.cs.utah.edu/flux/testbed/">Utah Network Testbed</a>]
[<a href="http://www.cs.utah.edu/flux/">Flux Research Group</a>]
[<a href="http://www.cs.utah.edu/">School of Computing</a>]
[<a href="http://www.utah.edu/">University of Utah</a>]
</center>
<p align=right>
<font size="-1">
<a href=\"mailto:testbed-ops@flux.cs.utah.edu\">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>
<br>
Last modified on Apr 2, 2001
</font>
</p>
</body>
</html>
<html>
<head>
<title>Emulab - TMCD</title>
<link rel='stylesheet' href='../tbstyle-doc.css' type='text/css'>
</head>
<body>
<basefont size=4>
<!-- This file is sucked in by the doc wrapper. -->
<center>
<h1>Testbed Master Control Daemon/Client Reference</h1>
......@@ -384,24 +378,3 @@ if a new experiment with the same name is started.
</ul>
</ul>
<hr size=2 noshade>
<center>
<!-- Force full window! -->
<base target=_top>
[<a href="https://www.emulab.net/">Emulab.Net Home</a>]<br>
[<a href="http://www.cs.utah.edu/flux/testbed/">Utah Network Testbed</a>]
[<a href="http://www.cs.utah.edu/flux/">Flux Research Group</a>]
[<a href="http://www.cs.utah.edu/">School of Computing</a>]
[<a href="http://www.utah.edu/">University of Utah</a>]
</center>
<p align=right>
<font size="-1">
<a href="mailto:testbed-ops@flux.cs.utah.edu">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>
<br>
Last modified on Mar 14, 2001
</font>
</p>
</body>
</html>
<?php
require("defs.php3");
#
# Standard Testbed Header
#
PAGEHEADER("Emulab Documentation");
#
# Need to sanity check the path! For now, just make sure the path
# does not start with a dot or a slash.
#
$first = substr($docname, 0, 1);
if (strcmp($first, ".") == 0 ||
strcmp($first, "/") == 0) {
USERERROR("Invalid document name: $docname!");
}
#
# Nothing that looks like a ../ is allowed anywhere in the name
#
if (strstr($docname, "../")) {
USERERROR("Invalid document name: $docname!");
}
readfile("$docname");
#
# Standard Testbed Footer
#
PAGEFOOTER();
?>
......@@ -4,7 +4,7 @@ include("defs.php3");
#
# Standard Testbed Header
#
PAGEHEADER("Cancel Batch Mode Experiment");
PAGEHEADER("Cancel a Batch Mode Experiment");
#
# Only known and logged in users can end experiments.
......@@ -48,13 +48,23 @@ $row = mysql_fetch_array($query_result);
if (! $isadmin) {
$query_result =
mysql_db_query($TBDBNAME,
"SELECT pid FROM proj_memb ".
"SELECT pid,trust FROM proj_memb ".
"WHERE uid=\"$uid\" and pid=\"$exp_pid\"");
if (mysql_num_rows($query_result) == 0) {
USERERROR("You are not a member of Project $exp_pid for ".
"Experiment: $exp_eid.", 1);
}
if (($row = mysql_fetch_row($query_result)) == 0) {
TBERROR("Database Error: Getting trust for uid $uid.", 1);
}
$trust = $row[1];
if (strcmp($trust, "group_root") && strcmp($trust, "local_root")) {
USERERROR("You are not group or local root in Project $exp_pid, ".
"so you cannot end batch experiments", 1);
}
}
#
......
......@@ -4,7 +4,7 @@ include("defs.php3");
#
# Standard Testbed Header
#
PAGEHEADER("Terminate Experiment");
PAGEHEADER("Terminate a Testbed Experiment");
#
# Only known and logged in users can end experiments.
......@@ -84,18 +84,27 @@ if ($batchmode) {
#
# Verify that this uid is a member of the project for the experiment
# being displayed, or is an admin type.
# being displayed, or is an admin type. Must be group or local root.
#
if (! $isadmin) {
$query_result =
mysql_db_query($TBDBNAME,
"SELECT pid FROM proj_memb ".
"SELECT pid,trust FROM proj_memb ".
"WHERE uid=\"$uid\" and pid=\"$exp_pid\"");
if (mysql_num_rows($query_result) == 0) {
USERERROR("You are not a member of Project $exp_pid for ".
"Experiment: $exp_eid.", 1);
}
if (($row = mysql_fetch_row($query_result)) == 0) {
TBERROR("Database Error: Getting trust for uid $uid.", 1);
}
$trust = $row[1];
if (strcmp($trust, "group_root") && strcmp($trust, "local_root")) {
USERERROR("You are not group or local root in Project $exp_pid, ".
"so you cannot end experiments", 1);
}
}
#
......
<html>
<head>
<title>Emulab - FAQ</title>
<link rel='stylesheet' href='tbstyle-doc.css' type='text/css'>
</head>
<body>
<basefont size=4>
<center>
<h1>Emulab FAQ</h1>
<h2>Frequently Asked Questions</h2>
</center>
<h2>Contents</h2>
......@@ -74,7 +66,8 @@
information and information about the project. Then click on the
"Submit" button. Within a few days you will be contacted via email
with an approval message. More information about starting projects
can be found in <a href="auth.html">Authorization Page</a>.
can be found in <a href="docwrapper.php3?docname=auth.html">
Authorization Page</a>.
</p>
<p>
If you already have an Emulab account, and wish to start a second
......@@ -121,8 +114,8 @@
<h3>Can I be in more than one project?</h3>
<p>
Yes. You may join (and/or start) as many projects as you like,
subject to Emulab <a href="policies.html">admininstrative
policies</a>.
subject to Emulab <a href="docwrapper.php3?docname=policies.html">
administrative policies</a>.
</p>
<li><a NAME="GS-5"></a>
......@@ -141,7 +134,7 @@
<h3>Where do I get help?</h3>
<p>
If you cannot find an answer to your question in the
<a href="../doc/doc.html">Emulab Documentation</a>, then you can
<a href="doc.php3">Emulab Documentation</a>, then you can
send email to <a href="mailto:testbed-ops@flux.cs.utah.edu">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>. We will try
to answer your question as quickly as we can.
......@@ -156,7 +149,7 @@
<li><a NAME="UTT-1"></a>
<h3>Is there a tutorial?</h3>
<p>
Yes, we have an extensive <a href="tutorial/tutorial.html">tutorial</a>
Yes, we have an extensive <a href="tutorial/tutorial.php3">tutorial</a>
on using the Testbed.
</p>
......@@ -168,7 +161,7 @@
get root if their project leader grants them root access, when the
leader approves the group <a href="#GS-1">membership request</a>.
Root privileges are granted via the <code>sudo</code> command. The
<a href="tutorial/tutorial.html#RootAccess">tutorial</a> describes
<a href="tutorial/tutorial.php3#RootAccess">tutorial</a> describes
this in more detail.
</p>
......@@ -250,9 +243,9 @@
<li><a NAME="HDS-3"></a>
How many ethernet cards are on each node?</h3>
<p>
Please see the <a href = "hardware.html">Hardware Overview</a>
page for a description and count of the computers that comprise
the Testbed.
Please see the <a href="docwrapper.php3?docname=hardware.html">
Hardware Overview</a> page for a description and count of the
computers that comprise the Testbed.
</p>
<li><a NAME="HDS-4"></a>
......@@ -275,9 +268,10 @@
loss rate between nodes in a regular LAN.
</p>
<p>
Please see the <a href="tutorial/nscommands.html">Extensions</a>
Please see the
<a href="docwrapper.php3?docname=tutorial/nscommands.html">Extensions</a>
page for a summary of all Emulab NS extensions, and the
<a href = "tutorial/tutorial.html">Emulab Tutorial</a> for an
<a href = "tutorial/tutorial.php3">Emulab Tutorial</a> for an
example.
</p>
</ul>
......@@ -290,9 +284,9 @@
<li><a NAME="SWS-1"></a>
<h3>What OS do the nodes run?</h3>
<p>
Please see the <a href = "software.html">Software Overview</a>
page for a description of the Operating Systems that can be run on
each of the Testbed nodes.
Please see the <a href="docwrapper.php3?docname=software.html">
Software Overview</a> page for a description of the Operating
Systems that can be run on each of the Testbed nodes.
</p>
<li><a NAME="SWS-2"></a>
......@@ -305,9 +299,10 @@
nodes, and the selected operating system will boot up on each.
</p>
<p>
Please see the <a href="tutorial/nscommands.html">Extensions</a>
Please see the
<a href="docwrapper.php3?docname=tutorial/nscommands.html">Extensions</a>
page for a summary of all Emulab NS extensions, and the
<a href = "tutorial/tutorial.html">Emulab Tutorial</a> for an
<a href = "tutorial/tutorial.php3">Emulab Tutorial</a> for an
example.
</p>
......@@ -325,9 +320,10 @@
installed).
</p>
<p>
Please see the <a href="tutorial/nscommands.html">Extensions</a>
Please see the
<a href="docwrapper.php3?docname=tutorial/nscommands.html">Extensions</a>
page for a summary of all Emulab NS extensions, and the
<a href = "tutorial/tutorial.html">Emulab Tutorial</a> for an
<a href = "tutorial/tutorial.php3">Emulab Tutorial</a> for an
example.
</p>
......@@ -345,9 +341,10 @@
specify a different program for each node in the experiment.
</p>
<p>
Please see the <a href="tutorial/nscommands.html">Extensions</a>
Please see the
<a href="docwrapper.php3?docname=tutorial/nscommands.html">Extensions</a>
page for a summary of all Emulab NS extensions, and the
<a href = "tutorial/tutorial.html">Emulab Tutorial</a> for an
<a href = "tutorial/tutorial.php3">Emulab Tutorial</a> for an
example.
</p>
......@@ -368,8 +365,9 @@
</p>
<p>
Use of the ready bits is described in more detail in the <a href =
"tutorial/tutorial.html">Emulab Tutorial</a> and in the <a href =
"doc/tmcd.html"> Testbed Master Control Daemon</a> documentation.
"tutorial/tutorial.php3">Emulab Tutorial</a> and in the <a href =
"docwrapper.php3?docname=doc/tmcd.html"> Testbed Master Control
Daemon</a> documentation.
</p>
<li><a NAME="SWS-6"></a>
......@@ -408,25 +406,3 @@
make special arrangements.
</p>
</ul>
<hr size=2 noshade>
<center>
<!-- Force full window! -->
<base target=_top>
[<a href="https://www.emulab.net/">Emulab.Net Home</a>]<br>
[<a href="http://www.cs.utah.edu/flux/testbed/">Utah Network Testbed</a>]
[<a href="http://www.cs.utah.edu/flux/">Flux Research Group</a>]
[<a href="http://www.cs.utah.edu/">School of Computing</a>]
[<a href="http://www.utah.edu/">University of Utah</a>]
</center>
<p align=right>
<font size="-1">
<a href="mailto:testbed-ops@flux.cs.utah.edu">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>
<br>
Last modified on Mar 14, 2001
</font>
</p>
</body>
</html>
<html>
<head>
<title>Emulab - Hardware Overview</title>
<link rel='stylesheet' href='tbstyle-doc.css' type='text/css'>
<link rel='stylesheet' href='tbstyle.css' type='text/css'>
</head>
<body>
<basefont size=4>
......@@ -109,25 +109,3 @@ The DNARD Sharks are also attached to the big Cisco switch by way of a
is capable of generating up to 80Mbps, and shares one
100Mbps link to the Cisco.
<hr size=2 noshade>
<center>
<!-- Force full window! -->
<base target=_top>
[<a href="https://www.emulab.net/">Emulab.Net Home</a>]<br>
[<a href="http://www.cs.utah.edu/flux/testbed/">Utah Network Testbed</a>]
[<a href="http://www.cs.utah.edu/flux/">Flux Research Group</a>]
[<a href="http://www.cs.utah.edu/">School of Computing</a>]
[<a href="http://www.utah.edu/">University of Utah</a>]
</center>
<p align=right>
<font size="-1">
<a href="mailto:testbed-ops@flux.cs.utah.edu">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>
<br>
Last modified on Apr 4, 2001
</font>
</p>
</body>
</html>
This diff is collapsed.
<script language="JavaScript">
<!--
var sURL = unescape(window.location.pathname);
function refresh()
{
// This version of the refresh function will cause a new
// entry in the visitor's history. It is provided for
// those browsers that only support JavaScript 1.0.
//
window.location.href = sURL;
}
//-->
</script>
<script language="JavaScript1.1">
<!--
function refresh()
{
// This version does NOT cause an entry in the browser's
// page view history. Most browsers will always retrieve
// the document from the web-server whether it is already