Skip to content

Commit

Permalink
Bug 686489 new download fennec apk download page
Browse files Browse the repository at this point in the history
  • Loading branch information
malena committed Sep 15, 2015
1 parent 8cc0721 commit 12cd348
Show file tree
Hide file tree
Showing 17 changed files with 265 additions and 27 deletions.
59 changes: 59 additions & 0 deletions bedrock/firefox/templates/firefox/android/all.html
@@ -0,0 +1,59 @@
{% extends "firefox/base-resp.html" %}

{% block extra_meta %}<meta name="robots" content="noindex">{% endblock %}

{% block page_title %}{{ _('Download Firefox for Android') }}{% endblock %}
{% block body_id %}firefox-all{% endblock %}

{% block page_desc %}
{{ _('Firefox is made in large part by volunteers around the world. That’s why we offer it in 80 languages (and why there’s heart and soul in every piece of code).') }}
{% endblock %}

{% block page_image %}
{{ static('img/firefox/all/page-image.png') }}
{% endblock %}

{% block body_class -%}
sky
{% endblock %}

{% block page_css %}
{% stylesheet 'firefox_android_all' %}
{% endblock %}

{% block content %}
<header id="main-feature">
<h1>{{ self.page_title() }}</h1>
<h2>{{ self.page_desc() }}</h2>
</header>

<main id="main-content" role="main">
<div class="build-table-container">
<table class="table">
<caption>
<h3>{{ _('APK Versions') }}</h3>
</caption>
<thead>
<tr>
<th scope="col">{{ _('Version') }}</th>
<th scope="col">{{ _('Download') }}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{{ _('android-api-9') }}</td>
<td class="download"><a href="https://ftp.mozilla.org/pub/mozilla.org/mobile/releases/latest/android-api-9/">{{ _('Download') }}</a></td>
</tr>
<tr>
<td>{{ _('android-api-11') }}</td>
<td class="download"><a href="https://ftp.mozilla.org/pub/mozilla.org/mobile/releases/latest/android-api-11/">{{ _('Download') }}</a></td>
</tr>
<tr>
<td>{{ _('android-x86') }}</td>
<td class="download"><a href="https://ftp.mozilla.org/pub/mozilla.org/mobile/releases/latest/android-x86/">{{ _('Download') }}</a></td>
</tr>
</tbody>
</table>
</div>
</main>
{% endblock %}
6 changes: 6 additions & 0 deletions bedrock/firefox/templates/firefox/android/index.html
Expand Up @@ -62,6 +62,9 @@ <h2 class="heading">
<a class="dl-button" rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-button-type="download" data-interaction="download click" data-download-version="Firefox for Android">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': 'Get it on Google Play', 'width': '129', 'height': '45', 'l10n': True}) }}
</a>
<small class="download-other">
<a class="dl-button" href="{{ url('firefox.android.all') }}">{{_('Systems &amp; Languages')}}</a>
</small>
<button class="send-to button-flat-dark" type="button">{{ _('Get Firefox for Android') }}</button>

{% if l10n_has_tag('ios_announce', 'firefox/new') %}
Expand Down Expand Up @@ -414,6 +417,9 @@ <h3>{{ _('Choose Firefox') }}</h3>
<li>
<a rel="external" href="https://support.mozilla.org/kb/will-firefox-work-my-mobile-device">{{ _('Supported devices') }}</a>
</li>
<li>
<a href="{{ url('firefox.android.all') }}">{{_('Systems &amp; Languages')}}</a>
</li>
<li>
<a href="{{ firefox_url('android', 'notes') }}">{{ _('Release notes') }}</a>
</li>
Expand Down
12 changes: 8 additions & 4 deletions bedrock/firefox/templates/firefox/family/index.html
Expand Up @@ -95,11 +95,15 @@ <h2>{{ _('Firefox <span>for</span> Android') }}</h2>
<p>{{ _('Make it uniquely yours.') }}</p>
</a>

<a rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" class="btn-google-play" data-product="Firefox for Android, Google Play">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': 'Get it on Google Play', 'width': '129', 'height': '45', 'l10n': True}) }}
</a>
<div class="btn-google-play">
<a rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-product="Firefox for Android, Google Play">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': 'Get it on Google Play', 'width': '129', 'height': '45', 'l10n': True}) }}
</a>
<small class="download-other">
<a href="{{ url('firefox.android.all') }}">{{_('Systems &amp; Languages')}}</a>
</small>
<div>
</li>

