diff --git a/modules/storm/storm.module b/modules/storm/storm.module index 1a4f100..cba4e7c 100644 --- a/modules/storm/storm.module +++ b/modules/storm/storm.module @@ -989,10 +989,16 @@ function storm_dashboard($type = 'page') { $link_blocks = storm_dashboard_get_links(TRUE, $type); if (!empty($link_blocks)) { - /* ALWAYS DISPLAY A PAIR NUMBER OF ITEMS - if (count($link_blocks) % 20) { - array_pop($link_blocks); - } */ + // ALWAYS DISPLAY A PAIR NUMBER OF ITEMS + if (count($link_blocks) % 2) { + $link_blocks[] = array( + 'theme' => 'storm_dashboard_link', + 'title' => t('Advanced search'), + 'icon' => 'stormsearch-item', + 'path' => 'search', + 'access_arguments' => 'access content', + ); + } // DIVIDE LINKS INTO TWO BLOCKS $count = ceil(count($link_blocks) / 2); $link_blocks = array_chunk($link_blocks, $count); @@ -1147,14 +1153,6 @@ function storm_storm_dashboard_links($type) { 'access_arguments' => 'Storm: access administration pages', 'weight' => 190, ); -/* $links[] = array( - 'theme' => 'storm_dashboard_link', - 'title' => t('Search in SuiteDesk'), - 'icon' => 'stormsearch-item', - 'path' => 'search', - 'access_arguments' => 'access content', - 'weight' => 200, - ); LAST ITEM TO REMOVE IF THERE IS AN ODD NUMBER OF ITEMS */ } return $links; } diff --git a/modules/storm/stormidea/stormidea.admin.inc b/modules/storm/stormidea/stormidea.admin.inc index 269ed2b..5cb02c1 100644 --- a/modules/storm/stormidea/stormidea.admin.inc +++ b/modules/storm/stormidea/stormidea.admin.inc @@ -93,7 +93,7 @@ function stormidea_list_filter(&$form_state, $filterdesc = 'Filter') { $form['filter']['group2']['title'] = array( '#type' => 'textfield', - '#title' => t('Idea'), + '#title' => t('Reminder'), '#default_value' => $title, ); diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php index cd4818f..1f505a0 100644 --- a/themes/zuitedesk/template.php +++ b/themes/zuitedesk/template.php @@ -199,7 +199,7 @@ function zuitedesk_preprocess_page(&$vars, $hook) { $partial .= _zuitedesk_option($deskmenu[16], "$lang/timetrackings", t('Timetrackings'), 'timetracking', 'timetracking'); $submenu .= _zuitedesk_divider($submenu, $partial); $partial = ''; - $partial .= _zuitedesk_option(TRUE, '', t('SuiteDesk Tour'), 'help', 'help', t('A beginner\'s guide to SuiteDesk')); + $partial .= _zuitedesk_option(TRUE, "$lang/search", t('Advanced search'), 'search', 'search'); $partial .= _zuitedesk_option($deskmenu[2], "$lang/attributes", t('Attributes'), 'attributes', 'filter'); $partial .= _zuitedesk_option($deskmenu[2], "$lang/admin/settings/suitedesk", t('Configuration'), 'settings', 'storm'); $submenu .= _zuitedesk_divider($submenu, $partial); @@ -208,9 +208,10 @@ function zuitedesk_preprocess_page(&$vars, $hook) { $submenu = ''; $submenu .= _zuitedesk_option($deskmenu[11], "$lang/notes", t('My notes'), 'notes', 'note'); $submenu .= _zuitedesk_option($deskmenu[12], "$lang/ideas", t('Reminders'), 'ideas', 'idea'); + $submenu .= _zuitedesk_option($deskmenu[17], "$lang/user/watcher", t('Watcher'), 'watcher', 'apply'); + $submenu .= _zuitedesk_option($deskmenu[18], "$lang/trash", t('Trash'), 'trash', 'trash'); $partial = ''; - $partial .= _zuitedesk_option($deskmenu[17], "$lang/user/watcher", t('Watcher'), 'watcher', 'apply'); - $partial .= _zuitedesk_option($deskmenu[18], "$lang/trash", t('Trash'), 'trash', 'trash'); + $partial .= _zuitedesk_option(TRUE, '', t('SuiteDesk Tour'), 'help', 'help', t('A beginner\'s guide to SuiteDesk')); $submenu .= _zuitedesk_divider($submenu, $partial); $partial = ''; $partial .= _zuitedesk_option(TRUE, "$lang/" . drupal_get_path_alias('user/' . $user->uid) . '/edit', t('My SuiteDesk profile'), 'profile', 'user', t('Edit my personal account options'));