Commit 76d62372 authored by Timothy Stack's avatar Timothy Stack
Browse files

Ops, the builtwith logo was showing up in popup windows.

parent d3ca9c2d
...@@ -728,10 +728,11 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0, ...@@ -728,10 +728,11 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
# #
# finishes sidebar td # finishes sidebar td
# #
function FINISHSIDEBAR($contentname = "content") function FINISHSIDEBAR($contentname = "content", $nocontent = 0)
{ {
global $TBMAINSITE; global $TBMAINSITE;
if (!$nocontent) {
if (!$TBMAINSITE) { if (!$TBMAINSITE) {
# #
# It is a violation of Emulab licensing restrictions to remove # It is a violation of Emulab licensing restrictions to remove
...@@ -740,9 +741,11 @@ function FINISHSIDEBAR($contentname = "content") ...@@ -740,9 +741,11 @@ function FINISHSIDEBAR($contentname = "content")
echo " <a class='builtwith' href='http://www.emulab.net'> echo " <a class='builtwith' href='http://www.emulab.net'>
<img src='$BASEPATH/builtwith.png'></a>"; <img src='$BASEPATH/builtwith.png'></a>";
} }
echo "<!-- sidebar ends --> echo "<!-- sidebar ends -->
</div> </div>";
}
echo "
<div class='$contentname'> <div class='$contentname'>
<!-- content body -->"; <!-- content body -->";
} }
...@@ -808,8 +811,9 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL) { ...@@ -808,8 +811,9 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL) {
$nobanner = 0; $nobanner = 0;
} }
$contentname = "content"; $contentname = "content";
$nocontent = isset($view['hide_sidebar']) && !isset($view['menu']);
PAGEBEGINNING( $title, $nobanner, PAGEBEGINNING( $title, $nobanner,
isset($view['hide_sidebar']) && !isset($view['menu']), $nocontent,
$extra_headers ); $extra_headers );
if (!isset($view['hide_sidebar'])) { if (!isset($view['hide_sidebar'])) {
WRITESIDEBAR(); WRITESIDEBAR();
...@@ -820,7 +824,7 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL) { ...@@ -820,7 +824,7 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL) {
else { else {
$contentname = "fullcontent"; $contentname = "fullcontent";
} }
FINISHSIDEBAR($contentname); FINISHSIDEBAR($contentname, $nocontent);
echo "<div class='contentbody'>"; echo "<div class='contentbody'>";
echo "<div id='logintime'>"; echo "<div id='logintime'>";
......
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