Skip to content

Commit

Permalink
FxFamily progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@craigcook
craigcook committed Mar 30, 2015
1 parent ea10aa2 commit 710334d
Show file tree
Hide file tree
Showing 45 changed files with 903 additions and 144 deletions.
125 changes: 73 additions & 52 deletions bedrock/firefox/templates/firefox/family/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,66 +17,73 @@
{% block site_header %}{% endblock %}

{% block content %}

<div id="conditional-download-bar" class="visible">
<div id="conditional-download-bar">
<div class="content">
<div id="dlbar-fx-desktop">
<div class="message" id="dlbar-oldfx-desktop">
{{ _('You’re using an older version of Firefox for desktop.') }}
{{ _('Update today to stay fast and safe.') }}
<a class="button-flat" href="{{ url('firefox.new') }}">{{ _('Download') }}</a>
<a class="button-flat btn-download" href="{{ url('firefox.new') }}">{{ _('Download') }}</a>
</div>
<div id="dlbar-nonfx-desktop">
<div class="message" id="dlbar-nonfx">
{{ _('Choose Independent.') }}
{{ _('Choose Firefox.') }}
<a class="button-flat btn-download" href="{{ url('firefox.new') }}">{{ _('Download') }}</a>
</div>
<div id="dlbar-nonfx-android">
<div class="message" id="dlbar-nonfx-android">
<a rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}">{{ _('Get Firefox for Android') }}</a>
</div>
<div id="dlbar-ios">
<div class="message" id="dlbar-ios">
{{ _('Firefox is coming soon to iOS! <a href="%s">Sign up to learn more</a>.')|format(url('newsletter.ios')) }}
</div>

