From b3f2e096e15b9127b516ee39de6cf6e59e901d22 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Fri, 1 Sep 2017 06:58:16 +0200 Subject: [PATCH] Better use of breadcrumbs in SuiteDesk --- modules/storm/storm.admin.inc | 2 +- modules/storm/storm.module | 4 +++- modules/storm/stormdok/stormdok.admin.inc | 4 +--- modules/storm/stormdok/stormdok.module | 4 ++-- modules/storm/stormevent/stormevent.admin.inc | 2 +- modules/storm/stormevent/stormevent.module | 4 ++-- .../storm/stormexpense/stormexpense.admin.inc | 4 ++-- .../storm/stormexpense/stormexpense.module | 2 +- modules/storm/stormidea/stormidea.admin.inc | 2 +- modules/storm/stormidea/stormidea.module | 4 ++-- .../storm/storminvoice/storminvoice.admin.inc | 4 ++-- .../storm/storminvoice/storminvoice.module | 4 ++-- modules/storm/stormnote/stormnote.admin.inc | 2 +- modules/storm/stormnote/stormnote.module | 4 ++-- .../stormorganization.admin.inc | 2 +- .../stormorganization.module | 4 ++-- .../storm/stormperson/stormperson.admin.inc | 3 +-- modules/storm/stormperson/stormperson.module | 4 ++-- .../storm/stormproject/stormproject.admin.inc | 2 +- .../storm/stormproject/stormproject.module | 4 ++-- modules/storm/stormtask/stormtask.admin.inc | 2 +- modules/storm/stormtask/stormtask.module | 4 ++-- modules/storm/stormteam/stormteam.module | 19 ++++++++----------- .../storm/stormticket/stormticket.admin.inc | 2 +- modules/storm/stormticket/stormticket.module | 4 ++-- .../stormtimetracking.admin.inc | 2 +- .../stormtimetracking.module | 4 ++-- themes/zuitedesk/template.php | 15 ++++++++++++--- themes/zuitedesk/zuitedesk.info | 2 +- 29 files changed, 62 insertions(+), 57 deletions(-) diff --git a/modules/storm/storm.admin.inc b/modules/storm/storm.admin.inc index 3846e21..100e192 100644 --- a/modules/storm/storm.admin.inc +++ b/modules/storm/storm.admin.inc @@ -383,7 +383,7 @@ function storm_attribute_delete_submit($form, &$form_state) { function storm_attribute_form($attribute = NULL) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Attributes'), 'attributes'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/storm.module b/modules/storm/storm.module index ac32c57..60aaaa5 100644 --- a/modules/storm/storm.module +++ b/modules/storm/storm.module @@ -843,6 +843,8 @@ function storm_notify_user_settings_form(&$form_state, $arg) { return; } + drupal_set_title(check_plain($account->name)); + $result = db_query('SELECT u.uid, u.name, u.mail, n.status, n.node, n.comment FROM {users} u LEFT JOIN {notify} n ON u.uid = n.uid WHERE u.uid = %d AND u.status = 1', $account->uid); $notify = db_fetch_object($result); $form = array(); @@ -1685,7 +1687,7 @@ function storm_trash_delete_node_confirm_submit($form, &$form_state) { */ function storm_trash_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); $output = ''; diff --git a/modules/storm/stormdok/stormdok.admin.inc b/modules/storm/stormdok/stormdok.admin.inc index 841234f..e3a1755 100644 --- a/modules/storm/stormdok/stormdok.admin.inc +++ b/modules/storm/stormdok/stormdok.admin.inc @@ -6,7 +6,7 @@ function stormdok_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { @@ -271,5 +271,3 @@ function stormdok_list_filter_filter($form, &$form_state) { $_SESSION['stormdok_list_filter']['title'] = $form_state['values']['title']; $_SESSION['stormdok_list_filter']['itemsperpage'] = $form_state['values']['itemsperpage']; } - - diff --git a/modules/storm/stormdok/stormdok.module b/modules/storm/stormdok/stormdok.module index 07d5f77..d8f4f59 100644 --- a/modules/storm/stormdok/stormdok.module +++ b/modules/storm/stormdok/stormdok.module @@ -350,7 +350,7 @@ function stormdok_stormtask_change_hierarchy($task_nid, $organization_nid, $orga function stormdok_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Documentation'), 'doks'); drupal_set_breadcrumb($breadcrumb); @@ -639,7 +639,7 @@ function stormdok_load($node) { function stormdok_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Documentation'), 'doks'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormevent/stormevent.admin.inc b/modules/storm/stormevent/stormevent.admin.inc index 81bd551..b3ab6f9 100644 --- a/modules/storm/stormevent/stormevent.admin.inc +++ b/modules/storm/stormevent/stormevent.admin.inc @@ -6,7 +6,7 @@ function stormevent_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { diff --git a/modules/storm/stormevent/stormevent.module b/modules/storm/stormevent/stormevent.module index 7de794f..5b5cfe0 100644 --- a/modules/storm/stormevent/stormevent.module +++ b/modules/storm/stormevent/stormevent.module @@ -315,7 +315,7 @@ function stormevent_stormtask_change_hierarchy($task_nid, $organization_nid, $or function stormevent_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Events'), 'events'); drupal_set_breadcrumb($breadcrumb); @@ -609,7 +609,7 @@ function stormevent_load($node) { function stormevent_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Events'), 'events'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormexpense/stormexpense.admin.inc b/modules/storm/stormexpense/stormexpense.admin.inc index 70efff3..7ecab9f 100644 --- a/modules/storm/stormexpense/stormexpense.admin.inc +++ b/modules/storm/stormexpense/stormexpense.admin.inc @@ -6,7 +6,7 @@ function stormexpense_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { @@ -55,7 +55,7 @@ function stormexpense_list() { $i->type = 'stormexpense'; $report_attrs = array( - 'onclick' => "storm_popup(this, 'expense_list_form_report', 'Expenses', 300, 150, 'stormexpense_list_form_report', 'l'); return false;", + 'onclick' => "storm_popup(this, 'expense_list_form_report', 'Expenses', 300, 244, 'stormexpense_list_form_report', 'l'); return false;", ); $header = array( diff --git a/modules/storm/stormexpense/stormexpense.module b/modules/storm/stormexpense/stormexpense.module index bf1d1fa..be8d2c3 100644 --- a/modules/storm/stormexpense/stormexpense.module +++ b/modules/storm/stormexpense/stormexpense.module @@ -301,7 +301,7 @@ function stormexpense_stormticket_change_hierarchy($ticket_nid, $organization_ni function stormexpense_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Expenses'), 'expenses'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormidea/stormidea.admin.inc b/modules/storm/stormidea/stormidea.admin.inc index 5d48925..bede7c6 100644 --- a/modules/storm/stormidea/stormidea.admin.inc +++ b/modules/storm/stormidea/stormidea.admin.inc @@ -6,7 +6,7 @@ function stormidea_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); $i = new stdClass(); diff --git a/modules/storm/stormidea/stormidea.module b/modules/storm/stormidea/stormidea.module index 89ff52a..6e41e06 100644 --- a/modules/storm/stormidea/stormidea.module +++ b/modules/storm/stormidea/stormidea.module @@ -156,7 +156,7 @@ function stormidea_node_info() { function stormidea_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('My ideas'), 'ideas'); drupal_set_breadcrumb($breadcrumb); @@ -189,7 +189,7 @@ function stormidea_nodeapi($node, $op, $a3 = NULL, $a4 = NULL) { function stormidea_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('My ideas'), 'ideas'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/storminvoice/storminvoice.admin.inc b/modules/storm/storminvoice/storminvoice.admin.inc index b114461..c9d4d92 100644 --- a/modules/storm/storminvoice/storminvoice.admin.inc +++ b/modules/storm/storminvoice/storminvoice.admin.inc @@ -6,7 +6,7 @@ function storminvoice_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { @@ -324,7 +324,7 @@ function storminvoice_report($node, $report, $language) { */ function storminvoice_send_page($node, $language) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Invoices'), 'invoices'); $breadcrumb[] = l($node->title, 'node/'. $node->nid); diff --git a/modules/storm/storminvoice/storminvoice.module b/modules/storm/storminvoice/storminvoice.module index d3d74fb..85909cd 100644 --- a/modules/storm/storminvoice/storminvoice.module +++ b/modules/storm/storminvoice/storminvoice.module @@ -303,7 +303,7 @@ function storminvoice_stormproject_change_hierarchy($project_nid, $organization_ // INVOICE CREATE/EDIT FORM function storminvoice_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Invoices'), 'invoices'); drupal_set_breadcrumb($breadcrumb); @@ -823,7 +823,7 @@ function storminvoice_load($node) { function storminvoice_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Invoices'), 'invoices'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormnote/stormnote.admin.inc b/modules/storm/stormnote/stormnote.admin.inc index 7766cdc..c201d12 100644 --- a/modules/storm/stormnote/stormnote.admin.inc +++ b/modules/storm/stormnote/stormnote.admin.inc @@ -6,7 +6,7 @@ function stormnote_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { diff --git a/modules/storm/stormnote/stormnote.module b/modules/storm/stormnote/stormnote.module index 6284669..31fe9d4 100644 --- a/modules/storm/stormnote/stormnote.module +++ b/modules/storm/stormnote/stormnote.module @@ -216,7 +216,7 @@ function stormnote_stormtask_change_hierarchy($task_nid, $organization_nid, $org function stormnote_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Notes'), 'notes'); drupal_set_breadcrumb($breadcrumb); @@ -444,7 +444,7 @@ function stormnote_load($node) { function stormnote_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Notes'), 'notes'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormorganization/stormorganization.admin.inc b/modules/storm/stormorganization/stormorganization.admin.inc index 0258386..3e6ad00 100644 --- a/modules/storm/stormorganization/stormorganization.admin.inc +++ b/modules/storm/stormorganization/stormorganization.admin.inc @@ -6,7 +6,7 @@ function stormorganization_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('name', $_GET)) { diff --git a/modules/storm/stormorganization/stormorganization.module b/modules/storm/stormorganization/stormorganization.module index a55d9c9..ac57571 100644 --- a/modules/storm/stormorganization/stormorganization.module +++ b/modules/storm/stormorganization/stormorganization.module @@ -211,7 +211,7 @@ function stormorganization_content_extra_fields($type_name) { function stormorganization_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Organizations'), 'organizations'); drupal_set_breadcrumb($breadcrumb); @@ -709,7 +709,7 @@ function stormorganization_load($node) { function stormorganization_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Organizations'), 'organizations'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormperson/stormperson.admin.inc b/modules/storm/stormperson/stormperson.admin.inc index c47f07d..ab72608 100644 --- a/modules/storm/stormperson/stormperson.admin.inc +++ b/modules/storm/stormperson/stormperson.admin.inc @@ -6,7 +6,7 @@ function stormperson_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET) && @@ -189,4 +189,3 @@ function _stormperson_organization_people_js($organization_nid=0) { print drupal_to_js($people); exit(); } - diff --git a/modules/storm/stormperson/stormperson.module b/modules/storm/stormperson/stormperson.module index d3f96cc..6b9ab2c 100644 --- a/modules/storm/stormperson/stormperson.module +++ b/modules/storm/stormperson/stormperson.module @@ -262,7 +262,7 @@ function stormperson_stormorganization_change($organization_nid, $organization_t function stormperson_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('People'), 'people'); drupal_set_breadcrumb($breadcrumb); @@ -737,7 +737,7 @@ function stormperson_load($node) { function stormperson_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('People'), 'people'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormproject/stormproject.admin.inc b/modules/storm/stormproject/stormproject.admin.inc index 893b9c8..dd31581 100644 --- a/modules/storm/stormproject/stormproject.admin.inc +++ b/modules/storm/stormproject/stormproject.admin.inc @@ -6,7 +6,7 @@ function stormproject_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { diff --git a/modules/storm/stormproject/stormproject.module b/modules/storm/stormproject/stormproject.module index 8372e20..4d3d464 100644 --- a/modules/storm/stormproject/stormproject.module +++ b/modules/storm/stormproject/stormproject.module @@ -331,7 +331,7 @@ function stormproject_stormperson_change($person_nid, $person_title) { function stormproject_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Projects'), 'projects'); drupal_set_breadcrumb($breadcrumb); @@ -864,7 +864,7 @@ function stormproject_load($node) { function stormproject_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Projects'), 'projects'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormtask/stormtask.admin.inc b/modules/storm/stormtask/stormtask.admin.inc index 4f1cf55..e2d8b9e 100644 --- a/modules/storm/stormtask/stormtask.admin.inc +++ b/modules/storm/stormtask/stormtask.admin.inc @@ -517,7 +517,7 @@ function stormtask_list() { global $user; $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { diff --git a/modules/storm/stormtask/stormtask.module b/modules/storm/stormtask/stormtask.module index 733d9d6..ed3d24b 100644 --- a/modules/storm/stormtask/stormtask.module +++ b/modules/storm/stormtask/stormtask.module @@ -443,7 +443,7 @@ function stormtask_stormproject_change_hierarchy($project_nid, $organization_nid function stormtask_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); if (array_key_exists('project_nid', $_GET)) { $breadcrumb[] = l(t('Projects'), 'projects'); @@ -1005,7 +1005,7 @@ function stormtask_validate(&$node) { function stormtask_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Tasks'), 'tasks'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormteam/stormteam.module b/modules/storm/stormteam/stormteam.module index 11a8db2..f2bad22 100644 --- a/modules/storm/stormteam/stormteam.module +++ b/modules/storm/stormteam/stormteam.module @@ -237,10 +237,9 @@ function stormteam_storm_rewrite_where_sql($query, $primary_table, $account) { * Implementation of hook_form(). */ function stormteam_form(&$node) { - $breadcrumb = array( - l(t('SuiteDesk'), 'dashboard'), - l(t('Teams'), 'teams'), - ); + $breadcrumb = array(); + $breadcrumb[] = l(t('Home'), ''); + $breadcrumb[] = l(t('Teams'), 'teams'); drupal_set_breadcrumb($breadcrumb); $type = node_get_types('type', $node); @@ -347,10 +346,9 @@ function stormteam_load($node) { * Implementation of hook_view(). */ function stormteam_view($node, $teaser, $page) { - $breadcrumb = array( - l(t('SuiteDesk'), 'dashboard'), - l(t('Teams'), 'teams'), - ); + $breadcrumb = array(); + $breadcrumb[] = l(t('Home'), ''); + $breadcrumb[] = l(t('Teams'), 'teams'); drupal_set_breadcrumb($breadcrumb); return theme('stormteam_view', $node, $teaser, $page); @@ -498,9 +496,8 @@ function stormteam_list() { // Add SuiteDesk generic CSS drupal_add_css(drupal_get_path('module', 'storm') .'/storm.css', 'module'); - $breadcrumb = array( - l(t('SuiteDesk'), 'dashboard'), - ); + $breadcrumb = array(); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('name', $_GET)) { diff --git a/modules/storm/stormticket/stormticket.admin.inc b/modules/storm/stormticket/stormticket.admin.inc index 2ff2c15..1d6619d 100644 --- a/modules/storm/stormticket/stormticket.admin.inc +++ b/modules/storm/stormticket/stormticket.admin.inc @@ -9,7 +9,7 @@ function stormticket_list() { global $user; $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { diff --git a/modules/storm/stormticket/stormticket.module b/modules/storm/stormticket/stormticket.module index 24c683b..d143b3e 100644 --- a/modules/storm/stormticket/stormticket.module +++ b/modules/storm/stormticket/stormticket.module @@ -358,7 +358,7 @@ function stormticket_stormtask_change_hierarchy($task_nid, $organization_nid, $o // TICKET CREATE / EDIT FORM function stormticket_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Tickets'), 'tickets'); drupal_set_breadcrumb($breadcrumb); @@ -881,7 +881,7 @@ function stormticket_load($node) { function stormticket_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Tickets'), 'tickets'); drupal_set_breadcrumb($breadcrumb); diff --git a/modules/storm/stormtimetracking/stormtimetracking.admin.inc b/modules/storm/stormtimetracking/stormtimetracking.admin.inc index 13936e6..be5e344 100644 --- a/modules/storm/stormtimetracking/stormtimetracking.admin.inc +++ b/modules/storm/stormtimetracking/stormtimetracking.admin.inc @@ -6,7 +6,7 @@ function stormtimetracking_list() { $breadcrumb = array(); - $breadcrumb[] = l(t('SuiteDesk'), 'dashboard'); + $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); if (array_key_exists('organization_nid', $_GET)) { diff --git a/modules/storm/stormtimetracking/stormtimetracking.module b/modules/storm/stormtimetracking/stormtimetracking.module index ece7129..6855ad9 100644 --- a/modules/storm/stormtimetracking/stormtimetracking.module +++ b/modules/storm/stormtimetracking/stormtimetracking.module @@ -302,7 +302,7 @@ function stormtimetracking_stormticket_change_hierarchy($ticket_nid, $organizati function stormtimetracking_form(&$node) { $breadcrumb = array(); - $breadcrumb[] = l(t('Storm'), 'storm'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Timetrackings'), 'timetrackings'); drupal_set_breadcrumb($breadcrumb); @@ -662,7 +662,7 @@ function stormtimetracking_load($node) { function stormtimetracking_view($node, $teaser = FALSE, $page = FALSE) { $breadcrumb = array(); - $breadcrumb[] = l(t('Storm'), 'storm'); + $breadcrumb[] = l(t('Home'), ''); $breadcrumb[] = l(t('Timetrackings'), 'timetrackings'); drupal_set_breadcrumb($breadcrumb); diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php index 317222e..c550c8d 100644 --- a/themes/zuitedesk/template.php +++ b/themes/zuitedesk/template.php @@ -369,10 +369,19 @@ function zuitedesk_preprocess_block(&$vars, $hook) { * Override theme_breadcrumb(). */ function zuitedesk_breadcrumb($breadcrumb) { - if (count($breadcrumb) > 2) { - array_shift($breadcrumb); - return '
'. implode(' / ', $breadcrumb) .'
'; + // When no breadcrumb: + if (count($breadcrumb) == 0) { + return ''; } + // No breadcrumb in home page and user tabs: + if (arg(0) == 'user') { + return ''; + } + // No breadcrumb if it's only one link to home page: + if (count($breadcrumb) == 1 && strpos($breadcrumb[0], '>' . t('Home') . '<') > 0) { + return ''; + } + return '
'. implode(' / ', $breadcrumb) .'
'; } /** diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info index d3e39da..c58cc31 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.47 +version = 0.2.48 screenshot = screenshot.png