Bug 1363803 - Consolidate YUI js and css into one js and one css file

7 files changed, 185 insertions, 174 deletions

diff --git a/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl b/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl
index 3a01f879f..413239b6c 100644
--- a/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl
+++ b/extensions/ProductDashboard/template/en/default/pages/productdashboard.html.tmpl
@@ -8,15 +8,14 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% javascript_urls = [ "js/yui3/yui/yui-min.js",
+[% javascript_urls = [ "js/yui3.js",
                        "js/util.js",
                        "js/field.js" ]
 %]
 
 [% IF current_tab_name == 'summary' %]
   [% javascript_urls.push("extensions/ProductDashboard/web/js/summary.js") %]
-  [% ELSIF current_tab_name == 'recents' %]
-  [% yui = [ "calendar" ] %]
+[% ELSIF current_tab_name == 'recents' %]
   [% javascript_urls.push("js/field.js") %]
   [% javascript_urls.push("js/util.js") %]
   [% javascript_urls.push("extensions/ProductDashboard/web/js/recents.js") %]
@@ -46,8 +45,8 @@
   title = "Product Dashboard: $filtered_product"
   generate_api_token = 1
   javascript = js
-  style_urls = [ "skins/standard/buglist.css",
-                 "js/yui/assets/skins/sam/paginator.css",
+  style_urls = [ "skins/yui3.css",
+                 "skins/standard/buglist.css",
                  "extensions/ProductDashboard/web/styles/productdashboard.css" ]
 %]
 
diff --git a/extensions/ProductDashboard/web/js/components.js b/extensions/ProductDashboard/web/js/components.js
index 8b0d28587..0c48576a7 100644
--- a/extensions/ProductDashboard/web/js/components.js
+++ b/extensions/ProductDashboard/web/js/components.js
@@ -6,85 +6,87 @@
  * defined by the Mozilla Public License, v. 2.0.
  */
 
-YUI({
-    base: 'js/yui3/',
-    combine: false
-}).use("datatable", "datatable-sort", "escape", function(Y) {
-    if (typeof PD.updated_recently != 'undefined') {
-        var columns = [
-            { key:"id", label:"ID", sortable:true, allowHTML: true,
-              formatter: '<a href="show_bug.cgi?id={value}" target="_blank">{value}</a>' },
-            { key:"bug_status", label:"Status", sortable:true },
-            { key:"version", label:"Version", sortable:true },
-            { key:"component", label:"Component", sortable:true },
-            { key:"severity", label:"Severity", sortable:true },
-            { key:"summary", label:"Summary", sortable:false },
-        ];
+$(function() {
+    YUI({
+        base: 'js/yui3/',
+        combine: false
+    }).use("datatable", "datatable-sort", "escape", function(Y) {
+        if (typeof PD.updated_recently != 'undefined') {
+            var columns = [
+                { key:"id", label:"ID", sortable:true, allowHTML: true,
+                formatter: '<a href="show_bug.cgi?id={value}" target="_blank">{value}</a>' },
+                { key:"bug_status", label:"Status", sortable:true },
+                { key:"version", label:"Version", sortable:true },
+                { key:"component", label:"Component", sortable:true },
+                { key:"severity", label:"Severity", sortable:true },
+                { key:"summary", label:"Summary", sortable:false },
+            ];
 
-        var updatedRecentlyDataTable = new Y.DataTable({
-            columns: columns,
-            data: PD.updated_recently
-        });
-        updatedRecentlyDataTable.render("#updated_recently");
-
-        if (typeof PD.past_due != 'undefined') {
-            var pastDueDataTable = new Y.DataTable({
+            var updatedRecentlyDataTable = new Y.DataTable({
                 columns: columns,
-                data: PD.past_due
+                data: PD.updated_recently
             });
-            pastDueDataTable.render('#past_due');
-        }
-    }
+            updatedRecentlyDataTable.render("#updated_recently");
 
-    if (typeof PD.component_counts != 'undefined') {
-        var summary_url = '<a href="page.cgi?id=productdashboard.html&amp;product=' +
-                          encodeURIComponent(PD.product_name) + '&bug_status=' +
-                          encodeURIComponent(PD.bug_status) + '&tab=components';
-
-        var columns = [
-            { key:"name", label:"Name", sortable:true, allowHTML: true,
-              formatter: function (o) {
-                  return summary_url + '&component=' +
-                         encodeURIComponent(o.value) + '">' +
-                         Y.Escape.html(o.value) + '</a>'
-              }
-            },
-            { key:"count", label:"Count", sortable:true },
-            { key:"percentage", label:"Percentage", sortable:false, allowHTML: true,
-              formatter: '<div class="percentage"><div class="bar" style="width:{value}%"></div><div class="percent">{value}%</div></div>' },
-            { key:"link", label:"Link", sortable:false, allowHTML: true }
-        ];
+            if (typeof PD.past_due != 'undefined') {
+                var pastDueDataTable = new Y.DataTable({
+                    columns: columns,
+                    data: PD.past_due
+                });
+                pastDueDataTable.render('#past_due');
+            }
+        }
 
-        var componentsDataTable = new Y.DataTable({
-            columns: columns,
-            data: PD.component_counts
-        });
-        componentsDataTable.render("#component_counts");
+        if (typeof PD.component_counts != 'undefined') {
+            var summary_url = '<a href="page.cgi?id=productdashboard.html&amp;product=' +
+                            encodeURIComponent(PD.product_name) + '&bug_status=' +
+                            encodeURIComponent(PD.bug_status) + '&tab=components';
 
-        columns[0].formatter = function (o) {
-            return summary_url + '&version=' +
-                   encodeURIComponent(o.value) + '">' +
-                   Y.Escape.html(o.value) + '</a>';
-        };
+            var columns = [
+                { key:"name", label:"Name", sortable:true, allowHTML: true,
+                formatter: function (o) {
+                    return summary_url + '&component=' +
+                            encodeURIComponent(o.value) + '">' +
+                            Y.Escape.html(o.value) + '</a>'
+                }
+                },
+                { key:"count", label:"Count", sortable:true },
+                { key:"percentage", label:"Percentage", sortable:false, allowHTML: true,
+                formatter: '<div class="percentage"><div class="bar" style="width:{value}%"></div><div class="percent">{value}%</div></div>' },
+                { key:"link", label:"Link", sortable:false, allowHTML: true }
+            ];
 
-        var versionsDataTable = new Y.DataTable({
-            columns: columns,
-            data: PD.version_counts
-        });
-        versionsDataTable.render('#version_counts');
+            var componentsDataTable = new Y.DataTable({
+                columns: columns,
+                data: PD.component_counts
+            });
+            componentsDataTable.render("#component_counts");
 
-        if (typeof PD.milestone_counts != 'undefined') {
             columns[0].formatter = function (o) {
-                return summary_url + '&target_milestone=' +
-                       encodeURIComponent(o.value) + '">' +
-                       Y.Escape.html(o.value) + '</a>';
+                return summary_url + '&version=' +
+                    encodeURIComponent(o.value) + '">' +
+                    Y.Escape.html(o.value) + '</a>';
             };
 
-            var milestonesDataTable = new Y.DataTable({
+            var versionsDataTable = new Y.DataTable({
                 columns: columns,
-                data: PD.milestone_counts
+                data: PD.version_counts
             });
-            milestonesDataTable.render('#milestone_counts');
+            versionsDataTable.render('#version_counts');
+
+            if (typeof PD.milestone_counts != 'undefined') {
+                columns[0].formatter = function (o) {
+                    return summary_url + '&target_milestone=' +
+                        encodeURIComponent(o.value) + '">' +
+                        Y.Escape.html(o.value) + '</a>';
+                };
+
+                var milestonesDataTable = new Y.DataTable({
+                    columns: columns,
+                    data: PD.milestone_counts
+                });
+                milestonesDataTable.render('#milestone_counts');
+            }
         }
-    }
+    });
 });
diff --git a/extensions/ProductDashboard/web/js/duplicates.js b/extensions/ProductDashboard/web/js/duplicates.js
index 5e3193a65..57f890d6e 100644
--- a/extensions/ProductDashboard/web/js/duplicates.js
+++ b/extensions/ProductDashboard/web/js/duplicates.js
@@ -6,23 +6,25 @@
  * defined by the Mozilla Public License, v. 2.0. 
  */
 
-YUI({
-    base: 'js/yui3/',
-    combine: false
-}).use("datatable", "datatable-sort", function (Y) {
-    var column_defs = [
-        { key:"id", label:"ID", sortable:true, allowHTML: true,
-          formatter: '<a href="show_bug.cgi?id={value}" target="_blank">{value}</a>' },
-        { key:"count", label:"Count", sortable:true },
-        { key:"status", label:"Status", sortable:true },
-        { key:"version", label:"Version", sortable:true },
-        { key:"component", label:"Component", sortable:true },
-        { key:"severity", label:"Severity", sortable:true },
-        { key:"summary", label:"Summary", sortable:false },
-    ];
+$(function() {
+    YUI({
+        base: 'js/yui3/',
+        combine: false
+    }).use("datatable", "datatable-sort", function (Y) {
+        var column_defs = [
+            { key:"id", label:"ID", sortable:true, allowHTML: true,
+            formatter: '<a href="show_bug.cgi?id={value}" target="_blank">{value}</a>' },
+            { key:"count", label:"Count", sortable:true },
+            { key:"status", label:"Status", sortable:true },
+            { key:"version", label:"Version", sortable:true },
+            { key:"component", label:"Component", sortable:true },
+            { key:"severity", label:"Severity", sortable:true },
+            { key:"summary", label:"Summary", sortable:false },
+        ];
 
-    var duplicatesDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.duplicates
-    }).render('#duplicates');
+        var duplicatesDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.duplicates
+        }).render('#duplicates');
+    });
 });
diff --git a/extensions/ProductDashboard/web/js/popularity.js b/extensions/ProductDashboard/web/js/popularity.js
index b78b67867..d496481fa 100644
--- a/extensions/ProductDashboard/web/js/popularity.js
+++ b/extensions/ProductDashboard/web/js/popularity.js
@@ -6,23 +6,25 @@
  * defined by the Mozilla Public License, v. 2.0. 
  */
 
-YUI({
-    base: 'js/yui3/',
-    combine: false
-}).use("datatable", "datatable-sort", function (Y) {
-    var column_defs = [
-        { key:"id", label:"ID", sortable:true, allowHTML: true,
-          formatter: '<a href="show_bug.cgi?id={value}" target="_blank">{value}</a>' },
-        { key:"count", label:"Count", sortable:true },
-        { key:"status", label:"Status", sortable:true },
-        { key:"version", label:"Version", sortable:true },
-        { key:"component", label:"Component", sortable:true },
-        { key:"severity", label:"Severity", sortable:true },
-        { key:"summary", label:"Summary", sortable:false },
-    ];
+$(function() {
+    YUI({
+        base: 'js/yui3/',
+        combine: false
+    }).use("datatable", "datatable-sort", function (Y) {
+        var column_defs = [
+            { key:"id", label:"ID", sortable:true, allowHTML: true,
+            formatter: '<a href="show_bug.cgi?id={value}" target="_blank">{value}</a>' },
+            { key:"count", label:"Count", sortable:true },
+            { key:"status", label:"Status", sortable:true },
+            { key:"version", label:"Version", sortable:true },
+            { key:"component", label:"Component", sortable:true },
+            { key:"severity", label:"Severity", sortable:true },
+            { key:"summary", label:"Summary", sortable:false },
+        ];
 
-    var popularityDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.popularity
-    }).render('#popularity');
+        var popularityDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.popularity
+        }).render('#popularity');
+    });
 });
diff --git a/extensions/ProductDashboard/web/js/recents.js b/extensions/ProductDashboard/web/js/recents.js
index 84e1758b6..d3a596c64 100644
--- a/extensions/ProductDashboard/web/js/recents.js
+++ b/extensions/ProductDashboard/web/js/recents.js
@@ -6,27 +6,29 @@
  * defined by the Mozilla Public License, v. 2.0. 
  */
 
-YUI({
-    base: 'js/yui3/',
-    combine: false
-}).use("datatable", "datatable-sort", function (Y) {
-    var column_defs = [
-        { key:"id", label:"ID", sortable:true, allowHTML: true, 
-          formatter: '<a href="show_bug.cgi?id={value}" target="_blank">{value}</a>' }, 
-        { key:"status", label:"Status", sortable:true },
-        { key:"version", label:"Version", sortable:true },
-        { key:"component", label:"Component", sortable:true },
-        { key:"severity", label:"Severity", sortable:true },
-        { key:"summary", label:"Summary", sortable:false },
-    ];
+$(function () {
+    YUI({
+        base: 'js/yui3/',
+        combine: false
+    }).use("datatable", "datatable-sort", function (Y) {
+        var column_defs = [
+            { key:"id", label:"ID", sortable:true, allowHTML: true, 
+            formatter: '<a href="show_bug.cgi?id={value}" target="_blank">{value}</a>' }, 
+            { key:"status", label:"Status", sortable:true },
+            { key:"version", label:"Version", sortable:true },
+            { key:"component", label:"Component", sortable:true },
+            { key:"severity", label:"Severity", sortable:true },
+            { key:"summary", label:"Summary", sortable:false },
+        ];
 
-    var recentlyOpenedDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.recents.opened
-    }).render('#recently_opened');
+        var recentlyOpenedDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.recents.opened
+        }).render('#recently_opened');
 
-    var recentlyClosedDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.recents.closed
-    }).render('#recently_closed');
+        var recentlyClosedDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.recents.closed
+        }).render('#recently_closed');
+    });
 });
