From a0765032abbf00f69aa9ce03b3d6ce09bdda4ab4 Mon Sep 17 00:00:00 2001 From: Paul Craciunoiu Date: Fri, 19 Feb 2010 10:51:28 -0800 Subject: [PATCH 01/11] templates/base --> templates/layout, per http://github.com/pcraciunoiu/kitsune/commit/3bef7859239efe7752779b5f2e30706e2ed2299f#comment_48941 --- templates/{base => layout}/base.html | 0 templates/{base => layout}/footer.html | 0 templates/{base => layout}/head.html | 0 templates/{base => layout}/header.html | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename templates/{base => layout}/base.html (100%) rename templates/{base => layout}/footer.html (100%) rename templates/{base => layout}/head.html (100%) rename templates/{base => layout}/header.html (100%) diff --git a/templates/base/base.html b/templates/layout/base.html similarity index 100% rename from templates/base/base.html rename to templates/layout/base.html diff --git a/templates/base/footer.html b/templates/layout/footer.html similarity index 100% rename from templates/base/footer.html rename to templates/layout/footer.html diff --git a/templates/base/head.html b/templates/layout/head.html similarity index 100% rename from templates/base/head.html rename to templates/layout/head.html diff --git a/templates/base/header.html b/templates/layout/header.html similarity index 100% rename from templates/base/header.html rename to templates/layout/header.html From fb6f0968bbee5135f9832cb618af9d6ece285b17 Mon Sep 17 00:00:00 2001 From: Paul Craciunoiu Date: Fri, 19 Feb 2010 10:56:34 -0800 Subject: [PATCH 02/11] Merge head.html to header.html, append Firefox Support to page title --- templates/layout/head.html | 14 -------------- templates/layout/header.html | 11 +++++++++++ 2 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 templates/layout/head.html diff --git a/templates/layout/head.html b/templates/layout/head.html deleted file mode 100644 index 91d4d188c0b..00000000000 --- a/templates/layout/head.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - -{% block title %} - -Firefox Support - -{% endblock %} - - - - diff --git a/templates/layout/header.html b/templates/layout/header.html index 2199aa0a9d9..79c799f5e36 100644 --- a/templates/layout/header.html +++ b/templates/layout/header.html @@ -1,3 +1,14 @@ + + + + + +{% block title %}{% endblock %} | Firefox Support + + + + + {# start #nav-access #} +

Except where otherwise noted, content on this site is licensed under the
Creative Commons Attribution Share-Alike License v3.0 or any later version.

@@ -77,14 +77,13 @@

Mozilla is providing links to any applications as a courtesy, and makes no representations regarding the applications or any information related there to. Any questions, complaints or claims regarding the applications must be directed to the appropriate software vendor.

-

Powered by The Django Framework

+

Powered by The Django Framework

