diff --git a/templates/mailman-django/base.html b/templates/mailman-django/base.html index 81e93e8..81db19c 100644 --- a/templates/mailman-django/base.html +++ b/templates/mailman-django/base.html @@ -18,15 +18,22 @@
-

{% block heading %} - {{list.list_name}} {{list.real_name}} +

+ {% block heading %} + {% if list %} + {{list.list_name}} {{list.real_name}} + {% else %} + on {{domain}} + {% endif %} {% endblock %}

{% block header%}{% endblock %} {% block actionButtonsList %}{% endblock %} {% block smallBoxLeft %}{% endblock %} {% block smallBoxRight %}{% endblock %}
diff --git a/templates/mailman-django/errors/generic.html b/templates/mailman-django/errors/generic.html index 2de5745..2b8d4ac 100644 --- a/templates/mailman-django/errors/generic.html +++ b/templates/mailman-django/errors/generic.html @@ -1,10 +1,14 @@ {% extends "mailman-django/base.html" %} {% load i18n %} -{% block content %} +{% block heading %} +ERROR +{% endblock %} -

{% trans "Error-Site" %}

-{% if error %}

{{ error }}

{% endif %} -{% if message %}

{{ message }}

{% endif %} - +{% block header %} +
+
{% trans "Error-Site" %}
+ {% if error %}

{{ error }}

{% endif %} + {% if message %}

{{ message }}

{% endif %} +
{% endblock %} diff --git a/templates/mailman-django/lists/new.html b/templates/mailman-django/lists/new.html index e8cc479..d3593a0 100644 --- a/templates/mailman-django/lists/new.html +++ b/templates/mailman-django/lists/new.html @@ -1,17 +1,14 @@ {% extends "mailman-django/base.html" %} {% load i18n %} -{% block content %} - -

{% trans "Create a new list" %}

- -

{% trans "Logout" %}

- -
- {{ form.as_div }} -
- +{% block header %} +
+
{% trans "Create a new list" %}
+ + {{ form.as_div }} +
+ +
+
- - {% endblock %} diff --git a/urls.py b/urls.py index 6e9e837..226418f 100644 --- a/urls.py +++ b/urls.py @@ -23,11 +23,11 @@ urlpatterns = patterns('mailman_django.views', (r'^$', 'list_index'), + url(r'^logout/$', 'logout', name = 'logout'), url(r'^administration/$', 'administration', name = 'administration'), url(r'^domains/$', 'domains', name = 'domains'), url(r'^lists/$', 'list_index', name = 'list_index'), url(r'^lists/new/$', 'list_new', name = 'list_new'), - url(r'^lists/logout/$', 'logout', name = 'logout'), url(r'^lists/(?P[^/]+)/$', 'list_summary', name = 'list_summary'), #PUBLIC url(r'^subscriptions/(?P[^/]+)/(?:(?P