Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[939781] Flip more switches for Thunderbird.

  • Loading branch information...
commit 2e35d85f3cbfbe17d8050469bc9ce8994977fb6a 1 parent e936839
@mythmon mythmon authored
View
2  kitsune/landings/templates/landings/home.html
@@ -5,7 +5,7 @@
{% block content %}
<div class="grid_12">
<section id="products-and-services">
- {{ product_cards(products, show_thunderbird=True) }}
+ {{ product_cards(products) }}
</section>
</div>
<section id="get-involved-box" class="grid_12">
View
2  kitsune/landings/tests/test_templates.py
@@ -18,4 +18,4 @@ def test_home(self):
r = self.client.get(reverse('home'), follow=True)
eq_(200, r.status_code)
doc = pq(r.content)
- eq_(5, len(doc('#products-and-services li')))
+ eq_(4, len(doc('#products-and-services li')))
View
11 kitsune/products/templates/products/includes/product_macros.html
@@ -1,4 +1,4 @@
-{% macro product_cards(products, topic=None, show_thunderbird=False) -%}
+{% macro product_cards(products, topic=None) -%}
<ul id="product-cards" class="card-grid cf">
{% for product in products %}
<li>
@@ -14,14 +14,5 @@
</a>
</li>
{% endfor %}
- {% if show_thunderbird %}
- <li class="thunderbird">
- <a class="cf" href="https://support.mozillamessaging.com">
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite" alt="" />
- <span class="title">{{ 'Thunderbird' }}</span>
- <span class="description">{{ _('Email software for Windows, Mac and Linux') }}</span>
- </a>
- </li>
- {% endif %}
</ul>
{%- endmacro %}
View
2  kitsune/products/templates/products/products.html
@@ -7,6 +7,6 @@
{% block content %}
<section id="products-and-services" class="grid_12">
<h1>{{ title }}</h1>
- {{ product_cards(products, show_thunderbird=True) }}
+ {{ product_cards(products) }}
</section>
{% endblock %}
View
2  kitsune/products/tests/test_templates.py
@@ -22,7 +22,7 @@ def test_products(self):
r = self.client.get(reverse('products'), follow=True)
eq_(200, r.status_code)
doc = pq(r.content)
- eq_(4, len(doc('#products-and-services li')))
+ eq_(3, len(doc('#products-and-services li')))
def test_product_landing(self):
"""Verify that /products/<slug> page renders topics."""
View
51 kitsune/questions/config.py
@@ -202,14 +202,53 @@
}),
])
}),
- ('other', {
+ ('thunderbird', {
'name': _lazy(u'Thunderbird'),
- 'subtitle': _lazy(u'or other Mozilla products'),
- 'html': 'This site is only for Firefox support. Please find your '
- 'product below.'
+ 'subtitle': '',
+ 'extra_fields': [],
+ 'tags': [],
+ 'products': ['thunderbird'],
+ 'categories': SortedDict([
+ ('get-started', {
+ 'name': _lazy(u'Learn the Basics: get started'),
+ 'topic': 'learn-basics-get-started',
+ 'tags': ['get-started'],
+ }),
+ ('download-and-install', {
+ 'name': _lazy(u'Download, install and migration'),
+ 'topic': 'download-install-and-migration',
+ 'tags': ['download-and-install'],
+ }),
+ ('privacy-and-security', {
+ 'name': _lazy(u'Privacy and security settings'),
+ 'topic': 'privacy-and-security-settings',
+ 'tags': ['privacy-and-security'],
+ }),
+ ('customize', {
+ 'name': _lazy(u'Customize controls, options and add-ons'),
+ 'topic': 'customize-controls-options-and-add-ons',
+ 'tags': ['customize'],
+ }),
+ ('fix-problems', {
+ 'name': _lazy(u'Fix slowness, crashing, error messages and '
+ u'other problems'),
+ 'topic': 'fix-slowness-crashing-error-messages-and-other-'
+ 'problems',
+ 'tags': ['fix-problems'],
+ }),
+ ('calendar', {
+ 'name': _lazy('Calendar'),
+ 'topic': 'calendar',
+ 'tags': ['calendar'],
+ })
+ ])
+ }),
+ ('other', {
+ 'name': _lazy(u'Other Mozilla products'),
+ 'subtitle': '',
+ 'html': 'This site is only provides support for some of our products. '
+ 'For other support, please find your product below.'
'<ul class="product-support">'
- '<li><a href="http://support.mozillamessaging.com/">'
- 'Thunderbird support</a></li>'
'<li><a href="http://www.seamonkey-project.org/doc/">'
'SeaMonkey support</a></li>'
'<li><a href="http://caminobrowser.org/help/">'
View
6 kitsune/sumo/static/less/mobile/main.less
@@ -368,9 +368,13 @@ input[type="submit"]:visited {
background-position: -50px -346px;
}
- &.logo-other {
+ &.logo-thunderbird {
background-position: -50px -198px;
}
+
+ &.logo-other {
+ background-position: -50px -50px;
+ }
}
.header-overlay {
View
6 kitsune/sumo/static/less/questions.less
@@ -470,9 +470,13 @@ h2 {
background-position: -100px -1281px;
}
- &.logo-other {
+ &.logo-thunderbird {
background-position: -100px -396px;
}
+
+ &.logo-other {
+ background-position: -100px -100px;
+ }
}
.questions {
Please sign in to comment.
Something went wrong with that request. Please try again.