diff --git a/extensions/ProductDashboard/web/js/roadmap.js b/extensions/ProductDashboard/web/js/roadmap.js
index 1bef5b091..466446c13 100644
--- a/extensions/ProductDashboard/web/js/roadmap.js
+++ b/extensions/ProductDashboard/web/js/roadmap.js
@@ -6,19 +6,21 @@
  * defined by the Mozilla Public License, v. 2.0. 
  */
 
-YUI({
-    base: 'js/yui3/',
-    combine: false
-}).use("datatable", "datatable-sort", function (Y) {
-    var column_defs = [
-        { key: 'name', label: 'Name', sortable: true },
-        { key: 'percentage', label: 'Percentage', sortable: false, allowHTML: true,
-          formatter: '<div class="percentage"><div class="bar" style="width:{value}%"></div><div class="percent">{value}%</div></div>' },
-        { key: 'link', label: 'Links', allowHTML: true, sortable: false }
-    ];
+$(function() {
+    YUI({
+        base: 'js/yui3/',
+        combine: false
+    }).use("datatable", "datatable-sort", function (Y) {
+        var column_defs = [
+            { key: 'name', label: 'Name', sortable: true },
+            { key: 'percentage', label: 'Percentage', sortable: false, allowHTML: true,
+            formatter: '<div class="percentage"><div class="bar" style="width:{value}%"></div><div class="percent">{value}%</div></div>' },
+            { key: 'link', label: 'Links', allowHTML: true, sortable: false }
+        ];
 
-    var roadmapDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.roadmap,
-    }).render('#bug_milestones');
+        var roadmapDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.roadmap,
+        }).render('#bug_milestones');
+    });
 });
