From 9da7eb281c13af55bbe37299a47c501a861fa67c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 9 Jun 2016 16:06:52 +0200 Subject: [css] Fix z-order of warning bar --- style/default.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'style') diff --git a/style/default.css b/style/default.css index 9fa2db8d..3701c43f 100644 --- a/style/default.css +++ b/style/default.css @@ -310,7 +310,7 @@ nav.sidebar li { } .slx-topbar div { - margin-left: 225px; + margin-left: 270px; } .sidebar-bg { @@ -324,6 +324,10 @@ nav.sidebar li { /* .....NavBar: Fully showing nav bar..... */ @media (min-width: 1200px) { + + nav.navbar.sidebar { + z-index: 200; + } .navbar-right { float: left !important; -- cgit v1.2.3-55-g7522 From 91bfa07f909101a42476accff50981d649e725d2 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 14 Jun 2016 11:21:29 +0200 Subject: [dashboard] Add submenu feature --- inc/dashboard.inc.php | 17 ++++++++++++++--- modules-available/main/templates/main-menu.html | 3 +++ style/default.css | 6 ++++++ 3 files changed, 23 insertions(+), 3 deletions(-) (limited to 'style') diff --git a/inc/dashboard.inc.php b/inc/dashboard.inc.php index ddea6166..3c913b76 100644 --- a/inc/dashboard.inc.php +++ b/inc/dashboard.inc.php @@ -4,6 +4,7 @@ class Dashboard { private static $iconCache = array(); + private static $subMenu = array(); public static function createMenu() { @@ -16,6 +17,7 @@ class Dashboard continue; $modByCategory[$cat][] = $module; } + $currentPage = Page::getModule()->getIdentifier(); $categories = array(); $catSort = array(); foreach ($modByCategory as $catId => $modList) { @@ -23,11 +25,15 @@ class Dashboard $sectionSort = array(); foreach ($modList as $module) { $modId = $module->getIdentifier(); - $modules[] = array( + $newEntry = array( 'displayName' => $module->getDisplayName(), - 'identifier' => $module->getIdentifier(), - 'className' => ($module->getIdentifier() === Page::getModule()->getIdentifier()) ? 'active' : '' + 'identifier' => $module->getIdentifier() ); + if ($module->getIdentifier() === $currentPage) { + $newEntry['className'] = 'active'; + $newEntry['subMenu'] = self::$subMenu; + } + $modules[] = $newEntry; if (isset($MENU_SETTING_SORT_ORDER[$modId])) { $sectionSort[] = (string)($MENU_SETTING_SORT_ORDER[$modId] + 1000); } else { @@ -82,5 +88,10 @@ class Dashboard } return 'glyphicon glyphicon-' . self::$iconCache[$module][$icon]; } + + public static function addSubmenu($url, $name) + { + self::$subMenu[] = array('url' => $url, 'name' => $name); + } } \ No newline at end of file diff --git a/modules-available/main/templates/main-menu.html b/modules-available/main/templates/main-menu.html index af8f833f..6538e2a3 100644 --- a/modules-available/main/templates/main-menu.html +++ b/modules-available/main/templates/main-menu.html @@ -33,6 +33,9 @@ diff --git a/style/default.css b/style/default.css index 3701c43f..c77149da 100644 --- a/style/default.css +++ b/style/default.css @@ -469,6 +469,12 @@ section{ padding-left: 15px; } +li.slx-submenu { + font-size: 80%; + font-weight: bold; + padding-left: 1em; +} + /* * Sysconfig Module Editor */ -- cgit v1.2.3-55-g7522 From f5f8d91f25378464c59fbec49ebf43f00c668966 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 14 Jun 2016 16:12:17 +0200 Subject: Fix main menu text color, make sub-section text bold --- style/default.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'style') diff --git a/style/default.css b/style/default.css index c77149da..bf1834d6 100644 --- a/style/default.css +++ b/style/default.css @@ -469,10 +469,14 @@ section{ padding-left: 15px; } -li.slx-submenu { +li.slx-submenu a { font-size: 80%; font-weight: bold; - padding-left: 1em; + padding-left: 3em; +} + +nav.navbar.sidebar { + color: #eee; } /* -- cgit v1.2.3-55-g7522 From 2180db9debec5ad86dd2d089be7ece80bee064a0 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 15 Jun 2016 15:09:21 +0200 Subject: [sysconfignew] Move css from global file to module specific one --- modules-available/sysconfignew/style.css | 59 +++++++++++++++++++++++++ style/default.css | 74 -------------------------------- 2 files changed, 59 insertions(+), 74 deletions(-) create mode 100644 modules-available/sysconfignew/style.css (limited to 'style') diff --git a/modules-available/sysconfignew/style.css b/modules-available/sysconfignew/style.css new file mode 100644 index 00000000..43f708d1 --- /dev/null +++ b/modules-available/sysconfignew/style.css @@ -0,0 +1,59 @@ +.mod-nav { + width: 250px; + float: left; + margin-right: 4px; + border-right: solid 1px #DDD; + padding: 4px; + height: 545px; + overflow: auto; +} + +.item { + padding: 4px; + margin: 3px 0; + border-radius: 3px; +} + +.item:HOVER { + background-color: #EEE; + cursor: pointer; +} + +.item-link { + color: #5893C6; +} + +.item-lock { + color: #939393; +} + +.dir-icon { + color: #2E6DA4; +} + +.folder { + padding-left: 16px; + display: none; + border-left: dashed 1px #CCC; +} + +#editor-header{ + display: block; + float: none; + width: 875px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.mod-editor{ + display: block; + float: none; + resize: none; + width: 875px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} + +textarea.form-control .editor-box{ + height: 520px; +} diff --git a/style/default.css b/style/default.css index bf1834d6..ab9eca08 100644 --- a/style/default.css +++ b/style/default.css @@ -478,77 +478,3 @@ li.slx-submenu a { nav.navbar.sidebar { color: #eee; } - -/* - * Sysconfig Module Editor - */ - -.mod-nav { - width: 250px; - float: left; - margin-right: 4px; - border-right: solid 1px #DDD; - padding: 4px; - height: 545px; - overflow: auto; -} - -.item { - padding: 4px; - margin: 3px 0; - border-radius: 3px; -} - -.item:HOVER { - background-color: #EEE; - cursor: pointer; -} - -.item-link { - color: #5893C6; -} - -.item-lock { - color: #939393; -} - -.dir-icon { - color: #2E6DA4; -} - -.folder { - padding-left: 16px; - display: none; - border-left: dashed 1px #CCC; -} - -#editor-header{ - display: block; - float: none; - width: 875px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.mod-editor{ - display: block; - float: none; - resize: none; - width: 875px; - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.slx-cfg-toggle > input[type=checkbox] ~ label { - font-weight: normal; -} - -.slx-cfg-toggle > input[type=checkbox]:checked ~ label { - font-weight: bold; -} - -/* what's this? -textarea.form-control .editor-box{ - height: 520px; -} -*/ -- cgit v1.2.3-55-g7522