[Rt-commit] r17969 - in rt/3.999/branches/merge_to_3.8.2: share/html/Dashboards

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Jan 28 22:32:51 2009
New Revision: 17969

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Render.html

Log:
 r19129 at sunnavys-mb:  sunnavy | 2009-01-29 09:44:15 +0800
 merged share/html/Dashboards/Render.html


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Render.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Render.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Render.html	Wed Jan 28 22:32:51 2009
@@ -54,19 +54,19 @@
     dashboard_obj => $DashboardObj &>
 % }
 
+<table class="dashboard">
 <table border="0" width="100%">
 <tr valign="top">
 
-<td class="boxcontainer" width="70%">
-% foreach ($DashboardObj->search_ids) {
-%   my ($type, $id, $desc) = @$_;
-%   my @for_showsearch = $DashboardObj->search_privacy(@$_);
-    <& /Elements/ShowSearch,
-        @for_showsearch,
-        override => { rows => $rows },
-        ignore_missing => 1,
-        hideable => $preview,
-    &>
+<td class="boxcontainer">
+% $show_cb->($_) foreach @{ $panes{body} || [] };
+</td>
+
+% if (@{ $panes{sidebar} || [] }) {
+<td class="boxcontainer">
+% $show_cb->($_) foreach @{ $panes{sidebar} || [] };
+</td>
+
 % }
 </td>
 
@@ -95,7 +95,21 @@
 }
 
 my $rows = $Loaded ? $SubscriptionObj->sub_value('Rows') : 20;
-my $title = $DashboardObj->name;
+my $title = _( 'Dashboard %1', $dashboard_obj->name );
+
+my %panes = %{ $dashboard_obj->panes };
+
+my $show_cb = sub {
+    my $portlet = shift;
+    my $portlet_type = $portlet->{portlet_type};
+    my $component = "Elements/ShowPortlet/$portlet_type";
+    $m->comp($component,
+        portlet   => $portlet,
+        rows      => $rows,
+        preview   => $Preview,
+        dashboard => $dashboard_obj,
+    );
+};
 
 </%INIT>
 <%ARGS>