Commit ec3f0e30 authored by Kirk Webb's avatar Kirk Webb

Track forum link according to site view.

Also clean up some commented out stuff from the pnet index page.
parent 6a0176aa
......@@ -278,7 +278,6 @@ apt-install: $(addprefix $(INSTALL_WWWDIR)/apt/, $(ALLAPTUI)) \
$(addprefix $(INSTALL_WWWDIR)/apt/formhelpers/css/, $(ALLHELPCSS)) \
$(addprefix $(INSTALL_WWWDIR)/apt/formhelpers/js/, $(ALLHELPJS))
post-install:
boss-install: install
......
......@@ -39,6 +39,7 @@ $ALTERNATE_DOMAINS[] =
array('/phantom/',
array('THISHOMEBASE' => 'PhantomNet',
'WIKINODE' => 'wiki.phantomnet.org',
'FORUMURL' => 'http://groups.google.com/group/phantomnet-users',
'DOMVIEW' => $PNET_DOMVIEW
));
......
......@@ -65,6 +65,7 @@ $MAILMANURL = "http://${USERNODE}/mailman";
$OPSCVSURL = "http://${USERNODE}/cvsweb/cvsweb.cgi";
$OPSJETIURL = "http://${USERNODE}/jabber/jeti.php";
$WIKIDOCURL = "http://${WIKINODE}/wikidocs/wiki";
$FORUMURL = "http://groups.google.com/group/emulab-users";
$MIN_UNIX_UID = @MIN_UNIX_UID@;
$MIN_UNIX_GID = @MIN_UNIX_GID@;
$EXPOSELINKTEST = 1;
......@@ -670,7 +671,7 @@ function CheckRedirect() {
function SetDomainDefs()
{
global $WWWHOST, $OURDOMAIN, $WWW, $THISHOMEBASE, $TBAUTHDOMAIN, $TBBASE;
global $TBDOCBASE, $TBWWW, $WIKINODE, $WIKIDOCURL, $TBMAINSITE;
global $TBDOCBASE, $TBWWW, $WIKINODE, $WIKIDOCURL, $TBMAINSITE, $FORUMURL;
global $ALTERNATE_DOMAINS, $FLAVOR, $DOMVIEW;
foreach ($ALTERNATE_DOMAINS as $altdom) {
......@@ -700,6 +701,9 @@ function SetDomainDefs()
} else {
$WIKIDOCURL = "http://${WIKINODE}/wikidocs/wiki";
}
if (isset($ovr['FORUMURL'])) {
$FORUMURL = $ovr['FORUMURL'];
}
if (isset($ovr['DOMVIEW'])) {
$DOMVIEW = $ovr['DOMVIEW'];
}
......
......@@ -43,7 +43,7 @@
Some helpful links:<br>
<ul>
<li><a href="http://wiki.phantomnet.org">PhantomNet Wiki</a></li>
<li><a href="http://wiki.phantomnet.org/oepc-tutorial">OpenEPC Tutorial</a></li>
<li><a href="http://wiki.phantomnet.org/oepc-tutorial">OpenEPC Tutorial (registration/approval required)</a></li>
</ul>
</p>
<p>
......@@ -53,105 +53,3 @@
<a href="http://www.cs.utah.edu">School of Computing</a> at the
<a href="http://www.utah.edu">University of Utah</a>.
</p>
<!-- Note - this stuff is fairly Utah-specific, so it's only displayed there
for now. But, feel free to use any of it if it applies to your testbed
<p>
Emulab is a <strong>public facility</strong>, available without charge to most
researchers worldwide.
If you are unsure if you qualify for use, please see our
<a href="/wikidocs/wiki/AdminPolicies">policies document</a>,
or <a href='mailto:testbed-ops@emulab.net'>ask us</a>.
If you think you qualify, you can
<a href="/wikidocs/wiki/Auth">apply to start a new
project</a>.
</p>
<p>
<em>Emulab</em> provides integrated access to a wide range of experimental
environments:
</p>
<div class="thumb">
<a href="node_usage/">
<img src="thumbnail-usage.png" height="100" width= "100"/><br />
</a>
<a href="node_usage/">
Emulab usage graphs
</a>
</div>
<div class="thumb">
<a href="usermap/">
<img src="thumbnail-usermap.png" height="100" width= "100"/><br />
</a>
<a href="doc/docwrapper.php3?docname=users.html">
Emulab user map
</a>
</div>
<div class="thumb">
<a href="http://users.emulab.net/trac/emulab/wiki/OtherEmulabs">
<img src="thumbnail-siteloc.png" height="100" width= "100"/><br />
</a>
<a href="http://users.emulab.net/trac/emulab/wiki/OtherEmulabs">
Other Emulab sites
</a>
</div>
<dl class="envlist">
<dt><a href="/wikidocs/wiki/Tutorial">Emulation</a></dt>
<dd>An emulated experiment allows you to specify an arbitrary network
topology, giving you a <em>controllable, predictable, and repeatable
environment</em>, including PC nodes on which you have
<em>full &quot;root&quot; access</em>, running an operating system of
your choice.</dd>
<dt><a href="/wikidocs/wiki/plab">Live-Internet Experimentation</a></dt>
<dd>Using the RON and <a href="http://www.planet-lab.org">PlanetLab</a>
testbeds, Emulab provides you with a
<em>full-featured environment</em> for <em>deploying, running, and
controlling</em> your application at hundreds of sites around the
world.</dd>
<dt><a href="/wikidocs/wiki/wireless">802.11 Wireless</a></dt>
<dd>Emulab's 802.11a/b/g testbed is deployed on multiple floors of an
office building. Nodes are <em>under your full control</em> and may act as
access points, clients, or in ad-hoc mode. All nodes have two wireless
interfaces, plus a <em>wired control network</em>.</dd>
<dt><a href="/wikidocs/wiki/gnuradio">Software-Defined Radio</a></dt>
<dd><a href="http://www.ettus.com/downloads/usrp_v4.pdf">USRP</a> devices from the <a href="http://www.gnu.org/software/gnuradio/index.html">GNU Radio</a> project give you <em>control over Layer 1 of a
wireless network</em> - everything from signal processing up is done in
software.</dd>
</dl>
<p>
Emulab unifies all of these environments under a common user interface,
and integrates them into a common framework. This framework
provides abstractions, services, and namespaces common to all, such as
allocation and naming of nodes and links. By mapping the abstractions
into domain-specific mechanisms and internal names, Emulab masks much
of the heterogeneity of the different resources.
</p>
<h3>Links to help you get started:</h3>
<ul>
<li><b><a href = "/wikidocs/wiki/Auth">
Authorization Scheme, Policy, and "How To Get Started"</a></b>
<li><b><a href = "/wikidocs/wiki/software">
Overview of Installed Software</a></b>
<li><b><a href = "hardware.php">
Hardware Overview, "Emulab Classic"</a></b>
<li><b><a href = "/wikidocs/wiki/SecReqs">
Security Issues</a></b>
<li><b><a href = "/wikidocs/wiki/AdminPolicies">
Administrative Policies and Disclaimer</a></b>
</ul>
<a href='pix/pc3k-front.jpg'>
<img src='pix/pc3k-front-thumb.jpg'/></a>
<a href='pix/pc3k-back.jpg'>
<img src='pix/pc3k-back-thumb.jpg'/></a>
-->
......@@ -667,7 +667,7 @@ function WRITEPNETSIDEBAR() {
global $login_status, $login_user;
global $TBBASE, $TBDOCBASE, $BASEPATH;
global $TBMAINSITE, $THISHOMEBASE;
global $WIKIDOCURL;
global $WIKIDOCURL, $FORUMURL;
list($newsBase, $newsDate, $newNews) = GETNEWSINFO();
......@@ -684,7 +684,7 @@ function WRITEPNETSIDEBAR() {
}
NavMenuButton("Documentation", "$WIKIDOCURL");
NavMenuButtonNew("Forums", "http://groups.google.com/group/phantomnet-users");
NavMenuButtonNew("Forums", "$FORUMURL");
# The search box. Placed in a table so the text input fills available
# space.
......@@ -729,7 +729,7 @@ function WRITESIDEBAR() {
global $CHECKLOGIN_WIKINAME, $TBMAINSITE;
global $THISHOMEBASE;
global $currentusage, $FANCYBANNER, $ELABINELAB, $PLABSUPPORT;
global $WIKIDOCURL;
global $WIKIDOCURL, $FORUMURL;
$firstinitstate = TBGetFirstInitState();
list($newsBase, $newsDate, $newNews) = GETNEWSINFO();
......@@ -759,7 +759,7 @@ function WRITESIDEBAR() {
}
NavMenuButton("Documentation", "$WIKIDOCURL");
NavMenuButtonNew("Forums", "http://groups.google.com/group/emulab-users");
NavMenuButtonNew("Forums", "$FORUMURL");
if ($rootEmulab) {
# Leave New here about 2 weeks
......@@ -1324,6 +1324,7 @@ function PAGEFOOTER($view = NULL) {
global $TBDOCBASE, $TBMAILADDR, $THISHOMEBASE, $BASEPATH, $TBBASE;
global $TBMAINSITE, $bodyclosestring, $currently_busy;
global $login_user, $javascript_debug, $sortedtables;
global $FORUMURL;
if ($currently_busy) {
CLEARBUSY();
......@@ -1374,12 +1375,12 @@ function PAGEFOOTER($view = NULL) {
if ($login_user) {
echo " <td class=reportbug>Questions? Join the ";
echo " <a href='http://groups.google.com/group/emulab-users'>";
echo " <a href='$FORUMURL'>";
echo " Help Forum</a>";
echo " </td>";
}
echo " <td class=contact>Bug? Join the ";
echo " <a href='http://groups.google.com/group/emulab-users'>";
echo " <a href='$FORUMURL'>";
echo " Help Forum</a>";
echo " </td>";
echo " </tr>\n";
......
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