Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Your daily update process.
Merge branch 'master' of https://github.com/mozilla/bedrock
  • Loading branch information
Mike Hoye committed Mar 4, 2014
2 parents f05861d + b6ce84d commit bc124ab
Show file tree
Hide file tree
Showing 326 changed files with 96,468 additions and 7,857 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -28,3 +28,4 @@ venv
*.db
james.ini
node_modules
/media/js/test/test-results.xml
21 changes: 21 additions & 0 deletions .gitmodules
Expand Up @@ -19,3 +19,24 @@
[submodule "vendor-local/src/django-waffle"]
path = vendor-local/src/django-waffle
url = https://github.com/jsocol/django-waffle.git
[submodule "vendor-local/src/rna"]
path = vendor-local/src/rna
url = git://github.com/mozilla/rna
[submodule "vendor-local/src/django-extensions"]
path = vendor-local/src/django-extensions
url = https://github.com/django-extensions/django-extensions.git
[submodule "vendor-local/src/django-rest-framework"]
path = vendor-local/src/django-rest-framework
url = https://github.com/tomchristie/django-rest-framework.git
[submodule "vendor-local/src/requests"]
path = vendor-local/src/requests
url = https://github.com/kennethreitz/requests.git
[submodule "vendor-local/src/Python-Markdown"]
path = vendor-local/src/Python-Markdown
url = https://github.com/waylan/Python-Markdown.git
[submodule "vendor-local/src/jingo-markdown"]
path = vendor-local/src/jingo-markdown
url = https://github.com/monkeywarrior/jingo-markdown.git
[submodule "vendor-local/src/six"]
path = vendor-local/src/six
url = https://github.com/kelp404/six.git
9 changes: 9 additions & 0 deletions Gruntfile.js
Expand Up @@ -42,6 +42,11 @@ module.exports = function (grunt) {
html: {
files: ['bedrock/**/*.html']
}
},
karma: {
unit: {
configFile: 'media/js/test/karma.conf.js'
}
}
});

Expand All @@ -57,8 +62,12 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-karma');

// Default task(s).
grunt.registerTask('default', ['watch']);

// Run JS tests in PhantomJS using Karma test runner
grunt.registerTask('test', ['karma']);

};
5 changes: 0 additions & 5 deletions bedrock/base/templates/base-resp.html
Expand Up @@ -66,11 +66,6 @@
<body id="{% block body_id %}{% endblock %}" class="html-{{ DIR }} {% block body_class %}{% endblock %}"{% block body_attrs %}{% endblock %}>
<div id="strings" data-global-close="{{ _('Close') }}" {% block string_data %}{% endblock %}></div>
<div id="outer-wrapper">

{% block mwc_badge %}
<div id="mwc-badge"><a href="/firefox/partners/">{{ _('Mobile World Congress') }}</a></div>
{% endblock %}

<div id="wrapper">

{% block site_header %}
Expand Down
5 changes: 0 additions & 5 deletions bedrock/base/templates/base.html
Expand Up @@ -61,11 +61,6 @@
<body id="{% block body_id %}{% endblock %}" class="html-{{ DIR }} {% block body_class %}{% endblock %}"{% block body_attrs %}{% endblock %}>
<div id="strings" data-global-close="{{ _('Close') }}" {% block string_data %}{% endblock %}></div>
<div id="outer-wrapper">

{% block mwc_badge %}
<div id="mwc-badge"><a href="/firefox/partners/">{{ _('Mobile World Congress') }}</a></div>
{% endblock %}

<div id="wrapper">

{% block site_header %}
Expand Down
4 changes: 2 additions & 2 deletions bedrock/base/templates/includes/lang_switcher.html
Expand Up @@ -3,13 +3,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}

