Skip to content

Commit

Permalink
Merge pull request #3482 from schalkneethling/bug1218491-developer-ed…
Browse files Browse the repository at this point in the history 
…ition-44-promo

Fix Bug 1218491, developer edition promo additions
  • Loading branch information
@alexgibson
alexgibson committed Nov 2, 2015
2 parents 4d7ce0a + 3f1c0a0 commit ec0cd0a
Show file tree
Hide file tree
Showing 16 changed files with 129 additions and 128 deletions.
104 changes: 60 additions & 44 deletions bedrock/firefox/templates/firefox/dev-firstrun.html
View file
Expand Up @@ -19,11 +19,7 @@
{% block page_og_url %}{{ url('firefox.developer') }}{% endblock %}

{% block page_og_desc %}
{% if l10n_has_tag('meta_update_201503') %}
{{_('Built for those who build the Web. Introducing the only browser made for developers.')}}
{%- else -%}
{{ _('Introducing the only browser made for developers like you.') }}
{% endif %}
{{_('Built for those who build the Web. Introducing the only browser made for developers.')}}
{% endblock %}

{% block body_id %}firefox-developer-firstrun{% endblock %}
Expand All @@ -37,15 +33,9 @@
data-webide-text="{{ _('Develop, deploy and debug Firefox OS apps directly in your browser or on a Firefox OS device.') }}"
data-next-sync="{{ _('Next: Sync') }}"

{% if l10n_has_tag('new_doorhanger') %}
data-sync-title="{{ _('Important') }}"
data-sync-text="{{ _('Sync your new Developer Edition profile to your Firefox Account to access bookmarks, browsing history, passwords and more from your existing Firefox profile.') }}"
data-doorhanger-sync="{{ _('Sync now') }}"
{% else %}
data-sync-title="{{ _('Keep your browser in Sync') }}"
data-sync-text="{{ _('Sync your Firefox desktop and mobile browsers to get instant access to your bookmarks, open tabs, passwords and more.') }}"
data-doorhanger-sync="{{ _('Sync my Firefox') }}"
{% endif %}
data-sync-title="{{ _('Important') }}"
data-sync-text="{{ _('Sync your new Developer Edition profile to your Firefox Account to access bookmarks, browsing history, passwords and more from your existing Firefox profile.') }}"
data-doorhanger-sync="{{ _('Sync now') }}"

data-doorhanger-close="{{ _('Close') }}"
data-doorhanger-nothanks="{{ _('No thanks') }}"
Expand All @@ -56,10 +46,8 @@
data-sync-icon="{{ static('img/firefox/dev-firstrun/sync-blue.png') }}"
data-sync-icon-high-res="{{ static('img/firefox/dev-firstrun/sync-blue-high-res.png') }}"

{% if l10n_has_tag('new_doorhanger') %}
data-sync-reminder-title="{{ _('Before you go…') }}"
data-sync-reminder-text="{{ _('If you continue without syncing your new Developer Edition profile, you could lose access to important browsing data from your existing Firefox profile.') }} {{ _('To sync now, choose the Sync option from this menu.') }}"
{% endif %}
data-sync-reminder-title="{{ _('Before you go…') }}"
data-sync-reminder-text="{{ _('If you continue without syncing your new Developer Edition profile, you could lose access to important browsing data from your existing Firefox profile.') }} {{ _('To sync now, choose the Sync option from this menu.') }}"

{% endblock %}

