diff options
author | Dave Lawrence <dlawrence@mozilla.com> | 2012-08-16 22:26:46 +0200 |
---|---|---|
committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-08-16 22:26:46 +0200 |
commit | 2b11e4ce9253bf543bde87c16bd9b6d90446cff6 (patch) | |
tree | 8eefcc04c9273e8cd170c0b820395a66a8aa6b6e | |
parent | ae3016495ffde3e71d879109e35437dbeff0747f (diff) | |
download | bugzilla-2b11e4ce9253bf543bde87c16bd9b6d90446cff6.tar.gz bugzilla-2b11e4ce9253bf543bde87c16bd9b6d90446cff6.tar.xz |
Dashboard improvements
11 files changed, 185 insertions, 159 deletions
diff --git a/extensions/MyDashboard/Extension.pm b/extensions/MyDashboard/Extension.pm index d1bbc17f1..e5f022dec 100644 --- a/extensions/MyDashboard/Extension.pm +++ b/extensions/MyDashboard/Extension.pm @@ -187,6 +187,18 @@ sub _standard_saved_queries { ### Saved query definitions ### These are enabled through the userprefs.cgi UI + + if ($user->showmybugslink) { + my $query = Bugzilla->params->{mybugstemplate}; + $query =~ s/%userid%/$user->login/; + push(@query_defs, { + name => 'mybugs', + heading => "My Bugs", + saved => 1, + params => $query, + }); + } + foreach my $q (@{$user->queries}) { next if !$q->in_mydashboard; push(@query_defs, { name => $q->name, diff --git a/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl b/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl index 50f31550e..ade7002be 100644 --- a/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl +++ b/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl @@ -17,22 +17,22 @@ yui = [ "datatable", "paginator", "autocomplete" ] javascript_urls = [ "extensions/MyDashboard/web/js/mydashboard.js", "extensions/MyDashboard/web/js/prod_comp_search.js" ] - onload = "showQuerySection();" + onload = "MD.showQuerySection();" %] <script type="text/javascript"> <!-- [%# Set up severities list for proper sorting %] - var severities = new Array(); + MD.severities = new Array(); [% sort_count = 0 %] [% FOREACH s = severities %] - severities['[% s FILTER js %]'] = [% sort_count FILTER js %]; + MD.severities['[% s FILTER js %]'] = [% sort_count FILTER js %]; [% sort_count = sort_count + 1 %] [% END %] - var full_query_list = []; + MD.full_query_list = []; [% FOREACH r = results %] - full_query_list.push('[% r.name FILTER js %]'); + MD.full_query_list.push('[% r.name FILTER js %]'); [% END %] --> </script> @@ -49,7 +49,7 @@ <div id="left"> <div id="query_list_container"> Choose query: - <select id="query" name="query" onchange="showQuerySection();"> + <select id="query" name="query" onchange="MD.showQuerySection();"> <optgroup id="standard_queries" label="Standard"> [% FOREACH r = standard_results %] <option value="[% r.name FILTER html %]">[% r.heading FILTER html %]</option> @@ -120,9 +120,8 @@ </div> <script> <!-- - addStatListener("requestee_table_container", "requestee_table", requestee_column_defs, requestee_fields, { - paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) - }); + MD.addStatListener("requestee_table_container", "requestee_table", + MD.requestee_column_defs, MD.requestee_fields, MD.options); --> </script> @@ -166,9 +165,8 @@ </div> <script> <!-- - addStatListener("requester_table_container", "requester_table", requester_column_defs, requester_fields, { - paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) - }); + MD.addStatListener("requester_table_container", "requester_table", + MD.requester_column_defs, MD.requester_fields, MD.options); --> </script> </div> @@ -213,9 +211,8 @@ </div> <script> <!-- - addStatListener("[% r.name FILTER js %]_table_container", "[% r.name FILTER js %]_table", query_column_defs, query_fields, { - paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) - }); + MD.addStatListener("[% r.name FILTER js %]_table_container", "[% r.name FILTER js %]_table", + MD.query_column_defs, MD.query_fields, MD.options); --> </script> </div> diff --git a/extensions/MyDashboard/web/js/mydashboard.js b/extensions/MyDashboard/web/js/mydashboard.js index 59b198cff..25529d8c8 100644 --- a/extensions/MyDashboard/web/js/mydashboard.js +++ b/extensions/MyDashboard/web/js/mydashboard.js @@ -6,7 +6,11 @@ * defined by the Mozilla Public License, v. 2.0. */ -var showQuerySection = function () { +YAHOO.namespace('MyDashboard'); + +var MD = YAHOO.MyDashboard; + +MD.showQuerySection = function () { var query_select = YAHOO.util.Dom.get('query'); var selected_value = ''; for (var i = 0, l = query_select.options.length; i < l; i++) { @@ -14,9 +18,9 @@ var showQuerySection = function () { selected_value = query_select.options[i].value; } } - for (var i = 0, l = full_query_list.length; i < l; i++) { - var query = full_query_list[i]; - if (selected_value == full_query_list[i]) { + for (var i = 0, l = MD.full_query_list.length; i < l; i++) { + var query = MD.full_query_list[i]; + if (selected_value == MD.full_query_list[i]) { YAHOO.util.Dom.removeClass(query + '_container', 'bz_default_hidden'); } else { @@ -25,63 +29,63 @@ var showQuerySection = function () { } } -var query_column_defs = [ - { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction:sortBugIdLinks } }, +MD.query_column_defs = [ + { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction: MD.sortBugIdLinks } }, { key:"updated", label:"Updated", sortable:true }, { key:"bug_status", label:"Status", sortable:true }, { key:"summary", label:"Summary", sortable:true }, ]; -var query_fields = [ +MD.query_fields = [ { key:"id" }, { key:"updated" }, { key:"bug_status" }, { key:"summary" } ]; -var requestee_column_defs = [ +MD.requestee_column_defs = [ { key:"requester", label:"Requester", sortable:true }, { key:"flag", label:"Flag", sortable:true }, { key:"bug", label:"Bug", sortable:true }, { key:"created", label:"Created", sortable:true } ]; -var requestee_fields = [ +MD.requestee_fields = [ { key:"requester" }, { key:"flag" }, { key:"bug" }, { key:"created" } ]; -var requester_column_defs = [ +MD.requester_column_defs = [ { key:"requestee", label:"Requestee", sortable:true }, { key:"flag", label:"Flag", sortable:true }, { key:"bug", label:"Bug", sortable:true }, { key:"created", label:"Created", sortable:true } ]; -var requester_fields = [ +MD.requester_fields = [ { key:"requestee" }, { key:"flag" }, { key:"bug" }, { key:"created" } ]; -function addStatListener (div_name, table_name, column_defs, fields, options) { +MD.addStatListener = function (div_name, table_name, column_defs, fields, options) { YAHOO.util.Event.addListener(window, "load", function() { YAHOO.example.StatsFromMarkup = new function() { this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get(table_name)); this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; this.myDataSource.responseSchema = { fields:fields }; this.myDataTable = new YAHOO.widget.DataTable(div_name, column_defs, this.myDataSource, options); - this.myDataTable.subscribe("rowMouseoverEvent", this.myDataTable.onEventHighlightRow); - this.myDataTable.subscribe("rowMouseoutEvent", this.myDataTable.onEventUnhighlightRow); + this.myDataTable.subscribe("rowMouseoverEvent", this.myDataTable.onEventHighlightRow); + this.myDataTable.subscribe("rowMouseoutEvent", this.myDataTable.onEventUnhighlightRow); }; }); } // Custom sort handler to sort by bug id inside an anchor tag -var sortBugIdLinks = function(a, b, desc) { +MD.sortBugIdLinks = function (a, b, desc) { // Deal with empty values if (!YAHOO.lang.isValue(a)) { return (!YAHOO.lang.isValue(b)) ? 0 : 1; @@ -113,17 +117,17 @@ var sortBugIdLinks = function(a, b, desc) { } // Custom sort handler for bug severities -var sortBugSeverity = function(a, b, desc) { +MD.sortBugSeverity = function (a, b, desc) { // Deal with empty values if (!YAHOO.lang.isValue(a)) { - return (!YAHOO.lang.isValue(b)) ? 0 : 1; + return (!YAHOO.lang.isValue(b)) ? 0 : 1; } else if(!YAHOO.lang.isValue(b)) { return -1; } - var new_a = new Number(severities[YAHOO.lang.trim(a.getData('bug_severity'))]); - var new_b = new Number(severities[YAHOO.lang.trim(b.getData('bug_severity'))]); + var new_a = new Number(MD.severities[YAHOO.lang.trim(a.getData('bug_severity'))]); + var new_b = new Number(MD.severities[YAHOO.lang.trim(b.getData('bug_severity'))]); if (!desc) { return YAHOO.util.Sort.compare(new_a, new_b); @@ -134,7 +138,7 @@ var sortBugSeverity = function(a, b, desc) { } // Custom sort handler for bug priorities -var sortBugPriority = function(a, b, desc) { +MD.sortBugPriority = function (a, b, desc) { // Deal with empty values if (!YAHOO.lang.isValue(a)) { return (!YAHOO.lang.isValue(b)) ? 0 : 1; @@ -143,8 +147,8 @@ var sortBugPriority = function(a, b, desc) { return -1; } - var new_a = new Number(priorities[YAHOO.lang.trim(a.getData('priority'))]); - var new_b = new Number(priorities[YAHOO.lang.trim(b.getData('priority'))]); + var new_a = new Number(MD.priorities[YAHOO.lang.trim(a.getData('priority'))]); + var new_b = new Number(MD.priorities[YAHOO.lang.trim(b.getData('priority'))]); if (!desc) { return YAHOO.util.Sort.compare(new_a, new_b); diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl index 9f537636f..a8096e391 100644 --- a/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl +++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl @@ -11,21 +11,21 @@ [% filtered_product = product.name FILTER html %] [% PROCESS global/header.html.tmpl title = "Product Dashboard: $filtered_product" - style_urls = [ "skins/standard/buglist.css", - "js/yui/assets/skins/sam/paginator.css", + style_urls = [ "skins/standard/buglist.css", + "js/yui/assets/skins/sam/paginator.css", "extensions/ProductDashboard/web/styles/productdashboard.css" ] yui = [ "datatable", "paginator", "calendar" ] - javascript_urls = [ "js/util.js", "js/field.js", + javascript_urls = [ "js/util.js", "js/field.js", "extensions/ProductDashboard/web/js/productdashboard.js" ] %] <script type="text/javascript"> <!-- [%# Set up severities list for proper sorting %] - var severities = new Array(); + PD.severities = new Array(); [% sort_count = 0 %] [% FOREACH s = severities %] - severities['[% s FILTER js %]'] = [% sort_count FILTER js %]; + PD.severities['[% s FILTER js %]'] = [% sort_count FILTER js %]; [% sort_count = sort_count + 1 %] [% 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 7f5a05568..0f51f9de2 100644 --- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/components.html.tmpl +++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/components.html.tmpl @@ -16,30 +16,29 @@ <script type="text/javascript"> <!-- - var column_defs = [ - { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction:sortBugIdLinks } }, - { key:"bug_status", label:"Status", sortable:true }, - { key:"version", label:"Version", sortable:true }, - { key:"component", label:"Component", sortable:true }, - { key:"bug_severity", label:"Severity", sortable:true, sortOptions:{ sortFunction:sortBugSeverity } }, - { key:"Summary", label:"Summary", sortable:false }, + PD.options = { + paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) + }; + PD.column_defs = [ + { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction: PD.sortBugIdLinks } }, + { key:"bug_status", label:"Status", sortable:true }, + { key:"version", label:"Version", sortable:true }, + { key:"component", label:"Component", sortable:true }, + { key:"bug_severity", label:"Severity", sortable:true, sortOptions:{ sortFunction: PD.sortBugSeverity } }, + { key:"Summary", label:"Summary", sortable:false }, ]; - var fields = [ - { key:"id" }, - { key:"bug_status" }, - { key:"version" }, - { key:"component" }, - { key:"bug_severity" }, - { key:"Summary" } + PD.fields = [ + { key:"id" }, + { key:"bug_status" }, + { key:"version" }, + { key:"component" }, + { key:"bug_severity" }, + { key:"Summary" } ]; [% IF user.is_timetracker %] - addStatListener("past_due", "past_due_table", column_defs, fields, { - [% IF summary.past_due.size > 25 %] paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25 }) [% END %] - }); + PD.addStatListener("past_due", "past_due_table", PD.column_defs, PD.fields, PD.options); [% END %] - addStatListener("updated_recently", "updated_recently_table", column_defs, fields, { - [% IF summary.updated_recently.size > 25 %] paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25 }) [% END %] - }); + PD.addStatListener("updated_recently", "updated_recently_table", PD.column_defs, PD.fields, PD.options); --> </script> @@ -121,21 +120,24 @@ <script type="text/javascript"> <!-- - var column_defs = [ - { key:"name", label:"Name", sortable:true }, - { key:"count", label:"Count", sortable:true }, - { key:"percentage", label:"Percentage", sortable:false }, - { key:"bug_list", label:"[% terms.Bug %] List", sortable:false } + PD.options = { + paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) + }; + PD.column_defs = [ + { key:"name", label:"Name", sortable:true }, + { key:"count", label:"Count", sortable:true }, + { key:"percentage", label:"Percentage", sortable:false }, + { key:"bug_list", label:"[% terms.Bug %] List", sortable:false } ]; - var fields = [ - { key:"name" }, - { key:"count", parser:"number" }, - { key:"percentage" }, - { key:"bug_list" } + PD.fields = [ + { key:"name" }, + { key:"count", parser:"number" }, + { key:"percentage" }, + { key:"bug_list" } ]; - addStatListener("component_counts", "component_counts_table", column_defs, fields, {}); - addStatListener("version_counts", "version_counts_table", column_defs, fields, {}); - addStatListener("milestone_counts", "milestone_counts_table", column_defs, fields, {}); + PD.addStatListener("component_counts", "component_counts_table", PD.column_defs, PD.fields, PD.options); + PD.addStatListener("version_counts", "version_counts_table", PD.column_defs, PD.fields, PD.options); + PD.addStatListener("milestone_counts", "milestone_counts_table", PD.column_defs, PD.fields, PD.options); --> </script> 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 36a820300..fc3403bc4 100644 --- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/duplicates.html.tmpl +++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/duplicates.html.tmpl @@ -12,26 +12,28 @@ <script type="text/javascript"> <!-- -var column_defs = [ - { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction:sortBugIdLinks } }, - { key:"count", label:"Count", sortable:true }, - { key:"bug_status", label:"Status", sortable:true }, - { key:"version", label:"Version", sortable:true }, - { key:"component", label:"Component", sortable:true }, - { key:"bug_severity", label:"Severity", sortable:true, sortOptions:{ sortFunction:sortBugSeverity } }, - { key:"Summary", label:"Summary", sortable:false }, +PD.options = { + paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) +}; +PD.column_defs = [ + { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction: PD.sortBugIdLinks } }, + { key:"count", label:"Count", sortable:true }, + { key:"bug_status", label:"Status", sortable:true }, + { key:"version", label:"Version", sortable:true }, + { key:"component", label:"Component", sortable:true }, + { key:"bug_severity", label:"Severity", sortable:true, sortOptions:{ sortFunction: PD.sortBugSeverity } }, + { key:"Summary", label:"Summary", sortable:false }, ]; -var fields = [ - { key:"id" }, - { key:"count", parser:"number" }, - { key:"bug_status" }, - { key:"version" }, - { key:"component" }, - { key:"bug_severity" }, - { key:"Summary" } +PD.fields = [ + { key:"id" }, + { key:"count", parser:"number" }, + { key:"bug_status" }, + { key:"version" }, + { key:"component" }, + { key:"bug_severity" }, + { key:"Summary" } ]; -addStatListener("duplicate_counts", "duplicate_counts_table", column_defs, fields, { - [% IF by_duplicate.size > 25 %] paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25 }) [% END %] +PD.addStatListener("duplicate_counts", "duplicate_counts_table", PD.column_defs, PD.fields, PD.options); }); --> </script> 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 9c7c42563..b6b159155 100644 --- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/popularity.html.tmpl +++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/popularity.html.tmpl @@ -12,27 +12,28 @@ <script type="text/javascript"> <!-- -var column_defs = [ - { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction:sortBugIdLinks } }, - { key:"count", label:"Count", sortable:true }, - { key:"bug_status", label:"Status", sortable:true }, - { key:"version", label:"Version", sortable:true }, - { key:"component", label:"Component", sortable:true }, - { key:"bug_severity", label:"Severity", sortable:true, sortOptions:{ sortFunction:sortBugSeverity } }, - { key:"Summary", label:"Summary", sortable:false }, +PD.options = { + paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) +}; +PD.column_defs = [ + { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction: PD.sortBugIdLinks } }, + { key:"count", label:"Count", sortable:true }, + { key:"bug_status", label:"Status", sortable:true }, + { key:"version", label:"Version", sortable:true }, + { key:"component", label:"Component", sortable:true }, + { key:"bug_severity", label:"Severity", sortable:true, sortOptions:{ sortFunction: PD.sortBugSeverity } }, + { key:"Summary", label:"Summary", sortable:false }, ]; -var fields = [ - { key:"id" }, - { key:"count", parser:"number" }, - { key:"bug_status" }, - { key:"version" }, - { key:"component" }, - { key:"bug_severity" }, - { key:"Summary" } +PD.fields = [ + { key:"id" }, + { key:"count", parser:"number" }, + { key:"bug_status" }, + { key:"version" }, + { key:"component" }, + { key:"bug_severity" }, + { key:"Summary" } ]; -addStatListener("popularity_counts", "popularity_counts_table", column_defs, fields, { - [% IF by_popularity.size > 25 %] paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25 }) [% END %] -}); +PD.addStatListener("popularity_counts", "popularity_counts_table", PD.column_defs, PD.fields, PD.options); --> </script> 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 4350e7472..470adef74 100644 --- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/recents.html.tmpl +++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/recents.html.tmpl @@ -12,28 +12,27 @@ <script type="text/javascript"> <!-- -var column_defs = [ - { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction:sortBugIdLinks } }, - { key:"bug_status", label:"Status", sortable:true }, - { key:"version", label:"Version", sortable:true }, - { key:"component", label:"Component", sortable:true }, - { key:"bug_severity", label:"Severity", sortable:true, sortOptions:{ sortFunction:sortBugSeverity } }, - { key:"Summary", label:"Summary", sortable:false }, +PD.options = { + paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) +}; +PD.column_defs = [ + { key:"id", label:"ID", sortable:true, sortOptions:{ sortFunction: PD.sortBugIdLinks } }, + { key:"bug_status", label:"Status", sortable:true }, + { key:"version", label:"Version", sortable:true }, + { key:"component", label:"Component", sortable:true }, + { key:"bug_severity", label:"Severity", sortable:true, sortOptions:{ sortFunction: PD.sortBugSeverity } }, + { key:"Summary", label:"Summary", sortable:false }, ]; -var fields = [ - { key:"id" }, - { key:"bug_status" }, - { key:"version" }, - { key:"component" }, - { key:"bug_severity" }, - { key:"Summary" } +PD.fields = [ + { key:"id" }, + { key:"bug_status" }, + { key:"version" }, + { key:"component" }, + { key:"bug_severity" }, + { key:"Summary" } ]; -addStatListener("recently_opened", "recently_opened_table", column_defs, fields, { - [% IF recently_opened.size > 25 %] paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25 }) [% END %] -}); -addStatListener("recently_closed", "recently_closed_table", column_defs, fields, { - [% IF recently_closed.size > 25 %] paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25 }) [% END %] -}); +PD.addStatListener("recently_opened", "recently_opened_table", PD.column_defs, PD.fields, PD.options); +PD.addStatListener("recently_closed", "recently_closed_table", PD.column_defs, PD.fields, PD.options); --> </script> 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 fad1cafa5..26edb03af 100644 --- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/roadmap.html.tmpl +++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/roadmap.html.tmpl @@ -8,18 +8,20 @@ <script type="text/javascript"> <!-- -var column_defs = [ - { key:"milestone", label:"Milestone", sortable:true }, - { key:"percentage complete", label:"Percentage Complete", sortable:false }, - { key:"links", label:"Links", sortable:false }, +PD.options = { + paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) +}; +PD.column_defs = [ + { key:"milestone", label:"Milestone", sortable:true }, + { key:"percentage complete", label:"Percentage Complete", sortable:false }, + { key:"links", label:"Links", sortable:false }, ]; -var fields = [ - { key:"milestone" }, - { key:"percentage complete" }, - { key:"links" } +PD.fields = [ + { key:"milestone" }, + { key:"percentage complete" }, + { key:"links" } ]; - -addStatListener("bug_milestones", "bug_milestones_table", column_defs, fields, {}); +PD.addStatListener("bug_milestones", "bug_milestones_table", PD.column_defs, PD.fields, PD.options); --> </script> 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 c1b0a8854..6d85b0175 100644 --- a/extensions/ProductDashboard/template/en/default/pages/productdashboard/summary.html.tmpl +++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard/summary.html.tmpl @@ -8,21 +8,24 @@ <script type="text/javascript"> <!-- -var column_defs = [ - { key:"name", label:"Name", sortable:true }, - { key:"count", label:"Count", sortable:true }, - { key:"percentage", label:"Percentage", sortable:false } +PD.options = { + paginator: new YAHOO.widget.Paginator({ rowsPerPage: 25, alwaysVisible: false }) +}; +PD.column_defs = [ + { key:"name", label:"Name", sortable:true }, + { key:"count", label:"Count", sortable:true }, + { key:"percentage", label:"Percentage", sortable:false } ]; -var fields = [ - { key:"name" }, - { key:"count", parser:"number" }, - { key:"percentage" } +PD.fields = [ + { key:"name" }, + { key:"count", parser:"number" }, + { key:"percentage" } ]; -addStatListener("bug_counts", "bug_counts_table", column_defs, fields, {}); -addStatListener("status_counts", "status_counts_table", column_defs, fields, {}); -addStatListener("priority_counts", "priority_counts_table", column_defs, fields, {}); -addStatListener("severity_counts", "severity_counts_table", column_defs, fields, {}); -addStatListener("assignee_counts", "assignee_counts_table", column_defs, fields, {}); +PD.addStatListener("bug_counts", "bug_counts_table", PD.column_defs, PD.fields, PD.options); +PD.addStatListener("status_counts", "status_counts_table", PD.column_defs, PD.fields, PD.options); +PD.addStatListener("priority_counts", "priority_counts_table", PD.column_defs, PD.fields, PD.options); +PD.addStatListener("severity_counts", "severity_counts_table", PD.column_defs, PD.fields, PD.options); +PD.addStatListener("assignee_counts", "assignee_counts_table", PD.column_defs, PD.fields, PD.options); --> </script> diff --git a/extensions/ProductDashboard/web/js/productdashboard.js b/extensions/ProductDashboard/web/js/productdashboard.js index e7276b7b2..56bc451ff 100644 --- a/extensions/ProductDashboard/web/js/productdashboard.js +++ b/extensions/ProductDashboard/web/js/productdashboard.js @@ -6,7 +6,11 @@ * defined by the Mozilla Public License, v. 2.0. */ -function addStatListener (div_name, table_name, column_defs, fields, options) { +YAHOO.namespace('ProductDashboard'); + +var PD = YAHOO.ProductDashboard; + +PD.addStatListener = function (div_name, table_name, column_defs, fields, options) { YAHOO.util.Event.addListener(window, "load", function() { YAHOO.example.StatsFromMarkup = new function() { this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get(table_name)); @@ -20,7 +24,7 @@ function addStatListener (div_name, table_name, column_defs, fields, options) { } // Custom sort handler to sort by bug id inside an anchor tag -var sortBugIdLinks = function(a, b, desc) { +PD.sortBugIdLinks = function (a, b, desc) { // Deal with empty values if (!YAHOO.lang.isValue(a)) { return (!YAHOO.lang.isValue(b)) ? 0 : 1; @@ -52,7 +56,7 @@ var sortBugIdLinks = function(a, b, desc) { } // Custom sort handler for bug severities -var sortBugSeverity = function(a, b, desc) { +PD.sortBugSeverity = function (a, b, desc) { // Deal with empty values if (!YAHOO.lang.isValue(a)) { return (!YAHOO.lang.isValue(b)) ? 0 : 1; @@ -73,7 +77,7 @@ var sortBugSeverity = function(a, b, desc) { } // Custom sort handler for bug priorities -var sortBugPriority = function(a, b, desc) { +PD.sortBugPriority = function (a, b, desc) { // Deal with empty values if (!YAHOO.lang.isValue(a)) { return (!YAHOO.lang.isValue(b)) ? 0 : 1; |