Commit b3e8a3e5 authored by Robert Ricci's avatar Robert Ricci

New front page text, for the first time in a few years. More clearly

enumerates the different experimental environments we support. Most
of the new text only gets displayed at Utah, since no one else has
wireless nodes, etc. Other sites get some short generic text.

New banner, plus other visual tweaks. The new banner is turned on via
the new @FANCYBANNER@ autoconf variable. This is turned on for
TBMAINSITE, but defaults to off for other sites. This is so that
existing sites which already have their own versions of the old banner
don't have to update them right away.

Made the usage iframe a little less prominent, by darkening it, and
making it ever so slightly transparent on browsers that support it.

Some minor visual tweaks to the background and content area.

Added specific IDs for the main menu subgroups so that if we want, we
can style them differently.

Man, IE is a pain in the ass.
parent ff45e20e
......@@ -1415,6 +1415,7 @@ done
#
......@@ -1456,6 +1457,7 @@ CLIENT_VARDIR="/var/emulab"
CLIENT_MANDIR="/usr/local/man"
TBSECURECOOKIES=1
TBMAINSITE=0
FANCYBANNER=0
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
IPBASE=10
......@@ -2054,17 +2056,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2058: checking for $ac_hdr" >&5
echo "configure:2060: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2063 "configure"
#line 2065 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -2103,17 +2105,17 @@ for ac_hdr in linux/videodev.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2107: checking for $ac_hdr" >&5
echo "configure:2109: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2112 "configure"
#line 2114 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -2146,7 +2148,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2150: checking for $ac_word" >&5
echo "configure:2152: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2225,7 +2227,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:2229: checking for a BSD compatible install" >&5
echo "configure:2231: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -2286,7 +2288,7 @@ esac
# Extract the first word of "rsync", so it can be a program name with args.
set dummy rsync; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2290: checking for $ac_word" >&5
echo "configure:2292: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2323,6 +2325,12 @@ if test x"$RSYNC" = x"" || test ! -x "$RSYNC"; then
echo "configure: warning: Rsync is required for logholes to work, see www.rsync.org." 1>&2
fi
# Turn on the new fancy banner - normally turned on only at Utah, but
# overridable for other sites
if test "$TBMAINSITE" = 1; then
FANCYBANNER=1
fi
outfiles="$outfiles Makeconf GNUmakefile \
assign/GNUmakefile \
named/GNUmakefile firewall/GNUmakefile \
......@@ -2717,6 +2725,7 @@ s%@TBCOOKIESUFFIX@%$TBCOOKIESUFFIX%g
s%@TBAUTHDOMAIN@%$TBAUTHDOMAIN%g
s%@TBAUTHTIMEOUT@%$TBAUTHTIMEOUT%g
s%@TBMAINSITE@%$TBMAINSITE%g
s%@FANCYBANNER@%$FANCYBANNER%g
s%@SFSSUPPORT@%$SFSSUPPORT%g
s%@ELABINELAB@%$ELABINELAB%g
s%@OUTERBOSS_NODENAME@%$OUTERBOSS_NODENAME%g
......
......@@ -117,6 +117,7 @@ AC_SUBST(TBCOOKIESUFFIX)
AC_SUBST(TBAUTHDOMAIN)
AC_SUBST(TBAUTHTIMEOUT)
AC_SUBST(TBMAINSITE)
AC_SUBST(FANCYBANNER)
AC_SUBST(SFSSUPPORT)
AC_SUBST(ELABINELAB)
AC_SUBST(OUTERBOSS_NODENAME)
......@@ -207,6 +208,7 @@ CLIENT_VARDIR="/var/emulab"
CLIENT_MANDIR="/usr/local/man"
TBSECURECOOKIES=1
TBMAINSITE=0
FANCYBANNER=0
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
IPBASE=10
......@@ -710,6 +712,12 @@ if test x"$RSYNC" = x"" || test ! -x "$RSYNC"; then
AC_MSG_WARN([Rsync is required for logholes to work, see www.rsync.org.])
fi
# Turn on the new fancy banner - normally turned on only at Utah, but
# overridable for other sites
if test "$TBMAINSITE" = 1; then
FANCYBANNER=1
fi
outfiles="$outfiles Makeconf GNUmakefile \
assign/GNUmakefile \
named/GNUmakefile firewall/GNUmakefile \
......
......@@ -57,6 +57,7 @@ $TBAUTHTIMEOUT = "@TBAUTHTIMEOUT@";
$TBMAINSITE = "@TBMAINSITE@";
$TBSECURECOOKIES= "@TBSECURECOOKIES@";
$TBCOOKIESUFFIX = "@TBCOOKIESUFFIX@";
$FANCYBANNER = "@FANCYBANNER@";
$TBWWW_DIR = "$TBDIR"."www/";
$TBBIN_DIR = "$TBDIR"."bin/";
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -235,15 +235,15 @@ function WRITESIDEBAR() {
}
if ($row = mysql_fetch_array($query_result)) {
$newsDate = "(".$row["prettydate"].")";
if ($row["age"] < 7) {
$newsDate = "(".$row[prettydate].")";
if ($row[age] < 7) {
$newNews = 1;
}
}
echo "<script type='text/javascript' language='javascript'
src='${BASEPATH}/textbox.js'></script>\n";
echo "<h3 class=menuheader>Information</h3><ul class=menu>\n";
echo "<h3 class=menuheader id=informationheader>Information</h3><ul class=menu id=information>\n";
if (0 == strcasecmp($THISHOMEBASE, "emulab.net")) {
$rootEmulab = 1;
......@@ -273,7 +273,7 @@ function WRITESIDEBAR() {
if ($rootEmulab) {
# Leave _NEW here about 2 weeks
WRITESIDEBARBUTTON("Papers and Talks (Dec 21)", $TBDOCBASE, "pubs.php3");
WRITESIDEBARBUTTON_NEW("Papers and Talks (Dec 21)", $TBDOCBASE, "pubs.php3");
WRITESIDEBARBUTTON("Software (Jul 18)",
$TBDOCBASE, "software.php3");
#WRITESIDEBARBUTTON("Add Widearea Node (CD)",
......@@ -390,8 +390,8 @@ function WRITESIDEBAR() {
# Start Interaction section if going to spit out interaction options.
if ($login_status & (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_MAYBEVALID)) {
echo "<h3 class='menuheader'>Experimentation</h3>
<ul class='menu'>\n";
echo "<h3 class='menuheader' id='experimentationheader'>Experimentation</h3>
<ul class='menu' id='experimentation'>\n";
}
if ($login_status & (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_MAYBEVALID)) {
......@@ -511,8 +511,8 @@ function WRITESIDEBAR() {
if (($login_status & (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_MAYBEVALID)) &&
($WIKISUPPORT || $MAILMANSUPPORT || $BUGDBSUPPORT ||
$CVSSUPPORT || $CHATSUPPORT)) {
echo "<h3 class='menuheader'>Collaboration</h3>
<ul class='menu'>";
echo "<h3 class='menuheader' id='collaborationheader'>Collaboration</h3>
<ul class='menu' id='collaboration'>";
if ($WIKISUPPORT && $CHECKLOGIN_WIKINAME != "") {
$wikiname = $CHECKLOGIN_WIKINAME;
......@@ -555,8 +555,8 @@ function WRITESIDEBAR() {
# Optional ADMIN menu.
if ($login_status & CHECKLOGIN_LOGGEDIN && ISADMIN()) {
echo "<h3 class='menuheader'>Administration</h3>
<ul class='menu'>";
echo "<h3 class='menuheader' id='administrationheader'>Administration</h3>
<ul class='menu' id='administration'>";
echo "<li>List <a " .
" href=\"$TBBASE/showproject_list.php3\">" .
......@@ -615,7 +615,7 @@ function WRITESIMPLESIDEBAR($menudefs) {
#
function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
$extra_headers = NULL ) {
global $BASEPATH, $TBMAINSITE, $THISHOMEBASE, $ELABINELAB;
global $BASEPATH, $TBMAINSITE, $THISHOMEBASE, $ELABINELAB, $FANCYBANNER;
global $TBDIR, $WWW;
global $MAINPAGE;
global $TBDOCBASE;
......@@ -666,31 +666,57 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
src='${BASEPATH}/emulab_sup.js'></script>\n";
if (! $nobanner ) {
echo "<map name='overlaymap'>
<area shape=\"rect\" coords=\"100,60,339,100\"
href='http://www.emulab.net/index.php3'>
<area shape=\"rect\" coords=\"0,0,339,100\"
href='$TBDOCBASE/index.php3'>
</map>
<div class='bannercell'>\n";
#
# We do the banner differently for the Utah site and other sites.
# The process of generating the fancy Utah banner is kind of
# complicated
#
if ($FANCYBANNER) {
echo "<div id='fancybannercell'>\n";
} else {
echo "<div id='bannercell'>\n";
}
# NOTE: This has to come before any images in the div for the float to
# work correctly.
if ($currentusage) {
echo "<iframe src='$BASEPATH/currentusage.php3' class='usageframe'
if ($FANCYBANNER) {
$class = "transparentusageframe";
} else {
$class = "usageframe";
}
echo "<iframe src='$BASEPATH/currentusage.php3' class='$class'
scrolling='no' frameborder='0'></iframe>\n";
}
echo "<img height='100' border='0' usemap=\"#overlaymap\" ";
if ($ELABINELAB) {
echo "width='239' ";
echo "src='$BASEPATH/overlay.elabinelab.gif' ";
}
else {
echo "width='339' ";
echo "src='$BASEPATH/overlay.".strtolower($THISHOMEBASE).".gif' ";
}
echo "alt='$THISHOMEBASE - the network testbed'>\n";
if (0 && !$MAINPAGE) {
echo "<span class='devpagename'>$WWW</span>";
}
if ($FANCYBANNER) {
# This transparent image gives the illusion of being able to click
# on the logo part of the banner image.
echo "<a href='$TBDOCBASE/index.php3'>
<img height='100px' width='360px' border='0' src='$BASEPATH/transparent.gif' />
</a>\n";
} else {
echo "<map name='overlaymap'>
<area shape=\"rect\" coords=\"100,60,339,100\"
href='http://www.emulab.net/index.php3'>
<area shape=\"rect\" coords=\"0,0,339,100\"
href='$TBDOCBASE/index.php3'>
</map>\n";
echo "<img height='100' border='0' usemap=\"#overlaymap\" ";
if ($ELABINELAB) {
echo "width='239' ";
echo "src='$BASEPATH/overlay.elabinelab.gif' ";
}
else {
echo "width='339' ";
echo "src='$BASEPATH/overlay.".strtolower($THISHOMEBASE).".gif' ";
echo "src='$BASEPATH/banner-rgb.png' ";
}
echo "alt='$THISHOMEBASE - the network testbed'>\n";
if (0 && !$MAINPAGE) {
echo "<span class='devpagename'>$WWW</span>";
}
}
echo "</div>\n";
}
if (! $nocontent ) {
......@@ -704,7 +730,7 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
#
function FINISHSIDEBAR($contentname = "content", $nocontent = 0)
{
global $TBMAINSITE, $TBBASE, $BASEPATH, $login_user;
global $TBMAINSITE, $login_user;
if (!$nocontent) {
if (!$TBMAINSITE) {
......@@ -781,20 +807,20 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL) {
header("Expires: " . gmdate("D, d M Y H:i:s", time() + 300) . " GMT");
}
if (VIEWSET($view, 'hide_banner')) {
if (isset($view['hide_banner'])) {
$nobanner = 1;
} else {
$nobanner = 0;
}
$contentname = "content";
$nocontent = VIEWSET($view, 'hide_sidebar') && !VIEWSET($view, 'menu');
$nocontent = isset($view['hide_sidebar']) && !isset($view['menu']);
PAGEBEGINNING( $title, $nobanner,
$nocontent,
$extra_headers );
if (!VIEWSET($view, 'hide_sidebar')) {
if (!isset($view['hide_sidebar'])) {
WRITESIDEBAR();
}
elseif (VIEWSET($view, 'menu')) {
elseif (isset($view['menu'])) {
WRITESIMPLESIDEBAR($view['menu']);
}
else {
......@@ -817,7 +843,7 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL) {
$minor = "";
$build = "";
TBGetVersionInfo($major, $minor, $build);
if (VIEWSET($view, 'hide_versioninfo'))
if ($view['hide_versioninfo'] == 1)
$versioninfo = "";
else
$versioninfo = "Vers: $major.$minor Build: $build";
......@@ -844,13 +870,9 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL) {
}
echo "$title</h2>\n";
if ($login_user) {
echo "<div class=pagenotworking>Page not working properly? ";
echo "<a href=pagenotworking.php>Click here</a></div>";
}
echo "<div class='cbody'>\n";
echo "<!-- begin content -->\n";
if (VIEWSET($view, 'show_topbar', "plab")) {
if ($view['show_topbar'] == "plab") {
WRITEPLABTOPBAR();
}
}
......@@ -883,14 +905,15 @@ function PAGEFOOTER($view = NULL) {
$year = $today["year"];
echo "<!-- end content -->\n";
echo "</div>\n";
if (VIEWSET($view, 'show_bottombar', "plab")) {
if ($view['show_bottombar'] == "plab") {
WRITEPLABBOTTOMBAR();
}
echo "
<div class='contentfooter'>\n";
if (!VIEWSET($view, 'hide_copyright')) {
if (!$view['hide_copyright']) {
echo "
<ul class='navlist'>
<li>[&nbsp;<a href=\"http://www.cs.utah.edu/flux/\"
......@@ -928,7 +951,7 @@ function PAGEFOOTER($view = NULL) {
ENDPAGE();
# Plug the home site from all others.
echo "\n<br><a href=\"www.emulab.net/netemu.php3\"></a>\n";
echo "\n<p><a href=\"www.emulab.net/netemu.php3\"></a>\n";
# This has to be after all the tooltip definitions.
echo "<script type='text/javascript' src='${TBBASE}/js/wz_tooltip.js'>".
......@@ -961,7 +984,6 @@ function WRITESUBMENUBUTTON($text, $link, $target = "") {
#
# Optional 'target' agument, so that we can pop up new windows
#
$targettext = "";
if ($target) {
$targettext = "target='$target'";
}
......@@ -1058,28 +1080,16 @@ function SUBMENUEND_2B() {
# Get a view, for use with PAGEHEADER and PAGEFOOTER, for the current user
#
function GETUSERVIEW() {
if (GETUID() && (ISPLABUSER() || isset($_REQUEST["plab_interface"]))) {
if (GETUID() && ISPLABUSER()) {
return array('hide_sidebar' => 1, 'hide_banner' => 1,
'show_topbar' => "plab", 'show_bottombar' => 'plab',
'hide_copyright' => 1);
} else {
# Most users get the default view
return array();
}
}
#
# Do we view something.
#
function VIEWSET($view, $thing, $value = null) {
if (! array_key_exists($thing, $view))
return 0;
if ($value) {
return $view[$thing] == $value;
}
$val = $view[$thing];
return ! empty($val);
}
function STARTBUSY($msg) {
global $currently_busy;
......
......@@ -33,4 +33,3 @@ table { border: 0px; background-color: #9A9; }
table.nogrid { border: solid 1px #696; background-color:#9A9; }
span.topbaroption { background-color:#E1EAE1; }
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2000-2003, 2005, 2006, 2007 University of Utah and the Flux Group.
* Copyright (c) 2000-2003, 2005-2007 University of Utah and the Flux Group.
* All rights reserved.
*/
......@@ -30,6 +30,7 @@ table.nogrid { border: solid 1px #669; background-color:#99A; }
table.stealth { border: 0px; background-color:#FFF; }
td.stealth { background-color:#FFF; }
img.stealth { background-color:#FFF; }
img.tbpic { float: right; clear: both; }
table.topbar { border-bottom: solid 2px #000; }
table.bottombar { border-top: solid 2px #000; }
......@@ -39,7 +40,7 @@ td.paddedcell { padding-left: 0.5em; padding-right: 0.5em; padding-top: 0.75em;
td.paddedcell2 { padding: 0.5em; }
/* BEGIN Banner - Draw and size the banner div across the top. */
.bannercell {
#bannercell {
background-color: #dae3e9;
background-image: url("logo-background.gif");
background-repeat: repeat-x;
......@@ -50,24 +51,53 @@ td.paddedcell2 { padding: 0.5em; }
width: 100%;
height: 100px;
}
iframe.usageframe {
#fancybannercell {
background-color: #000000;
background-image: url("fancy-banner.png");
background-repeat: no-repeat;
border-bottom: solid 2px #666666;
padding: 0px;
margin: 0px;
width: 100%;
height: 100px;
}
/* Styling for the usage box title and cells. */
iframe.usageframe, iframe.transparentusageframe {
width: 275px;
height: 100px;
border: 0px;
margin: 0px;
float: right;
padding: 0px;
background-color: #444444;
}
iframe.transparentusageframe {
opacity: 0.85;
/* Why, IE, why?! */
filter: alpha(opacity=85);
-moz-opacity: 0.85;
}
div#usage table {
border-width: 0px;
background-color: #666666;
/* Force the same height as the banner */
height: 100px;
}
/* Styling for the usage box title and cells. */
.usagetitle {
background-color: #000;
color: #fff;
background-color: #222222;
text-align: center;
font-size: 10pt;
}
td.menuoptusage {
background-color: #dae3e9;
font-weight: bold;
color: #ffffff;
background-color: #444444;
padding-left: 6px;
padding-top: 1px;
padding-bottom: 0px;
......@@ -75,6 +105,11 @@ td.menuoptusage {
border: 0px;
font-size: 9pt;
}
td.menuoptusage a {
/* Change link color to be more visible on a dark background */
color: #bbbbff;
}
/* END Banner */
......@@ -89,7 +124,6 @@ td.menuoptusage {
.leftcell {
/* Border for the entire group of menus. */
border: solid 2px black;
border-top: 0px;
/* Style for text inlined between menus. */
background-color: #def;
......@@ -227,6 +261,10 @@ ul.menu li.newgroup {
padding-right: 16px;
margin-bottom: 8px;
min-width: 95%; /* XXX Safari doesn't expand the div to fill the viewport. */
padding-bottom: 20px;
background-image: url(gradient-black-flipped.png);
background-repeat: repeat-x;
background-position: bottom left;
}
/* The black bar containing the page title. */
......@@ -243,7 +281,12 @@ ul.menu li.newgroup {
padding-left: 3px;
clear: none; /* Let the version/login floats share the line. XXX IE6 */
line-height: 38px;
padding-bottom: 12px;
background-image: url(gradient-black.png);
background-repeat: repeat-x;
background-position: bottom left;
}
#versioninfo {
color: #FFF;
font-size: x-small;
......@@ -352,14 +395,6 @@ ul.submenu li.newgroup {
text-align: right;
margin-bottom: 0px;
}
.pagenotworking {
background-color:#FFF;
font-size: x-small;
text-align: left;
margin-bottom: 6px;
margin-top: 0px;
font-weight: bold;
}
.reportbug {
background-color:#FFF;
font-size: x-small;
......@@ -480,3 +515,16 @@ span.topbaroption { background-color:#E1E1EA; }
white-space: pre;
line-height: 110%;
}
dl {
padding-left: 10px;
}
dl dt {
font-weight: bold;
}
dl.envlist {
border: #ffff00 solid 2px;
background: #ffffcc;
}
www/wallpaper1.png

145 Bytes | W: | H:

www/wallpaper1.png

142 Bytes | W: | H:

www/wallpaper1.png
www/wallpaper1.png
www/wallpaper1.png
www/wallpaper1.png
  • 2-up
  • Swipe
  • Onion skin
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