Skip to content

Commit

Permalink
PR Review feedback and cleanup for Bug 1182225
Browse files Browse the repository at this point in the history 
Includes the follow changes:
- Remove redundant JS include
- Don't use custom page title for Dev edition
- Make URL locale-independent
- Whitespace cleanup
- Remove unused 'blank' body CSS classes
- Remove dead-spot in menu hover
- Keep 'Developer Edition' terms on dev-ed notes
- Remove copy-pasta JS comments
- Hide All Downloads link for mobile
- Indenting clean-up
- Use consistent quotes and :before syntax
- Use .background-size() mixin
- Use heading tag rather than paragraph
- Use lower-case for tag IDs
- Use @baseline variable
- Move section IDs up to section tag
- Use <nav> tag for nav element
- Move ID for #Known section
- Fix out-of-date tag headline tags for mobile
- Use h4 for tag section headers
- Make tabzilla text legible on light background
- Use nav element for nav elements
- Use more appropriate heading levels
- Remove hard-coded en-US local code in feedback URL
- Use @baseline LESS var where appropriate
- Drop unit from 0 CSS values
- Use @baseline LESS var where appropriate
- Improve heading levels for Dev Edition template
- Use bedrock URL helps for all but iOS notes
  • Loading branch information
@sgarrity
sgarrity committed Dec 15, 2015
1 parent 76744b6 commit 1a6d51d
Show file tree
Hide file tree
Showing 6 changed files with 151 additions and 142 deletions.
18 changes: 8 additions & 10 deletions bedrock/firefox/templates/firefox/releases/aurora-notes.html
View file
Expand Up @@ -4,33 +4,31 @@

{% extends "firefox/releases/release-notes.html" %}

{% block body_class %}fx-notes blank{% endblock %}

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

{% set channel_name = 'Aurora' %}

