Commit e3152424 authored by Kirk Webb's avatar Kirk Webb

The beginnings of a PhantomNet "skin"

A changed look and some cases feel for the Emulab UI for when
users come in through a PhantomNet domain.  This commit contains
a very spare conversion attempt, just to see if I can get things
moving in the right direction.
parent ba6d7982
......@@ -195,8 +195,15 @@ if (strpos($_SERVER['SERVER_NAME'],'phantomnet') !== false) {
$TBWWW = "<$TBBASE/>";
$WIKINODE = "wiki.phantomnet.org";
$WIKIDOCS = "http://${WIKINODE}/wikidocs/wiki";
$IS_PNET = 1;
}
#
# PhantomNet view declaration
#
$PNETVIEW = array('hide_sidebar' => 1, 'hide_banner' => 0,
'show_topbar' => "pnet", 'show_bottombar' => 'pnet',
'hide_copyright' => 0, 'show_pnet' => 1);
#
# Database constants and the like.
......
......@@ -1041,6 +1041,7 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL,
global $TBBASE, $TBDOCBASE, $THISHOMEBASE;
global $BASEPATH, $drewheader, $autorefresh;
global $TBMAINSITE;
global $IS_PNET, $PNETVIEW;
$drewheader = 1;
if (isset($_GET['refreshrate']) && is_numeric($_GET['refreshrate'])) {
......@@ -1056,10 +1057,14 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL,
}
#
# If no view options were specified, get the ones for the current user
# If no view options were specified, get the ones for the current user.
# if no user specific view, see if we are coming in via Phantomnet.
#
if (!$view) {
$view = GETUSERVIEW();
if (empty($view) && $IS_PNET) {
$view = $PNETVIEW;
}
}
#
......@@ -1204,14 +1209,22 @@ function PAGEFOOTER($view = NULL) {
global $TBDOCBASE, $TBMAILADDR, $THISHOMEBASE, $BASEPATH, $TBBASE;
global $TBMAINSITE, $bodyclosestring, $currently_busy;
global $login_user, $javascript_debug, $sortedtables;
global $IS_PNET, $PNETVIEW;
if ($currently_busy) {
CLEARBUSY();
$currently_busy = 0;
}
#
# If no view options were specified, get the ones for the current user.
# if no user specific view, see if we are coming in via Phantomnet.
#
if (!$view) {
$view = GETUSERVIEW();
if (empty($view) && $IS_PNET) {
$view = $PNETVIEW;
}
}
$today = getdate();
......
<!--
Copyright (c) 2000-2014 University of Utah and the Flux Group.
Copyright (c) 2014 University of Utah and the Flux Group.
{{{EMULAB-LICENSE
......@@ -33,7 +33,7 @@
NS file templates augmented with PhantomNet-specific functionality.
In addition to raw resources, <em>PhantomNet</em> provides configuration
directives and scripts to assist researchers in setting up their
mobility experiments. In complement to the template NS files,
mobility experiments. In complement to these template NS files,
PhantomNet does the work of configuring the EPC software components
to operate within the underlying <em>Emulab</em> environment.
The PhantomNet facility is built on top of
......@@ -44,7 +44,7 @@
</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 -->
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.
......@@ -142,3 +142,5 @@ of the heterogeneity of the different resources.
<img src='pix/pc3k-front-thumb.jpg'/></a>
<a href='pix/pc3k-back.jpg'>
<img src='pix/pc3k-back-thumb.jpg'/></a>
-->
<!--
Copyright (c) 2000-2004 University of Utah and the Flux Group.
Copyright (c) 2014 University of Utah and the Flux Group.
{{{EMULAB-LICENSE
......@@ -23,8 +23,8 @@
<!--- This exists to redirect to the PHP script -->
<html>
<head>
<title>Emulab.Net</title>
<META HTTP-EQUIV="Refresh" Content= "0; URL=index.php3" ALT="Emulab home page">
<title>PhantomNet.Org</title>
<META HTTP-EQUIV="Refresh" Content= "0; URL=index.php3" ALT="PhantomNet home page">
</head>
</html>
......
<?php
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
# Copyright (c) 2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -31,15 +31,7 @@ $optargs = OptionalPageArguments("stayhome", PAGEARG_BOOLEAN);
#
CheckRedirect();
#
# PhantomNet Header
#
$pnetview = array('hide_sidebar' => 1, 'hide_banner' => 0,
'show_topbar' => "pnet", 'show_bottombar' => 'pnet',
'hide_copyright' => 0, 'show_pnet' => 1);
PAGEHEADER("PhantomNet - Mobility Testbed Platform", $pnetview,
$RSS_HEADER_PNNEWS);
PAGEHEADER("PhantomNet - Mobility Testbed", NULL, $RSS_HEADER_PNNEWS);
#
# Show special banner message, if set.
......@@ -59,5 +51,5 @@ readfile("index-phantomnet.html");
#
# Standard Testbed Footer
#
PAGEFOOTER($pnetview);
PAGEFOOTER();
?>
include_path = ".:.."
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