Index: stormexpense/stormexpense.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormexpense/stormexpense.theme.inc,v
retrieving revision 1.1.4.17
diff -u -p -r1.1.4.17 stormexpense.theme.inc
--- stormexpense/stormexpense.theme.inc	19 May 2010 20:33:41 -0000	1.1.4.17
+++ stormexpense/stormexpense.theme.inc	3 Jun 2010 16:31:48 -0000
@@ -78,6 +78,7 @@ function theme_stormexpense_view($node, 
   drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
   
   $node = node_prepare($node, $teaser);
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks"><dl>',
@@ -97,7 +98,7 @@ function theme_stormexpense_view($node, 
       '#prefix' => '<dt id="storminvoices" class="stormcomponent">',
       '#suffix' => '</dt>',
       '#value' => $v,
-      '#weight' => $w++,
+      '#weight' => $l_pos++,
     );
   }
   
Index: storminvoice/storminvoice.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/storminvoice/storminvoice.theme.inc,v
retrieving revision 1.2.4.53
diff -u -p -r1.2.4.53 storminvoice.theme.inc
--- storminvoice/storminvoice.theme.inc	19 May 2010 20:33:41 -0000	1.2.4.53
+++ storminvoice/storminvoice.theme.inc	3 Jun 2010 16:31:49 -0000
@@ -183,6 +183,7 @@ function theme_storminvoice_view($node, 
   drupal_add_css(drupal_get_path('module', 'storminvoice') . '/storminvoice-nodeview.css');  
   
   $node = node_prepare($node, $teaser);
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
   
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks"><dl>',
@@ -199,7 +200,7 @@ function theme_storminvoice_view($node, 
     '#prefix' => '<dt class="stormcomponent print_html">',
     '#suffix' => '</dt>',
     '#value' => l(t('Print HTML'), 'storm/invoice/report/'. $node->nid .'/html/'. $node->language),
-    '#weight' => $w++,
+    '#weight' => $l_pos++,
   );
 
   // Display link to tcpdf library only if library is installed.
@@ -209,14 +210,14 @@ function theme_storminvoice_view($node, 
       '#prefix' => '<dt class="stormcomponent print_pdf">',
       '#suffix' => '</dt>',
       '#value' => l(t('Print PDF'), 'storm/invoice/report/'. $node->nid .'/pdf/'. $node->language),
-      '#weight' => $w++,
+      '#weight' => $l_pos++,
     );
       $node->content['links']['print']['email'] = array(
       '#value' => t('Send PDF via e-mail'),
       '#prefix' => '<dt class="stormcomponent print_pdf">',
       '#suffix' => '</dt>',
       '#value' => l(t('Send PDF via e-mail'), 'storm/invoice/report/'. $node->nid .'/email/'. $node->language, array('query' => drupal_get_destination())),
-      '#weight' => $w++,
+      '#weight' => $l_pos++,
     );
   }
   