- - -{# end #footer #} + + - + \ No newline at end of file diff --git a/templates/layout/header.html b/templates/layout/header.html index 9cf85e36df1..d64a354e91d 100644 --- a/templates/layout/header.html +++ b/templates/layout/header.html @@ -1,79 +1,51 @@ - + - - -{% block title %}{% endblock %} | Firefox Support +{% block title %}{% endblock %}{% print _("| Firefox Support") %} + + + - - -
- -{# end #header #} +
-
+
From c54f70b94fa81f0aadcd99f55878fb572dc008af Mon Sep 17 00:00:00 2001 From: Paul Craciunoiu Date: Fri, 19 Feb 2010 15:31:23 -0800 Subject: [PATCH 05/11] styling breadcrumb --- media/css/main.css | 92 +++++++++++++++++++++----------------- templates/layout/base.html | 12 ++--- 2 files changed, 56 insertions(+), 48 deletions(-) diff --git a/media/css/main.css b/media/css/main.css index d2979cd1b4b..724f9a92cc6 100644 --- a/media/css/main.css +++ b/media/css/main.css @@ -804,48 +804,6 @@ body.html-rtl { background: #3d5b74; } -/*---------------------------------- - Breadcrumbs -----------------------------------*/ - -#breadcrumbs { - margin: -10px 0 10px 0; - font-family: verdana; -} - -#breadcrumbs ul { - margin: 0; - padding: 0; -} - -#breadcrumbs ul li { - display: inline; - margin: 0; - color: #4b4742; - font-size: 10px; -} - -#breadcrumbs ul li.divider { - padding: 0 3px 0 0; - color: #807970; - font-size: 11px; -} - -#breadcrumbs span, -#breadcrumbs a { - color: #0489b7; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0; - display: inline; -} - -#breadcrumbs a:hover, -#breadcrumbs a:active { - text-decoration: underline; -} - /*---------------------------------- Footer ----------------------------------*/ @@ -964,3 +922,53 @@ body.html-rtl { #footer #lang_form div { display: inline; } + + +/*---------------------------------- + Breadcrumbs +----------------------------------*/ + +#breadcrumbs { + margin: 14px 0 0 25px; + font-family: Verdana; +} + +#breadcrumbs ul li { + display: inline; + margin: 0; + color: #4b4742; + font-size: 10px; +} + +#breadcrumbs ul li.divider { + padding: 0 3px 0 0; + color: #807970; + font-size: 11px; +} + +#breadcrumbs span, +#breadcrumbs a { + color: #0489b7; + font-weight: bold; + text-decoration: none; + margin: 0; + padding: 0; + display: inline; +} + +#breadcrumbs a:hover, +#breadcrumbs a:active { + text-decoration: underline; +} + + +/*---------------------------------- + Content +----------------------------------*/ + +#content { + width: 920px; + margin: auto; + text-align: left; +} + diff --git a/templates/layout/base.html b/templates/layout/base.html index f6925b614d3..448947dcf8d 100644 --- a/templates/layout/base.html +++ b/templates/layout/base.html @@ -1,11 +1,11 @@ {% include 'layout/header.html' %} -
- - +{% block breadcrumbs %} + +{% endblock %}
{# end .feature-contents #} From abd4b024b937f604566ff8dbff693aec421450cb Mon Sep 17 00:00:00 2001 From: Paul Craciunoiu Date: Fri, 19 Feb 2010 16:11:14 -0800 Subject: [PATCH 06/11] Adding default sidebar, styling side menu --- media/css/sidebar.css | 69 ++++++++++++++++++++++++++++++++ media/img/side-menu-divider.png | Bin 0 -> 176 bytes templates/layout/base.html | 48 +++++++++------------- templates/layout/header.html | 1 + 4 files changed, 90 insertions(+), 28 deletions(-) create mode 100644 media/css/sidebar.css create mode 100755 media/img/side-menu-divider.png diff --git a/media/css/sidebar.css b/media/css/sidebar.css new file mode 100644 index 00000000000..08e7e0fd9e4 --- /dev/null +++ b/media/css/sidebar.css @@ -0,0 +1,69 @@ +/* default sidebar, used on most SUMO pages */ +#sidebar { + float: right; + width: 200px; +} + +#side-menu { + margin: -3px 0 0 15px; + list-style-type: none; + font-family: verdana; + font-size: 0.8em; +} + +#side-menu li { + list-style-type: none; + margin: 0; + padding: 5px; + background: url(../img/side-menu-divider.png) top left no-repeat; +} + +#side-menu li.first { + font-family: georgia, freeserif, serif; + font-size: 20px; + padding: 4px 5px 2px; + background: none; +} + +#side-menu li ul { + margin: 5px 0 0 0; + left: auto; +} + +#side-menu li ul li { + padding-left: 8px; +} + +#side-menu h3 { + margin: 0; + font-weight: normal; +} + +#side-menu a:link, +#side-menu a:visited { + color: #1e4262; + text-decoration: none; +} + +#side-menu a.on:link, +#side-menu a.on:visited { + color: #fff; + font-weight: bold; +} + +.mini #side-menu a.on:link, +.mini #side-menu a.on:visited { + color: #0489B7; +} + +#side-menu h3 a.on:link, +#side-menu h3 a.on:visited { + font-weight: normal; +} + +#side-menu a:hover, +#side-menu a:active { + text-decoration: underline; +} + + diff --git a/media/img/side-menu-divider.png b/media/img/side-menu-divider.png new file mode 100755 index 0000000000000000000000000000000000000000..48bae2ee7ca3301ada631ad6abfa260ff039f7db GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^tALo1gBeIx79X7pq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c70Ctogt$)Gdwkx>D~m4Qn|(kP!EHrtDnm{r-UW|6NNqH literal 0 HcmV?d00001 diff --git a/templates/layout/base.html b/templates/layout/base.html index 448947dcf8d..948e3cdd6ac 100644 --- a/templates/layout/base.html +++ b/templates/layout/base.html @@ -1,15 +1,7 @@ {% include 'layout/header.html' %} -{% block breadcrumbs %} - -{% endblock %} - - -
{# end .feature-contents #} - +{% block sidebar %} + +{% endblock %} -
-
-
-
-
-
- {% block content %}content{% endblock %} -
-
-
-
-
-
-
{# end #c1c2 #} +{% block breadcrumbs %} + +{% endblock %} + +
+{% block content %} +

-
{# end #doc #} -
{# end #wrap #} +
+{% endblock %} + +
{% include 'layout/footer.html' %} \ No newline at end of file diff --git a/templates/layout/header.html b/templates/layout/header.html index d64a354e91d..6bec39b504d 100644 --- a/templates/layout/header.html +++ b/templates/layout/header.html @@ -7,6 +7,7 @@ + From 3460525893ab82c9eea1d281b1e7e105b97d2f6f Mon Sep 17 00:00:00 2001 From: Paul Craciunoiu Date: Fri, 19 Feb 2010 17:23:44 -0800 Subject: [PATCH 07/11] Search page styling: pager, search box --- media/css/main.css | 48 +++++++++++ media/css/search.css | 69 ++++++++++++++++ media/img/botbar.png | Bin 0 -> 793 bytes media/img/topbar.png | Bin 0 -> 470 bytes templates/layout/base.html | 148 +++++++++++++++++++++++++++++++++- templates/layout/footer.html | 89 -------------------- templates/layout/header.html | 52 ------------ templates/search/results.html | 64 ++++++++++----- 8 files changed, 308 insertions(+), 162 deletions(-) create mode 100644 media/css/search.css create mode 100755 media/img/botbar.png create mode 100755 media/img/topbar.png delete mode 100644 templates/layout/footer.html delete mode 100644 templates/layout/header.html diff --git a/media/css/main.css b/media/css/main.css index 724f9a92cc6..46121ba9985 100644 --- a/media/css/main.css +++ b/media/css/main.css @@ -686,6 +686,11 @@ body.html-rtl { clear: both; } +a { + color: #0489B7; + text-decoration: none; +} + /*---------------------------------- Header ----------------------------------*/ @@ -970,5 +975,48 @@ body.html-rtl { width: 920px; margin: auto; text-align: left; + font-size: 12px; +} + +#content-inner { + width: 680px; + padding: 0 20px; +} + +.topbar { + background: url(../img/topbar.png) no-repeat top left; + height: 20px; + width: 723px; + margin-top: 30px; +} + +.botbar { + background: url(../img/botbar.png) no-repeat top left; + height: 20px; + width: 723px; } +/* orange buttons */ +.btn-small, .btn-large { + border: 0; + cursor: pointer; + background: #e26000; + text-transform: uppercase; + text-shadow: #b85f06 -1px 1px 1px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + color: #fff; +} +.btn-small { + font: bold 11px Verdana, sans-serif; + padding: 2px 5px; +} +.btn-large { + font: bold 12px Verdana, sans-serif; + padding: 5px; +} +.btn-small:hover, .btn-large:hover { + background: #ff9900; + text-decoration: none; +} +/* end orange buttons */ \ No newline at end of file diff --git a/media/css/search.css b/media/css/search.css new file mode 100644 index 00000000000..121c3cc6341 --- /dev/null +++ b/media/css/search.css @@ -0,0 +1,69 @@ +.search-query { + border: 1px solid #E16601; + width: 270px; + margin-right: 5px; +} +.btn-large { + text-transform: none; +} + +.pager { + padding: 10px 20px; + text-align: center; +} + +.pager li { + float: left; +} + +.pager a, .pager span { + padding: 0 4px; +} + +div.search-count { + font-size: 14px; + padding: 0.2em 0 0.3em; +} + +/* Bug 525944 - Using pspell for spelling suggestions */ +div.search-suggestion { + color: #cc4047; + font-size: 120%; + padding: .3em 0; +} + +span.corrected { + font-weight: bold; +} +/* END Bug 525944 */ + +/* Bug 527859 - Add search form to top and bottom of results */ +div.search-refine { + margin: .5em 0; +} + +input.search-refine-query { + padding: 4px 2px 2px; +} + +input.search-refine-submit { + text-transform: none; + padding: 2px 4px; +} +input.search-refine-submit:hover { + background-color: #f90; +} +/* END Bug 527859 */ +/* Bug 501880 -- advanced search */ +.show-search-tabs { + padding: 0.5em; + display: inline-block; +} +input.search-empty-query { + padding: 5px; +} +input.search-empty-submit { + -moz-border-radius: 8px; + padding: 5px 10px; +} +/* END Bug 501880 */ diff --git a/media/img/botbar.png b/media/img/botbar.png new file mode 100755 index 0000000000000000000000000000000000000000..7f40e48ad0b3f96d8037bc735bf4997c15ab9f8e GIT binary patch literal 793 zcmV+!1LpjRP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00084NklWvi6ae5y6lL8FRBS7?2j~g78Rll3pa*ExO*cre>9#Anv6YEq8~;EuINv8l7=z7t zY(JidnK*(saXKE(52xedtSa8dqN;UOF1G7p!glpy&rBBDh`9W1MH=3DvFGcP7CYj!Mysy)8 zwU$x?ieCXZ`A_OCw}!* zELZDYnhBTd*`?1f&97c7KY#n8>0|5;n{tw+%Qk&kObOsqPyTz?6)5`#@oNW?TkMOR z_V1Lk+k<@n}Y4WeB2ByUeWah3qXd=AEGosrU5#l zp=}y~EEEwDM!5iF?9~rU0KC5{Hp`>|GA2j^Wb83bt(*D*rfGLwSAXPm*`ezh+b_EB zbkp)_`L5W>JsVARJETs!=5_7+A^WH67@0eRTJE#1YwIe~fhv~O XjFpuVcD6XM00000NkvXXu0mjf{dR5} literal 0 HcmV?d00001 diff --git a/media/img/topbar.png b/media/img/topbar.png new file mode 100755 index 0000000000000000000000000000000000000000..bda1ce6dd75ccfd022f7924ce69f8ff2f89259a3 GIT binary patch literal 470 zcmV;{0V)28P)h0|6?Ca?4 z>*?$2=gWIe|JVSiWB>pF40KXXQ~&?}|NsC0|NsC0021HM&Hw-bFiAu~ zRCwC#n%NeDFbqVaxHA9$ziNRJK(=F1zhz~;$w3xoqJTHc`e))P>D z6uYe=eY`(4v==XZqb*C7UQAGaXmyiOUxu1FW|G8{4N+dT#n$;gEs5;fBPutkr$Qsg zC+3hpaQ<q9*t!Zc~Cz=kb^z)~;+v?iDl*$;qY!S&Ks?R$#qqv&|h{#ub3nTvB#c zmT1k2_Li*euGO^DDlKs*rU)E%vCfFLJMd;ap$#20pla?FnpV4B2RGT6XEWU~bGrP4 zaQ;M1& literal 0 HcmV?d00001 diff --git a/templates/layout/base.html b/templates/layout/base.html index 948e3cdd6ac..fca673402d8 100644 --- a/templates/layout/base.html +++ b/templates/layout/base.html @@ -1,4 +1,58 @@ -{% include 'layout/header.html' %} + + + +{{ title }}{% print _(" | Firefox Support") %} + + + + + + +{% for script in scripts %} + +{% endfor %} + + + + + + + +
+ +
{% block sidebar %}
-{% include 'layout/footer.html' %} \ No newline at end of file +
+ + + + + + \ No newline at end of file diff --git a/templates/layout/footer.html b/templates/layout/footer.html deleted file mode 100644 index c9dad7df778..00000000000 --- a/templates/layout/footer.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/templates/layout/header.html b/templates/layout/header.html deleted file mode 100644 index 6bec39b504d..00000000000 --- a/templates/layout/header.html +++ /dev/null @@ -1,52 +0,0 @@ - - - -{% block title %}{% endblock %}{% print _("| Firefox Support") %} - - - - - - - - - - - - - -
- -
diff --git a/templates/search/results.html b/templates/search/results.html index de77a4125a3..b363abcb09e 100644 --- a/templates/search/results.html +++ b/templates/search/results.html @@ -1,29 +1,40 @@ {% extends "layout/base.html" %} - -{% block title %} -Search Firefox Support -{% endblock %} +{% set title = _("Search") %} +{% set scripts = ('css/search.css',) %} {% block content %} -
+
+ +
-
- About {{ num_results }} search results - for {{ q }} - in English +
+ {% print _("About {num_results} search results for {q} in {lang_name}")|f(num_results=num_results, q=q, lang_name='English') %}
-
-
- 1 2 3 4 5 6 7 8 9 10 11 ... Next › Last » +
+
+ 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + ... + Next › + Last »
@@ -40,10 +51,27 @@
{% endfor %} -
- 1 2 3 4 5 6 7 8 9 10 11 ... Next › Last » + +
+ 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + ... + Next › + Last »
+

Can't find what you're looking for? Ask a support question instead!

-
+
+
+
{% endblock %} \ No newline at end of file From 7de57d5c26de700331760a1ad64d417524cb7b57 Mon Sep 17 00:00:00 2001 From: Paul Craciunoiu Date: Fri, 19 Feb 2010 19:08:00 -0800 Subject: [PATCH 08/11] Convert font sizes to %s --- media/css/main.css | 6 +++--- media/css/search.css | 2 +- media/css/sidebar.css | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media/css/main.css b/media/css/main.css index 46121ba9985..8d06f5de4ef 100644 --- a/media/css/main.css +++ b/media/css/main.css @@ -942,13 +942,13 @@ a { display: inline; margin: 0; color: #4b4742; - font-size: 10px; + font-size: 83%; } #breadcrumbs ul li.divider { padding: 0 3px 0 0; color: #807970; - font-size: 11px; + font-size: 92%; } #breadcrumbs span, @@ -975,7 +975,7 @@ a { width: 920px; margin: auto; text-align: left; - font-size: 12px; + font-size: 92.31%; } #content-inner { diff --git a/media/css/search.css b/media/css/search.css index 121c3cc6341..bb9b07a6ce9 100644 --- a/media/css/search.css +++ b/media/css/search.css @@ -21,7 +21,7 @@ } div.search-count { - font-size: 14px; + font-size: 120%; padding: 0.2em 0 0.3em; } diff --git a/media/css/sidebar.css b/media/css/sidebar.css index 08e7e0fd9e4..3bf112479e7 100644 --- a/media/css/sidebar.css +++ b/media/css/sidebar.css @@ -8,7 +8,7 @@ margin: -3px 0 0 15px; list-style-type: none; font-family: verdana; - font-size: 0.8em; + font-size: 80%; } #side-menu li { @@ -20,7 +20,7 @@ #side-menu li.first { font-family: georgia, freeserif, serif; - font-size: 20px; + font-size: 205%; padding: 4px 5px 2px; background: none; } From a50b7c11768a3566a668ac777d538db9fa5efd37 Mon Sep 17 00:00:00 2001 From: Paul Craciunoiu Date: Wed, 24 Feb 2010 13:41:49 -0800 Subject: [PATCH 09/11] layout/base.html skeleton, localized and split into header, footer, sidebar --- templates/layout/base.html | 162 ++++------------------------------ templates/layout/footer.html | 77 ++++++++++++++++ templates/layout/header.html | 31 +++++++ templates/layout/sidebar.html | 16 ++++ templates/search/results.html | 2 +- 5 files changed, 144 insertions(+), 144 deletions(-) create mode 100644 templates/layout/footer.html create mode 100644 templates/layout/header.html create mode 100644 templates/layout/sidebar.html diff --git a/templates/layout/base.html b/templates/layout/base.html index fca673402d8..34df6bbaa94 100644 --- a/templates/layout/base.html +++ b/templates/layout/base.html @@ -1,84 +1,40 @@ - + -{{ title }}{% print _(" | Firefox Support") %} + +{{ title }} | {{ _('Firefox Support') }} - - + - - -{% for script in scripts %} - + + +{% for style in styles %} + {% endfor %} - -
+{% include 'layout/header.html' %}
-{% block sidebar %} -{% endblock %} - {% block breadcrumbs %} - + {% endblock %}
@@ -93,89 +49,9 @@

- - \ No newline at end of file diff --git a/templates/layout/footer.html b/templates/layout/footer.html new file mode 100644 index 00000000000..a93b0eb24df --- /dev/null +++ b/templates/layout/footer.html @@ -0,0 +1,77 @@ + + +
+

Except where otherwise noted, content on this site is licensed under the
Creative Commons Attribution Share-Alike License v3.0 or any later version.

+ + +

Mozilla is providing links to any applications as a courtesy, and makes no representations regarding the applications or any information related there to. Any questions, complaints or claims regarding the applications must be directed to the appropriate software vendor.

+ +

Powered by The Django Framework

+
diff --git a/templates/layout/header.html b/templates/layout/header.html new file mode 100644 index 00000000000..41b10a0aaed --- /dev/null +++ b/templates/layout/header.html @@ -0,0 +1,31 @@ + +
diff --git a/templates/layout/sidebar.html b/templates/layout/sidebar.html new file mode 100644 index 00000000000..57beeaf95cb --- /dev/null +++ b/templates/layout/sidebar.html @@ -0,0 +1,16 @@ +{% block sidebar %} + +{% endblock %} diff --git a/templates/search/results.html b/templates/search/results.html index b363abcb09e..508a2334416 100644 --- a/templates/search/results.html +++ b/templates/search/results.html @@ -1,6 +1,6 @@ {% extends "layout/base.html" %} {% set title = _("Search") %} -{% set scripts = ('css/search.css',) %} +{% set styles = ('css/search.css',) %} {% block content %}
From b2b5995ca15c822d3270a68f4989b338acb58090 Mon Sep 17 00:00:00 2001 From: Paul Craciunoiu Date: Wed, 24 Feb 2010 13:58:29 -0800 Subject: [PATCH 10/11] Localize, localize. And add js for YUI header menu. --- media/js/mozilla-menu.js | 48 +++++++++++++++++++ templates/layout/base.html | 1 + templates/layout/footer.html | 88 +++++++++++++++++------------------ templates/layout/header.html | 20 ++++---- templates/layout/sidebar.html | 18 +++---- 5 files changed, 112 insertions(+), 63 deletions(-) create mode 100755 media/js/mozilla-menu.js diff --git a/media/js/mozilla-menu.js b/media/js/mozilla-menu.js new file mode 100755 index 00000000000..30390f90298 --- /dev/null +++ b/media/js/mozilla-menu.js @@ -0,0 +1,48 @@ +/* +Copyright (c) 2008, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.5.1 (concatenated manually) +*/ +/*** DOM EVENT ***/ +if(typeof YAHOO=="undefined"||!YAHOO){var YAHOO={};}YAHOO.namespace=function(){var A=arguments,E=null,C,B,D;for(C=0;C0)?C.dump(A[D],G-1):J);}else{I.push(A[D]);}I.push(H);}if(I.length>1){I.pop();}I.push("]");}else{I.push("{");for(D in A){if(C.hasOwnProperty(A,D)){I.push(D+E);if(C.isObject(A[D])){I.push((G>0)?C.dump(A[D],G-1):J);}else{I.push(A[D]);}I.push(H);}}if(I.length>1){I.pop();}I.push("}");}return I.join("");},substitute:function(Q,B,J){var G,F,E,M,N,P,D=YAHOO.lang,L=[],C,H="dump",K=" ",A="{",O="}";for(;;){G=Q.lastIndexOf(A);if(G<0){break;}F=Q.indexOf(O,G);if(G+1>=F){break;}C=Q.substring(G+1,F);M=C;P=null;E=M.indexOf(K);if(E>-1){P=M.substring(E+1);M=M.substring(0,E);}N=B[M];if(J){N=J(M,N,P);}if(D.isObject(N)){if(D.isArray(N)){N=D.dump(N,parseInt(P,10));}else{P=P||"";var I=P.indexOf(H);if(I>-1){P=P.substring(4);}if(N.toString===Object.prototype.toString||I>-1){N=D.dump(N,parseInt(P,10));}else{N=N.toString();}}}else{if(!D.isString(N)&&!D.isNumber(N)){N="~-"+L.length+"-~";L[L.length]=C;}}Q=Q.substring(0,G)+N+Q.substring(F+1);}for(G=L.length-1;G>=0;G=G-1){Q=Q.replace(new RegExp("~-"+G+"-~"),"{"+L[G]+"}","g");}return Q;},trim:function(A){try{return A.replace(/^\s+|\s+$/g,"");}catch(B){return A;}},merge:function(){var D={},B=arguments;for(var C=0,A=B.length;C=this.left&&A.right<=this.right&&A.top>=this.top&&A.bottom<=this.bottom);};YAHOO.util.Region.prototype.getArea=function(){return((this.bottom-this.top)*(this.right-this.left));};YAHOO.util.Region.prototype.intersect=function(E){var C=Math.max(this.top,E.top);var D=Math.min(this.right,E.right);var A=Math.min(this.bottom,E.bottom);var B=Math.max(this.left,E.left);if(A>=C&&D>=B){return new YAHOO.util.Region(C,D,A,B);}else{return null;}};YAHOO.util.Region.prototype.union=function(E){var C=Math.min(this.top,E.top);var D=Math.max(this.right,E.right);var A=Math.max(this.bottom,E.bottom);var B=Math.min(this.left,E.left);return new YAHOO.util.Region(C,D,A,B);};YAHOO.util.Region.prototype.toString=function(){return("Region {"+"top: "+this.top+", right: "+this.right+", bottom: "+this.bottom+", left: "+this.left+"}");};YAHOO.util.Region.getRegion=function(D){var F=YAHOO.util.Dom.getXY(D);var C=F[1];var E=F[0]+D.offsetWidth;var A=F[1]+D.offsetHeight;var B=F[0];return new YAHOO.util.Region(C,E,A,B);};YAHOO.util.Point=function(A,B){if(YAHOO.lang.isArray(A)){B=A[1];A=A[0];}this.x=this.right=this.left=this[0]=A;this.y=this.top=this.bottom=this[1]=B;};YAHOO.util.Point.prototype=new YAHOO.util.Region();YAHOO.register("dom",YAHOO.util.Dom,{version:"2.5.1",build:"984"});YAHOO.util.CustomEvent=function(D,B,C,A){this.type=D;this.scope=B||window;this.silent=C;this.signature=A||YAHOO.util.CustomEvent.LIST;this.subscribers=[];if(!this.silent){}var E="_YUICEOnSubscribe";if(D!==E){this.subscribeEvent=new YAHOO.util.CustomEvent(E,this,true);}this.lastError=null;};YAHOO.util.CustomEvent.LIST=0;YAHOO.util.CustomEvent.FLAT=1;YAHOO.util.CustomEvent.prototype={subscribe:function(B,C,A){if(!B){throw new Error("Invalid callback for subscriber to '"+this.type+"'");}if(this.subscribeEvent){this.subscribeEvent.fire(B,C,A);}this.subscribers.push(new YAHOO.util.Subscriber(B,C,A));},unsubscribe:function(D,F){if(!D){return this.unsubscribeAll();}var E=false;for(var B=0,A=this.subscribers.length;B0){A=H[0];}try{F=K.fn.call(J,A,K.obj);}catch(E){this.lastError=E;}}else{try{F=K.fn.call(J,this.type,H,K.obj);}catch(G){this.lastError=G;}}if(false===F){if(!this.silent){}return false;}}}return true;},unsubscribeAll:function(){for(var A=this.subscribers.length-1;A>-1;A--){this._delete(A);}this.subscribers=[];return A;},_delete:function(A){var B=this.subscribers[A];if(B){delete B.fn;delete B.obj;}this.subscribers.splice(A,1);},toString:function(){return"CustomEvent: "+"'"+this.type+"', "+"scope: "+this.scope;}};YAHOO.util.Subscriber=function(B,C,A){this.fn=B;this.obj=YAHOO.lang.isUndefined(C)?null:C;this.override=A;};YAHOO.util.Subscriber.prototype.getScope=function(A){if(this.override){if(this.override===true){return this.obj;}else{return this.override;}}return A;};YAHOO.util.Subscriber.prototype.contains=function(A,B){if(B){return(this.fn==A&&this.obj==B);}else{return(this.fn==A);}};YAHOO.util.Subscriber.prototype.toString=function(){return"Subscriber { obj: "+this.obj+", override: "+(this.override||"no")+" }";};if(!YAHOO.util.Event){YAHOO.util.Event=function(){var H=false;var I=[];var J=[];var G=[];var E=[];var C=0;var F=[];var B=[];var A=0;var D={63232:38,63233:40,63234:37,63235:39,63276:33,63277:34,25:9};return{POLL_RETRYS:2000,POLL_INTERVAL:20,EL:0,TYPE:1,FN:2,WFN:3,UNLOAD_OBJ:3,ADJ_SCOPE:4,OBJ:5,OVERRIDE:6,lastError:null,isSafari:YAHOO.env.ua.webkit,webkit:YAHOO.env.ua.webkit,isIE:YAHOO.env.ua.ie,_interval:null,_dri:null,DOMReady:false,startInterval:function(){if(!this._interval){var K=this;var L=function(){K._tryPreloadAttach();};this._interval=setInterval(L,this.POLL_INTERVAL);}},onAvailable:function(P,M,Q,O,N){var K=(YAHOO.lang.isString(P))?[P]:P;for(var L=0;L-1;O--){U=(this.removeListener(L[O],K,T)&&U);}return U;}}if(!T||!T.call){return this.purgeElement(L,false,K);}if("unload"==K){for(O=J.length-1;O>-1;O--){V=J[O];if(V&&V[0]==L&&V[1]==K&&V[2]==T){J.splice(O,1);return true;}}return false;}var P=null;var Q=arguments[3];if("undefined"===typeof Q){Q=this._getCacheIndex(L,K,T);}if(Q>=0){P=I[Q];}if(!L||!P){return false;}if(this.useLegacyEvent(L,K)){var N=this.getLegacyIndex(L,K);var M=E[N];if(M){for(O=0,R=M.length;O0&&F.length>0);}var P=[];var R=function(T,U){var S=T;if(U.override){if(U.override===true){S=U.obj;}else{S=U.override;}}U.fn.call(S,U.obj);};var L,K,O,N,M=[];for(L=0,K=F.length;L-1;L--){O=F[L];if(!O||!O.id){F.splice(L,1);}}this.startInterval();}else{clearInterval(this._interval);this._interval=null;}this.locked=false;},purgeElement:function(O,P,R){var M=(YAHOO.lang.isString(O))?this.getEl(O):O;var Q=this.getListeners(M,R),N,K;if(Q){for(N=Q.length-1;N>-1;N--){var L=Q[N];this.removeListener(M,L.type,L.fn);}}if(P&&M&&M.childNodes){for(N=0,K=M.childNodes.length;N-1;M--){L=I[M];if(L){K.removeListener(L[K.EL],L[K.TYPE],L[K.FN],M);}}L=null;}G=null;K._simpleRemove(window,"unload",K._unload);},_getScrollLeft:function(){return this._getScroll()[1];},_getScrollTop:function(){return this._getScroll()[0];},_getScroll:function(){var K=document.documentElement,L=document.body;if(K&&(K.scrollTop||K.scrollLeft)){return[K.scrollTop,K.scrollLeft];}else{if(L){return[L.scrollTop,L.scrollLeft];}else{return[0,0];}}},regCE:function(){},_simpleAdd:function(){if(window.addEventListener){return function(M,N,L,K){M.addEventListener(N,L,(K));};}else{if(window.attachEvent){return function(M,N,L,K){M.attachEvent("on"+N,L);};}else{return function(){};}}}(),_simpleRemove:function(){if(window.removeEventListener){return function(M,N,L,K){M.removeEventListener(N,L,(K));};}else{if(window.detachEvent){return function(L,M,K){L.detachEvent("on"+M,K);};}else{return function(){};}}}()};}();(function(){var EU=YAHOO.util.Event;EU.on=EU.addListener; +/* DOMReady: based on work by: Dean Edwards/John Resig/Matthias Miller */ +if(EU.isIE){YAHOO.util.Event.onDOMReady(YAHOO.util.Event._tryPreloadAttach,YAHOO.util.Event,true);var n=document.createElement("p");EU._dri=setInterval(function(){try{n.doScroll("left");clearInterval(EU._dri);EU._dri=null;EU._ready();n=null;}catch(ex){}},EU.POLL_INTERVAL);}else{if(EU.webkit&&EU.webkit<525){EU._dri=setInterval(function(){var rs=document.readyState;if("loaded"==rs||"complete"==rs){clearInterval(EU._dri);EU._dri=null;EU._ready();}},EU.POLL_INTERVAL);}else{EU._simpleAdd(document,"DOMContentLoaded",EU._ready);}}EU._simpleAdd(window,"load",EU._load);EU._simpleAdd(window,"unload",EU._unload);EU._tryPreloadAttach();})();}YAHOO.util.EventProvider=function(){};YAHOO.util.EventProvider.prototype={__yui_events:null,__yui_subscribers:null,subscribe:function(A,C,F,E){this.__yui_events=this.__yui_events||{};var D=this.__yui_events[A];if(D){D.subscribe(C,F,E);}else{this.__yui_subscribers=this.__yui_subscribers||{};var B=this.__yui_subscribers;if(!B[A]){B[A]=[];}B[A].push({fn:C,obj:F,override:E});}},unsubscribe:function(C,E,G){this.__yui_events=this.__yui_events||{};var A=this.__yui_events;if(C){var F=A[C];if(F){return F.unsubscribe(E,G);}}else{var B=true;for(var D in A){if(YAHOO.lang.hasOwnProperty(A,D)){B=B&&A[D].unsubscribe(E,G);}}return B;}return false;},unsubscribeAll:function(A){return this.unsubscribe(A);},createEvent:function(G,D){this.__yui_events=this.__yui_events||{};var A=D||{};var I=this.__yui_events;if(I[G]){}else{var H=A.scope||this;var E=(A.silent);var B=new YAHOO.util.CustomEvent(G,H,E,YAHOO.util.CustomEvent.FLAT); +I[G]=B;if(A.onSubscribeCallback){B.subscribeEvent.subscribe(A.onSubscribeCallback);}this.__yui_subscribers=this.__yui_subscribers||{};var F=this.__yui_subscribers[G];if(F){for(var C=0;C0){G=F-1;do{D=E.subscribers[G];if(D&&D.obj==I&&D.fn==H){return true;}}while(G--);}return false;};YAHOO.lang.augmentProto(A,YAHOO.util.EventProvider);}());(function(){YAHOO.widget.Module=function(Q,P){if(Q){this.init(Q,P);}else{}};var F=YAHOO.util.Dom,D=YAHOO.util.Config,M=YAHOO.util.Event,L=YAHOO.util.CustomEvent,G=YAHOO.widget.Module,H,O,N,E,A={"BEFORE_INIT":"beforeInit","INIT":"init","APPEND":"append","BEFORE_RENDER":"beforeRender","RENDER":"render","CHANGE_HEADER":"changeHeader","CHANGE_BODY":"changeBody","CHANGE_FOOTER":"changeFooter","CHANGE_CONTENT":"changeContent","DESTORY":"destroy","BEFORE_SHOW":"beforeShow","SHOW":"show","BEFORE_HIDE":"beforeHide","HIDE":"hide"},I={"VISIBLE":{key:"visible",value:true,validator:YAHOO.lang.isBoolean},"EFFECT":{key:"effect",suppressEvent:true,supercedes:["visible"]},"MONITOR_RESIZE":{key:"monitorresize",value:true},"APPEND_TO_DOCUMENT_BODY":{key:"appendtodocumentbody",value:false}};G.IMG_ROOT=null;G.IMG_ROOT_SSL=null;G.CSS_MODULE="yui-module";G.CSS_HEADER="hd";G.CSS_BODY="bd";G.CSS_FOOTER="ft";G.RESIZE_MONITOR_SECURE_URL="javascript:false;";G.textResizeEvent=new L("textResize");function K(){if(!H){H=document.createElement("div");H.innerHTML=('
'+'
');O=H.firstChild;N=O.nextSibling;E=N.nextSibling;}return H;}function J(){if(!O){K();}return(O.cloneNode(false));}function B(){if(!N){K();}return(N.cloneNode(false));}function C(){if(!E){K();}return(E.cloneNode(false));}G.prototype={constructor:G,element:null,header:null,body:null,footer:null,id:null,imageRoot:G.IMG_ROOT,initEvents:function(){var P=L.LIST;this.beforeInitEvent=this.createEvent(A.BEFORE_INIT);this.beforeInitEvent.signature=P;this.initEvent=this.createEvent(A.INIT);this.initEvent.signature=P;this.appendEvent=this.createEvent(A.APPEND); +this.appendEvent.signature=P;this.beforeRenderEvent=this.createEvent(A.BEFORE_RENDER);this.beforeRenderEvent.signature=P;this.renderEvent=this.createEvent(A.RENDER);this.renderEvent.signature=P;this.changeHeaderEvent=this.createEvent(A.CHANGE_HEADER);this.changeHeaderEvent.signature=P;this.changeBodyEvent=this.createEvent(A.CHANGE_BODY);this.changeBodyEvent.signature=P;this.changeFooterEvent=this.createEvent(A.CHANGE_FOOTER);this.changeFooterEvent.signature=P;this.changeContentEvent=this.createEvent(A.CHANGE_CONTENT);this.changeContentEvent.signature=P;this.destroyEvent=this.createEvent(A.DESTORY);this.destroyEvent.signature=P;this.beforeShowEvent=this.createEvent(A.BEFORE_SHOW);this.beforeShowEvent.signature=P;this.showEvent=this.createEvent(A.SHOW);this.showEvent.signature=P;this.beforeHideEvent=this.createEvent(A.BEFORE_HIDE);this.beforeHideEvent.signature=P;this.hideEvent=this.createEvent(A.HIDE);this.hideEvent.signature=P;},platform:function(){var P=navigator.userAgent.toLowerCase();if(P.indexOf("windows")!=-1||P.indexOf("win32")!=-1){return"windows";}else{if(P.indexOf("macintosh")!=-1){return"mac";}else{return false;}}}(),browser:function(){var P=navigator.userAgent.toLowerCase();if(P.indexOf("opera")!=-1){return"opera";}else{if(P.indexOf("msie 7")!=-1){return"ie7";}else{if(P.indexOf("msie")!=-1){return"ie";}else{if(P.indexOf("safari")!=-1){return"safari";}else{if(P.indexOf("gecko")!=-1){return"gecko";}else{return false;}}}}}}(),isSecure:function(){if(window.location.href.toLowerCase().indexOf("https")===0){return true;}else{return false;}}(),initDefaultConfig:function(){this.cfg.addProperty(I.VISIBLE.key,{handler:this.configVisible,value:I.VISIBLE.value,validator:I.VISIBLE.validator});this.cfg.addProperty(I.EFFECT.key,{suppressEvent:I.EFFECT.suppressEvent,supercedes:I.EFFECT.supercedes});this.cfg.addProperty(I.MONITOR_RESIZE.key,{handler:this.configMonitorResize,value:I.MONITOR_RESIZE.value});this.cfg.addProperty(I.APPEND_TO_DOCUMENT_BODY.key,{value:I.APPEND_TO_DOCUMENT_BODY.value});},init:function(U,T){var R,V;this.initEvents();this.beforeInitEvent.fire(G);this.cfg=new D(this);if(this.isSecure){this.imageRoot=G.IMG_ROOT_SSL;}if(typeof U=="string"){R=U;U=document.getElementById(U);if(!U){U=(K()).cloneNode(false);U.id=R;}}this.element=U;if(U.id){this.id=U.id;}V=this.element.firstChild;if(V){var Q=false,P=false,S=false;do{if(1==V.nodeType){if(!Q&&F.hasClass(V,G.CSS_HEADER)){this.header=V;Q=true;}else{if(!P&&F.hasClass(V,G.CSS_BODY)){this.body=V;P=true;}else{if(!S&&F.hasClass(V,G.CSS_FOOTER)){this.footer=V;S=true;}}}}}while((V=V.nextSibling));}this.initDefaultConfig();F.addClass(this.element,G.CSS_MODULE);if(T){this.cfg.applyConfig(T,true);}if(!D.alreadySubscribed(this.renderEvent,this.cfg.fireQueue,this.cfg)){this.renderEvent.subscribe(this.cfg.fireQueue,this.cfg,true);}this.initEvent.fire(G);},initResizeMonitor:function(){var Q=(YAHOO.env.ua.gecko&&this.platform=="windows");if(Q){var P=this;setTimeout(function(){P._initResizeMonitor();},0);}else{this._initResizeMonitor();}},_initResizeMonitor:function(){var P,R,T;function V(){G.textResizeEvent.fire();}if(!YAHOO.env.ua.opera){R=F.get("_yuiResizeMonitor");var U=this._supportsCWResize();if(!R){R=document.createElement("iframe");if(this.isSecure&&G.RESIZE_MONITOR_SECURE_URL&&YAHOO.env.ua.ie){R.src=G.RESIZE_MONITOR_SECURE_URL;}if(!U){T=[" \ No newline at end of file diff --git a/templates/layout/footer.html b/templates/layout/footer.html index a93b0eb24df..2cb27b32d2f 100644 --- a/templates/layout/footer.html +++ b/templates/layout/footer.html @@ -1,77 +1,77 @@
-

Except where otherwise noted, content on this site is licensed under the
Creative Commons Attribution Share-Alike License v3.0 or any later version.

+

{{ _('Except where otherwise ') }}{{ _('noted') }}, content on this site is licensed under the
Creative Commons Attribution Share-Alike License v3.0 or any later version.

Mozilla is providing links to any applications as a courtesy, and makes no representations regarding the applications or any information related there to. Any questions, complaints or claims regarding the applications must be directed to the appropriate software vendor.

-

Powered by The Django Framework

+

{{ _('Powered by ') }}{{ _('The Django Framework') }}

diff --git a/templates/layout/header.html b/templates/layout/header.html index 41b10a0aaed..36f3cc0fa5b 100644 --- a/templates/layout/header.html +++ b/templates/layout/header.html @@ -1,28 +1,28 @@