manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better use of breadcrumbs in SuiteDesk

Browse source
This commit is contained in:
Manuel Cillero 2017-09-01 06:58:16 +02:00
parent 6c766c0cfb
commit b3f2e096e1
29 changed files with 62 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/storm/storm.admin.inc
View file

@ -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'), '<front>');
$breadcrumb[] = l(t('Attributes'), 'attributes');
drupal_set_breadcrumb($breadcrumb);

4
modules/storm/storm.module
View file

@ -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'), '<front>');
drupal_set_breadcrumb($breadcrumb);
$output = '';

4
modules/storm/stormdok/stormdok.admin.inc
View file

@ -6,7 +6,7 @@
function stormdok_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
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'];
}

4
modules/storm/stormdok/stormdok.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('Documentation'), 'doks');
drupal_set_breadcrumb($breadcrumb);

2
modules/storm/stormevent/stormevent.admin.inc
View file

@ -6,7 +6,7 @@
function stormevent_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
drupal_set_breadcrumb($breadcrumb);
if (array_key_exists('organization_nid', $_GET)) {

4
modules/storm/stormevent/stormevent.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('Events'), 'events');
drupal_set_breadcrumb($breadcrumb);

4
modules/storm/stormexpense/stormexpense.admin.inc
View file

@ -6,7 +6,7 @@
function stormexpense_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
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(

2
modules/storm/stormexpense/stormexpense.module
View file

@ -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'), '<front>');
$breadcrumb[] = l(t('Expenses'), 'expenses');
drupal_set_breadcrumb($breadcrumb);

2
modules/storm/stormidea/stormidea.admin.inc
View file

@ -6,7 +6,7 @@
function stormidea_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
drupal_set_breadcrumb($breadcrumb);
$i = new stdClass();

4
modules/storm/stormidea/stormidea.module
View file

@ -156,7 +156,7 @@ function stormidea_node_info() {
function stormidea_form(&$node) {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('My ideas'), 'ideas');
drupal_set_breadcrumb($breadcrumb);

4
modules/storm/storminvoice/storminvoice.admin.inc
View file

@ -6,7 +6,7 @@
function storminvoice_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
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'), '<front>');
$breadcrumb[] = l(t('Invoices'), 'invoices');
$breadcrumb[] = l($node->title, 'node/'. $node->nid);

4
modules/storm/storminvoice/storminvoice.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('Invoices'), 'invoices');
drupal_set_breadcrumb($breadcrumb);

2
modules/storm/stormnote/stormnote.admin.inc
View file

@ -6,7 +6,7 @@
function stormnote_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
drupal_set_breadcrumb($breadcrumb);
if (array_key_exists('organization_nid', $_GET)) {

4
modules/storm/stormnote/stormnote.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('Notes'), 'notes');
drupal_set_breadcrumb($breadcrumb);

2
modules/storm/stormorganization/stormorganization.admin.inc
View file

@ -6,7 +6,7 @@
function stormorganization_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
drupal_set_breadcrumb($breadcrumb);
if (array_key_exists('name', $_GET)) {

4
modules/storm/stormorganization/stormorganization.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('Organizations'), 'organizations');
drupal_set_breadcrumb($breadcrumb);

3
modules/storm/stormperson/stormperson.admin.inc
View file

@ -6,7 +6,7 @@
function stormperson_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
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();
}

4
modules/storm/stormperson/stormperson.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('People'), 'people');
drupal_set_breadcrumb($breadcrumb);

2
modules/storm/stormproject/stormproject.admin.inc
View file

@ -6,7 +6,7 @@
function stormproject_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
drupal_set_breadcrumb($breadcrumb);
if (array_key_exists('organization_nid', $_GET)) {

4
modules/storm/stormproject/stormproject.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('Projects'), 'projects');
drupal_set_breadcrumb($breadcrumb);

2
modules/storm/stormtask/stormtask.admin.inc
View file

@ -517,7 +517,7 @@ function stormtask_list() {
global $user;
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
drupal_set_breadcrumb($breadcrumb);
if (array_key_exists('organization_nid', $_GET)) {

4
modules/storm/stormtask/stormtask.module
View file

@ -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'), '<front>');
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'), '<front>');
$breadcrumb[] = l(t('Tasks'), 'tasks');
drupal_set_breadcrumb($breadcrumb);

19
modules/storm/stormteam/stormteam.module
View file

@ -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'), '<front>');
$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'), '<front>');
$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'), '<front>');
drupal_set_breadcrumb($breadcrumb);
if (array_key_exists('name', $_GET)) {

2
modules/storm/stormticket/stormticket.admin.inc
View file

@ -9,7 +9,7 @@ function stormticket_list() {
global $user;
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
drupal_set_breadcrumb($breadcrumb);
if (array_key_exists('organization_nid', $_GET)) {

4
modules/storm/stormticket/stormticket.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('Tickets'), 'tickets');
drupal_set_breadcrumb($breadcrumb);

2
modules/storm/stormtimetracking/stormtimetracking.admin.inc
View file

@ -6,7 +6,7 @@
function stormtimetracking_list() {
$breadcrumb = array();
$breadcrumb[] = l(t('SuiteDesk'), 'dashboard');
$breadcrumb[] = l(t('Home'), '<front>');
drupal_set_breadcrumb($breadcrumb);
if (array_key_exists('organization_nid', $_GET)) {

4
modules/storm/stormtimetracking/stormtimetracking.module
View file

@ -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'), '<front>');
$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'), '<front>');
$breadcrumb[] = l(t('Timetrackings'), 'timetrackings');
drupal_set_breadcrumb($breadcrumb);

15
themes/zuitedesk/template.php
View file

@ -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 '<div class="breadcrumb">'. implode(' / ', $breadcrumb) .'</div>';
// 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 '<div class="breadcrumb">'. implode(' / ', $breadcrumb) .'</div>';
}
/**

2
themes/zuitedesk/zuitedesk.info
View file

@ -1,6 +1,6 @@
name = SuiteDesk Theme
description = SuiteDesk Theme Zen.
version = 0.2.47
version = 0.2.48
screenshot = screenshot.png