From ce6f5b40e1f1d7180aaf6c91caacec68f10348f3 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 4 Dec 2012 16:17:00 -0500
Subject: Current dashboard work

---
 .../template/en/default/pages/mydashboard.html.tmpl       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'extensions/MyDashboard/template/en')

diff --git a/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl b/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
index b85ba3cc8..d7cdb0d28 100644
--- a/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
+++ b/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
@@ -10,8 +10,11 @@
 
 [% PROCESS global/header.html.tmpl
   title = "My Dashboard"
-  style_urls = [ "extensions/MyDashboard/web/styles/mydashboard.css",
-                 "extensions/MyDashboard/web/styles/prod_comp_search.css" ]
+  style_urls = [ "extensions/MyDashboard/web/styles/mydashboard.css" ]
+  javascript_urls = [ "js/yui3/yui/yui-min.js",
+                      "extensions/MyDashboard/web/js/query.js",
+                      "extensions/MyDashboard/web/js/flags.js",
+                      "extensions/MyDashboard/web/js/prod_comp_search.js" ]
 %]
 
 [% standard_queries = [] %]
@@ -21,10 +24,6 @@
   [% saved_queries.push(q) IF q.saved %]
 [% END %]
 
-<script src="http://yui.yahooapis.com/3.7.3/build/yui/yui-min.js"></script>
-[%# These need to load after yui-min.js %]
-<script type="text/javascript" src="[% 'extensions/MyDashboard/web/js/mydashboard.js' FILTER mtime FILTER html %]"></script>
-
 <div id="mydashboard">
   <div class="yui3-skin-sam">
     <div id="left">
@@ -33,12 +32,12 @@
         <select id="query" name="query">
           <optgroup id="standard_queries" label="Standard">
             [% FOREACH r = standard_queries %]
-              <option value="[% r.name FILTER html %]">[% r.heading FILTER html %]</option>
+              <option value="[% r.name FILTER html %]">[% r.heading || r.name FILTER html %]</option>
             [% END%]
           </optgroup>
           <optgroup id="saved_queries" label="Saved">
             [% FOREACH r = saved_queries %]
-              <option value="[% r.name FILTER html %]">[% r.heading FILTER html %]</option>
+              <option value="[% r.name FILTER html %]">[% r.heading || r.name FILTER html %]</option>
             [% END %]
           </optgroup>
         </select>
-- 
cgit v1.2.3-24-g4f1b