<button type="button" class="btn-close button-flat" title="{{ _('Close') }}">{{ _('Close') }}</button>
</div>{#-- /.content --#}
</div>{#-- /#conditional-download-bar --#}

<section id="header">
<header id="header">
<div class="content">
<div id="moztab">
<a href="{{ url('mozorg.home') }}">Mozilla</a>
</div>

<h1>
{% if request.locale.startswith('en') %}
Free <span>yourself with</span> {{ high_res_img('img/firefox/family/index/firefox-wordmark.png', {'alt': 'Firefox', 'width': '330', 'height': '95'}) }}
{% if LANG.startswith('en') %}
<span><b>Free</b> yourself</span> with {{ high_res_img('img/firefox/family/index/firefox-wordmark.png', {'alt': 'Firefox', 'width': '330', 'height': '95'}) }}
{% else %}
{{ _('Free yourself with %s')|format(high_res_img('img/firefox/family/index/firefox-wordmark.png', {'alt': 'Firefox', 'width': '330', 'height': '95'})) }}
{% endif %}
</h1>
</div>{#-- /.content --#}
</section>{#-- /#header --#}

<div id="fox"></div>
</header>{#-- /#header --#}

<section id="products-primary">
<div class="content">
<ul class="product-list">
<li id="desktop">
{# L10n: <span> tag below adds visual style to "for" text #}
<h2><a href="{{ url('firefox.desktop.index') }}">{{ _('Firefox <span>for</span> desktop') }}</a></h2>
<h3>{{ _('Trusted. Flexible. Fast.') }}</h3>

<div id="img-desktop"></div>
<li class="product" id="product-desktop">
<a href="{{ url('firefox.desktop.index') }}">
{# L10n: <span> tag below adds visual style to "for" text #}
<h2>{{ _('Firefox <span>for</span> desktop') }}</h2>
<p>{{ _('Trusted. Flexible. Fast.') }}</p>
</a>
</li>
<li id="android">
{# L10n: <span> tag below adds visual style to "for" text #}
<h2><a href="{{ url('firefox.android.index') }}">{{ _('Firefox <span>for</span> Android') }}</a></h2>
<h3>{{ _('Make it uniquely yours.') }}</h3>

<a rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" id="img-google-play">{{ _('Get it on Google Play') }}</a>
<li class="product highlight" id="product-android">
<a href="{{ url('firefox.android.index') }}">
{# L10n: span below adds visual style to "for" text #}
<h2>{{ _('Firefox <span>for</span> Android') }}</h2>
<p>{{ _('Make it uniquely yours.') }}</p>
</a>

<div id="img-android"></div>
<div id="img-android-robot"></div>
<a rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" class="btn-google-play">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': 'Get it on Google Play', 'width': '129', 'height': '45', 'l10n': True}) }}
</a>
</li>
<li id="fxos">
<h2><a href="{{ url('firefox.os.index') }}">{{ _('Firefox OS') }}</a></h2>
<h3>{{ _('Get just what you need.') }}</h3>

<div id="img-fxos"></div>
<li class="product" id="product-fxos">
<a href="{{ url('firefox.os.index') }}">
<h2>{{ _('Firefox OS') }}</h2>
<p>{{ _('Get just what you need.') }}</p>
</a>
</li>
</ul>
</div>{#-- /.content --#}
Expand All @@ -85,39 +92,53 @@ <h3>{{ _('Get just what you need.') }}</h3>
<section id="products-secondary">
<div class="content">
<ul class="product-list">
<li id="hello">
<h2><a href="{{ url('firefox.hello') }}">{{ _('Firefox Hello') }}</a></h2>
<h3>{{ _('Free, easy video conversations.') }}</h3>
<li class="product" id="product-hello">
<a href="{{ url('firefox.hello') }}">
<h2>{{ _('Firefox Hello') }}</h2>
<p>{{ _('Free, easy video conversations.') }}</p>
</a>
</li>
<li id="marketplace">
<h2><a rel="external" href="https://marketplace.firefox.com/">{{ _('Firefox Marketplace') }}</a></h2>
<h3>{{ _('Discover and download Web apps.') }}</h3>

<li class="product" id="product-sync">
<a href="{{ url('firefox.sync') }}">
<h2>{{ _('Sync') }}</h2>
<p>{{ _('Connect Firefox wherever you use it.') }}</p>
</a>
</li>
<li id="sync">
<h2><a href="{{ url('firefox.sync') }}">{{ _('Sync') }}</a></h2>
<h3>{{ _('Connect Firefox wherever you use it.') }}</h3>

<li class="product" id="product-marketplace">
<a rel="external" href="https://marketplace.firefox.com/">
<h2>{{ _('Firefox Marketplace') }}</h2>
<p>{{ _('Discover and download Web apps.') }}</p>
</a>
</li>
</ul>
</div>{#-- /.content --#}
</section>{#-- /#products-secondary --#}

{% endblock %}

{% block site_footer %}
<footer id="footer">
<a href="{{ url('mozorg.home') }}">Mozilla</a>
<ul>
<li>
<a href="{{ url('privacy') }}">{{ _('Privacy Policy') }}</a>
</li>
<li>
<a href="{{ url('privacy.notices.websites') }}#cookies">{{ _('Cookies') }}</a>
</li>
<li>
<a href="{{ url('legal.index') }}">{{ _('Legal Notices') }}</a>
</li>
</ul>
<div class="content">
<a class="mozlogo" href="{{ url('mozorg.home') }}">Mozilla</a>

<ul>
<li>
<a href="{{ url('privacy') }}">{{ _('Privacy Policy') }}</a>
</li>
<li>
<a href="{{ url('privacy.notices.websites') }}#cookies">{{ _('Cookies') }}</a>
</li>
<li>
<a href="{{ url('legal.index') }}">{{ _('Legal Notices') }}</a>
</li>
</ul>
</div>
</footer>
{% endblock %}

{% block email_form %}{% endblock %}

{% block js %}
{% javascript 'firefox_family_index' %}
{% endblock %}
6 changes: 6 additions & 0 deletions bedrock/settings/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1402,6 +1402,12 @@ def JINJA_CONFIG():
),
'output_filename': 'js/firefox_os_tv-bundle.js',
},
'firefox_family_index': {
'source_filenames': (
'js/firefox/family-index.js',
),
'output_filename': 'js/firefox_family_index-bundle.js',
},
'firefox_faq': {
'source_filenames': (
'js/base/mozilla-accordion.js',
Expand Down
Loading

0 comments on commit 710334d

Please sign in to comment.