Expand All @@ -70,14 +58,31 @@ <h2>{{ high_res_img('firefox/firstrun/dev/title.png', {'alt': _('Firefox Develop

{% block content %}

<main role="main" {% if l10n_has_tag('new_doorhanger') %}class="sync-reminder"{% endif %} >
<main role="main">
<section class="intro container">
<header>
<h1>{{_('Welcome to <span>Firefox Developer Edition</span>')}}</h1>
<p>{{_('Get to know the features that make it the most complete browser for building the Web.')}}</p>
</header>
<ul class="features">
{% if l10n_has_tag('spring_release') %}
{% if l10n_has_tag('firefox_dev_fall') and waffle.switch('firefox-dev-fall') %}
<li class="feature">
<a href="https://hacks.mozilla.org/2015/11/developer-edition-44-creative-tools-and-more" rel="external">
{{ high_res_img('firefox/firstrun/dev/creative-tools.png', {'alt': 'Screenshot', 'width': '300', 'height': '160', 'class': 'screenshot'}) }}
</a>
<h2>{{_('Visual Editing Tools')}}</h2>
<p>{{_('Visually edit CSS and HTML animations playing on the page from the Inspector panel. Verify alignment, dimensions and padding of any element using the Ruler and Measurement tools.')}}</p>
<a href="https://hacks.mozilla.org/2015/11/developer-edition-44-creative-tools-and-more" rel="external" class="more">{{_('Learn more about Visual Editing Tools')}}</a>
</li>
<li class="feature">
<a href="http://devtoolschallenger.com/" rel="external">
{{ high_res_img('firefox/firstrun/dev/devtools-challenger.png', {'alt': 'Screenshot', 'width': '300', 'height': '160', 'class': 'screenshot'}) }}
</a>
<h2>{{_('DevTools Challenger')}}</h2>
<p>{{_('Use Developer Edition’s visual animation and CSS editing tools to explore the depths of the ocean and interact with the strangest of creatures.')}}</p>
<a href="http://devtoolschallenger.com/" rel="external" class="more">{{_('Try DevTools Challenger')}}</a>
</li>
{% else %}
<li class="feature">
<a href="https://developer.mozilla.org/docs/Tools/Performance" rel="external">
<img src="{{ static('img/firefox/firstrun/dev/feature-performancetools.png') }}" alt="{{ _('Screenshot') }}" class="screenshot">
Expand All @@ -92,7 +97,6 @@ <h2>{{_('Performance Tools')}}</h2>
<div class="video" data-video-id="eH0R10Ga4Hs"></div>
</div>
</li>
{% endif %}
<li class="feature">
<a href="https://www.youtube.com/watch?v=eQqNfkqIJdw" rel="external" class="video-play">
<img src="{{ static('img/firefox/firstrun/dev/feature-inspector-large.jpg') }}" alt="{{ _('Screenshot') }}" class="screenshot">
Expand All @@ -104,29 +108,16 @@ <h2>{{_('Page Inspector')}}</h2>
<div class="video" data-video-id="eQqNfkqIJdw"></div>
</div>
</li>
{% if not l10n_has_tag('spring_release') %}
<li class="feature">
<a href="https://www.youtube.com/watch?v=R_qDaLQ8ghg" rel="external" class="video-play">
<img src="{{ static('img/firefox/firstrun/dev/feature-webaudio-large.jpg') }}" alt="{{ _('Screenshot') }}" class="screenshot">
</a>
<h2>{{_('Web Audio Editor')}}</h2>
<p>{{_('Inspect and interact with Web Audio API in real time to ensure that all audio nodes are connected in the way you expect.')}}</p>
<a href="https://developer.mozilla.org/docs/Tools/Web_Audio_Editor" rel="external" class="more">{{_('Learn more about Web Audio Editor')}}</a>
<div class="responsive-video-container">
<div class="video" data-video-id="R_qDaLQ8ghg"></div>
</div>
</li>
{% endif %}
</ul>
{% if l10n_has_tag('new_doorhanger') %}
<div class="notice">
<h4>{{ _('Important: Sync your new profile') }}</h4>
<p>
{{ _('Developer Edition comes with a new profile so you can run it alongside other versions of Firefox.') }} {{ _('To access your bookmarks, browsing history and more, you need to sync the profile with your existing Firefox Account, or create a new one.') }}
<a href="https://support.mozilla.org/kb/recover-lost-bookmarks-firefox-developer-edition" rel="external" class="more">{{ _('Learn more') }}</a>
</p>
</div>
{% endif %}

<div class="notice">
<h4>{{ _('Important: Sync your new profile') }}</h4>
<p>
{{ _('Developer Edition comes with a new profile so you can run it alongside other versions of Firefox.') }} {{ _('To access your bookmarks, browsing history and more, you need to sync the profile with your existing Firefox Account, or create a new one.') }}
<a href="https://support.mozilla.org/kb/recover-lost-bookmarks-firefox-developer-edition" rel="external" class="more">{{ _('Learn more') }}</a>
</p>
</div>
</section>

<section class="more-features">
Expand All @@ -135,7 +126,6 @@ <h4>{{ _('Important: Sync your new profile') }}</h4>
<h2>{{_('Features and tools')}}</h2>
</header>
<ul class="features">
{% if l10n_has_tag('spring_release') %}
<li class="feature">
<a href="https://www.youtube.com/watch?v=R_qDaLQ8ghg" rel="external" class="video-play">
<img src="{{ static('img/firefox/firstrun/dev/feature-webaudio.jpg') }}" alt="{{ _('Screenshot') }}" class="screenshot">
Expand All @@ -147,7 +137,33 @@ <h2>{{_('Web Audio Editor')}}</h2>
<div class="video" data-video-id="R_qDaLQ8ghg"></div>
</div>
</li>
{% endif %}
{% if l10n_has_tag('firefox_dev_fall') and waffle.switch('firefox-dev-fall') %}
<li class="feature">
<a href="https://developer.mozilla.org/docs/Tools/Performance" rel="external">
<img src="{{ static('img/firefox/firstrun/dev/performance-tools.png') }}" alt="{{ _('Screenshot') }}" class="screenshot">
</a>
<h2>{{_('Performance Tools')}}</h2>
<p>{{_('Examine your web content’s frame rate, memory consumption and JS profile in a consolidated timeline view to help easily identify and troubleshoot performance bottlenecks.')}}</p>
<a href="https://developer.mozilla.org/docs/Tools/Performance" rel="external" class="more">{{_('Learn more about Performance Tools')}}</a>
{% if LANG.startswith('en-') %}
<br><a href="http://codepen.io/mozhacks/pen/xGgevw?editors=001?utm_source=mozilla.org&amp;utm_medium=referral&amp;utm_campaign=firefox-developer-game&amp;utm_content=firstrun-dev-tour" rel="external" class="more">{{_('Play the game on Codepen')}}</a>
{% endif %}
<div class="responsive-video-container">
<div class="video" data-video-id="eH0R10Ga4Hs"></div>
</div>
</li>
<li class="feature">
<a href="https://www.youtube.com/watch?v=eQqNfkqIJdw" rel="external" class="video-play">
<img src="{{ static('img/firefox/firstrun/dev/feature-inspector.png') }}" alt="{{ _('Screenshot') }}" class="screenshot">
</a>
<h2>{{_('Page Inspector')}}</h2>
<p>{{_('Examine the HTML and CSS of any Web page and easily modify the structure and layout of a page.')}}</p>
<a href="https://developer.mozilla.org/docs/Tools/Page_Inspector" rel="external" class="more">{{_('Learn more about Page Inspector')}}</a>
<div class="responsive-video-container">
<div class="video" data-video-id="eQqNfkqIJdw"></div>
</div>
</li>
{% endif %}
<li class="feature">
<a href="https://www.youtube.com/watch?v=iEDk8o9ehlw" rel="external" class="video-play">
<img src="{{ static('img/firefox/firstrun/dev/feature-console.jpg') }}" alt="{{ _('Screenshot') }}" class="screenshot">
Expand Down
70 changes: 26 additions & 44 deletions bedrock/firefox/templates/firefox/dev-whatsnew.html
View file
Expand Up @@ -19,11 +19,7 @@
{% block page_og_url %}{{ url('firefox.developer') }}{% endblock %}

{% block page_og_desc %}
{% if l10n_has_tag('meta_update_201503') %}
{{_('Built for those who build the Web. Introducing the only browser made for developers.')}}
{%- else -%}
{{ _('Introducing the only browser made for developers like you.') }}
{% endif %}
{{_('Built for those who build the Web. Introducing the only browser made for developers.')}}
{% endblock %}

{% block body_id %}firefox-developer-whatsnew{% endblock %}
Expand All @@ -43,7 +39,24 @@ <h1>{{_('Congrats. You’re up to date!')}}</h1>
<p>{{_('Get to know the features that make it the most complete browser for building the Web.')}}</p>
</header>
<ul class="features">
{% if l10n_has_tag('spring_release') %}
{% if l10n_has_tag('firefox_dev_fall') and waffle.switch('firefox-dev-fall') %}
<li class="feature">
<a href="https://hacks.mozilla.org/2015/11/developer-edition-44-creative-tools-and-more" rel="external">
{{ high_res_img('firefox/firstrun/dev/creative-tools.png', {'alt': 'Screenshot', 'width': '300', 'height': '160', 'class': 'screenshot'}) }}
</a>
<h2>{{_('Visual Editing Tools')}}</h2>
<p>{{_('Visually edit CSS and HTML animations playing on the page from the Inspector panel. Verify alignment, dimensions and padding of any element using the Ruler and Measurement tools.')}}</p>
<a href="https://hacks.mozilla.org/2015/11/developer-edition-44-creative-tools-and-more" rel="external" class="more">{{_('Learn more about Visual Editing Tools')}}</a>
</li>
<li class="feature">
<a href="http://devtoolschallenger.com/" rel="external">
{{ high_res_img('firefox/firstrun/dev/devtools-challenger.png', {'alt': 'Screenshot', 'width': '300', 'height': '160', 'class': 'screenshot'}) }}
</a>
<h2>{{_('DevTools Challenger')}}</h2>
<p>{{_('Use Developer Edition’s visual animation and CSS editing tools to explore the depths of the ocean and interact with the strangest of creatures.')}}</p>
<a href="http://devtoolschallenger.com/" rel="external" class="more">{{_('Try DevTools Challenger')}}</a>
</li>
{%- else -%}
<li class="feature{% if not LANG.startswith('en-') %} feature-centered{% endif %}">
<a href="https://developer.mozilla.org/docs/Tools/Performance" rel="external">
<img src="{{ static('img/firefox/firstrun/dev/feature-performancetools.png') }}" alt="{{ _('Screenshot') }}" class="screenshot">
Expand All @@ -68,49 +81,18 @@ <h2>{{_('What we fixed')}}</h2>
<a href="https://hacks.mozilla.org/?p=28808" rel="external" class="more">{{_('See how you helped')}}</a>
</li>
{% endif %}
{%- else -%}
<li class="feature">
<a href="https://www.youtube.com/watch?v=1R9_WdXwUsE" class="video-play" rel="external">
<img src="{{ static('img/firefox/developer/feature-webide.jpg') }}" alt="{{ _('Screenshot') }}" class="screenshot">
</a>
<h2>{{_('WebIDE')}}</h2>
<p>{{_('Develop, deploy and debug Firefox OS apps directly in your browser, or on a Firefox OS device, with this tool that replaces App Manager.')}}</p>
<a href="https://developer.mozilla.org/docs/Tools/WebIDE" class="more" rel="external">{{_('Learn more about WebIDE')}}</a>
<div class="responsive-video-container">
<div class="video" data-video-id="1R9_WdXwUsE"></div>
</div>
</li>
<li class="feature">
<a href="https://www.youtube.com/watch?v=eH0R10Ga4Hs" class="video-play" rel="external">
<img src="{{ static('img/firefox/developer/feature-valence.jpg') }}" alt="{{ _('Screenshot') }}" class="screenshot">
</a>
<h2>{{_('Valence')}}</h2>
<p>{{_('Develop and debug your apps across multiple browsers and devices with this powerful extension that comes pre-installed with Firefox Developer Edition.')}}</p>
<a href="https://developer.mozilla.org/docs/Tools/Firefox_Tools_Adapter" class="more" rel="external">{{_('Learn more about Valence')}}</a>
<div class="responsive-video-container">
<div class="video" data-video-id="eH0R10Ga4Hs"></div>
</div>
</li>
{% endif -%}
</ul>
{% if l10n_has_tag('new_doorhanger') %}
<div class="notice">
<h4>{{ _('Important: Sync your new profile') }}</h4>
<p>
{{ _('Developer Edition comes with a new profile so you can run it alongside other versions of Firefox.') }} {{ _('To access your bookmarks, browsing history and more, you need to sync the profile with your existing Firefox Account, or create a new one.') }}
<a href="https://support.mozilla.org/kb/recover-lost-bookmarks-firefox-developer-edition" rel="external" class="more">{{ _('Learn more') }}</a>
</p>
</div>
{% endif %}
<div class="notice">
<h4>{{ _('Important: Sync your new profile') }}</h4>
<p>
{{ _('Developer Edition comes with a new profile so you can run it alongside other versions of Firefox.') }} {{ _('To access your bookmarks, browsing history and more, you need to sync the profile with your existing Firefox Account, or create a new one.') }}
<a href="https://support.mozilla.org/kb/recover-lost-bookmarks-firefox-developer-edition" rel="external" class="more">{{ _('Learn more') }}</a>
</p>
</div>
</section>
</main>

{% endblock %}

{% block email_form %}{% endblock %}

{% block js %}
{% if not l10n_has_tag('spring_release') %}
{% javascript 'firefox_developer_whatsnew' %}
{% endif %}
{% endblock %}

0 comments on commit ec0cd0a

Please sign in to comment.