Skip to content

Commit

Permalink
Merge pull request #2091 from sgarrity/bug-988044-port-unsupported-sy…
Browse files Browse the repository at this point in the history
…stems

Port Unsupported Systems page to bedrock
  • Loading branch information
alexgibson committed Jun 9, 2014
2 parents 67dbd5c + 0c021e0 commit 5215673
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 0 deletions.
44 changes: 44 additions & 0 deletions bedrock/firefox/templates/firefox/unsupported-systems.html
@@ -0,0 +1,44 @@
{# 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 %}{{ _('Unsupported Systems') }}{% endblock %}
{% block page_desc %}{{ _('We’re sorry to report this, but your computer does not meet the minimum system requirements to run this version.') }}{% endblock %}

{% block extrahead %}
{{ css('firefox_unsupported_systems') }}
{% endblock %}

{% block content %}

<div id="main-feature">
<h1>{{ _('Thanks for choosing Firefox!') }}</h1>
<h2>{{_('We’re sorry to report this, but your computer does not meet the minimum system requirements to run this version.')}}</h2>
</div>

<div id="main-content" class="billboard">

<div class="help-feature">
<h3>Need <span>Help?</span></h3>
<p>Our Support page has plenty of answers, including full instructions for downloading and installing Firefox and a live chat feature to guide you through any tricky spots.</p>
<a class="blocklevel" href="https://support.mozilla.org/products/firefox">Visit Firefox Support</a>
</div>

<div class="systems-feature">
<h4>For more information on supported systems</h4>
<a class="blocklevel" href="{{ url('firefox.sysreq') }}">View System Requirements</a>
</div>

</div>

<div class="other-browsers container">
<p>To make your computer more secure, we recommend upgrading your operating system to a newer version as soon as possible (plus, you’ll be able to use Firefox!). But, if you can’t do so, here are some alternate browsers that should be compatible with your current system:</p>
<ul>
<li><a href="http://www.opera.com/">Opera</a> for Windows 95 and above and Mac OS 10.3 and above</li>
<li><a href="http://www.icab.de/">iCab</a> for Mac OS 10.3 and above</li>
</ul>
</div>

{% endblock %}
1 change: 1 addition & 0 deletions bedrock/firefox/urls.py
Expand Up @@ -44,6 +44,7 @@
url('^firefox/sms/$', views.sms_send, name='firefox.sms'),
page('firefox/sms/sent', 'firefox/android/sms-thankyou.html'),
page('firefox/sync', 'firefox/sync.html'),
page('firefox/unsupported-systems', 'firefox/unsupported-systems.html'),
page('firefox/new', 'firefox/new.html'),
page('firefox/organizations/faq', 'firefox/organizations/faq.html'),
page('firefox/organizations', 'firefox/organizations/organizations.html'),
Expand Down
3 changes: 3 additions & 0 deletions bedrock/settings/base.py
Expand Up @@ -170,6 +170,9 @@ def JINJA_CONFIG():
'firefox_unsupported': (
'css/firefox/unsupported.less',
),
'firefox_unsupported_systems': (
'css/firefox/unsupported-systems.less',
),
'firefox-resp': (
'css/firefox/template-resp.less',
),
Expand Down
4 changes: 4 additions & 0 deletions etc/httpd/global.conf
Expand Up @@ -214,6 +214,10 @@ RewriteRule ^/(pt-BR)/firefox/speed(/?)$ /b/$1/firefox/speed$2 [PT]
# bug 796952, 915845, 915867
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/unsupported/(.*)$ /b/$1firefox/unsupported/$2 [PT]

# bug 988044
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/unsupported-systems\.html$ /$1firefox/unsupported-systems/ [L,R=301]
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/unsupported-systems(.*)$ /b/$1firefox/unsupported-systems$2 [PT]

# Bug 1009247
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?(firefox|mobile)/(aurora|beta)/?$ /$1firefox/channel/#$3 [NE,L,R=301]

Expand Down
77 changes: 77 additions & 0 deletions media/css/firefox/unsupported-systems.less
@@ -0,0 +1,77 @@
// 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/.

@import "../sandstone/lib.less";

#main-feature {
h1 {
.span-all;
margin-bottom: 10px;
}
h2 {
.span(10);
font-size: 28px;
}
}

#main-content {
.help-feature {
.span(8);
}
.systems-feature {
.span(4);
}
.blocklevel {
.trailing-arrow();
}
}

.other-browsers {
margin-top: (@baseLine * 2);
margin-bottom: (@baseLine * 2);
p,
ul {
.span(8);
}
ul {
margin-top: @baseLine;
}
}


/* Tablet and Mobile */
@media only screen and (max-width: @breakDesktop) {

#main-feature h1,
#main-feature h2,
#main-content .help-feature,
#main-content .systems-feature,
.other-browsers p,
.other-browsers ul {
.span-all;
}

#main-feature {
h1 {
margin-bottom: 10px;
}
h2 {
font-size: 18px;
}
}

#main-content {
padding-top: @baseLine;
.help-feature {
margin-bottom: @baseLine;
}
}

.other-browsers {
ul {
margin-top: @baseLine;
}
}

}

0 comments on commit 5215673

Please sign in to comment.