<li class="product" id="product-fxos">
<a href="{{ url('firefox.os.index') }}" data-product="Firefox OS">
<h2>{{ _('Firefox OS') }}</h2>
Expand Down
Expand Up @@ -95,6 +95,9 @@
{% endif -%}
<a href="https://support.mozilla.org/kb/will-firefox-work-my-mobile-device">{{ _('Supported Devices') }}</a>
{%- if channel == 'alpha' %}<br>{% else %} |{% endif %}
{% if channel != 'alpha' %}
<a href="{{ url('firefox.android.all') }}">{{ _('Systems &amp; Languages') }}</a><br>
{% endif %}
<a href="{{ firefox_url('android', 'notes', channel) }}">{{ _('What’s New') }}</a> |
<a href="{{ url('privacy.notices.firefox') }}">{{ _('Privacy') }}</a>
</small>
Expand Down
7 changes: 6 additions & 1 deletion bedrock/firefox/templates/firefox/partners/index.html
Expand Up @@ -459,7 +459,12 @@ <h2 class="tween">
<div class="intro tween">
{% if l10n_has_tag('mwc_2015') %}
<h4>{{ _('A superior mobile experience') }}</h4>
<a href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}"><img src="{{ static('img/firefox/partners/google-play.png') }}" alt="{{ _('Get it on Google Play') }}" class="play" /></a>
<div class="play-button">
<a href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}"><img src="{{ static('img/firefox/partners/google-play.png') }}" alt="{{ _('Get it on Google Play') }}" class="play" /></a>
<small class="download-other">
<a href="{{ url('firefox.android.all') }}">{{_('Systems &amp; Languages')}}</a>
</small>
</div>
<p>{{ _('With connected features and the latest in security and privacy, our top-rated browser offers an alternative to closed platforms and provides a valuable way to connect with smartphones and tablets users alike.') }}</p>
<h4>{{ _('Customize relationships') }}</h4>
<p>{{ _('Provide your users with your own flavor of Firefox for Android and Firefox Marketplace for a more engaging user experience that increases the visibility of your brand.') }}</p>
Expand Down
3 changes: 3 additions & 0 deletions bedrock/firefox/templates/firefox/personal.html
Expand Up @@ -37,6 +37,9 @@ <h1>{{_('When it’s personal,<span>choose Firefox</span>')}}</h1>
<a rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': 'Get it on Google Play', 'width': '172', 'l10n': True}) }}
</a>
<small class="download-other">
<a href="{{ url('firefox.android.all') }}">{{_('Systems &amp; Languages')}}</a>
</small>
</div>
</div>
{% endblock alt_header %}
Expand Down
1 change: 1 addition & 0 deletions bedrock/firefox/urls.py
Expand Up @@ -42,6 +42,7 @@
url(r'^firefox/hello/$', views.hello, name='firefox.hello'),
page('firefox/interest-dashboard', 'firefox/interest-dashboard.html'),
url(r'^firefox/android/$', views.android, name='firefox.android.index'),
page('firefox/android/all', 'firefox/android/all.html'),
page('firefox/android/faq', 'firefox/android/faq.html'),
page('firefox/ios', 'firefox/ios.html'),
page('firefox/os/faq', 'firefox/os/faq.html'),
Expand Down
8 changes: 8 additions & 0 deletions bedrock/settings/static_media.py
Expand Up @@ -187,6 +187,14 @@
),
'output_filename': 'css/firefox_android-bundle.css',
},
'firefox_android_all': {
'source_filenames': (
'css/base/mozilla-share-cta.less',
'css/firefox/menu-resp.less',
'css/firefox/android/all.less',
),
'output_filename': 'css/firefox-android-all.css',
},
'firefox_unsupported': {
'source_filenames': (
'css/firefox/unsupported.less',
Expand Down
3 changes: 3 additions & 0 deletions etc/httpd/global.conf
Expand Up @@ -853,6 +853,9 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/mobile/faq(/?)$ /$1firefox/android/f
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/android(/?)$ /b/$1firefox/android$2 [PT]
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/android/faq(/?)$ /b/$1firefox/android/faq$2 [PT]

#Bug 686489
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/android/all(/?)$ /b/$1firefox/android/all$2 [PT]

# Bug 979527
RewriteCond %{HTTP_USER_AGENT} Firefox
RewriteCond %{HTTP_USER_AGENT} !(Camino|Iceweasel|SeaMonkey)
Expand Down
5 changes: 2 additions & 3 deletions media/css/firefox/all.less
Expand Up @@ -102,10 +102,9 @@
a {
display: block;
padding: 10px 10px 10px 45px;
background-position: 0 50%;
background-repeat: no-repeat;
background-image: url(/media/img/firefox/all/download-icons.png);
background: transparent url(/media/img/firefox/all/download-icons.png) left center no-repeat;
}

&.win64 a {
background-position: -300px 50%
}
Expand Down
5 changes: 5 additions & 0 deletions media/css/firefox/android.less
Expand Up @@ -727,8 +727,13 @@ html[dir="rtl"] #phone-wrapper figure {

// Android users should only see play store button
.js.android .show-widget {
.download-other {
.open-sans-light();
.font-size(12px);
}
.dl-button {
display: block;
color: #bee1f5;
}
.send-to {
display: none;
Expand Down
100 changes: 100 additions & 0 deletions media/css/firefox/android/all.less
@@ -0,0 +1,100 @@
@import '../../sandstone/lib.less';

#main-feature {
.span-all();
h1 {
margin-bottom: @baseLine;
}
h2 {
.font-size(24px);
letter-spacing: -0.25px;
line-height: 1.4;
}
}

#main-content {
.build-table-container {
.span-all();
}
table {
width: 100%;
thead {
th {
white-space: nowrap;
&:not([colspan]) {
width: 15%;
}
}
th, td {
padding: 10px 0;
}
}
tbody {
th, td {
padding: 10px 0;
}
}
.download {
padding: 10px 0;
a {
display: block;
padding: 5px 5px 5px 35px;
background: transparent url(/media/img/firefox/android/android-download.png) left center no-repeat;
background: url(/media/img/firefox/android/android-download.svg), linear-gradient(transparent, transparent);
background-repeat: no-repeat;
}
}
}
}


/* Tablet Layout: 760px */
@media only screen and (min-width: @breakTablet) and (max-width: @breakDesktop) {

#main-feature {
h1 {
.font-size(48px);
}
}
}

/* Wide mobile layout: 480px; */
@media only screen and (min-width: @breakMobileLandscape) and (max-width: @breakTablet) {
#main-content table tbody {
th {
width: 50%;
}
td {
border-top: none;
}
}
}

/* Mobile layout: 320px */
@media only screen and (max-width: @breakTablet) {

#main-feature {
h1 {
.font-size(36px);
}
h2 {
.font-size(18px);
letter-spacing: normal;
}
}

#main-content {
table {
thead {
display: none;
}
td {
border-top: none;
}
tr {
overflow: hidden;
border-top: 1px solid rgba(0, 0, 0, 0.2);
}
}
}
}
7 changes: 7 additions & 0 deletions media/css/firefox/family/index.less
Expand Up @@ -411,6 +411,13 @@ html[dir="rtl"] #header h1 {
z-index: 5;
}

.download-other {
clear: both;
display: block;
.font-size(11px);
.open-sans();
}

@media only screen and (min-width: @breakDesktopWide) {
&:after {
left: -160px;
Expand Down
28 changes: 9 additions & 19 deletions media/css/firefox/partners.less
Expand Up @@ -493,9 +493,17 @@
/* {{{ Firefox for Android section */

#android {
#android-overview .intro .play {
#android-overview .intro .play-button {
display: block;
margin: 5px 0 5px 20px;
float: right;
.download-other {
clear: both;
display: block;
.open-sans();
.font-size(11px);
text-align: center;
}
}

#android-partner {
Expand Down Expand Up @@ -857,15 +865,6 @@
.font-size(30px);
}

#android {
#android-overview {
.play {
float: right;
margin: 5px 20px 0px 10px;
}
}
}

#testimonials {
iframe {
width: 960px;
Expand Down Expand Up @@ -1007,15 +1006,6 @@
}


#android {
#android-overview {
.play {
float: right;
margin: 5px 20px 0px 10px;
}
}
}

#testimonials {
iframe {
width: 400px;
Expand Down
9 changes: 9 additions & 0 deletions media/css/firefox/personal.less
Expand Up @@ -319,6 +319,15 @@ main {
section.android-download {
display: none;
}
.download-other {
clear: both;
display: block;
.open-sans-light();
.font-size(12px);
a {
color: #bee1f5;
}
}
.android {
.download-button.download-button-simple {
display: none;
Expand Down
Binary file added media/img/firefox/android/android-download.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 12cd348

Please sign in to comment.