app stats implementation (bug 695236)

mozilla · Apr 3, 2012 · b0ccd4e · b0ccd4e
1 parent e03b1cf
commit b0ccd4e
Show file tree

Hide file tree

Showing 27 changed files with 1,210 additions and 50 deletions.
diff --git a/apps/stats/helpers.py b/apps/stats/helpers.py
@@ -1,4 +1,5 @@
 import jinja2
+import waffle
 
 from jingo import env, register
 from tower import ugettext as _
@@ -20,6 +21,8 @@ def report_menu(context, request, report, obj=None):
                 obj.has_author(request.amo_user))):
                 has_privs = True
             t = env.get_template('stats/addon_report_menu.html')
+            if obj.is_webapp() and waffle.switch_is_active('marketplace'):
+                t = env.get_template('appstats/app_report_menu.html')
             c = {
                 'addon': obj,
                 'has_privs': has_privs

diff --git a/apps/stats/templates/stats/popup.html b/apps/stats/templates/stats/popup.html
@@ -0,0 +1,36 @@
+  <div class="modal" id="stats-note">
+    <a class="close">{{ _('close') }}</a>
+    {% block stats_note %}{% endblock %}
+  </div>
+  <div class="modal" id="exception-note">
+    <a class="close">{{ _('close') }}</a>
+    <h2></h2>
+    <div></div>
+  </div>
+  <div class="modal" id="custom-criteria">
+    <h2>{{ _('Custom Date Range') }}</h2>
+    <a class="close">{{ _('close') }}</a>
+    <form id="date-range-form">
+      <fieldset>
+        <p>
+          <label for="date-range-start">{{ _('From') }}</label>
+          <input type="date" id="date-range-start">
+        </p>
+        <div id="start-date-picker"></div>
+      </fieldset>
+      <fieldset>
+        <p>
+          <label for="date-range-end">{{ _('To') }}</label>
+          <input type="date" id="date-range-end">
+        </p>
+        <div id="end-date-picker"></div>
+      </fieldset>
+      <footer>
+        <p>
+          <button id="date-range-submit" type="submit">
+            {{ _('Update') }}
+          </button>
+        </p>
+      </footer>
+    </form>
+  </div>
diff --git a/apps/stats/templates/stats/stats.html b/apps/stats/templates/stats/stats.html
@@ -193,46 +193,12 @@ <h1>
 {% endblock %}
 
 {% block popups %}
-  <div class="modal" id="stats-note">
-    <a class="close">{{ _('close') }}</a>
-    {% block stats_note %}
-    {% endblock %}
-  </div>
-  <div class="modal" id="exception-note">
-    <a class="close">{{ _('close') }}</a>
-    <h2></h2>
-    <div></div>
-  </div>
-  <div class="modal" id="custom-criteria">
-    <h2>{{ _('Custom Date Range') }}</h2>
-    <a class="close">{{ _('close') }}</a>
-    <form id="date-range-form">
-      <fieldset>
-        <p>
-          <label for="date-range-start">{{ _('From') }}</label>
-          <input type="date" id="date-range-start">
-        </p>
-        <div id="start-date-picker"></div>
-      </fieldset>
-      <fieldset>
-        <p>
-          <label for="date-range-end">{{ _('To') }}</label>
-          <input type="date" id="date-range-end">
-        </p>
-        <div id="end-date-picker"></div>
-      </fieldset>
-      <footer>
-        <p>
-          <button id="date-range-submit" type="submit">{{ _('Update') }}</button>
-        </p>
-      </footer>
-    </form>
-  </div>
+  {% include 'popup.html' %}
 {% endblock %}
 
 {% block js %}
 <!--[if IE]>
-   <script src="{{ media('js/lib/excanvas.compiled.js" type="text/javascript') }}"></script>
+   <script src="{{ media('js/lib/excanvas.compiled.js') }}"></script>
 <![endif]-->
 {{ js('zamboni/stats') }}
 {% endblock %}
diff --git a/media/css/mkt/paginator.less b/media/css/mkt/paginator.less
@@ -31,7 +31,10 @@
             font-size: 12px;
             line-height: 14px;
             margin-left: 7px;
-            padding: 7px 14px 9px;
+            padding: 8px 14px;
+            &:hover {
+                text-decoration: none;
+            }
         }
     }
 }

diff --git a/media/css/mkt/site.less b/media/css/mkt/site.less
@@ -217,3 +217,7 @@ body {
     padding: 16px;
     text-align: center;
 }
+
+.hidden {
+    display: none;
+}