mobile search results now show badges (bug 636056)

apps/addons/templates/addons/listing/items_mobile.html

@@ -28,6 +28,9 @@
           {% endif %}
         </div>
       </details>
+      {% if src == 'search' %}
+        {{ mobile_install_button(addon, show_warning=False) }}
+      {% endif %}
     </a>
   </li>
 {% endfor %}

apps/addons/templates/addons/mobile/button.html

@@ -12,25 +12,27 @@
      data-min="{{ compat.min.version }}"
      data-max="{{ compat.max.version }}"
   {% endif %}>
-  {% set links = b.links() %}
-  {% if not links %}
-    <a class="button disabled">
-      {{ _('No compatible versions') }}
-    </a>
-  {% endif %}
-  {% for link in links %}
-    {% set extra = "platform " + link.os.shortname if link.os else "" %}
-    <a class="button add {{ b.button_class|join(' ') }} {{ extra }}"
-       data-hash="{{ link.file.hash }}"
-       {% if b.show_warning %}
-         href="{{ b.addon.get_url_path() }}"
-         data-realurl="{{ link.url }}"
-       {% else %}
-         href="{{ link.url|absolutify }}"
-       {% endif %}>
-        {{ _('Add to Firefox') }}
-    </a>
-  {% endfor %}
+  <div class="buttons">
+    {% set links = b.links() %}
+    {% if not links %}
+      <a class="button disabled">
+        {{ _('No compatible versions') }}
+      </a>
+    {% endif %}
+    {% for link in links %}
+      {% set extra = "platform " + link.os.shortname if link.os else "" %}
+      <a class="button add {{ b.button_class|join(' ') }} {{ extra }}"
+         data-hash="{{ link.file.hash }}"
+         {% if b.show_warning %}
+           href="{{ b.addon.get_url_path() }}"
+           data-realurl="{{ link.url }}"
+         {% else %}
+           href="{{ link.url|absolutify }}"
+         {% endif %}>
+          {{ _('Add to Firefox') }}
+      </a>
+    {% endfor %}
+  </div>
   <ul class="badges">
     {% if settings.PERF_THRESHOLD and addon.ts_slowness >= settings.PERF_THRESHOLD %}
       <li class="warning">{{ _('May Slow Down Your Browser') }}</li>

apps/search/templates/search/mobile/results.html

@@ -13,8 +13,9 @@
 <meta name="WT.oss_r" content="{{ pager.paginator.count }}">
 {% endblock %}
 
+{% block contentclass %}search{% endblock %}
+
 {% block page %}
-<section id="content">
   <h2>{{ _('Search Results <i>({num})</i>')|f(num=pager.paginator.count)|safe }}</h2>
 
   <div class="menu">
@@ -29,5 +30,4 @@
   </div>
 
   {{ pager|mobile_paginator }}
-</section>
 {% endblock %}

media/css/zamboni/mobile.css

@@ -622,6 +622,18 @@ a.listview:before {
     -webkit-transform: scaleX(-1);
 }
 
+#content.search .item .install-wrapper {
+    margin: 0 14px;
+    padding: 0;
+}
+#content.search .item .badges {
+    margin: 0;
+}
+#content.search .item .buttons,
+#content.search .item .privacy-policy {
+    display: none;
+}
+
 /************************************/
 /*            SORT MENU             */
 /************************************/

templates/mobile/base.html

@@ -56,7 +56,7 @@
         </header>
       {% endblock %}
 
-      <section id="content">
+      <section id="content" class="{% block contentclass %}{% endblock %}">
         {% block page %}
         {% endblock page %}
       </section>