diff --git a/extensions/ProductDashboard/web/js/summary.js b/extensions/ProductDashboard/web/js/summary.js
index 59d000d7b..c4501200a 100644
--- a/extensions/ProductDashboard/web/js/summary.js
+++ b/extensions/ProductDashboard/web/js/summary.js
@@ -6,40 +6,42 @@
  * defined by the Mozilla Public License, v. 2.0. 
  */
 
-YUI({
-    base: 'js/yui3/',
-    combine: false
-}).use("datatable", "datatable-sort", function (Y) {
-    var column_defs = [
-        { key: 'name', label: 'Name', sortable: true },
-        { key: 'count', label: 'Count', sortable: true },
-        { key: 'percentage', label: 'Percentage', sortable: true, allowHTML: true, 
-          formatter: '<div class="percentage"><div class="bar" style="width:{value}%"></div><div class="percent">{value}%</div></div>' }, 
-        { key: 'link', label: 'Link', allowHTML: true }
-    ];
+$(function() {
+    YUI({
+        base: 'js/yui3/',
+        combine: false
+    }).use("datatable", "datatable-sort", function (Y) {
+        var column_defs = [
+            { key: 'name', label: 'Name', sortable: true },
+            { key: 'count', label: 'Count', sortable: true },
+            { key: 'percentage', label: 'Percentage', sortable: true, allowHTML: true, 
+            formatter: '<div class="percentage"><div class="bar" style="width:{value}%"></div><div class="percent">{value}%</div></div>' }, 
+            { key: 'link', label: 'Link', allowHTML: true }
+        ];
 
-    var bugsCountDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.summary.bug_counts
-    }).render('#bug_counts');
+        var bugsCountDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.summary.bug_counts
+        }).render('#bug_counts');
 
-    var statusCountsDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.summary.status_counts
-    }).render('#status_counts');
+        var statusCountsDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.summary.status_counts
+        }).render('#status_counts');
 
-    var priorityCountsDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.summary.priority_counts
-    }).render('#priority_counts');
+        var priorityCountsDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.summary.priority_counts
+        }).render('#priority_counts');
 
-    var severityCountsDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.summary.severity_counts
-    }).render('#severity_counts');
+        var severityCountsDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.summary.severity_counts
+        }).render('#severity_counts');
 
-    var assigneeCountsDataTable = new Y.DataTable({
-        columns: column_defs,
-        data: PD.summary.assignee_counts
-    }).render('#assignee_counts');
+        var assigneeCountsDataTable = new Y.DataTable({
+            columns: column_defs,
+            data: PD.summary.assignee_counts
+        }).render('#assignee_counts');
+    });
 });