diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2015-09-09 17:53:39 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2015-10-07 14:42:28 +0300 |
commit | 10d482f1d3deb4c717fbb87f523428196634a326 (patch) | |
tree | fe4ba19fe7a69afed399812fdeed70e123e79579 /plugins/CoreAdminHome | |
parent | 8d2e4b1d1ae867b8a1fedcc0d937ef2ad00431b0 (diff) |
Left menu design
Diffstat (limited to 'plugins/CoreAdminHome')
-rw-r--r-- | plugins/CoreAdminHome/CoreAdminHome.php | 1 | ||||
-rw-r--r-- | plugins/CoreAdminHome/Menu.php | 10 | ||||
-rw-r--r-- | plugins/CoreAdminHome/stylesheets/generalSettings.less | 16 | ||||
-rw-r--r-- | plugins/CoreAdminHome/stylesheets/menu.less | 71 | ||||
-rw-r--r-- | plugins/CoreAdminHome/templates/_menu.twig | 3 |
5 files changed, 9 insertions, 92 deletions
diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index 75f1230cd6..305506038a 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -38,7 +38,6 @@ class CoreAdminHome extends \Piwik\Plugin public function getStylesheetFiles(&$stylesheets) { $stylesheets[] = "libs/jquery/themes/base/jquery-ui.min.css"; - $stylesheets[] = "plugins/CoreAdminHome/stylesheets/menu.less"; $stylesheets[] = "plugins/Morpheus/stylesheets/base.less"; $stylesheets[] = "plugins/Morpheus/stylesheets/main.less"; $stylesheets[] = "plugins/CoreAdminHome/stylesheets/generalSettings.less"; diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php index 7994979450..91d8ac8197 100644 --- a/plugins/CoreAdminHome/Menu.php +++ b/plugins/CoreAdminHome/Menu.php @@ -23,10 +23,10 @@ class Menu extends \Piwik\Plugin\Menu $hasAdminAccess = Piwik::isUserHasSomeAdminAccess(); if ($hasAdminAccess) { - $menu->addManageItem(null, "", $order = 1); - $menu->addSettingsItem(null, "", $order = 5); - $menu->addDiagnosticItem(null, "", $order = 10); - $menu->addDevelopmentItem(null, "", $order = 15); + $menu->addManageItem(null, array(), $order = 1); + $menu->addSettingsItem(null, array(), $order = 5); + $menu->addDiagnosticItem(null, array(), $order = 10); + $menu->addDevelopmentItem(null, array(), $order = 15); if (Piwik::hasUserSuperUserAccess()) { $menu->addSettingsItem('General_General', @@ -51,7 +51,7 @@ class Menu extends \Piwik\Plugin\Menu $url = $this->urlForAction('generalSettings'); } - $menu->addItem('CoreAdminHome_Administration', null, $url, 10); + $menu->addItem('icon-configure', null, $url, 980, Piwik::translate('CoreAdminHome_Administration')); } } diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less index eac16b6c4c..9d232f789b 100644 --- a/plugins/CoreAdminHome/stylesheets/generalSettings.less +++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less @@ -13,9 +13,6 @@ } #content.admin { - margin: 0 0 0 260px; - padding: 0 0 40px; - display: table; font-size: 13px; // Fix the <pre> blocks because of the display: table @@ -25,8 +22,8 @@ } .admin #header_message { - margin-top: 10px; - margin-right: 10px; + margin-top: 8px; + margin-right: 8px; } table.admin { @@ -92,9 +89,9 @@ table.admin tbody td:hover, table.admin tbody th:hover { width: 100%; &:first-of-type:not(.secondary) { - margin-top: 17px; + margin-top: 7px; margin-bottom: 16px; - border-bottom: 1px solid #DADADA; + border-bottom: 1px solid @theme-color-background-tinyContrast; } } @@ -162,11 +159,6 @@ table.admin tbody td:hover, table.admin tbody th:hover { margin-left: 0px; } -/* to override .admin a */ -.admin .sites_autocomplete a { - color: #255792; -} - /* trusted host styles */ #trustedHostSettings input { width: 238px; diff --git a/plugins/CoreAdminHome/stylesheets/menu.less b/plugins/CoreAdminHome/stylesheets/menu.less deleted file mode 100644 index af76bc8281..0000000000 --- a/plugins/CoreAdminHome/stylesheets/menu.less +++ /dev/null @@ -1,71 +0,0 @@ -#container { - clear: left; -} - -.Menu--admin { - padding: 0; - float: left; - width: 240px; -} - -.Menu--admin > .Menu-tabList { - -moz-background-size: 5px 100%; - background-size: 5px 100%; - background-position: 0 0, 100% 0; - background-repeat: no-repeat; -} - -.Menu--admin > .Menu-tabList { - padding-left: 5px; - margin-bottom: 0; - margin-top: 0.1em; - border: 1px solid @theme-color-background-lowContrast; - border-radius: 5px; - border-left: 0px; -} - -.Menu--admin > .Menu-tabList li { - list-style: none; - margin: 0; -} - -.Menu--admin > .Menu-tabList > li { - padding-bottom: 5px; -} - -.Menu--admin > .Menu-tabList > li > a, -.Menu--admin > .Menu-tabList > li > span { - text-decoration: none; - border-bottom: 1px dotted #778; - display: block; - padding: 5px 10px; - font-size: 18px; - color: #7E7363; -} - -.Menu--admin > .Menu-tabList li li a { - text-decoration: none; - padding: 0.6em 0.9em; - font-size: 14px; - display: block; -} - -.Menu--admin > .Menu-tabList li li a:link, -.Menu--admin > .Menu-tabList li li a:visited { - color: #000; -} - -.Menu--admin > .Menu-tabList li li a:hover, -.Menu--admin > .Menu-tabList li li a.active { - color: @theme-color-menu-contrast-textActive !important; - background: @theme-color-menu-contrast-background; - border-color: #000; -} - -.Menu--admin > .Menu-tabList li li a:hover { - text-decoration: underline; -} - -.Menu--admin > .Menu-tabList li li a.current { - background: #defdbb; -} diff --git a/plugins/CoreAdminHome/templates/_menu.twig b/plugins/CoreAdminHome/templates/_menu.twig deleted file mode 100644 index 080f36e93c..0000000000 --- a/plugins/CoreAdminHome/templates/_menu.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@CoreHome/macros.twig' as corehome %} - -{{ corehome.sidebarMenu(adminMenu, currentModule, currentAction) }}
\ No newline at end of file |