Merge branch 'master' of github.com:mozilla/spark
This commit is contained in:
sork
Коммит
d73690cb84
|
|
@ -1,6 +1,6 @@
|
|||
<div id="main-info">
|
||||
<h1>
|
||||
{{ _('Firefox Spark') }}
|
||||
{{ _('Spark') }} <span>{{ _('powered by Firefox for mobile') }}</span>
|
||||
</h1>
|
||||
<div id="user-info">
|
||||
{% include "desktop/includes/hello.html" %}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
<div id="main-info">
|
||||
<h1>
|
||||
{{ _('Firefox Spark') }}
|
||||
{{ _('Spark') }} <span>{{ _('powered by Firefox for mobile') }}</span>
|
||||
</h1>
|
||||
<div id="user-info">
|
||||
{{ title }}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="button-wrapper">
|
||||
<button untouchstart="">{{ _('Share This') }}</button>
|
||||
<button untouchstart="">{{ _('Share my badge') }}</button>
|
||||
</div>
|
||||
</li>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -7,20 +7,9 @@
|
|||
<div class="section">
|
||||
<h2>{{ _('Wanna share a few more details?') }}</h2>
|
||||
<p class="sans">
|
||||
{{ _("If you do, you'll get to unlock even more cool challenges and get to see your Spark transform. Go on, you know you want to!") }}
|
||||
{{ _("If you do, you'll get to unlock even more cool challenges and get to see your Spark transform.") }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="section">
|
||||
<h2>{{ _('P.S.') }}</h2>
|
||||
<p class="sans">
|
||||
{{ _("Don't worry, we don't share any details about your information with anyone. Everything you tell us is kept private so you're in good hands.") }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
<h2 id="disclaimer" class="cta"><a ontouchstart="" href="#">{{ _('Privacy Disclaimer') }}</a></h2>
|
||||
<hr>
|
||||
|
||||
<div class="buttons-wrapper">
|
||||
<div class="button left-button"><a href="{{ url('mobile.home') }}">{{ _('Maybe later') }}</a></div>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
{{ csrf() }}
|
||||
<fieldset id="identifier" class="section">
|
||||
<div class="input-wrapper">
|
||||
<input tabindex="1" type="text" name="identifier" value="{{ form.identifier.data }}" placeholder="{{ _('Username or Email address') }}">
|
||||
<input tabindex="1" type="text" name="identifier" value="{{ form.identifier.data }}" placeholder="{{ _('Username/email address') }}">
|
||||
</div>
|
||||
{{ form.identifier.errors|safe }}
|
||||
</fieldset>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<fieldset id="from-website">
|
||||
<p id="custom-cb" class="sans">
|
||||
<input tabindex="2" id="from-website-cb" type="checkbox" name="from_website">
|
||||
<label ontouchstart="" for="from-website-cb">{{ _('I started a new Spark from Firefox.com') }}</label>
|
||||
<label ontouchstart="" for="from-website-cb">{{ _('I started a new Spark on my own.') }}</label>
|
||||
</p>
|
||||
</fieldset>
|
||||
<hr>
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
</div>
|
||||
<p class="section sans">
|
||||
{{ _('Wanna help spread Firefox for Mobile around the world? Take challenges, unlock badges and earn yourself some bragging rights.') }}
|
||||
{{ _('Wanna help spread Firefox 4 for Android around the world? Take challenges, unlock badges and earn yourself some bragging rights.') }}
|
||||
</p>
|
||||
<hr>
|
||||
<h2 class="cta"><a ontouchstart="" href="{{ url('mobile.instructions') }}">{{ _('What is Firefox Spark?') }}</a></h2>
|
||||
<hr>
|
||||
<div class="buttons-wrapper">
|
||||
<a href="{{ url('users.mobile_register') }}"><button ontouchstart="" class="left-button">{{ _('Join') }}</button></a>
|
||||
<a href="{{ url('users.mobile_login') }}"><button ontouchstart="" class="right-button">{{ _('Log in') }}</button></a>
|
||||
<a href="{{ url('users.mobile_login') }}"><button ontouchstart="" class="right-button">{{ _('Sign in') }}</button></a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -7,8 +7,8 @@
|
|||
{% block pagecontent %}
|
||||
<p class="section legend">
|
||||
{% trans %}
|
||||
Good question. Spark is a game based on sharing challenges. The more you share your Spark with others,
|
||||
the more challenges you'll unlock and the more badges you'll earn.
|
||||
Ready to light up the world? To celebrate Mozilla Firefox going mobile, we've created Spark, a game that challenges you to share with friends to help the flame of the open Web glow bright.
|
||||
So get Spark, take challenges, unlock badges and support Mozilla's mission for a better Web in the process. All good stuff!
|
||||
{% endtrans %}
|
||||
</p>
|
||||
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<div class="section">
|
||||
<h2>{{ _('How it works') }}</h2>
|
||||
<p class="sans">
|
||||
{{ _('Each player starts with their own Spark.') }}
|
||||
{{ _('Each player starts with their own spark.') }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
|
@ -28,11 +28,19 @@
|
|||
</p>
|
||||
</div>
|
||||
|
||||
<hr> <!-- Fennec inexplicably refuses to display this line in portrait mode -->
|
||||
<hr>
|
||||
<div class="section">
|
||||
<div class="arrow"></div>
|
||||
<p class="sans">
|
||||
{{ _("There are X levels of sharing challenges to get through, and for each challenge you complete, you'll earn yourself a sweet little badge.") }}
|
||||
{{ _("There are 4 levels of sharing challenges to get through, and for each challenge you complete, you'll earn yourself a sweet little badge.") }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
<div class="section">
|
||||
<div class="arrow"></div>
|
||||
<p class="sans">
|
||||
{{ _('So do you have what it takes to light up the world? Then get to it!') }}
|
||||
</p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -13,15 +13,6 @@
|
|||
|
||||
</div>
|
||||
{% if non_android %}
|
||||
<p class="section sans">
|
||||
{% trans %}
|
||||
Oops! You haven't downloaded
|
||||
Firefox for Mobile yet. Get it now and
|
||||
start a Spark.
|
||||
{% endtrans %}
|
||||
</p>
|
||||
<a href="#" class="button" ountouchstart="">{{ ('Get Firefox for Mobile') }}</a>
|
||||
{% else %}
|
||||
<p class="section sans">
|
||||
{% trans %}
|
||||
Oh no! Firefox for Mobile isn't
|
||||
|
|
@ -32,25 +23,38 @@
|
|||
{% endtrans %}
|
||||
</p>
|
||||
<a href="#" class="button" ountouchstart="">{{ _('Share the Spark') }}</a>
|
||||
{% else %}
|
||||
<p class="section sans">
|
||||
{% trans %}
|
||||
Oops! You haven't downloaded
|
||||
Firefox for Mobile yet. Get it now and
|
||||
start a Spark.
|
||||
{% endtrans %}
|
||||
</p>
|
||||
<a href="#" class="button" ountouchstart="">{{ ('Get Firefox for Mobile') }}</a>
|
||||
{% endif %}
|
||||
|
||||
<hr>
|
||||
<div class="section">
|
||||
<h2>{{ ('Meet Firefox') }}</h2>
|
||||
<h2>{{ ('Meet Firefox 4 for desktop') }}</h2>
|
||||
<p class="sans">
|
||||
{{ ('Here are just a few of the amazing things Firefox has to offer:') }}
|
||||
</p>
|
||||
<h3>{{ ('Awesome Bar') }}</h3>
|
||||
<h3>{{ ('A fresh new look') }}</h3>
|
||||
<p class="sans">
|
||||
{{ ('Start typing to find the sites you love in seconds.') }}
|
||||
{{ ('A new user interface lets Web content take center stage.') }}
|
||||
</p>
|
||||
<h3>{{ ('Private Browsing') }}</h3>
|
||||
<h3>{{ ('Blazing speed') }}</h3>
|
||||
<p class="sans">
|
||||
{{ ('Surf the web without leaving a single trace.') }}
|
||||
{{ ('Huge performance gains make Firefox 4 almost six times faster than Firefox 3.6.') }}
|
||||
</p>
|
||||
<h3>{{ ('One-Click Bookmarking') }}</h3>
|
||||
<h3>{{ ('Stay in Sync') }}</h3>
|
||||
<p class="sans">
|
||||
{{ ('Bookmark, search and organize Web sites quickly and easily.') }}
|
||||
{{ ('Synchronize your Firefox history, bookmarks, tabs and passwords across multiple devices.') }}
|
||||
</p>
|
||||
<h3>{{ ('Customize your browser') }}</h3>
|
||||
<p class="sans">
|
||||
{{ ('Add features and functionality to customize Firefox exactly the way you like.') }}
|
||||
</p>
|
||||
</div>
|
||||
<a href="#" class="button" ountouchstart="">{{ ('Learn more') }}</a>
|
||||
|
|
@ -59,16 +63,15 @@
|
|||
<div class="section">
|
||||
<h2>{{ ('About Us') }}</h2>
|
||||
<p class="sans">
|
||||
{% trans %}
|
||||
The Firefox Mobile browser is created
|
||||
by Mozilla, a non-profit organization
|
||||
whose mission is to promote
|
||||
openness, innovation and opportunity
|
||||
on the Web.
|
||||
{% trans mozilla_url='http://www.mozilla.org' %}
|
||||
Mozilla is a global, non-profit organization dedicated to making the Web better.
|
||||
We believe in principle over profit, and that the Internet is a shared public resource to be cared for, not a commodity to be sold.
|
||||
We work with a worldwide community to create free, open source software like Mozilla Firefox, and to innovate for the benefit of the individual and the betterment of the Web.
|
||||
The result is great products built by passionate people and better choices for everyone. For more information, visit <a href="{{ mozilla_url }}">www.mozilla.org</a>.
|
||||
{% endtrans %}
|
||||
</p>
|
||||
</div>
|
||||
<a href="#" class="button" ountouchstart="">{{ ('About Mozilla') }}</a>
|
||||
<a href="#" class="button" ountouchstart="">{{ ('Learn more') }}</a>
|
||||
|
||||
<div id="non-ff-links">
|
||||
<a href="#">{{ ('Privacy Policy') }}</a>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,111 @@
|
|||
{% extends "mobile/page.html" %}
|
||||
{% set pagetitle = _('Firefox Spark') %}
|
||||
{% set body_id = 'user-share' %}
|
||||
{% set scripts = ('menu',) %}
|
||||
{% set hide_menu = True %}
|
||||
|
||||
{% block flame %}{% endblock %}
|
||||
|
||||
{% block pagecontent %}
|
||||
<div id="static-spark">
|
||||
|
||||
</div>
|
||||
<p class="section sans">
|
||||
<span>{{ _('{username}')|f(username='FoxyBarbarian') }}</span>
|
||||
|
||||
{{ ngettext('shared to <span>{n} person</span>',
|
||||
'shared to <span>{n} people</span>', num_people)|fe(n=num_people) }}
|
||||
{{ ngettext('in <span>{n} country</span> around the world.',
|
||||
'in <span>{n} different countries</span> around the world.', num_countries)|fe(n=num_countries) }}
|
||||
{{ ngettext('And, they unlocked <span>{n} cool badge</span> in the process.',
|
||||
'And, they unlocked <span>{n} cool badges</span> in the process.', num_badges)|fe(n=num_badges) }}
|
||||
|
||||
{{ _('How far will your Spark go?') }}
|
||||
|
||||
{# L10n: {n} is the number of recently completed challenges. #}
|
||||
</p>
|
||||
|
||||
{# Compatible phone, non-firefox #}
|
||||
<p class="section sans">
|
||||
{{ _("Don't have a spark yet? Get Firefox 4 for Android then start a spark.") }}
|
||||
</p>
|
||||
<div class="buttons-wrapper">
|
||||
<a href="#"><button ontouchstart="">{{ _('Get Firefox 4 for Android') }}</button></a>
|
||||
</div>
|
||||
|
||||
{# Compatible phone, viewing with Firefox, logged-out #}
|
||||
<hr>
|
||||
<h2 class="cta"><a ontouchstart="" href="{{ url('mobile.instructions') }}">{{ _('What is Firefox Spark?') }}</a></h2>
|
||||
<hr>
|
||||
<div class="buttons-wrapper">
|
||||
<a href="{{ url('users.mobile_register') }}"><button ontouchstart="" class="left-button">{{ _('Start a spark') }}</button></a>
|
||||
<a href="{{ url('users.mobile_login') }}"><button ontouchstart="" class="right-button">{{ _('Sign in') }}</button></a>
|
||||
</div>
|
||||
|
||||
{# Compatible phone, viewing with Firefox, logged-in #}
|
||||
<div class="buttons-wrapper">
|
||||
<a href="#"><button ontouchstart="">{{ _('Go to My Spark') }}</button></a>
|
||||
</div>
|
||||
|
||||
{# Incompatible phone #}
|
||||
<p class="section sans">
|
||||
{{ _("Aww, too bad your phone isn’t compatible. Want to help light up the world anyway?") }}
|
||||
</p>
|
||||
<div class="buttons-wrapper">
|
||||
<a href="#"><button ontouchstart="">{{ _('Share a spark') }}</button></a>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
<div class="section">
|
||||
<h2>{{ ('Meet Firefox 4 for desktop') }}</h2>
|
||||
<p class="sans">
|
||||
{{ ('Here are just a few of the amazing things Firefox has to offer:') }}
|
||||
</p>
|
||||
<h3>{{ ('A fresh new look') }}</h3>
|
||||
<p class="sans">
|
||||
{{ ('A new user interface lets Web content take center stage.') }}
|
||||
</p>
|
||||
<h3>{{ ('Blazing speed') }}</h3>
|
||||
<p class="sans">
|
||||
{{ ('Huge performance gains make Firefox 4 almost six times faster than Firefox 3.6.') }}
|
||||
</p>
|
||||
<h3>{{ ('Stay in Sync') }}</h3>
|
||||
<p class="sans">
|
||||
{{ ('Synchronize your Firefox history, bookmarks, tabs and passwords across multiple devices.') }}
|
||||
</p>
|
||||
<h3>{{ ('Customize your browser') }}</h3>
|
||||
<p class="sans">
|
||||
{{ ('Add features and functionality to customize Firefox exactly the way you like.') }}
|
||||
</p>
|
||||
</div>
|
||||
<a href="#" class="button" ountouchstart="">{{ ('Learn more') }}</a>
|
||||
|
||||
<hr>
|
||||
<div class="section">
|
||||
<h2>{{ ('About Us') }}</h2>
|
||||
<p class="sans">
|
||||
{% trans mozilla_url='http://www.mozilla.org' %}
|
||||
Mozilla is a global, non-profit organization dedicated to making the Web better.
|
||||
We believe in principle over profit, and that the Internet is a shared public resource to be cared for, not a commodity to be sold.
|
||||
We work with a worldwide community to create free, open source software like Mozilla Firefox, and to innovate for the benefit of the individual and the betterment of the Web.
|
||||
The result is great products built by passionate people and better choices for everyone. For more information, visit <a href="{{ mozilla_url }}">www.mozilla.org</a>.
|
||||
{% endtrans %}
|
||||
</p>
|
||||
</div>
|
||||
<a href="#" class="button" ountouchstart="">{{ ('Learn more') }}</a>
|
||||
|
||||
<div id="non-ff-links">
|
||||
<a href="#">{{ ('Privacy Policy') }}</a>
|
||||
<a href="#">{{ ('Legal Notices') }}</a>
|
||||
<a class="last" href="#">{{ ('Report Trademark Abuse') }}</a>
|
||||
</div>
|
||||
|
||||
<p class="license sans">
|
||||
{% trans %}
|
||||
Except where otherwise noted, content on
|
||||
this site is licensed under the Creative
|
||||
Commons Attribution Share-Alike License
|
||||
v3.0 or any later version.
|
||||
{% endtrans %}
|
||||
</p>
|
||||
{% endblock %}
|
||||
|
|
@ -18,7 +18,7 @@ urlpatterns = patterns('',
|
|||
url(r'^boost1$', views.boost1, name='mobile.boost1'),
|
||||
url(r'^boost2$', views.boost2, name='mobile.boost2'),
|
||||
url(r'^boost2_confirm$', views.boost2_confirm, name='mobile.boost2_confirm'),
|
||||
|
||||
url(r'^user$', views.user, name='mobile.user'),
|
||||
url(r'^iphone$', views.iphone, name='mobile.home_iphone'),
|
||||
url(r'^non-android$', views.non_android, name='mobile.home_non_android'),
|
||||
url(r'^non-ff$', views.non_firefox, name='mobile.home_non_firefox'),
|
||||
|
|
|
|||
|
|
@ -110,3 +110,6 @@ def non_android(request):
|
|||
|
||||
def non_firefox(request):
|
||||
return jingo.render(request, 'mobile/non_firefox.html')
|
||||
|
||||
def user(request):
|
||||
return jingo.render(request, 'mobile/user.html')
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
</div>
|
||||
{{ form.password.errors|safe }}
|
||||
<div class="input-wrapper">
|
||||
<input tabindex="2" type="password" name="password2" value="" placeholder="{{ _('Confirm Password') }}" required>
|
||||
<input tabindex="2" type="password" name="password2" value="" placeholder="{{ _('Please confirm password') }}" required>
|
||||
</div>
|
||||
{{ form.password2.errors|safe }}
|
||||
<div class="input-wrapper">
|
||||
|
|
|
|||
|
|
@ -682,18 +682,18 @@ div.shape {
|
|||
|
||||
/* Home */
|
||||
|
||||
#home #header {
|
||||
#home #header, #user-share #header {
|
||||
margin-top:20px;
|
||||
border-top:3px solid #ffd40d;
|
||||
border-bottom:0px;
|
||||
padding-top:0px;
|
||||
}
|
||||
|
||||
#home #header h1 {
|
||||
#home #header h1, #user-share #header h1 {
|
||||
padding-top:10px;
|
||||
}
|
||||
|
||||
#home {
|
||||
#home, #user-share {
|
||||
background:url('../img/mobile/spark.png') no-repeat center 0;
|
||||
background-size:320px auto;
|
||||
}
|
||||
|
|
@ -702,13 +702,13 @@ div.shape {
|
|||
height:200px;
|
||||
}
|
||||
|
||||
#home .left-button {
|
||||
#home .left-button, #user-share .left-button {
|
||||
border-top:1px solid #ffe87d;
|
||||
background:-moz-linear-gradient(90deg, #ffd825, #e5bf0c);
|
||||
background:-webkit-gradient(linear,center top, center bottom, from(#ffd825), to(#e5bf0c));
|
||||
}
|
||||
|
||||
#home .left-button:active, #home .left-button:focus {
|
||||
#home .left-button:active, #home .left-button:focus, #user-share .left-button:active, #user-share .left-button:focus {
|
||||
border-top:1px solid #ffe87d;
|
||||
background:-moz-linear-gradient(90deg, #ffea87, #f1dc7a);
|
||||
background:-webkit-gradient(linear,center top, center bottom, from(#ffea87), to(#f1dc7a));
|
||||
|
|
@ -848,3 +848,9 @@ div.challenge.complete .checkbox {
|
|||
background:url('../img/mobile/checkbox480.png') no-repeat 0px -27px;
|
||||
background-size:26px auto;
|
||||
}
|
||||
|
||||
/*User-share*/
|
||||
|
||||
#user-share .section span {
|
||||
color:#fff;
|
||||
}
|
||||
|
|
@ -299,6 +299,10 @@ ul#main-menu {
|
|||
font-size:60%;
|
||||
}
|
||||
|
||||
#main-info h1 span {
|
||||
font-size:50%;
|
||||
}
|
||||
|
||||
#headline h3 {
|
||||
color:#df731b;
|
||||
font-size:1.846em;
|
||||
|
|
@ -629,7 +633,7 @@ div.input-wrapper:first-child {
|
|||
margin-top:0;
|
||||
}
|
||||
|
||||
#popup input[type=text], input[type=email] {
|
||||
#popup input[type=text], input[type=email], input[type=password] {
|
||||
display:block;
|
||||
border-radius:0px;
|
||||
-moz-border-radius:0px;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,16 @@
|
|||
|
||||
<div id="wrapper">
|
||||
<div id="header">
|
||||
{% if body_id not in ['home', 'myspark'] %}
|
||||
{% if body_id not in ['home', 'myspark', 'user-share'] %}
|
||||
<div ontouchstart="" class="back" onclick="history.back()">
|
||||
</div>
|
||||
{% endif %}
|
||||
<h1>
|
||||
{{ pagetitle }}
|
||||
</h1>
|
||||
{% if body_id == 'user-share' %}
|
||||
<span class="username">{{ _("{username}'s Spark")|f(username='FoxyBarbarian') }}</span>
|
||||
{% endif %}
|
||||
</div> <!-- end header -->
|
||||
|
||||
<div id="content">
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче