Commit 3373d4e3 authored by Florian Fuchs's avatar Florian Fuchs

* removed obsolete MAILMAN_THEME setting; provided by Richard Wackerbarth (LP: 1043258)

parents f958678d d527fd34
......@@ -17,13 +17,6 @@
# Postorius. If not, see <http://www.gnu.org/licenses/>.
import logging
from django.conf import settings
from django.utils.translation import gettext as _
from mailman.client import Client
from urllib2 import HTTPError
logger = logging.getLogger(__name__)
......@@ -36,5 +29,4 @@ def postorius(request):
else:
extend_template = "postorius/base.html"
return {'MAILMAN_THEME': settings.MAILMAN_THEME,
'extend_template': extend_template}
return {'extend_template': extend_template}
......@@ -34,6 +34,7 @@ along with Postorius. If not, see <http://www.gnu.org/licenses/>.
* added developer documentation
* added test helper utils
* all code now conform to PEP8
* themes: removed obsolete MAILMAN_THEME settings from templates, contexts, file structure; contributed by Richard Wackerbarth (LP: 1043258)
1.0 alpha 1 -- "Space Farm"
......
......@@ -8,12 +8,12 @@
<meta name="author" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}images/favicon.ico">
<link rel="apple-touch-icon" href="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}images/apple-touch-icon.png">
<link rel="shortcut icon" href="{{ STATIC_URL }}postorius/img/favicon.ico">
<link rel="apple-touch-icon" href="{{ STATIC_URL }}postorius/img/apple-touch-icon.png">
<link rel="stylesheet" href="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}/css/normalize.css">
<link rel="stylesheet" href="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}/css/bootstrap.css">
<link rel="stylesheet" href="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}/css/style.css">
<link rel="stylesheet" href="{{ STATIC_URL }}postorius/css/normalize.css">
<link rel="stylesheet" href="{{ STATIC_URL }}postorius/css/bootstrap.css">
<link rel="stylesheet" href="{{ STATIC_URL }}postorius/css/style.css">
</head>
<body class="{% block body_class %}{% endblock %}">
......@@ -31,7 +31,7 @@
{% endif %}
<li>{% if user.is_authenticated %}<a class="mm_logout" href="{% url user_logout %}">Logout</a>{% else %}<a class="mm_user" href="{% url user_login %}">Login</a>{% endif %}</li>
</ul>
<a href="{% url list_index %}" class="mm_logo"><img src="{{ STATIC_URL }}/postorius/default/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
<a href="{% url list_index %}" class="mm_logo"><img src="{{ STATIC_URL }}/postorius/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
{% if user.is_authenticated %}
<div class="mm_loginName">Logged in as: <a href="{% url user_profile %}">{{ user.username }}</a></div>
{% endif %}
......@@ -53,10 +53,10 @@
{% block footer %}{% endblock footer %}
</div>
<script src="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}/js/libs/jquery-1.7.1.min.js"></script>
<script src="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}/js/libs/bootstrap.js"></script>
<script src="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}/js/plugins.js"></script>
<script src="{{ STATIC_URL }}postorius/{{ MAILMAN_THEME }}/js/script.js"></script>
<script src="{{ STATIC_URL }}postorius/js/libs/jquery-1.7.1.min.js"></script>
<script src="{{ STATIC_URL }}postorius/js/libs/bootstrap.js"></script>
<script src="{{ STATIC_URL }}postorius/js/plugins.js"></script>
<script src="{{ STATIC_URL }}postorius/js/script.js"></script>
{% block additionaljs %}{% endblock %}
</body>
......@@ -29,7 +29,7 @@
<form method="post" action="{% url socialauth_complete "browserid" %}"> {% csrf_token %}
<input type="hidden" name="assertion" value="" />
<a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}postorius/default/img/sign_in_blue.png" alt="Login using BrowserID" /></a>
<a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}postorius/img/sign_in_blue.png" alt="Login using BrowserID" /></a>
</form>
{% endblock %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment