diff --git a/www/aptui/css/quickvm.css b/www/aptui/css/quickvm.css index 5f156909cdfdb2c8cb7d2a81e1bc6e68c3be8a81..80f1e88f61da255e9fb1a093e6336cd6a6b971de 100644 --- a/www/aptui/css/quickvm.css +++ b/www/aptui/css/quickvm.css @@ -44,22 +44,38 @@ body { width: 100%; } +.navbar-nav { + margin: 0; +} + .navbar-nav > li > a, .navbar-nav > li > p { color: #000000; margin-top: 20px; } +.navbar-nav-shortcuts { + background-color: #FAFAFA; +} + .navbar-btn.btn-xs, .navbar-btn { margin-top: 20px; } +.apt-navbar-btn { + color: #FFFFFF !important; +} +.apt-navbar-btn:hover { + background-color: #337ab7 !important; +} + .btn-quickvm-home, .btn-quickvm-home:hover { color: #000000; background-color: #D3D3D3; border-color: #357ebd; margin-right: 10px; + margin-bottom: 0px; } .navbar-right li .navbar-btn { @@ -91,7 +107,7 @@ body { /* So that containers have some top room */ .container { - margin-top: 15px; !important; + margin-top: 15px !important; } @@ -327,7 +343,7 @@ body { color: red; } .border-none { - border: none; + border: none !important; } /* @@ -409,7 +425,7 @@ blockquote #selected_profile_description { .popover { - min-width: 350px ! important; + min-width: 350px !important; } /* Update for better cross browser compat */ diff --git a/www/aptui/quickvm_sup.php b/www/aptui/quickvm_sup.php index de787230f08a02612c642458403cfae855660eca..375499d520eafa5d4bad8aa234059d21a26748fa 100644 --- a/www/aptui/quickvm_sup.php +++ b/www/aptui/quickvm_sup.php @@ -85,6 +85,7 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL, global $GOOGLEUA, $ISCLOUD, $ISPNET, $ISEMULAB, $TBBASE, $ISEMULAB; global $login_user, $login_status; global $disable_accounts, $page_title, $drewheader, $embedded; + $showmenus = 0; $title = $APTTITLE; if (isset($page_title)) { $title .= " - $page_title"; @@ -99,7 +100,9 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL, $login_status = $status; $login_uid = $login_user->uid(); } - + if ($login_user && !($login_status & CHECKLOGIN_WEBONLY)) { + $showmenus = 1; + } echo " $title @@ -143,82 +146,107 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL, goto embed; } - echo " -