diff --git a/modules/storm/images/doks.png b/modules/storm/images/doks.png deleted file mode 100644 index 93677f3..0000000 Binary files a/modules/storm/images/doks.png and /dev/null differ diff --git a/modules/storm/images/events.png b/modules/storm/images/events.png deleted file mode 100644 index 4371bd7..0000000 Binary files a/modules/storm/images/events.png and /dev/null differ diff --git a/modules/storm/images/expenses.png b/modules/storm/images/expenses.png deleted file mode 100644 index 1336ec3..0000000 Binary files a/modules/storm/images/expenses.png and /dev/null differ diff --git a/modules/storm/images/invoices.png b/modules/storm/images/invoices.png deleted file mode 100644 index 38c5712..0000000 Binary files a/modules/storm/images/invoices.png and /dev/null differ diff --git a/modules/storm/images/notes.png b/modules/storm/images/notes.png deleted file mode 100644 index 81266df..0000000 Binary files a/modules/storm/images/notes.png and /dev/null differ diff --git a/modules/storm/images/organizations.png b/modules/storm/images/organizations.png deleted file mode 100644 index 7effc1a..0000000 Binary files a/modules/storm/images/organizations.png and /dev/null differ diff --git a/modules/storm/images/people.png b/modules/storm/images/people.png deleted file mode 100644 index 6f938b8..0000000 Binary files a/modules/storm/images/people.png and /dev/null differ diff --git a/modules/storm/images/projects.png b/modules/storm/images/projects.png deleted file mode 100644 index 6669d1c..0000000 Binary files a/modules/storm/images/projects.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-doks.png b/modules/storm/images/suitedesk-doks.png deleted file mode 100644 index 584820a..0000000 Binary files a/modules/storm/images/suitedesk-doks.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-events.png b/modules/storm/images/suitedesk-events.png deleted file mode 100644 index bed4c13..0000000 Binary files a/modules/storm/images/suitedesk-events.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-expenses.png b/modules/storm/images/suitedesk-expenses.png deleted file mode 100644 index d52fd7e..0000000 Binary files a/modules/storm/images/suitedesk-expenses.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-invoices.png b/modules/storm/images/suitedesk-invoices.png deleted file mode 100644 index c24136a..0000000 Binary files a/modules/storm/images/suitedesk-invoices.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-notes.png b/modules/storm/images/suitedesk-notes.png deleted file mode 100644 index 2433c39..0000000 Binary files a/modules/storm/images/suitedesk-notes.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-organizations.png b/modules/storm/images/suitedesk-organizations.png deleted file mode 100644 index 6182c18..0000000 Binary files a/modules/storm/images/suitedesk-organizations.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-people.png b/modules/storm/images/suitedesk-people.png deleted file mode 100644 index aab7fbe..0000000 Binary files a/modules/storm/images/suitedesk-people.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-projects.png b/modules/storm/images/suitedesk-projects.png deleted file mode 100644 index 3e0d6a3..0000000 Binary files a/modules/storm/images/suitedesk-projects.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-rwd.png b/modules/storm/images/suitedesk-rwd.png deleted file mode 100644 index a94f4ff..0000000 Binary files a/modules/storm/images/suitedesk-rwd.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-tasks.png b/modules/storm/images/suitedesk-tasks.png deleted file mode 100644 index 216a4d0..0000000 Binary files a/modules/storm/images/suitedesk-tasks.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-teams.png b/modules/storm/images/suitedesk-teams.png deleted file mode 100644 index 7733528..0000000 Binary files a/modules/storm/images/suitedesk-teams.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-tickets.png b/modules/storm/images/suitedesk-tickets.png deleted file mode 100644 index ceb15c1..0000000 Binary files a/modules/storm/images/suitedesk-tickets.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-timetrackings.png b/modules/storm/images/suitedesk-timetrackings.png deleted file mode 100644 index d8e28b5..0000000 Binary files a/modules/storm/images/suitedesk-timetrackings.png and /dev/null differ diff --git a/modules/storm/images/suitedesk-watcher.png b/modules/storm/images/suitedesk-watcher.png deleted file mode 100644 index 6df72ad..0000000 Binary files a/modules/storm/images/suitedesk-watcher.png and /dev/null differ diff --git a/modules/storm/images/tasks.png b/modules/storm/images/tasks.png deleted file mode 100644 index dec5ef5..0000000 Binary files a/modules/storm/images/tasks.png and /dev/null differ diff --git a/modules/storm/images/teams.png b/modules/storm/images/teams.png deleted file mode 100644 index c849a42..0000000 Binary files a/modules/storm/images/teams.png and /dev/null differ diff --git a/modules/storm/images/tickets.png b/modules/storm/images/tickets.png deleted file mode 100644 index 7a94223..0000000 Binary files a/modules/storm/images/tickets.png and /dev/null differ diff --git a/modules/storm/images/timetrackings.png b/modules/storm/images/timetrackings.png deleted file mode 100644 index 4278f6d..0000000 Binary files a/modules/storm/images/timetrackings.png and /dev/null differ diff --git a/modules/storm/images/watcher.png b/modules/storm/images/watcher.png deleted file mode 100644 index 2436e84..0000000 Binary files a/modules/storm/images/watcher.png and /dev/null differ diff --git a/modules/storm/storm.css b/modules/storm/storm.css index f5e42b5..0dbc7d8 100644 --- a/modules/storm/storm.css +++ b/modules/storm/storm.css @@ -85,54 +85,6 @@ ul.storm_quick_shortcuts li a { font-weight: normal; } -#stormorganization-item { - background: transparent url(images/organizations.png) no-repeat top left; -} -#stormproject-item { - background: transparent url(images/projects.png) no-repeat top left; -} -#stormtask-item, -#stormtaskc-item { - background: transparent url(images/tasks.png) no-repeat top left; -} -#stormticket-item, -#stormticketc-item { - background: transparent url(images/tickets.png) no-repeat top left; -} -#stormperson-item { - background: transparent url(images/people.png) no-repeat top left; -} -#stormteam-item { - background: transparent url(images/teams.png) no-repeat top left; -} -#stormtimetracking-item { - background: transparent url(images/timetrackings.png) no-repeat top left; -} -#stormdok-item { - background: transparent url(images/doks.png) no-repeat top left; -} -#stormnote-item { - background: transparent url(images/notes.png) no-repeat top left; -} -#stormidea-item { - background: transparent url(images/ideas.png) no-repeat top left; -} -#storminvoice-item { - background: transparent url(images/invoices.png) no-repeat top left; -} -#stormexpense-item { - background: transparent url(images/expenses.png) no-repeat top left; -} -#stormevent-item { - background: transparent url(images/events.png) no-repeat top left; -} -#stormattributes { - background: transparent url(images/attributes.png) no-repeat top left; -} -#stormconfiguration { - background: transparent url(images/configuration.png) no-repeat top left; -} - .view .attachment .storm-icon-add-view { float: right; } diff --git a/modules/storm/storm.module b/modules/storm/storm.module index d6553d8..8f9994b 100644 --- a/modules/storm/storm.module +++ b/modules/storm/storm.module @@ -36,33 +36,6 @@ function storm_help($path, $arg) { if (user_is_anonymous()) { $output = '

