Dashboard improvements

7 files changed, 31 insertions, 18 deletions

diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl
index a8096e391..daf0ea6df 100644
--- a/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl
+++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl
@@ -56,11 +56,6 @@
       link  => "page.cgi?id=productdashboard.html&product=$url_filtered_product&bug_status=$url_filtered_status&tab=duplicates"
     },
     {
-      name  => "popularity",
-      label => "Popularity",
-      link  => "page.cgi?id=productdashboard.html&product=$url_filtered_product&bug_status=$url_filtered_status&tab=popularity"
-    },
-    {
       name  => "roadmap",
       label => "Road Map",
       link  => "page.cgi?id=productdashboard.html&product=$url_filtered_product&bug_status=$url_filtered_status&tab=roadmap"
@@ -68,6 +63,16 @@
   ]
 %]
 
+[% IF product.votesperuser %]
+  [%
+    tabs.push({
+      name  => "popularity",
+      label => "Popularity",
+      link  => "page.cgi?id=productdashboard.html&product=$url_filtered_product&bug_status=$url_filtered_status&tab=popularity"
+    })
+  %]
+[% END %]
+
 [% FOREACH tab IN tabs %]
   [% IF tab.name == current_tab_name %]
     [% current_tab = tab %]
@@ -152,10 +157,6 @@
        current_tab = current_tab
     %]
 
-    <div class="current_tab_label">
-      [% current_tab.label FILTER html %]
-    </div>
-
     [% IF current_tab.name == 'summary' %]
       [% PROCESS pages/productdashboard/summary.html.tmpl %]
     [% END %]
diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard/components.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard/components.html.tmpl
index 0f51f9de2..0b8bd34c7 100644
--- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/components.html.tmpl
+++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/components.html.tmpl
@@ -116,8 +116,6 @@
 
 [% ELSE %]
 
-  [% summary_url = "page.cgi?id=productdashboard.html&amp;product=$url_filtered_product&bug_status=$url_filtered_status&tab=components" %]
-
   <script type="text/javascript">
   <!--
   PD.options = {
@@ -141,13 +139,17 @@
   -->
   </script>
 
+  [% summary_url = "page.cgi?id=productdashboard.html&amp;product=$url_filtered_product&bug_status=$url_filtered_status&tab=components" %]
+
+  <h3>[% terms.Bug %] counts per component, version and milestone.</h3>
+
   <p>
     <a href="#component">Component</a> |
     <a href="#version">Version</a> |
     <a href="#milestone">Milestone</a>
   </p>
 
-  <p>Click on value to show additional information</p>
+  <p>Click on a value to show a list of most recently updated bugs.</p>
 
   <div class="yui-skin-sam"> 
     <a name="component"></a>
diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard/duplicates.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard/duplicates.html.tmpl
index fc3403bc4..07d93da26 100644
--- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/duplicates.html.tmpl
+++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/duplicates.html.tmpl
@@ -37,7 +37,9 @@ PD.addStatListener("duplicate_counts", "duplicate_counts_table", PD.column_defs,
 });
 -->
 </script>
-  
+
+<h3>Most duplicated [% terms.bugs %]</h3>
+
 [% IF by_duplicate.size %]
   <b>[% by_duplicate.size FILTER html %]&nbsp;[% terms.Bugs %] Found</b>
   <div class="yui-skin-sam">
@@ -47,7 +49,7 @@ PD.addStatListener("duplicate_counts", "duplicate_counts_table", PD.column_defs,
         <tr bgcolor="#CCCCCC">
           [% FOREACH column = [ "ID", "Dupe Count", "Status", "Version"
                                 "Component", "Severity" "Summary" ] %]
-  
+ 
             <th>[% column FILTER html %]</th>
           [% END %]
         </tr>
@@ -71,5 +73,5 @@ PD.addStatListener("duplicate_counts", "duplicate_counts_table", PD.column_defs,
     </div>
   </div>
 [% ELSE %]
-  <h3>No duplicate [% terms.bugs %] found.</h3>
+  <b>No duplicate [% terms.bugs %] found.</b>
 [% END %]
diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard/popularity.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard/popularity.html.tmpl
index b6b159155..ad0f8eca4 100644
--- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/popularity.html.tmpl
+++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/popularity.html.tmpl
@@ -36,7 +36,9 @@ PD.fields = [
 PD.addStatListener("popularity_counts", "popularity_counts_table", PD.column_defs, PD.fields, PD.options);
 -->
 </script>
-  
+
+<h3>Most voted on [% terms.bugs %]</h3>
+
 [% IF by_popularity.size %]
   <b>[% by_popularity.size FILTER html %]&nbsp;[% terms.Bugs %] Found</b>
   <div class="yui-skin-sam">
@@ -70,5 +72,5 @@ PD.addStatListener("popularity_counts", "popularity_counts_table", PD.column_def
     </div>
   </div>
 [% ELSE %]
-  <h3>No [% terms.bugs %] found.</h3>
+  <b>No [% terms.bugs %] found.</b>
 [% END %]
diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard/recents.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard/recents.html.tmpl
index 470adef74..c08e298c8 100644
--- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/recents.html.tmpl
+++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/recents.html.tmpl
@@ -35,7 +35,9 @@ PD.addStatListener("recently_opened", "recently_opened_table", PD.column_defs, P
 PD.addStatListener("recently_closed", "recently_closed_table", PD.column_defs, PD.fields, PD.options);
 -->
 </script>
-  
+
+<h3>Most recently opened and closed [% terms.bugs %]</h3>
+
 <p>
   Activity within the last <input type="text" size="4" name="recent_days" 
                                   value="[% recent_days FILTER html %]">
diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard/roadmap.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard/roadmap.html.tmpl
index 26edb03af..565a8b996 100644
--- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/roadmap.html.tmpl
+++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/roadmap.html.tmpl
@@ -25,6 +25,8 @@ PD.addStatListener("bug_milestones", "bug_milestones_table", PD.column_defs, PD.
 -->
 </script>
 
+<h3>Percentage of [% terms.bug %] closure per milestone</h3>
+
 <div class="yui-skin-sam">
 <div id="bug_milestones">
   <table id="bug_milestones_table" border="0" cellspacing="3" cellpadding="0">
diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard/summary.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard/summary.html.tmpl
index 6d85b0175..a907d3e5b 100644
--- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/summary.html.tmpl
+++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/summary.html.tmpl
@@ -29,6 +29,8 @@ PD.addStatListener("assignee_counts", "assignee_counts_table", PD.column_defs, P
 -->
 </script>
 
+<h3>Summary of [% terms.bug %] counts</h3>
+
 <p>
   <a href="#counts">Counts</a>
   <span class="separator"> | </span>