From 1509f3805da35d76b493eedab192ae2a2d22f19e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 18 Jan 2015 14:53:34 -0500 Subject: [PATCH] display server name in dashboard --- dashboard-ui/advanced.html | 3 +- dashboard-ui/css/librarybrowser.css | 4 +- dashboard-ui/css/librarymenu.css | 4 +- dashboard-ui/css/site.css | 68 +++++++++++--- dashboard-ui/dashboard.html | 1 - dashboard-ui/dashboardgeneral.html | 1 - dashboard-ui/notificationsetting.html | 10 +- dashboard-ui/notificationsettings.html | 10 +- dashboard-ui/scheduledtask.html | 10 +- dashboard-ui/scheduledtasks.html | 10 +- dashboard-ui/scripts/dashboardgeneral.js | 9 ++ dashboard-ui/scripts/dashboardpage.js | 5 + dashboard-ui/scripts/site.js | 112 +++++++++++++++++------ dashboard-ui/serversecurity.html | 9 +- 14 files changed, 169 insertions(+), 87 deletions(-) diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index 27870dc926..cbbe51504e 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -11,8 +11,7 @@
${TabGeneral} - ${TabNotifications} - ${TabScheduledTasks} + ${TabSecurity}
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 3b0447f6c6..c9ad731d95 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -559,7 +559,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .ui-page-theme-a .detailSectionHeader { - background-color: #e9e9e9; + background-color: #fff; border: 1px solid #ddd; border-radius: 2px; } @@ -644,7 +644,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -@media all and (max-width: 750px) { +@media all and (max-width: 800px) { .editorMenuLink { display: none; diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 619f5e19fa..23665a481a 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -265,14 +265,14 @@ } } -@media all and (min-width: 750px) { +@media all and (min-width: 800px) { .dashboardDocument .dashboardMenuButton { display: none; } } -@media all and (max-width: 750px) { +@media all and (max-width: 800px) { .dashboardDocument .libraryMenuButton { display: none; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index ae15b3c104..8f2897f44f 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -320,49 +320,93 @@ h1 .imageLink { border: 0; display: none; text-align: left; - width: 220px; + width: 240px; position: fixed; top: 51px; left: 0; bottom: 0; margin: 0; + overflow-x: hidden; + overflow-y: auto; + border-right: 1px solid #e0e0e0; + /*-moz-box-shadow: -3px 0 10px 0 #555; + -webkit-box-shadow: -3px 0 10px 0 #555; + box-shadow: -3px 0 10px 0 #555;*/ } +.ui-page-theme-a { + background: #f2f2f2; +} + + .ui-page-theme-a .content-secondary { + background: #fff; + } + .sidebarLinks { - margin-top: 2.75em; - margin-left: 1em; + margin-top: 1.5em; + padding-bottom: 50px; } .sidebarLinks a { display: block; - padding: .6em 20px .6em 20px; + padding: .6em 20px .6em 0; text-decoration: none; color: inherit !important; text-shadow: none !important; font-weight: 500 !important; font-size: 14px; - border-radius: 2px; + vertical-align: middle; } .sidebarLinks a:hover { - background: #52B54B; - color: #fff !important; + background: #f2f2f2; } .sidebarLinks a.selectedSidebarLink { - background: #38c !important; - color: #fff !important; margin-right: 0; } +.ui-page-theme-a .sidebarLinks a.selectedSidebarLink { + background: #f2f2f2 !important; +} + +.ui-page-theme-b .sidebarLinks a.selectedSidebarLink { + background: #38c !important; + color: #fff !important; +} + +.sidebarLinks .sidebarLinkIcon { + font-size: 17px; + width: 66px; + text-align: center; +} + +.ui-page-theme-a .sidebarLinkIcon { + color: #666; +} + .sidebarDivider { height: 0; border-width: 1px 0 0; border-style: solid; - margin: .25em 0; + margin: .7em 0; border-radius: 0; } +.sidebarLinkText, .sidebarLinkIcon { +} + +.sidebarHeader { + padding-left: 20px; + margin: 1em 0; + font-size: 90%; +} + +.ui-page-theme-a .sidebarHeader { + color: #888; +} + + .invalidEntry { background-color: lightpink !important; } @@ -439,7 +483,7 @@ h1 .imageLink { } } -@media all and (min-width: 750px) { +@media all and (min-width: 800px) { /* Forms @@ -465,7 +509,7 @@ h1 .imageLink { .content-primary { padding: 80px 15px 3em 0; - margin: 0 0 0 260px; + margin: 0 0 0 280px; } .content-primary ul:first-child { diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index 50ed20663d..2b120724d3 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -12,7 +12,6 @@