Index: stormknowledgebase/stormknowledgebase.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormknowledgebase/stormknowledgebase.theme.inc,v
retrieving revision 1.1.4.8
diff -u -p -r1.1.4.8 stormknowledgebase.theme.inc
--- stormknowledgebase/stormknowledgebase.theme.inc	27 Nov 2009 21:24:00 -0000	1.1.4.8
+++ stormknowledgebase/stormknowledgebase.theme.inc	3 Jun 2010 16:31:49 -0000
@@ -31,11 +31,12 @@ function theme_stormknowledgebase_view($
   drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
   
   $node = node_prepare($node, $teaser);
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
   
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks"><dl>',
     '#suffix' => '</dl></div>',
-    '#weight' => $w++,
+    '#weight' => $l_pos++,
   );
 
   $node->content['group1'] = array(
Index: stormnote/stormnote.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormnote/stormnote.theme.inc,v
retrieving revision 1.1.4.6
diff -u -p -r1.1.4.6 stormnote.theme.inc
--- stormnote/stormnote.theme.inc	18 Jan 2010 21:44:29 -0000	1.1.4.6
+++ stormnote/stormnote.theme.inc	3 Jun 2010 16:31:49 -0000
@@ -35,11 +35,12 @@ function theme_stormnote_view($node, $te
   drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
   
   $node = node_prepare($node, $teaser);
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
   
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks"><dl>',
     '#suffix' => '</dl></div>',
-    '#weight' => $w++,
+    '#weight' => $l_pos++,
   );
 
   $node->content['group1'] = array(
Index: stormorganization/stormorganization.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormorganization/stormorganization.theme.inc,v
retrieving revision 1.2.4.19
diff -u -p -r1.2.4.19 stormorganization.theme.inc
--- stormorganization/stormorganization.theme.inc	19 May 2010 20:33:41 -0000	1.2.4.19
+++ stormorganization/stormorganization.theme.inc	3 Jun 2010 16:31:49 -0000
@@ -33,21 +33,22 @@ function theme_stormorganization_view($n
   drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
   
   $node = node_prepare($node, $teaser);
-  
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
+
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks"><dl>',
     '#suffix' => '</dl></div>',
     '#weight' => -25,
   );
   
-  $node->content['links']['expenses'] = theme('storm_link', 'stormorganization', 'stormexpense', $node->nid, $w++);
-  $node->content['links']['invoices'] = theme('storm_link', 'stormorganization', 'storminvoice', $node->nid, $w++);
-  $node->content['links']['notes'] = theme('storm_link', 'stormorganization', 'stormnote', $node->nid, $w++);
-  $node->content['links']['people'] = theme('storm_link', 'stormorganization', 'stormperson', $node->nid, $w++);
-  $node->content['links']['projects'] = theme('storm_link', 'stormorganization', 'stormproject', $node->nid, $w++);
-  $node->content['links']['tasks'] = theme('storm_link', 'stormorganization', 'stormtask', $node->nid, $w++);
-  $node->content['links']['tickets'] = theme('storm_link', 'stormorganization', 'stormticket', $node->nid, $w++);
-  $node->content['links']['timetrackings'] = theme('storm_link', 'stormorganization', 'stormtimetracking', $node->nid, $w++);
+  $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']['notes'] = theme('storm_link', 'stormorganization', 'stormnote', $node->nid, $l_pos++);
+  $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']['timetrackings'] = theme('storm_link', 'stormorganization', 'stormtimetracking', $node->nid, $l_pos++);
   
   $node->content['group2'] = array(
     '#prefix' => '<div class="stormfields">',
Index: stormproject/stormproject.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormproject/stormproject.theme.inc,v
retrieving revision 1.2.4.18
diff -u -p -r1.2.4.18 stormproject.theme.inc
--- stormproject/stormproject.theme.inc	19 May 2010 20:33:42 -0000	1.2.4.18
+++ stormproject/stormproject.theme.inc	3 Jun 2010 16:31:49 -0000
@@ -30,18 +30,20 @@ function theme_stormproject_view($node, 
   drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
   
   $node = node_prepare($node, $teaser);
-  
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
+
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks"><dl>',
     '#suffix' => '</dl></div>',
     '#weight' => -25,
   );
   
-  $node->content['links']['expenses'] = theme('storm_link', 'stormproject', 'stormexpense', $node->nid, 1);
-  $node->content['links']['notes'] = theme('storm_link', 'stormproject', 'stormnote', $node->nid, 2);
-  $node->content['links']['tasks'] = theme('storm_link', 'stormproject', 'stormtask', $node->nid, 3);
-  $node->content['links']['tickets'] = theme('storm_link', 'stormproject', 'stormticket', $node->nid, 4);  
-  $node->content['links']['timetrackings'] = theme('storm_link', 'stormproject', 'stormtimetracking', $node->nid, 5);
+  $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']['notes'] = theme('storm_link', 'stormproject', 'stormnote', $node->nid, $l_pos++);
+  $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']['timetrackings'] = theme('storm_link', 'stormproject', 'stormtimetracking', $node->nid, $l_pos++);
   
   $node->content['group1'] = array(
     '#prefix' => '<div class="stormfields">',
Index: stormtask/stormtask.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormtask/stormtask.theme.inc,v
retrieving revision 1.3.4.24
diff -u -p -r1.3.4.24 stormtask.theme.inc
--- stormtask/stormtask.theme.inc	19 May 2010 20:33:42 -0000	1.3.4.24
+++ stormtask/stormtask.theme.inc	3 Jun 2010 16:31:49 -0000
@@ -84,6 +84,7 @@ function theme_stormtask_view($node, $te
   drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
   
   $node = node_prepare($node, $teaser);
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks">',
@@ -91,10 +92,10 @@ function theme_stormtask_view($node, $te
     '#weight' => -25,
   );
 
-  $node->content['links']['expenses'] = theme('storm_link', 'stormtask', 'stormexpense', $node->nid, $w++);
-  $node->content['links']['notes'] = theme('storm_link', 'stormtask', 'stormnote', $node->nid, $w++);
-  $node->content['links']['tickets'] = theme('storm_link', 'stormtask', 'stormticket', $node->nid, $w++);
-  $node->content['links']['timetrackings'] = theme('storm_link', 'stormtask', 'stormtimetracking', $node->nid, $w++);
+  $node->content['links']['expenses'] = theme('storm_link', 'stormtask', 'stormexpense', $node->nid, $l_pos++);
+  $node->content['links']['notes'] = theme('storm_link', 'stormtask', 'stormnote', $node->nid, $l_pos++);
+  $node->content['links']['tickets'] = theme('storm_link', 'stormtask', 'stormticket', $node->nid, $l_pos++);
+  $node->content['links']['timetrackings'] = theme('storm_link', 'stormtask', 'stormtimetracking', $node->nid, $l_pos++);
   
   $node->content['group1'] = array(
     '#prefix' => '<div class="stormfields">',
Index: stormticket/stormticket.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormticket/stormticket.theme.inc,v
retrieving revision 1.5.4.17
diff -u -p -r1.5.4.17 stormticket.theme.inc
--- stormticket/stormticket.theme.inc	19 May 2010 20:33:42 -0000	1.5.4.17
+++ stormticket/stormticket.theme.inc	3 Jun 2010 16:31:49 -0000
@@ -37,6 +37,7 @@ function theme_stormticket_view($node, $
   drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
   
   $node = node_prepare($node, $teaser);
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
   
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks"><dl>',
@@ -44,8 +45,8 @@ function theme_stormticket_view($node, $
     '#weight' => -25,
   );
 
-  $node->content['links']['expenses'] = theme('storm_link', 'stormticket', 'stormexpense', $node->nid, 1);
-  $node->content['links']['timetrackings'] = theme('storm_link', 'stormticket', 'stormtimetracking', $node->nid, 5);
+  $node->content['links']['expenses'] = theme('storm_link', 'stormticket', 'stormexpense', $node->nid, $l_pos++);
+  $node->content['links']['timetrackings'] = theme('storm_link', 'stormticket', 'stormtimetracking', $node->nid, $l_pos++);
 
   $node->content['group1'] = array(
     '#prefix' => '<div class="stormfields">',
Index: stormtimetracking/stormtimetracking.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormtimetracking/stormtimetracking.theme.inc,v
retrieving revision 1.5.4.15
diff -u -p -r1.5.4.15 stormtimetracking.theme.inc
--- stormtimetracking/stormtimetracking.theme.inc	19 May 2010 20:33:42 -0000	1.5.4.15
+++ stormtimetracking/stormtimetracking.theme.inc	3 Jun 2010 16:31:50 -0000
@@ -37,6 +37,7 @@ function theme_stormtimetracking_view($n
   drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
   
   $node = node_prepare($node, $teaser);
+  $l_pos = 1; // Used to increase the link position number (see issue 814820)
   
   $node->content['links'] = array(
     '#prefix' => '<div class="stormlinks"><dl>',
@@ -51,7 +52,7 @@ function theme_stormtimetracking_view($n
       '#prefix' => variable_get('storm_icons_display', TRUE) ? '<dt id="storminvoices" class="stormcomponent">' : '<dt class="stormcomponent">',
       '#suffix' => '</dt>',
       '#value' => theme('storminvoice_autoadd_links', $node->nid, $node->billable, $node->billed),
-      '#weight' => 1,
+      '#weight' => $l_pos++,
     );
   }