mozilla
/
addons-server
зеркало из https://github.com/mozilla/addons-server.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Remove django-moz-header entirely 

We were not using it for much anymore, only a couple css rules and
a few lines in templates.
This commit is contained in:
Mathieu Pillard 2016-06-23 16:15:36 +02:00
Родитель 9f94d37f1e
Коммит 0f88216c78
9 изменённых файлов: 64 добавлений и 82 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
requirements/prod_without_hash.txt
Просмотреть файл

@ -1,6 +1,5 @@
# Temporary fork.
-e git+https://github.com/yohanboniface/jingo-minify.git@amo.2014.09.03#egg=jingo_minify
-e git+https://github.com/mozilla/django-moz-header.git@djangoapp#egg=django-moz-header
## Forked.
-e git+https://github.com/EnTeQuAk/django-cache-machine@1cac98a3e1dcc3cb654665cc67b6b15ab60d62c4#egg=django-cache-machine

8
src/olympia/lib/settings_base.py
Просмотреть файл

@ -410,7 +410,6 @@ INSTALLED_APPS = (
# Third party apps
'product_details',
'moz_header',
'cronjobs',
'csp',
'aesfield',
@ -488,8 +487,6 @@ MINIFY_BUNDLES = {
'css/legacy/jquery-lightbox.css',
'css/legacy/autocomplete.css',
'css/zamboni/zamboni.css',
'moz_header/header.css',
'moz_header/footer.css',
'css/zamboni/tags.css',
'css/zamboni/tabs.css',
'css/impala/formset.less',
@ -505,8 +502,6 @@ MINIFY_BUNDLES = {
'css/legacy/jquery-lightbox.css',
'css/impala/site.less',
'css/impala/typography.less',
'moz_header/header.css',
'moz_header/footer.css',
'css/impala/forms.less',
'css/common/invisible-upload.less',
'css/impala/header.less',
@ -676,9 +671,6 @@ MINIFY_BUNDLES = {
# Users
'js/zamboni/users.js',
# Hover delay for global header
'moz_header/menu.js',
# Password length and strength
'js/zamboni/password-strength.js',

21
src/olympia/templates/amo_footer.html
Просмотреть файл

@ -1,21 +0,0 @@
{% extends "moz_header/footer.html" %}
{% block copyright %}
{% block lang_form %}
<form class="languages go" id="lang_form" method="get" action="">
<label for="language">{{ _('Other languages') }}</label>
<select id="language" name="lang" dir="ltr">
{% for code, name in LANGUAGES|dictsort -%}
<option value="{{ code }}" {{ code|ifeq(LANG|lower, "selected") }}>
{{ name }}
</option>
{%- endfor %}
</select>
{% for key, value in request.GET.items() %}
<input type="hidden" name="{{ key }}" value="{{ value }}">
{% endfor %}
<noscript><button type="submit">{{ _('Go') }}</button></noscript>
</form>
{% endblock %}
{% include 'copyright.html' %}
{% endblock %}

7
src/olympia/templates/amo_footer_small.html
Просмотреть файл

@ -1,7 +0,0 @@
<div id="footer" class="footer-condensed" role="contentinfo">
<div class="footer-wrap">
<div class="section">
{% include "copyright.html" %}
</div>
</div>
</div>

39
src/olympia/templates/copyright.html
Просмотреть файл

@ -1,8 +1,31 @@
{% extends 'moz_header/copyright.html' %}
{% block extra_footer_links %}
{% if not hide_mobile_link %}
&nbsp;|&nbsp;<a class="mobile-link" href="#">{{ _('View Mobile Site') }}</a>
{% endif %}
&nbsp;|&nbsp;<a href="https://status.mozilla.org/#addons.mozilla.org_service_history">{{ _('Site Status')}}</a>
{% endblock %}
<div id="copyright">
<p id="footer-links">
{% block footer_links %}
<a href="http://www.mozilla.org/privacy/websites/">
{{ _('Privacy Policy') }}
</a> &nbsp;|&nbsp;
<a href="http://www.mozilla.org/about/legal.html">
{{ _('Legal Notices') }}
</a> &nbsp;|&nbsp;
<a href="http://www.mozilla.org/legal/fraud-report/index.html">
{{ _('Report Trademark Abuse') }}
</a>
{% block extra_footer_links %}
{% if not hide_mobile_link %}
&nbsp;|&nbsp;<a class="mobile-link" href="#">{{ _('View Mobile Site') }}</a>
{% endif %}
&nbsp;|&nbsp;<a href="https://status.mozilla.org/#addons.mozilla.org_service_history">{{ _('Site Status')}}</a>
{% endblock %}
{% endblock %}
</p>
<p>
{% trans %}
Except where otherwise
<a href="http://www.mozilla.org/about/legal.html#site">noted</a>,
content on this site is licensed under the <br />
<a href="http://creativecommons.org/licenses/by-sa/3.0/">
Creative Commons Attribution Share-Alike License v3.0
</a> or any later version.
{% endtrans %}
</p>
</div>

20
src/olympia/templates/footer.html
Просмотреть файл

@ -9,6 +9,24 @@
</ul>
</div>
<div id="footer-content">
{% include "amo_footer.html" %}
{% block copyright %}
{% block lang_form %}
<form class="languages go" id="lang_form" method="get" action="">
<label for="language">{{ _('Other languages') }}</label>
<select id="language" name="lang" dir="ltr">
{% for code, name in LANGUAGES|dictsort -%}
<option value="{{ code }}" {{ code|ifeq(LANG|lower, "selected") }}>
{{ name }}
</option>
{%- endfor %}
</select>
{% for key, value in request.GET.items() %}
<input type="hidden" name="{{ key }}" value="{{ value }}">
{% endfor %}
<noscript><button type="submit">{{ _('Go') }}</button></noscript>
</form>
{% endblock %}
{% include "copyright.html" %}
{% endblock %}
</div>

35
src/olympia/templates/menu_links.html
Просмотреть файл

@ -1,35 +0,0 @@
{% extends "moz_header/menu_links.html" %}
{% block amo_links %}
<li class="current"><a href="https://addons.mozilla.org/">{{ _('Add-ons') }}</a>
<ul>
<li class="first"><a href="https://addons.mozilla.org/firefox/">{{ _('Firefox Add-ons') }}</a></li>
<li><a href="https://addons.mozilla.org/firefox/featured/">{{ _('Featured Add-ons') }}</a></li>
<li><a href="https://addons.mozilla.org/firefox/extensions/">{{ _('Extensions') }}</a></li>
<li><a href="https://addons.mozilla.org/firefox/themes/">{{ _('Themes') }}</a></li>
<li><a href="https://addons.mozilla.org/firefox/search-tools/">{{ _('Search Tools') }}</a></li>
<li><a href="https://addons.mozilla.org/firefox/language-tools/">{{ _('Language Support') }}</a></li>
<li><a href="https://addons.mozilla.org/firefox/collections/">{{ _('Collections') }}</a></li>
<li><a href="https://addons.mozilla.org/android/">{{ _('Mobile Add-ons') }}</a></li>
<li class="last"><a href="https://addons.mozilla.org/developers/">{{ _('Developer Hub') }}</a></li>
</ul>
</li>
{% endblock %}
{% block about_links %}
<li class="last"><a href="http://www.mozilla.org/about/">{{ _('About') }}</a>
<ul>
<li class="first"><a href="http://www.mozilla.org/about/">{{ _('About Firefox') }}</a></li>
<li><a href="http://www.mozilla.org/join">{{ _('Join Mozilla') }}</a></li>
<li><a href="http://www.mozilla.org/about/participate/">{{ _('Participate') }}</a></li>
<li><a href="https://github.com/mozilla/zamboni">{{ _('Contribute') }}</a></li>
<li><a href="http://www.mozilla.org/press/">{{ _('Press Center') }}</a></li>
<li><a href="http://www.mozilla.org/en-US/firefox/brand/">{{ _('Brand Toolkit') }}</a></li>
<li><a href="http://www.mozilla.org/careers">{{ _('Careers') }}</a></li>
<li><a href="http://www.mozilla.org/about/partnerships.html">{{ _('Partnerships') }}</a></li>
<li><a href="http://www.mozilla.org/legal/">{{ _('Legal') }}</a></li>
<li><a href="http://www.mozilla.org/about/contact.html">{{ _('Contact Us') }}</a></li>
<li class="last"><a href="http://blog.mozilla.com/">{{ _('Blog') }}</a></li>
</ul>
</li>
{% endblock %}

1
static/css/moz_header/footer.css Normal file
Просмотреть файл

@ -0,0 +1 @@

14
static/css/restyle/restyle.less
Просмотреть файл

@ -1112,15 +1112,27 @@ body:not(.developer-hub) section.secondary {
}
#footer #lang_form {
margin-top: 12px;
margin: 12px 0 15px 27px;
label {
color: @link-on-white-bg;
display: block;
font-family: @primary-font;
font-size: 14px;
margin: 10px 0 4px;
text-transform: none;
}
}
.html-rtl #footer #lang_form {
margin: 12px 27px 15px 0;
}
#footer #copyright p {
font-size: 85%;
margin-bottom: 0.5em;
}
// Add-on Details Page
#breadcrumbs {
display: none;