{% block platform_switch %}
<div id="nav" class="navigator">
<nav id="nav" class="navigator">
<div class="container">
<ul class="menu">
<li><a href="{{ url('firefox') + 'notes/' }}">{{ _('Desktop') }}</a></li>
<li><a href="{{ url('firefox') + 'android/notes/' }}">{{ _('Android') }}</a></li>
<li><a href="{{ url('firefox.notes') }}">{{ _('Desktop') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android') }}">{{ _('Android') }}</a></li>
<li><a href="{{ url('firefox') + 'ios/1.1/releasenotes/' }}">{{ _('iOS') }}</a></li>
<li class="current submenu-title">
<a>{{ _('Other Releases') }}</a>
<ul class="submenu">
<li class="title">{{ _('Recent Desktop Releases') }}</li>
<li><a href="{{ url('firefox') + 'aurora/notes/' }}">{{ _('Latest Developer Edition') }}</a></li>
<li><a href="{{ url('firefox') + 'beta/notes/' }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox.notes', channel='developer') }}">{{ _('Latest Developer Edition') }}</a></li>
<li><a href="{{ url('firefox.notes', channel='beta') }}">{{ _('Latest Beta') }}</a></li>
<li class="title">{{ _('Recent Android Releases') }}</a></li>
<li><a href="{{ url('firefox') + 'android/beta/notes/' }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox') + 'android/aurora/notes/' }}">{{ _('Latest Aurora') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android', channel='beta') }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android', channel='aurora') }}">{{ _('Latest Aurora') }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
{% endblock %}
20 changes: 8 additions & 12 deletions bedrock/firefox/templates/firefox/releases/beta-notes.html
View file
Expand Up @@ -4,31 +4,27 @@

{% extends "firefox/releases/release-notes.html" %}

{% block js %}
{% javascript 'releasenotes' %}
{% endblock %}

{% set channel_name = 'Beta' %}

{% block platform_switch %}
<div id="nav" class="navigator">
<nav id="nav" class="navigator">
<div class="container">
<ul class="menu">
<li><a href="{{ url('firefox') + 'notes/' }}">{{ _('Desktop') }}</a></li>
<li><a href="{{ url('firefox') + 'android/notes/' }}">{{ _('Android') }}</a></li>
<li><a href="{{ url('firefox.notes') }}">{{ _('Desktop') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android') }}">{{ _('Android') }}</a></li>
<li><a href="{{ url('firefox') + 'ios/1.1/releasenotes/' }}">{{ _('iOS') }}</a></li>
<li class="current submenu-title">
<a>{{ _('Other Releases') }}</a>
<ul class="submenu">
<li class="title">{{ _('Recent Desktop Releases') }}</li>
<li><a href="{{ url('firefox') + 'aurora/notes/' }}">{{ _('Latest Developer Edition') }}</a></li>
<li><a href="{{ url('firefox') + 'beta/notes/' }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox.notes', channel='developer') }}">{{ _('Latest Developer Edition') }}</a></li>
<li><a href="{{ url('firefox.notes', channel='beta') }}">{{ _('Latest Beta') }}</a></li>
<li class="title">{{ _('Recent Android Releases') }}</a></li>
<li><a href="{{ url('firefox') + 'android/beta/notes/' }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox') + 'android/aurora/notes/' }}">{{ _('Latest Aurora') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android', channel='beta') }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android', channel='aurora') }}">{{ _('Latest Aurora') }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
{% endblock %}
16 changes: 10 additions & 6 deletions bedrock/firefox/templates/firefox/releases/dev-browser-notes.html
View file
@@ -1,13 +1,17 @@
{% extends "firefox/releases/aurora-notes.html" %}

{% block body_class %}fx-notes blank{% endblock %}

{% block site_header_logo %}
<h2>{{ high_res_img('firefox/developer/title-inverse.png', {'alt': _('Firefox Developer Edition'), 'width': '220', 'height': '84'}) }}</h2>
{% endblock %}

{% block notes_heading_primary %}
<h1>{{ _('Firefox Developer Edition Notes')|f(channel=channel_name) }}</h1>
{% block notes_heading_secondary %}
<div class="version">
<h2>{{ _('{version}')|f(version=release.version) }}</h2>
<h3>{{ _('Firefox Developer Edition') }}</h3>
<p>{{ _('{date}')|f(date=release.release_date|l10n_format_date) }}</p>
</div>
<div class="description">
<h2>{{ _('Version {version}, first offered to Firefox Developer Edition channel users on {date}')|f(channel=release.channel, date=release.release_date|l10n_format_date, version=release.version) }}</h2>
<p>{{ release.text|markdown|safe }}</p>
</div>
{% endblock %}


110 changes: 55 additions & 55 deletions bedrock/firefox/templates/firefox/releases/release-notes.html
View file
Expand Up @@ -8,7 +8,7 @@
{% block page_title %}{{ _('{product} — {channel} Notes ({version})')|f(product=release.product, channel=channel_name, version=release.version) }}{% endblock %}

{% block body_id %}notes{% endblock %}
{% block body_class %}fx-notes blank{% endblock %}
{% block body_class %}fx-notes{% endblock %}

{% block page_css %}
{% stylesheet 'firefox_releasenotes_firefox' %}
Expand Down Expand Up @@ -50,13 +50,13 @@ <h2><a href="{{ url('firefox') }}">{{ high_res_img('firefox/template/header-logo
{% block notes_heading_primary %}
<h1>{{ _('See what’s new in Firefox!') }}</h1>
{% endblock %}
<p>
{% trans
feedback='https://input.mozilla.org/feedback/android/' + release.version + '?utm_source=releasenotes'
if release.product == 'Firefox for Android'
<p>
{% trans
feedback='https://input.mozilla.org/feedback/android/' + release.version + '?utm_source=releasenotes'
if release.product == 'Firefox for Android'
else 'https://input.mozilla.org/feedback/firefox/' + release.version + '?utm_source=releasenotes',
bugzilla='https://bugzilla.mozilla.org/',
bug_search_url=release.get_bug_search_url()
bug_search_url=release.get_bug_search_url()
%}
Release Notes tell you what’s new in Firefox. As always, we welcome your <a href="{{ feedback }}">feedback</a>. You can also <a href="{{ bugzilla }}"> file a bug in Bugzilla </a> or see the <a href="{{ bug_search_url }}">complete list of changes</a> in this release.
{% endtrans %}
Expand All @@ -65,45 +65,45 @@ <h1>{{ _('See what’s new in Firefox!') }}</h1>
</div>

{% block platform_switch %}
<div id="nav" class="navigator">
<nav id="nav" class="navigator">
<div class="container">
<ul class="menu">
{% if release.product == 'Firefox' %}
<li class="current">{{ _('Desktop') }}</li>
<li><a href="{{ url('firefox') + 'android/notes/' }}">{{ _('Android') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android') }}">{{ _('Android') }}</a></li>
<li><a href="{{ url('firefox') + 'ios/1.1/releasenotes' }}">{{ _('iOS') }}</a></li>
{% elif release.product == 'Firefox for Android' %}
<li><a href="{{ url('firefox') + 'notes/' }}">{{ _('Desktop') }}</a></li>
<li><a href="{{ url('firefox.notes') }}">{{ _('Desktop') }}</a></li>
<li class="current">{{ _('Android') }}</li>
<li><a href="{{ url('firefox') + 'ios/1.1/releasenotes' }}">{{ _('iOS') }}</a></li>
{% else %}
<li><a href="{{ url('firefox') + 'notes/' }}">{{ _('Desktop') }}</a></li>
<li><a href="{{ url('firefox') + 'android/notes/' }}">{{ _('Android') }}</a></li>
<li><a href="{{ url('firefox.notes') }}">{{ _('Desktop') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android') }}">{{ _('Android') }}</a></li>
<li class="current">{{ _('iOS') }}</li>
{% endif %}
<li class="submenu-title">
<a>{{ _('Other Releases') }}</a>
<ul class="submenu">
<li class="title">{{ _('Recent Desktop Releases') }}</li>
<li><a href="{{ url('firefox') + 'aurora/notes/' }}">{{ _('Latest Developer Edition') }}</a></li>
<li><a href="{{ url('firefox') + 'beta/notes/' }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox.notes', channel='developer') }}">{{ _('Latest Developer Edition') }}</a></li>
<li><a href="{{ url('firefox.notes', channel='beta') }}">{{ _('Latest Beta') }}</a></li>
<li class="title">{{ _('Recent Android Releases') }}</a></li>
<li><a href="{{ url('firefox') + 'android/beta/notes/' }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox') + 'android/aurora/notes/' }}">{{ _('Latest Aurora') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android', channel='beta') }}">{{ _('Latest Beta') }}</a></li>
<li><a href="{{ url('firefox.notes', platform='android', channel='aurora') }}">{{ _('Latest Aurora') }}</a></li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
{% endblock %}

{% if release.version %}
<div class="latest-release" >
<div class="container">
{% block notes_heading_secondary %}
<div class="version">
<h3>{{ _('{version}')|f(version=release.version) }}</h3>
<h4>{{ release.product }} {{ release.channel }}</h4>
<h2>{{ _('{version}')|f(version=release.version) }}</h2>
<h3>{{ release.product }} {{ release.channel }}</h3>
<p>{{ _('{date}')|f(date=release.release_date|l10n_format_date) }}</p>
</div>
<div class="description">
Expand All @@ -123,59 +123,59 @@ <h2>{{ _('Version {version}, first offered to {channel} channel users on {date}'
{% if new_features %}
{% for note in new_features if note.tag == "New" %}
{% if loop.first %}
<div class="section-wrapper">
<p id="{{ note.tag }}">{{ note.tag }}</p>
<div class="section-wrapper" id="{{ note.tag|lower() }}">
<h4>{{ note.tag }}</h4>
<ul class="section-items">
{% endif %}
<li id="note-{{ note.id }}">
<p>{{ note.note|markdown|safe }}</p>
</li>
{% if loop.last %}
{% if loop.last %}
</ul>
</div>
{% endif %}
{% endfor %}

{% for note in new_features if note.tag == "Fixed" %}
{% if loop.first %}
<div class="section-wrapper">
<p id="{{ note.tag }}">{{ note.tag }}</p>
<div class="section-wrapper" id="{{ note.tag|lower() }}">
<h4>{{ note.tag }}</h4>
<ul class="section-items">
{% endif %}
{% endif %}
<li id="note-{{ note.id }}">
<p>{{ note.note|markdown|safe }}</p>
</li>
{% if loop.last %}
{% if loop.last %}
</ul>
</div>
{% endif %}
{% endfor %}

{% for note in new_features if note.tag == "Changed" %}
{% if loop.first %}
<div class="section-wrapper">
<p id="{{ note.tag }}">{{ note.tag }}</p>
<div class="section-wrapper" id="{{ note.tag|lower() }}">
<h4>{{ note.tag }}</h4>
<ul class="section-items">
{% endif %}
{% endif %}
<li id="note-{{ note.id }}">
<p>{{ note.note|markdown|safe }}</p>
</li>
{% if loop.last %}
{% if loop.last %}
</ul>
</div>
{% endif %}
{% endfor %}

{% for note in new_features if note.tag == "Developer" %}
{% if loop.first %}
<div class="section-wrapper">
<p id="{{ note.tag }}">{{ note.tag }}</p>
<div class="section-wrapper" id="{{ note.tag|lower() }}">
<h4>{{ note.tag }}</h4>
<ul class="section-items">
{% endif %}
<li id="note-{{ note.id }}">
<p>{{ note.note|markdown|safe }}</p>
</li>
{% if loop.last %}
{% if loop.last %}
</ul>
<a class="mdn-icon more" rel="external" href="https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/{{ release.major_version() }}">{{ _('Developer Information') }}</a>
</div>
Expand All @@ -184,44 +184,44 @@ <h2>{{ _('Version {version}, first offered to {channel} channel users on {date}'

{% for note in new_features if note.tag == "HTML5" %}
{% if loop.first %}
<div class="section-wrapper">
<p id="{{ note.tag }}">{{ note.tag }}</p>
<div class="section-wrapper" id="{{ note.tag|lower() }}">
<h4>{{ note.tag }}</h4>
<ul class="section-items">
{% endif %}
<li id="note-{{ note.id }}">
<p>{{ note.note|markdown|safe }}</p>
</li>
{% if loop.last %}
{% if loop.last %}
</ul>
</div>
{% endif %}
{% endfor %}

{% for note in new_features if note.tag == "Resolved" %}
{% if loop.first %}
<div class="section-wrapper">
<p id="{{ note.tag }}">{{ note.tag }}</p>
<div class="section-wrapper" id="{{ note.tag|lower() }}">
<h4>{{ note.tag }}</h4>
<ul class="section-items">
{% endif %}
{% endif %}
<li id="note-{{ note.id }}">
<p>{{ note.note|markdown|safe }}</p>
</li>
{% if loop.last %}
{% if loop.last %}
</ul>
</div>
{% endif %}
{% endfor %}

{% for note in new_features if not note.tag %}
{% if loop.first %}
<div class="section-wrapper">
<p id="{{ note.tag }}">{{ note.tag }}</p>
<div class="section-wrapper" id="{{ note.tag|lower() }}">
<h4>{{ note.tag }}</h4>
<ul class="section-items untagged">
{% endif %}
{% endif %}
<li id="note-{{ note.id }}">
<p>{{ note.note|markdown|safe }}</p>
</li>
{% if loop.last %}
{% if loop.last %}
</ul>
</div>
{% endif %}
Expand All @@ -231,14 +231,14 @@ <h2>{{ _('Version {version}, first offered to {channel} channel users on {date}'
{% if known_issues %}
{% for note in known_issues %}
{% if loop.first %}
<div class="section-wrapper">
<p id="Known">{{ _('unresolved') }}</p>
<div class="section-wrapper" id="known">
<h4>{{ _('unresolved') }}</h4>
<ul class="section-items">
{% endif %}
{% endif %}
<li id="note-{{ note.id }}">
<p>{{ note.note|markdown|safe }}</p>
</li>
{% if loop.last %}
{% if loop.last %}
</ul>
</div>
{% endif %}
Expand All @@ -248,12 +248,12 @@ <h2>{{ _('Version {version}, first offered to {channel} channel users on {date}'
</div>
</section>

{% block notes_download_footer %}
{% block notes_download_footer %}
<section class="notes-footer">
<div class="container">
<div class="all-download">
<div class="all-download">
<p class="message">{{ _('Download the latest version of Firefox') }}</p>
<a rel="external" href="https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/">{{ _('All Firefox downloads') }}</a>
<a rel="external" href="{{ url('firefox.all') }}">{{ _('All Firefox downloads') }}</a>
</div>
<div class="download-buttons">
<div class="firefox-latest-cta">
Expand Down Expand Up @@ -285,18 +285,18 @@ <h2>{{ _('Version {version}, first offered to {channel} channel users on {date}'
</article>
</main>

{% block releasenotes_footer %}
{% block releasenotes_footer %}
<footer class="release-footer">
<div class="container">
<div class="col">
<h2>{{ _('Need help or want to leave feedback?') }}</h2>
<a rel="external" href="https://bugzilla.mozilla.org/enter_bug.cgi">{{ _('File a bug') }}</a>
<a rel="external" href="https://input.mozilla.org/en-US/feedback?utm_source=releasenotes">{{ _('Leave feedback') }}</a>
<a rel="external" href="https://input.mozilla.org/feedback?utm_source=releasenotes">{{ _('Leave feedback') }}</a>
</div>
<div class="col">
<h2>{{ _('Get Involved') }}</h2>
<p>{{ _('Did you know that most of the content in Firefox Support was written by volunteers?') }}</p>
<a rel="external" href="https://support.mozilla.org/en-US/get-involved">{{ _('Find out more') }}</a>
<a rel="external" href="https://support.mozilla.org/get-involved">{{ _('Find out more') }}</a>
</div>
<div class="col">
<h2>{{ _('Other Resources') }}</h2>
Expand All @@ -311,8 +311,8 @@ <h2>{{ _('Other Resources') }}</h2>

{% endblock %}

{% block email_form %} {% endblock %}
{% block email_form %}{% endblock %}

{% block js %}
{% javascript 'releasenotes' %}
{% javascript 'releasenotes' %}
{% endblock %}

0 comments on commit 1a6d51d

Please sign in to comment.