' . t('Welcome to !suitedesk, my own web based app for planning, knowledge sharing, clients support, collaboration and personal productivity, with both powerful and simplicity in mind.', array('!suitedesk' => 'SuiteDesk')) . '

'; $output .= '

' . t('As a customer, you will have direct access to !suitedesk on any device to keep track your project(s), view online documentation, report project issues or access billing information.', array('!suitedesk' => 'SuiteDesk')) . '


'; - /* - $output .= '
'; - $output .= '' . 'SuiteDesk Projects' . ''; - $output .= '

' . t('Projects & Tasks') . '

'; - $output .= '

' . t('Keep track of everything, with visual indicators and Gantt charts to monitorize tasks and subtasks in order to stay up to date with milestones, track of time, workflows and all that requires your attention.') . '

'; - $output .= '
'; - - $output .= '
'; - $output .= '' . 'SuiteDesk Doks' . ''; - $output .= '

' . t('Doks') . '

'; - $output .= '

' . t('Documents are "web documents", availables wherever you are. Use the book project to keep project requeriments, attached files, install and user guides, or meeting minutes at your fingertips.') . '

'; - $output .= '
'; - - $output .= '
'; - $output .= '' . 'SuiteDesk Tickets' . ''; - $output .= '

' . t('Issue Tracking') . '

'; - $output .= '

' . t('You can report and interact on every issue that arise in your project and easily track it and get all needed information until get fixed and tested.') . '

