From 0c021e0f5ccbda96761abd95967e85d54dfcbaae Mon Sep 17 00:00:00 2001 From: Steven Garrity Date: Mon, 9 Jun 2014 12:02:05 -0300 Subject: [PATCH] Port Unsupported Systems page to bedrock Bug 988044 --- .../firefox/unsupported-systems.html | 44 +++++++++++ bedrock/firefox/urls.py | 1 + bedrock/settings/base.py | 3 + etc/httpd/global.conf | 4 + media/css/firefox/unsupported-systems.less | 77 +++++++++++++++++++ 5 files changed, 129 insertions(+) create mode 100644 bedrock/firefox/templates/firefox/unsupported-systems.html create mode 100644 media/css/firefox/unsupported-systems.less diff --git a/bedrock/firefox/templates/firefox/unsupported-systems.html b/bedrock/firefox/templates/firefox/unsupported-systems.html new file mode 100644 index 00000000000..4fb3ae80b3a --- /dev/null +++ b/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 %} + +
+

{{ _('Thanks for choosing Firefox!') }}

+

{{_('We’re sorry to report this, but your computer does not meet the minimum system requirements to run this version.')}}

+
+ +
+ +
+

Need Help?

+

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.

+ Visit Firefox Support +
+ +
+

For more information on supported systems

+ View System Requirements +
+ +
+ +
+

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:

+ +
+ +{% endblock %} diff --git a/bedrock/firefox/urls.py b/bedrock/firefox/urls.py index 7a5296b1754..51069f122d8 100644 --- a/bedrock/firefox/urls.py +++ b/bedrock/firefox/urls.py @@ -45,6 +45,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'), diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py index 81f5602be3b..92c5b4e37b5 100644 --- a/bedrock/settings/base.py +++ b/bedrock/settings/base.py @@ -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', ), diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf index 078a0ba7043..4617c81bb42 100644 --- a/etc/httpd/global.conf +++ b/etc/httpd/global.conf @@ -211,6 +211,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] diff --git a/media/css/firefox/unsupported-systems.less b/media/css/firefox/unsupported-systems.less new file mode 100644 index 00000000000..37754e16566 --- /dev/null +++ b/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; + } + } + +}