[Rt-commit] r18981 - in rt/3.8/trunk: share/html/Dashboards/Elements

[sartak at bestpractical.com]

Author: sartak
Date: Mon Mar 30 17:32:21 2009
New Revision: 18981

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/share/html/Dashboards/Elements/Tabs

Log:
 r81640 at onn:  sartak | 2009-03-30 17:31:38 -0400
 Display other dashboards as tabs, basics/queries/subscription as actions


Modified: rt/3.8/trunk/share/html/Dashboards/Elements/Tabs
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Elements/Tabs	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Elements/Tabs	Mon Mar 30 17:32:21 2009
@@ -49,11 +49,12 @@
     subtabs => $tabs,
     current_tab => 'Dashboards/index.html',
     current_subtab => $current_subtab,
+    actions => $actions,
     Title => $Title &>
 
 <%INIT>
 my $tabs;
-my $real_subtab = $current_subtab;
+my $actions;
 if ( $DashboardObj and $DashboardObj->Id ) {
 
     my $name = $DashboardObj->Name;
@@ -66,32 +67,28 @@
         title   => $DashboardObj->Name,
         path    => $modify,
         current_subtab  => $current_subtab,
-        subtabs => {
-            a_Basics => { title => loc('Basics'),
-                          path  => $modify,
-            },
-
-            b_Queries => { title => loc('Queries'),
-                           path  => $queries,
-            },
-
-            c_Subscription => { title => loc('Subscription'),
-                                path  => "Dashboards/Subscription.html?DashboardId=" . $DashboardObj->Id
-            },
-
-
-            z_Preview => { title => loc('Show'),
-                           path  => $render,
-            },
-        }
+        subtabs => $m->comp('DashboardTabs'),
     };
 
-    delete $tabs->{"this"}{"subtabs"}{"c_Subscription"}
-        unless $DashboardObj->CurrentUserCanSubscribe;
+    $actions = {
+        a_Basics => {
+            title => loc('Basics'),
+            path  => $modify,
+        },
+
+        b_Queries => {
+            title => loc('Queries'),
+            path  => $queries,
+        },
+
+        c_Subscription => {
+            title => loc('Subscription'),
+            path  => "Dashboards/Subscription.html?DashboardId=" . $DashboardObj->Id
+        },
+    };
 
-    $tabs->{"this"}{"subtabs"}{"z_Preview"}{path} = $real_subtab
-        if $real_subtab =~ /Render/
-        || $real_subtab =~ /Dashboard\/\d+/;
+    delete $actions->{"c_Subscription"}
+        unless $DashboardObj->CurrentUserCanSubscribe;
 
     $current_subtab = $modify;
 }