'; - $output .= '
'; - - $output .= '
'; - $output .= '' . 'SuiteDesk Responsive Design' . ''; - $output .= '

' . t('Responsive Design') . '

'; - $output .= '

' . t('!suitedesk is optimized to look great on mobile devices thanks to its !rwd. All pages adapt automatically to the screen size on a mobile phone, tablet or desktop computer.', array('!suitedesk' => 'SuiteDesk', '!rwd' => '' . t('responsive design') . '')) . '

'; - $output .= '
'; - - $output .= '
'; - */ } break; case "admin/help#storm": @@ -1123,102 +1096,53 @@ function storm_storm_dashboard_links($type) { $links[] = array( 'theme' => 'storm_dashboard_link', 'title' => t('Desktop'), - 'icon' => 'stormoptions', + 'icon' => 'stormdesktop-item', 'path' => '/', 'access_arguments' => 'access content', - 'weight' => -10, - ); -/* if (module_exists('storm_dashboard')) { - $links[] = array( - 'theme' => 'storm_dashboard_link', - 'title' => t('Desktop'), - 'icon' => 'stormknowledgebase', - 'path' => 'stormdashboard', - 'access_arguments' => 'create stormdoc content', - 'weight' => -9, - ); - } - if ($_GET['q'] == 'admin/settings/storm' || !empty($_SESSION['SuiteCRM_Session_ID'])) { - $links[] = array( - 'theme' => 'storm_dashboard_link', - 'title' => 'SuiteCRM', - 'icon' => 'stormknowledgebase', - 'path' => 'crm', - 'weight' => -8, - ); - } -*/ $links[] = array( - 'theme' => 'storm_dashboard_link', - 'title' => t('Tasks Kanban'), - 'icon' => 'stormkanban', - 'path' => 'tasks/kanban', - 'access_arguments' => 'Storm task: access', - 'weight' => 5, + 'weight' => 1, ); $links[] = array( - 'theme' => 'storm_dashboard_link', - 'title' => t('Attributes'), - 'icon' => 'stormattributes', - 'path' => 'attributes', - 'params' => array(), - 'access_arguments' => 'Storm: access administration pages', - 'map' => array(), - 'weight' => 14, - ); - $links[] = array( - 'title' => t('Configuration'), - 'icon' => 'stormconfiguration', - 'path' => 'admin/settings/storm', - 'params' => array(), - 'access_arguments' => 'Storm: access administration pages', - 'node_type' => '', - 'add_type' => '', - 'map' => array(), - 'weight' => 15, - ); -/* $links[] = array( - 'theme' => 'storm_dashboard_link', - 'title' => t('My calendar'), - 'icon' => 'stormevent', - 'path' => 'calendar', - 'params' => array(), - 'access_arguments' => 'create stormevent content', - 'node_type' => 'stormevent', - 'add_type' => 'stormevent', - 'map' => array(), - 'weight' => 21, - ); -*/ $links[] = array( 'theme' => 'storm_dashboard_link', 'title' => t('Glossary'), - 'icon' => 'stormglossary', + 'icon' => 'stormglossary-item', 'path' => 'lexicon', 'access_arguments' => 'access lexicon', - 'weight' => 22, - ); - $links[] = array( - 'theme' => 'storm_dashboard_link', - 'title' => t('FAQ'), - 'icon' => 'stormfaq', - 'path' => 'faq', - 'access_arguments' => 'view faq page', - 'weight' => 23, + 'weight' => 150, ); $links[] = array( 'theme' => 'storm_dashboard_link', 'title' => t('Watcher'), - 'icon' => 'stormwatcher', + 'icon' => 'stormwatcher-item', 'path' => 'user/watcher', 'access_arguments' => 'use watcher', - 'weight' => 24, + 'weight' => 160, ); $links[] = array( 'theme' => 'storm_dashboard_link', 'title' => t('Trash'), - 'icon' => 'stormtrash', + 'icon' => 'stormtrash-item', 'path' => 'trash', 'access_arguments' => 'Storm: access trash', - 'weight' => 25, + 'weight' => 170, + ); + $links[] = array( + 'theme' => 'storm_dashboard_link', + 'title' => t('Attributes'), + 'icon' => 'stormattributes-item', + 'path' => 'attributes', + 'params' => array(), + 'access_arguments' => 'Storm: access administration pages', + 'map' => array(), + 'weight' => 180, + ); + $links[] = array( + 'title' => t('Configuration'), + 'icon' => 'stormconfiguration-item', + 'path' => 'admin/settings/suitedesk', + 'params' => array(), + 'access_arguments' => 'Storm: access administration pages', + 'map' => array(), + 'weight' => 190, ); } return $links; @@ -1231,23 +1155,23 @@ function storm_storm_dashboard_links($type) { * @return array */ function storm_storm_dashboard_types() { - return array( /* + return array( 'page' => array( // URL: menu path which should be used, if omitted no menu item will be created - 'url' => 'dashboard', + 'url' => '', // title: Required. Title of menu item, page title and title for the storm settings - 'title' => t('SuiteDesk'), + 'title' => t('SuiteDesk'), // description: Required. Description for the fieldset in the storm settings - 'description' => t('You can disable or reorder the links from the !dashboard here', array('!dashboard' => l(t('dashboard'), 'dashboard'))), + 'description' => t('You can disable or reorder the links from the !dashboard here', array('!dashboard' => l(t('dashboard'), 'dashboard'))), // theme: theme which should be used to display this dashboard. If omitted uses standard theme storm_dashboard - 'theme' => 'storm_dashboard', + 'theme' => 'storm_dashboard', // menu_options: This array will be merged into the default menu item array. If the menu should have special access arguments, title, it can be set here. // page callback and page argument shouldn't been overwritten. 'menu_options' => array( 'title' => t('SuiteDesk'), 'description' => t('SuiteDesk dashboard'), ), - ), */ + ), 'block' => array( 'title' => 'Dashboard block', 'description' => t('You can disable or reorder the links from the dashboard !block here', array('!block' => l(t('block'), 'admin/build/block'))), diff --git a/modules/storm/storm.theme.inc b/modules/storm/storm.theme.inc index 0401d22..75ca2ee 100644 --- a/modules/storm/storm.theme.inc +++ b/modules/storm/storm.theme.inc @@ -283,7 +283,7 @@ function theme_storm_link($source_module='', $destination_module='', $node_nid=0 case "stormconfiguration": $user_access_check = 'Storm: access administration pages'; $list_text = t('Configuration'); - $list_path = 'admin/settings/storm'; + $list_path = 'admin/settings/suitedesk'; $add_icon_type = ''; $add_path = ''; $dt_id = 'stormconfiguration'; diff --git a/modules/storm/stormdok/stormdok.module b/modules/storm/stormdok/stormdok.module index 5754f75..852bc72 100644 --- a/modules/storm/stormdok/stormdok.module +++ b/modules/storm/stormdok/stormdok.module @@ -675,7 +675,7 @@ function stormdok_storm_dashboard_links($type) { if ($type == 'page' || $type == 'block') { $links[] = array( 'theme' => 'storm_dashboard_link', - 'title' => t('Documentation'), + 'title' => t('Doks'), 'icon' => 'stormdok-item', 'path' => 'doks', 'params' => array(), @@ -683,7 +683,7 @@ function stormdok_storm_dashboard_links($type) { 'node_type' => 'stormdok', 'add_type' => 'stormdok', 'map' => array(), - 'weight' => 9, + 'weight' => 70, ); } return $links; diff --git a/modules/storm/stormevent/stormevent.module b/modules/storm/stormevent/stormevent.module index 5b5cfe0..9350299 100644 --- a/modules/storm/stormevent/stormevent.module +++ b/modules/storm/stormevent/stormevent.module @@ -636,7 +636,19 @@ function stormevent_storm_dashboard_links($type) { 'node_type' => 'stormevent', 'add_type' => 'stormevent', 'map' => array(), - 'weight' => 9, + 'weight' => 60, + ); + $links[] = array( + 'theme' => 'storm_dashboard_link', + 'title' => t('Calendar'), + 'icon' => 'stormcalendar-item', + 'path' => 'calendar', + 'params' => array(), + 'access_arguments' => 'create stormevent content', + 'node_type' => 'stormevent', + 'add_type' => 'stormevent', + 'map' => array(), + 'weight' => 65, ); } return $links; diff --git a/modules/storm/stormexpense/stormexpense.module b/modules/storm/stormexpense/stormexpense.module index 16eea56..15dc074 100644 --- a/modules/storm/stormexpense/stormexpense.module +++ b/modules/storm/stormexpense/stormexpense.module @@ -766,7 +766,7 @@ function stormexpense_storm_dashboard_links($type) { 'node_type' => 'stormexpense', 'add_type' => 'stormexpense', 'map' => array(), - 'weight' => 11, + 'weight' => 110, ); } return $links; diff --git a/modules/storm/stormidea/stormidea.module b/modules/storm/stormidea/stormidea.module index 8248437..75d2ad8 100644 --- a/modules/storm/stormidea/stormidea.module +++ b/modules/storm/stormidea/stormidea.module @@ -218,7 +218,7 @@ function stormidea_storm_dashboard_links($type) { 'node_type' => 'stormidea', 'add_type' => 'stormidea', 'map' => array(), - 'weight' => 9, + 'weight' => 90, ); } return $links; diff --git a/modules/storm/storminvoice/storminvoice.module b/modules/storm/storminvoice/storminvoice.module index 938b315..983357d 100644 --- a/modules/storm/storminvoice/storminvoice.module +++ b/modules/storm/storminvoice/storminvoice.module @@ -1162,7 +1162,7 @@ function storminvoice_storm_dashboard_links($type) { 'node_type' => 'storminvoice', 'add_type' => 'storminvoice', 'map' => array(), - 'weight' => 10, + 'weight' => 120, ); } return $links; diff --git a/modules/storm/stormnote/stormnote.module b/modules/storm/stormnote/stormnote.module index 6fbaef1..8d95c8b 100644 --- a/modules/storm/stormnote/stormnote.module +++ b/modules/storm/stormnote/stormnote.module @@ -486,7 +486,7 @@ function stormnote_storm_dashboard_links($type) { 'node_type' => 'stormnote', 'add_type' => 'stormnote', 'map' => array(), - 'weight' => 9, + 'weight' => 80, ); } return $links; diff --git a/modules/storm/stormorganization/stormorganization.module b/modules/storm/stormorganization/stormorganization.module index 308574d..9213f31 100644 --- a/modules/storm/stormorganization/stormorganization.module +++ b/modules/storm/stormorganization/stormorganization.module @@ -763,7 +763,7 @@ function stormorganization_storm_dashboard_links($type) { 'node_type' => 'stormorganization', 'add_type' => 'stormorganization', 'map' => array(), - 'weight' => 1, + 'weight' => 10, ); } return $links; diff --git a/modules/storm/stormorganization/stormorganization.theme.inc b/modules/storm/stormorganization/stormorganization.theme.inc index 1ddfeee..21cb136 100644 --- a/modules/storm/stormorganization/stormorganization.theme.inc +++ b/modules/storm/stormorganization/stormorganization.theme.inc @@ -36,10 +36,10 @@ function theme_stormorganization_view($node, $teaser = FALSE, $page = FALSE) { $node->content['links']['people'] = theme('storm_link', 'stormorganization', 'stormperson', $node->nid, $l_pos++); $node->content['links']['projects'] = theme('storm_link', 'stormorganization', 'stormproject', $node->nid, $l_pos++); $node->content['links']['tasks'] = theme('storm_link', 'stormorganization', 'stormtask', $node->nid, $l_pos++); - $node->content['links']['tickets'] = theme('storm_link', 'stormorganization', 'stormticket', $node->nid, $l_pos++); + $node->content['links']['events'] = theme('storm_link', 'stormorganization', 'stormevent', $node->nid, $l_pos++); $node->content['links']['doks'] = theme('storm_link', 'stormorganization', 'stormdok', $node->nid, $l_pos++); $node->content['links']['notes'] = theme('storm_link', 'stormorganization', 'stormnote', $node->nid, $l_pos++); - $node->content['links']['events'] = theme('storm_link', 'stormorganization', 'stormevent', $node->nid, $l_pos++); + $node->content['links']['tickets'] = theme('storm_link', 'stormorganization', 'stormticket', $node->nid, $l_pos++); $node->content['links']['expenses'] = theme('storm_link', 'stormorganization', 'stormexpense', $node->nid, $l_pos++); $node->content['links']['invoices'] = theme('storm_link', 'stormorganization', 'storminvoice', $node->nid, $l_pos++); $node->content['links']['timetrackings'] = theme('storm_link', 'stormorganization', 'stormtimetracking', $node->nid, $l_pos++); diff --git a/modules/storm/stormperson/stormperson.module b/modules/storm/stormperson/stormperson.module index 6b9ab2c..6c0db61 100644 --- a/modules/storm/stormperson/stormperson.module +++ b/modules/storm/stormperson/stormperson.module @@ -825,7 +825,7 @@ function stormperson_storm_dashboard_links($type) { 'node_type' => 'stormperson', 'add_type' => 'stormperson', 'map' => array(), - 'weight' => 2, + 'weight' => 20, ); } return $links; diff --git a/modules/storm/stormproject/stormproject.module b/modules/storm/stormproject/stormproject.module index a0129e8..55fdf3d 100644 --- a/modules/storm/stormproject/stormproject.module +++ b/modules/storm/stormproject/stormproject.module @@ -1074,7 +1074,7 @@ function stormproject_storm_dashboard_links($type) { 'node_type' => 'stormproject', 'add_type' => 'stormproject', 'map' => array(), - 'weight' => 4, + 'weight' => 40, ); } return $links; diff --git a/modules/storm/stormproject/stormproject.theme.inc b/modules/storm/stormproject/stormproject.theme.inc index 505af8f..114439e 100644 --- a/modules/storm/stormproject/stormproject.theme.inc +++ b/modules/storm/stormproject/stormproject.theme.inc @@ -40,10 +40,10 @@ function theme_stormproject_view($node, $teaser = FALSE, $page = FALSE) { ); $node->content['links']['tasks'] = theme('storm_link', 'stormproject', 'stormtask', $node->nid, $l_pos++); - $node->content['links']['tickets'] = theme('storm_link', 'stormproject', 'stormticket', $node->nid, $l_pos++); + $node->content['links']['events'] = theme('storm_link', 'stormproject', 'stormevent', $node->nid, $l_pos++); $node->content['links']['doks'] = theme('storm_link', 'stormproject', 'stormdok', $node->nid, $l_pos++); $node->content['links']['notes'] = theme('storm_link', 'stormproject', 'stormnote', $node->nid, $l_pos++); - $node->content['links']['events'] = theme('storm_link', 'stormproject', 'stormevent', $node->nid, $l_pos++); + $node->content['links']['tickets'] = theme('storm_link', 'stormproject', 'stormticket', $node->nid, $l_pos++); $node->content['links']['expenses'] = theme('storm_link', 'stormproject', 'stormexpense', $node->nid, $l_pos++); $node->content['links']['invoices'] = theme('storm_link', 'stormproject', 'storminvoice', $node->nid, $l_pos++); $node->content['links']['timetrackings'] = theme('storm_link', 'stormproject', 'stormtimetracking', $node->nid, $l_pos++); diff --git a/modules/storm/stormquicktt/stormquicktt.module b/modules/storm/stormquicktt/stormquicktt.module index d82093f..47c6d34 100644 --- a/modules/storm/stormquicktt/stormquicktt.module +++ b/modules/storm/stormquicktt/stormquicktt.module @@ -610,7 +610,7 @@ function stormquicktt_timetracking_trigger($nid = 0, $info = TRUE) { if (!$active) { $title = t('Start time tracking.'); - $img_src = url(drupal_get_path('module', 'storm') .'/images/timetrackings.png', array('absolute' => TRUE, 'language' => '')); + $img_src = url(path_to_theme() .'/images/storm/timetracking.png', array('absolute' => TRUE, 'language' => '')); $class = ""; $info_txt = ' '.t('Click to start timetracking'); } diff --git a/modules/storm/stormtask/stormtask.module b/modules/storm/stormtask/stormtask.module index 07e7a9f..5ccbfd4 100644 --- a/modules/storm/stormtask/stormtask.module +++ b/modules/storm/stormtask/stormtask.module @@ -1254,7 +1254,15 @@ function stormtask_storm_dashboard_links($type) { 'node_type' => 'stormtask', 'add_type' => 'stormtask', 'map' => array(), - 'weight' => 5, + 'weight' => 50, + ); + $links[] = array( + 'theme' => 'storm_dashboard_link', + 'title' => t('Tasks Kanban'), + 'icon' => 'stormkanban-item', + 'path' => 'tasks/kanban', + 'access_arguments' => 'Storm task: access', + 'weight' => 55, ); } return $links; diff --git a/modules/storm/stormtask/stormtask.theme.inc b/modules/storm/stormtask/stormtask.theme.inc index 8a59be3..054048a 100644 --- a/modules/storm/stormtask/stormtask.theme.inc +++ b/modules/storm/stormtask/stormtask.theme.inc @@ -100,10 +100,10 @@ function theme_stormtask_view($node, $teaser = FALSE, $page = FALSE) { '#weight' => -25, ); - $node->content['links']['tickets'] = theme('storm_link', 'stormtask', 'stormticket', $node->nid, $l_pos++); + $node->content['links']['events'] = theme('storm_link', 'stormtask', 'stormevent', $node->nid, $l_pos++); $node->content['links']['doks'] = theme('storm_link', 'stormtask', 'stormdok', $node->nid, $l_pos++); $node->content['links']['notes'] = theme('storm_link', 'stormtask', 'stormnote', $node->nid, $l_pos++); - $node->content['links']['events'] = theme('storm_link', 'stormtask', 'stormevent', $node->nid, $l_pos++); + $node->content['links']['tickets'] = theme('storm_link', 'stormtask', 'stormticket', $node->nid, $l_pos++); $node->content['links']['expenses'] = theme('storm_link', 'stormtask', 'stormexpense', $node->nid, $l_pos++); $node->content['links']['timetrackings'] = theme('storm_link', 'stormtask', 'stormtimetracking', $node->nid, $l_pos++); diff --git a/modules/storm/stormteam/stormteam.module b/modules/storm/stormteam/stormteam.module index 11286d2..5f3f901 100644 --- a/modules/storm/stormteam/stormteam.module +++ b/modules/storm/stormteam/stormteam.module @@ -739,7 +739,7 @@ function stormteam_storm_dashboard_links($type) { 'node_type' => 'stormteam', 'add_type' => 'stormteam', 'map' => array(), - 'weight' => 3, + 'weight' => 30, ); } return $links; diff --git a/modules/storm/stormticket/stormticket.module b/modules/storm/stormticket/stormticket.module index d143b3e..94b6962 100644 --- a/modules/storm/stormticket/stormticket.module +++ b/modules/storm/stormticket/stormticket.module @@ -1083,7 +1083,7 @@ function stormticket_storm_dashboard_links($type) { 'node_type' => 'stormticket', 'add_type' => 'stormticket', 'map' => array(), - 'weight' => 6, + 'weight' => 100, ); } return $links; diff --git a/modules/storm/stormtimetracking/stormtimetracking.module b/modules/storm/stormtimetracking/stormtimetracking.module index 8359ec9..50d6f52 100644 --- a/modules/storm/stormtimetracking/stormtimetracking.module +++ b/modules/storm/stormtimetracking/stormtimetracking.module @@ -802,7 +802,7 @@ function stormtimetracking_storm_dashboard_links($type) { 'node_type' => 'stormtimetracking', 'add_type' => 'stormtimetracking', 'map' => array(), - 'weight' => 8, + 'weight' => 130, ); } return $links; diff --git a/themes/zuitedesk/css/suitedesk.css b/themes/zuitedesk/css/suitedesk.css index 0518f1b..61464dc 100644 --- a/themes/zuitedesk/css/suitedesk.css +++ b/themes/zuitedesk/css/suitedesk.css @@ -409,24 +409,69 @@ dt.stormcomponent span.stormlinks-count + a > img { margin-left: 2px !important; } -dt#stormoptions { - background: transparent url(../images/storm/storm.png) no-repeat top left; +#stormdesktop-item { + background: transparent url(../images/storm/desktop.png) no-repeat top left; } -dt#stormkanban { +#stormorganization-item { + background: transparent url(../images/storm/organization.png) no-repeat top left; +} +#stormperson-item { + background: transparent url(../images/storm/person.png) no-repeat top left; +} +#stormteam-item { + background: transparent url(../images/storm/team.png) no-repeat top left; +} +#stormproject-item { + background: transparent url(../images/storm/project.png) no-repeat top left; +} +#stormtask-item, #stormtaskc-item { + background: transparent url(../images/storm/task.png) no-repeat top left; +} +#stormkanban-item { background: transparent url(../images/storm/kanban.png) no-repeat top left; } -dt#stormglossary { +#stormevent-item { + background: transparent url(../images/storm/event.png) no-repeat top left; +} +#stormcalendar-item { + background: transparent url(../images/storm/calendar.png) no-repeat top left; +} +#stormdok-item { + background: transparent url(../images/storm/dok.png) no-repeat top left; +} +#stormnote-item { + background: transparent url(../images/storm/note.png) no-repeat top left; +} +#stormidea-item { + background: transparent url(../images/storm/idea.png) no-repeat top left; +} +#stormticket-item, #stormticketc-item { + background: transparent url(../images/storm/ticket.png) no-repeat top left; +} +#stormexpense-item { + background: transparent url(../images/storm/expense.png) no-repeat top left; +} +#storminvoice-item { + background: transparent url(../images/storm/invoice.png) no-repeat top left; +} +#stormtimetracking-item { + background: transparent url(../images/storm/timetracking.png) no-repeat top left; +} +#stormglossary-item { background: transparent url(../images/storm/glossary.png) no-repeat top left; } -dt#stormfaq { - background: transparent url(../images/storm/faq.png) no-repeat top left; -} -dt#stormwatcher { +#stormwatcher-item { background: transparent url(../images/storm/watcher.png) no-repeat top left; } -dt#stormtrash { +#stormtrash-item { background: transparent url(../images/storm/trash.png) no-repeat top left; } +#stormattributes-item { + background: transparent url(../images/storm/attributes.png) no-repeat top left; +} +#stormconfiguration-item { + background: transparent url(../images/storm/configuration.png) no-repeat top left; +} /* * "SuiteDesk" list & filter. diff --git a/modules/storm/images/attributes.png b/themes/zuitedesk/images/storm/attributes.png similarity index 100% rename from modules/storm/images/attributes.png rename to themes/zuitedesk/images/storm/attributes.png diff --git a/themes/zuitedesk/images/storm/calendar.png b/themes/zuitedesk/images/storm/calendar.png new file mode 100644 index 0000000..dc1b21e Binary files /dev/null and b/themes/zuitedesk/images/storm/calendar.png differ diff --git a/themes/zuitedesk/images/storm/configuration.png b/themes/zuitedesk/images/storm/configuration.png new file mode 100644 index 0000000..ac4fa44 Binary files /dev/null and b/themes/zuitedesk/images/storm/configuration.png differ diff --git a/modules/storm/images/configuration.png b/themes/zuitedesk/images/storm/desktop.png similarity index 100% rename from modules/storm/images/configuration.png rename to themes/zuitedesk/images/storm/desktop.png diff --git a/themes/zuitedesk/images/storm/faq.png b/themes/zuitedesk/images/storm/faq.png deleted file mode 100644 index 3f03e84..0000000 Binary files a/themes/zuitedesk/images/storm/faq.png and /dev/null differ diff --git a/modules/storm/images/ideas.png b/themes/zuitedesk/images/storm/idea.png similarity index 100% rename from modules/storm/images/ideas.png rename to themes/zuitedesk/images/storm/idea.png diff --git a/themes/zuitedesk/images/storm/storm.png b/themes/zuitedesk/images/storm/storm.png deleted file mode 100644 index 8dbdcea..0000000 Binary files a/themes/zuitedesk/images/storm/storm.png and /dev/null differ diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php index 3711797..622fa23 100644 --- a/themes/zuitedesk/template.php +++ b/themes/zuitedesk/template.php @@ -194,9 +194,9 @@ function zuitedesk_preprocess_page(&$vars, $hook) { $submenu = ''; $submenu .= _zuitedesk_option($deskmenu[10], "$lang/tickets", t('Tickets'), 'tickets', 'ticket'); $partial = ''; - $partial .= _zuitedesk_option($deskmenu[11], "$lang/timetrackings", t('Timetrackings'), 'timetracking', 'timetracking'); $partial .= _zuitedesk_option($deskmenu[12], "$lang/expenses", t('Expenses'), 'expenses', 'expense'); $partial .= _zuitedesk_option($deskmenu[13], "$lang/invoices", t('Invoices'), 'invoices', 'invoice'); + $partial .= _zuitedesk_option($deskmenu[11], "$lang/timetrackings", t('Timetrackings'), 'timetracking', 'timetracking'); $submenu .= _zuitedesk_divider($submenu, $partial); $partial = ''; $partial .= _zuitedesk_option($deskmenu[16], "$lang/trash", t('Trash'), 'trash', 'trash'); diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info index af96246..f332559 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.56 +version = 0.2.57 screenshot = screenshot.png