Commit 78443e3a authored by Robert Ricci's avatar Robert Ricci

On second thought, right under the navbar is a fine place

parent c55de421
......@@ -198,19 +198,6 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL,
goto embed;
}
# Put the special message, if any, above the header
if ($ISCLOUD) {
$message = TBGetSiteVar("cloudlab/message");
}
else {
$message = TBGetSiteVar("aptlab/message");
}
if ($message != "") {
echo "<div class='alert alert-warning alert-dismissible' role='alert' style='margin-bottom: 0'>
<button type='button' class='close' data-dismiss='alert' aria-label='Close'><span aria-hidden='true'>&times;</span></button>
$message
</div>";
}
echo "
<div class='navbar navbar-static-top' style='margin-bottom: 10px'
role='navigation'>
......@@ -327,6 +314,21 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL,
echo " </ul>
</div>
</div>\n";
# Put the special message, if any, right below the header. Note that the
# negative margin is to put it flush below the navbar without having to
# permanently remove the bottom margin on the navbar
if ($ISCLOUD) {
$message = TBGetSiteVar("cloudlab/message");
}
else {
$message = TBGetSiteVar("aptlab/message");
}
if ($message != "") {
echo "<div class='alert alert-warning alert-dismissible' role='alert' style='margin-top: -10px'>
$message
</div>";
}
if ($login_user) {
list($pcount, $phours) = Instance::CurrentUsage($login_user);
......
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