[bug 790799] Restyle notifications button on kb dashboards.

mozilla · Oct 8, 2012 · edbf53b · edbf53b
1 parent 007e897
commit edbf53b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 27 deletions.
diff --git a/apps/dashboards/templates/dashboards/contributors.html b/apps/dashboards/templates/dashboards/contributors.html
@@ -27,6 +27,17 @@ <h1>{{ title }}</h1>
         </div>
       {% endif %}
 
+      {% if not user.is_anonymous() %}
+        {{ print_subscription_menu(default_locale_name,
+                                   request_locale_name,
+                                   on_default_locale,
+                                   is_watching_default_locale,
+                                   is_watching_other_locale,
+                                   is_watching_default_approved,
+                                   is_watching_other_approved,
+                                   settings.WIKI_DEFAULT_LANGUAGE) }}
+      {% endif %}
+
       {% for readout in readouts.itervalues() %}
         {{ print_readout(readout, locale=default_locale) }}
       {% endfor %}
@@ -37,16 +48,5 @@ <h1>{{ title }}</h1>
 {% endblock %}
 
 {% block side_top %}
-  {% if not user.is_anonymous() %}
-    {{ print_subscription_menu(default_locale_name,
-                               request_locale_name,
-                               on_default_locale,
-                               is_watching_default_locale,
-                               is_watching_other_locale,
-                               is_watching_default_approved,
-                               is_watching_other_approved,
-                               settings.WIKI_DEFAULT_LANGUAGE) }}
-  {% endif %}
-
   {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, active='kbdashboard') }}
 {% endblock %}
diff --git a/apps/dashboards/templates/dashboards/includes/macros.html b/apps/dashboards/templates/dashboards/includes/macros.html
@@ -124,7 +124,10 @@
                                  show_default_waiting=True,
                                  show_default_approved=True) %}
   <div id="doc-watch">
-    <div class="popup-trigger">{{ _('Email me when revisions are...', 'l10n dashboard') }}</div>
+    <button class="btn btn-submit popup-trigger" type="submit">
+      <img src="{{ MEDIA_URL }}img/blank.png" alt="" />
+      {{ _('Email me when revisions are...', 'l10n dashboard') }}
+    </button>
     <form class="popup-menu" action="" method="POST">
       {{ csrf() }}
       <table>

diff --git a/apps/dashboards/templates/dashboards/localization.html b/apps/dashboards/templates/dashboards/localization.html
@@ -13,6 +13,7 @@
     <article id="localize" class="dashboards">
       <h1>{{ title }}</h1>
 
+
       <div class="choice-list">
         <label>{{ _('Show information for:') }}</label>
         <ul>
@@ -25,6 +26,17 @@ <h1>{{ title }}</h1>
         </ul>
       </div>
 
+      {% if not user.is_anonymous() %}
+        {{ print_subscription_menu(default_locale_name,
+                                   current_locale_name,
+                                   on_default_locale,
+                                   is_watching_default_locale,
+                                   is_watching_other_locale,
+                                   is_watching_default_approved,
+                                   is_watching_other_approved,
+                                   settings.WIKI_DEFAULT_LANGUAGE) }}
+      {% endif %}
+
       {% set rows = overview_rows() %}
       {{ overview_section(readouts, ((rows['most-visited'], True),
                                      (rows['templates'], True),
@@ -39,16 +51,5 @@ <h1>{{ title }}</h1>
 {% endblock %}
 
 {% block side_top %}
-  {% if not user.is_anonymous() %}
-    {{ print_subscription_menu(default_locale_name,
-                               current_locale_name,
-                               on_default_locale,
-                               is_watching_default_locale,
-                               is_watching_other_locale,
-                               is_watching_default_approved,
-                               is_watching_other_approved,
-                               settings.WIKI_DEFAULT_LANGUAGE) }}
-  {% endif %}
-
   {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, active='kbdashboard') }}
 {% endblock %}
diff --git a/media/less/kbdashboards.less b/media/less/kbdashboards.less
@@ -320,15 +320,20 @@
 /* Email notifications */
 #doc-watch {
   .popup-trigger {
-    color: @textBlue;
-    cursor: pointer;
-    margin: 0 0 10px;
-    padding: 2px 0 2px 10px;
+    font-weight: bold;
+    padding-left: 10px;
+
+    img {
+      background: transparent url("../img/icons-sprite.png") no-repeat -50px -1213px;
+      height: 9px;
+      width: 16px;
+    }
   }
 
   .popup-menu {
     display: none;
     position: relative;
+    width: 250px;
 
     table {
       background: #fff;