Set a new order for options in frontpage, shortcuts block and shortcuts main nodes

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;
 }

modules/storm/storm.module

@@ -36,33 +36,6 @@ function storm_help($path, $arg) {
       if (user_is_anonymous()) {
         $output = '<p>' . 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' => '<strong>SuiteDesk</strong>')) . '</p>';
         $output .= '<p>' . 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' => '<strong>SuiteDesk</strong>')) . '</p><br />';
-        /*
-        $output .= '<div class="suitedesk-help suitedesk-projects">';
-        $output .= '<img class="img-responsive" src="' . drupal_get_path('module', 'storm') . '/images/suitedesk-projects.png" alt="' . 'SuiteDesk Projects' . '" />';
-        $output .= '<h2>' . t('Projects & Tasks') . '</h2>';
-        $output .= '<p>' . 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.') . '</p>';
-        $output .= '</div>';
-
-        $output .= '<div class="suitedesk-help suitedesk-doks">';
-        $output .= '<img class="img-responsive" src="' . drupal_get_path('module', 'storm') . '/images/suitedesk-doks.png" alt="' . 'SuiteDesk Doks' . '" />';
-        $output .= '<h2>' . t('Doks') . '</h2>';
-        $output .= '<p>' . 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.') . '</p>';
-        $output .= '</div>';
-
-        $output .= '<div class="suitedesk-help suitedesk-tickets">';
-        $output .= '<img class="img-responsive" src="' . drupal_get_path('module', 'storm') . '/images/suitedesk-tickets.png" alt="' . 'SuiteDesk Tickets' . '" />';
-        $output .= '<h2>' . t('Issue Tracking') . '</h2>';
-        $output .= '<p>' . 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.') . '</p>';
-        $output .= '</div>';
-
-        $output .= '<div class="suitedesk-help suitedesk-rwd">';
-        $output .= '<img class="img-responsive" src="' . drupal_get_path('module', 'storm') . '/images/suitedesk-rwd.png" alt="' . 'SuiteDesk Responsive Design' . '" />';
-        $output .= '<h2>' . t('Responsive Design') . '</h2>';
-        $output .= '<p>' . 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' => '<strong>SuiteDesk</strong>', '!rwd' => '<em>' . t('responsive design') . '</em>')) . '</p>';
-        $output .= '</div>';
-
-        $output .= '<div class="suitedesk-contact"></div>';
-        */
       }
       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'))),

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';

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;

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;

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;

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;

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;

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;

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;

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++);

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;

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;

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++);

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');
   }

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;

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++);
 

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;

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;

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;