{% if translations|length > 1 %}
<form id="lang_form" dir="ltr" method="get" action="#">
<form id="lang_form" method="get" action="#">
<label for="language">{{ _('Other languages:') }}</label>
<select id="language" name="lang" dir="ltr">
{% for code, label in translations|dictsort -%}
{# Don't escape the label as it may include entity references
# like "Português (do&nbsp;Brasil)" (Bug 861149) #}
<option value="{{ code }}"{{ code|ifeq(LANG, " selected") }}>{{ label|safe }}</option>
<option lang="{{ code }}" value="{{ code }}"{{ code|ifeq(LANG, " selected") }}>{{ label|safe }}</option>
{% endfor %}
</select>
<noscript>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/features.html
Expand Up @@ -885,7 +885,7 @@ <h4>{{ _('Customizable Interface') }}</h4>
</p>
<p>
{% trans url=url('firefox.customize') %}
<a href="{{ url }}">Learn more about Firefox’s personalizatio
<a href="{{ url }}">Learn more about Firefox’s personalization
features.</a>
{% endtrans %}
</p>
Expand Down
12 changes: 6 additions & 6 deletions bedrock/firefox/templates/firefox/os/devices.html
Expand Up @@ -106,8 +106,8 @@ <h2 class="section-heading">{{ _('Smartphones') }}</h2>
<h3 class="device-title">{{ _('Alcatel One Touch Fire') }}</h3>

<ul class="pager-tabs">
<li><a href="#p1">{{_('Features')}}</a></li>
<li><a href="#p2">{{_('Specifications')}}</a></li>
<li><a href="#p1" data-label="Features">{{_('Features')}}</a></li>
<li><a href="#p2" data-label="Specifications">{{_('Specifications')}}</a></li>
</ul>

<button class="device-detail-close">{{ _('Close') }}</button>
Expand Down Expand Up @@ -308,8 +308,8 @@ <h4 class="device-details-title">{{ _('Specifications') }}</h4>
<h3 class="device-title">{{ _('LG Fireweb') }}</h3>

<ul class="pager-tabs">
<li><a href="#p1">{{_('Features')}}</a></li>
<li><a href="#p2">{{_('Specifications')}}</a></li>
<li><a href="#p1" data-label="Features">{{_('Features')}}</a></li>
<li><a href="#p2" data-label="Specifications">{{_('Specifications')}}</a></li>
</ul>

<button class="device-detail-close">{{ _('Close') }}</button>
Expand Down Expand Up @@ -473,8 +473,8 @@ <h4 class="device-details-title">{{ _('Specifications') }}</h4>
<h3 class="device-title">{{ _('ZTE Open') }}</h3>

<ul class="pager-tabs">
<li><a href="#p1">{{_('Features')}}</a></li>
<li><a href="#p2">{{_('Specifications')}}</a></li>
<li><a href="#p1" data-label="Features">{{_('Features')}}</a></li>
<li><a href="#p2" data-label="Specifications">{{_('Specifications')}}</a></li>
</ul>

<button class="device-detail-close">{{ _('Close') }}</button>
Expand Down
2 changes: 0 additions & 2 deletions bedrock/firefox/templates/firefox/partners/index.html
Expand Up @@ -35,8 +35,6 @@
{{ js('partners') }}
{% endblock %}

{% block mwc_badge %}{% endblock %}

{% block site_header %}
<header id="masthead">
<a href="{{ url('mozorg.home') }}" id="tabzilla" data-infobar="{{ settings.TABZILLA_INFOBAR_OPTIONS }}">{{ _('Mozilla') }}</a>
Expand Down
5 changes: 5 additions & 0 deletions bedrock/firefox/templates/firefox/releases/aurora-notes.html
@@ -0,0 +1,5 @@
{# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. #}

{% extends "firefox/releases/release-notes.html" %}
5 changes: 5 additions & 0 deletions bedrock/firefox/templates/firefox/releases/beta-notes.html
@@ -0,0 +1,5 @@
{# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. #}

{% extends "firefox/releases/release-notes.html" %}
5 changes: 5 additions & 0 deletions bedrock/firefox/templates/firefox/releases/esr-notes.html
@@ -0,0 +1,5 @@
{# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. #}

{% extends "firefox/releases/release-notes.html" %}
5 changes: 5 additions & 0 deletions bedrock/firefox/templates/firefox/releases/nightly-notes.html
@@ -0,0 +1,5 @@
{# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. #}

{% extends "firefox/releases/release-notes.html" %}
5 changes: 5 additions & 0 deletions bedrock/firefox/templates/firefox/releases/os-notes.html
@@ -0,0 +1,5 @@
{# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. #}

{% extends "firefox/releases/release-notes.html" %}
125 changes: 125 additions & 0 deletions bedrock/firefox/templates/firefox/releases/release-notes.html
@@ -0,0 +1,125 @@
{# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. #}

{% extends "firefox/base-resp.html" %}

{% block page_title_prefix %}{% endblock %}
{% block page_title %}{{ _('Firefox — {version} Notes')|f(version=version) }}{% endblock %}

{% block body_id %}notes{% endblock %}
{% block body_class %}fxos-notes sky{% endblock %}


{% block site_css %}
{{ css('firefox_releasenotes') }}
{% endblock %}

{% block content %}
<header id="main-feature">
<h1>{{ _('Firefox {version} Notes')|f(version=version) }}</h1>

<h2>{{ _('First offered to release channel users on {date}')|f(date=release.release_date|l10n_format_date) }}</h2>

<p>
{% trans feedback='https://input.mozilla.org/feedback',
bugzilla='https://bugzilla.mozilla.org/' %}
As always, you&#146;re encouraged to
<a href="{{ feedback }}">tell us what you think</a>,
or <a href="{{ bugzilla }}">file a bug in Bugzilla</a>.
{% endtrans %}
{% if release.bug_search_url %}
{% trans bug_search_url=release.bug_search_url %}
If interested, please see the <a href="{{ bug_search_url }}">complete list of changes</a>
in this release.
{% endtrans %}
{% elif release.bug_list %}
<form action="https://bugzilla.mozilla.org/buglist.cgi" method="post">
<input type="hidden" name="limit" value="0">
<input type="hidden" name="bug_id" value="{{ release.bug_list }}">
<p>{{ _('If interested, please see the <input type="submit" value="complete list of changes"> in this release.') }}</p>
</form>
{% endif %}
</p>
</header>

<div id="main-content">
<article class="main-column">
<section class="notes-section" id="new-features">
<h3>{{ _('New Features') }}</h3>
<ul class="section-items tagged">
{% for note in new_features %}
<li {% if not note.tag %}class="untagged"{% endif %}>
<p>
{% if note.tag %}
<b class="tag tag-{{ note.tag.lower() }}">{{ note.tag }}</b>
{% endif %}
{{ note.note|markdown|safe }}
</p>
</li>
{% endfor %}
</ul>
</section>

<section class="notes-section" id="known-issues">
<h3>{{ _('Known Issues') }}</h3>
<ul class="section-items tagged">
{% for note in known_issues %}
<li>
<p>
<b class="tag tag-unresolved">{{ _('unresolved') }}</b>
{{ note.note|markdown|safe }}
</p>
{% if note.fixed_in_release %}
<p class="note">
<a href="{{ url('firefox.releasenotes', '{major_version}.0'|f(major_version=note.fixed_in_release.version)) }}">
{{ _('Resolved in v{version_number}')|f(version_number=note.fixed_in_release.version) }}
</a>
</p>
{% endif %}
</li>
{% endfor %}
</ul>
</section>
</article>

{% block sidebar %}
<aside id="sidebar" class="sidebar">
<section id="try">
<h3>{{ _('Try Firefox') }}</h3>
<ol>
<li class="try1"><a href="{{ url('firefox.system_requirements', version) }}">{{ _('Check') }}</a></li>
<li class="try2"><a href="{{ url('firefox') }}">{{ _('Download') }}</a></li>
<li class="try3"><a href="https://support.mozilla.org/kb/Installing%20Firefox">{{ _('Install') }}</a></li>
<li class="try4"><a href="https://addons.mozilla.org/firefox/">{{ _('Customize') }}</a></li>
</ol>
</section>

<section id="get-involved">
<h3>{{ _('Want to get involved?') }}</h3>
<p>{{ _('Did you know that most of the content in Firefox Support was written by volunteers?') }}<br>
<a href="{{ url('mozorg.contribute') }}">{{ _('Find out more') }}</a></p>
</section>

<section id="problems">
<h3>{{ _('Having Problems?') }}</h3>
<ol>
<li><a href="http://support.mozilla.org/">{{ _('Search for answers on the Firefox Support page') }}</a></li>
<li><a href="#knownissues">{{ _('Look at the known issues list and see if we already know about the problem') }}</a></li>
<li><a href="https://bugzilla.mozilla.org/enter_bug.cgi">{{ _('If you can’t find reference to your issue, please consider filing a technical bug report') }}</a></li>
</ol>
</section>


<section id="other">
<h3>{{ _('Other Resources') }}</h3>
<p><a href="https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/{{ major_version }}">{{ _('Developer Information') }}</a></p>
<p><a href="https://blog.mozilla.com/futurereleases/">{{ _('Future of Firefox Blog') }}</a></p>
</section>
</aside>
{% endblock %}

</div>
{% endblock %}

{% block js %}{% endblock %}
@@ -0,0 +1,33 @@
{# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. #}

{% extends "firefox/base-resp.html" %}

{% block page_title_prefix %}{% endblock %}
{% block page_title %}{{ _('Firefox — {version} System Requirements')|f(version=version) }}{% endblock %}

{% block body_id %}notes{% endblock %}
{% block body_class %}fxos-notes sky{% endblock %}


{% block site_css %}
{{ css('firefox_releasenotes') }}
{% endblock %}

{% block extrahead %}{% endblock %}

{% block content %}
<header id="main-feature">
<h1>{{ _('Firefox {version} System Requirements')|f(version=version) }}</h1>
</header>

<div id="main-content">
<article class="main-column">
{{ release.system_requirements|markdown|safe }}
</article>
</div>
{% block sidebar %}{% endblock %}
{% endblock %}

{% block js %}{% endblock %}
19 changes: 19 additions & 0 deletions bedrock/firefox/templates/firefox/whatsnew-aurora-29-survey.html
@@ -0,0 +1,19 @@
{% extends 'firefox/whatsnew.html' %}

{% block body_class %} {{ super() }} whatsnew29 {% endblock %}

{% block content %}
<h1 id="whatsnew-header">{{ _('Firefox Aurora is up to date.') }}</h1>
<article id="main-content" class="billboard">
<div class="content-column">
<h3>{{ _('Now help us make it better.') }}</h3>
<p>{{ _('You’ve probably noticed that Firefox has been looking different lately. Features have changed and moved around. It’s all part of our effort to make it easier to use and easier on the eyes.') }}</p>
<p>{{ _('And we need your help.') }}
<p>{{ _('We created a survey to help us understand how you use Firefox so we can shape it to serve you better. We’d really appreciate it if you took a few minutes to fill it out. Thanks!') }}</p>
<p><a href="http://www.surveygizmo.com/s3/1512875/Aurora-Australis-29-Survey" class="button">{{ _('Start the survey') }}</a></p>
</div>
<div class="image-column">
{{ platform_img('img/firefox/whatsnew/australis.png', {'alt': _('New Firefox interface')}) }}
</div>
</article>
{% endblock %}
Empty file.
Expand Up @@ -387,6 +387,7 @@ def test_sf_form_proxy(self, post_patch):
'mobile': u'',
'00NU0000002pDJr': [],
'email': u'thedude@mozilla.com',
'lead_source': 'www.mozilla.org/about/partnerships/',
})

def test_sf_form_csrf_status(self):
Expand Down

0 comments on commit bc124ab

Please sign in to comment.