diff --git a/config/INSTALL.md b/config/README.md similarity index 100% rename from config/INSTALL.md rename to config/README.md diff --git a/themes/zuitedesk/css/global.css b/themes/zuitedesk/css/global.css index b2fed56..b85613b 100644 --- a/themes/zuitedesk/css/global.css +++ b/themes/zuitedesk/css/global.css @@ -199,6 +199,7 @@ div.status { margin-bottom: .75em; padding: 5px 10px 5px 50px; min-height: 45px; + white-space: normal; } div.messages { color: #3c763d; diff --git a/themes/zuitedesk/css/navigation.css b/themes/zuitedesk/css/navigation.css index 4905186..02c4d24 100644 --- a/themes/zuitedesk/css/navigation.css +++ b/themes/zuitedesk/css/navigation.css @@ -142,6 +142,11 @@ ul.social-menu .social-link-mail:hover a { .logo img { position: absolute; } +@media (min-width: 768px) and (max-width: 899px) { + .navbar-default .navbar-nav > li:first-child { + display: none; + } +} @media (max-width: 767px) {/* .navbar-brand > img { margin-top: -5px; diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php index 48b81b6..93d9196 100644 --- a/themes/zuitedesk/template.php +++ b/themes/zuitedesk/template.php @@ -163,23 +163,31 @@ function zuitedesk_preprocess_page(&$vars, $hook) { if ($vars['logged_in'] && !empty($deskmenu)) { // Home option: $pl .= _zuitedesk_option(TRUE, "$lang/", t('Home'), NULL, t('Desktop')); - // Plan submenu: + // CRM submenu: $submenu = ''; $submenu .= _zuitedesk_option(!empty($_SESSION['SuiteCRM_Session_ID']), "$lang/suitecrm", 'SuiteCRM', 'crm', t('Core sales, customer service and marketing processes with SuiteCRM')); $submenu .= _zuitedesk_option($deskmenu[7], "$lang/organizations", t('Organizations'), 'org'); $partial = ''; - $partial .= _zuitedesk_option($deskmenu[2], "$lang/projects", t('Projects'), 'project'); - $partial .= _zuitedesk_option($deskmenu[3], "$lang/tasks", t('Tasks'), 'task'); - $partial .= _zuitedesk_option($deskmenu[4], "$lang/tasks/kanban", t('Tasks Kanban'), 'kanban', t('Kanban board view for your tasks')); + $partial .= _zuitedesk_option($deskmenu[1], "$lang/admin/user/user/local", t('User list'), 'login', t('Allows to view list users and register new users')); + $partial .= _zuitedesk_option($deskmenu[8], "$lang/people", t('People'), 'people'); + $partial .= _zuitedesk_option($deskmenu[9], "$lang/teams", t('Teams'), 'team'); $submenu .= _zuitedesk_divider($submenu, $partial); $partial = ''; + $partial .= _zuitedesk_option(FALSE, "$lang/activity", t('Activity'), 'eye'); + $submenu .= _zuitedesk_divider($submenu, $partial); + $pl .= _zuitedesk_submenu($submenu, t('Contacts')); + // Plan submenu: + $submenu = ''; + $submenu .= _zuitedesk_option($deskmenu[2], "$lang/projects", t('Projects'), 'project'); + $submenu .= _zuitedesk_option($deskmenu[3], "$lang/tasks", t('Tasks'), 'task'); + $submenu .= _zuitedesk_option($deskmenu[4], "$lang/tasks/kanban", t('Tasks Kanban'), 'kanban', t('Kanban board view for your tasks')); + $partial = ''; $partial .= _zuitedesk_option($deskmenu[5], "$lang/events", t('Events'), 'event'); $partial .= _zuitedesk_option($deskmenu[5], "$lang/calendar", t('Calendar'), 'calendar'); $submenu .= _zuitedesk_divider($submenu, $partial); $partial = ''; - $partial .= _zuitedesk_option($deskmenu[1], "$lang/admin/user/user/local", t('User list'), 'login', t('Allows to view list users and register new users')); - $partial .= _zuitedesk_option($deskmenu[8], "$lang/people", t('People'), 'people'); - $partial .= _zuitedesk_option($deskmenu[9], "$lang/teams", t('Teams'), 'team'); + $partial .= _zuitedesk_option($deskmenu[6], "$lang/doks", t('Documentation'), 'doc'); + $partial .= _zuitedesk_option($deskmenu[6], "$lang/lexicon", t('Glossary'), 'glossary'); $submenu .= _zuitedesk_divider($submenu, $partial); $pl .= _zuitedesk_submenu($submenu, t('Plan')); // Assistance submenu: @@ -191,12 +199,7 @@ function zuitedesk_preprocess_page(&$vars, $hook) { $partial .= _zuitedesk_option($deskmenu[13], "$lang/invoices", t('Invoices'), 'invoice'); $submenu .= _zuitedesk_divider($submenu, $partial); $partial = ''; - $partial .= _zuitedesk_option($deskmenu[6], "$lang/doks", t('Documentation'), 'doc'); - $partial .= _zuitedesk_option($deskmenu[6], "$lang/lexicon", t('Glossary'), 'glossary'); - $submenu .= _zuitedesk_divider($submenu, $partial); - $partial = ''; $partial .= _zuitedesk_option($deskmenu[16], "$lang/trash", t('Trash'), 'trash'); - $partial .= _zuitedesk_option(FALSE, "$lang/activity", t('Activity'), 'eye'); $submenu .= _zuitedesk_divider($submenu, $partial); $pl .= _zuitedesk_submenu($submenu, t('Assistance')); // User submenu: diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info index 6bc762c..f634ef0 100644 --- a/themes/zuitedesk/zuitedesk.info +++ b/themes/zuitedesk/zuitedesk.info @@ -1,6 +1,6 @@ name = SuiteDesk Theme description = SuiteDesk Theme Zen. -version = 0.2.29 +version = 0.2.32 screenshot = screenshot.png