diff --git a/templates/mailman-django/base.html b/templates/mailman-django/base.html index 34afff3..81e93e8 100644 --- a/templates/mailman-django/base.html +++ b/templates/mailman-django/base.html @@ -18,7 +18,9 @@
-

{% block heading %}{% endblock %}

+

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

{% block header%}{% endblock %} {% block actionButtonsList %}{% endblock %} {% block smallBoxLeft %}{% endblock %} diff --git a/templates/mailman-django/domains.html b/templates/mailman-django/domains.html index 6f2cc4c..e2aae22 100644 --- a/templates/mailman-django/domains.html +++ b/templates/mailman-django/domains.html @@ -1,39 +1,41 @@ {% extends "mailman-django/base.html" %} {% load i18n %} -{% block content %} - -

{% trans "Add a new Domain" %}

-

{% trans "Logout" %}

- - - - - - - {% if domains %} - {% for domain in domains %} - - - - - - {% endfor %} - {% endif %} -
{% trans "Domain" %}{% trans "Contact Address" %}{% trans "Description" %}
{{ domain.base_url }}{{ domain.contact_address }} - {% if domain.description %} - {{ domain.description }} - {% endif %} -
- -
-
- - {{ form.as_div }} - -
- -
- -
+{% block heading %} + {% trans "Add a new Domain" %} {% endblock %} + +{% block header %} +
+
{% trans "About" %}
+

{% trans "Logout" %}

+ + + + + + + {% if domains %} + {% for domain in domains %} + + + + + + {% endfor %} + {% endif %} +
{% trans "Domain" %}{% trans "Contact Address" %}{% trans "Description" %}
{{ domain.base_url }}{{ domain.contact_address }} + {% if domain.description %} + {{ domain.description }} + {% endif %} +
+{% endblock %} +{% block actionButtonsList %} + TODO JS Form +
+ {{ form.as_div }} +
+ +
+
+{% endblock %} diff --git a/templates/mailman-django/lists/list_summary.html b/templates/mailman-django/lists/list_summary.html index 0930b6a..471e9ed 100644 --- a/templates/mailman-django/lists/list_summary.html +++ b/templates/mailman-django/lists/list_summary.html @@ -1,4 +1,4 @@ -{% extends "mailman-django/public/base.html" %} +{% extends "mailman-django/base.html" %} {% load i18n %} {% block heading %} @@ -14,10 +14,10 @@ {% block actionButtonsList %} {% endblock %} diff --git a/templates/mailman-django/lists/settings.html b/templates/mailman-django/lists/settings.html index f09d33b..a51d2b5 100644 --- a/templates/mailman-django/lists/settings.html +++ b/templates/mailman-django/lists/settings.html @@ -5,12 +5,12 @@ {{list.list_name}} {{list.real_name}} {% endblock %} -{% block header%} +{% block header %}
{% trans "List Settings for " %}{{ fqdn_listname }}

{% trans "This page visualizes all list settings. This gives an idea of what the settings page could look like." %}

-
+ {{ form.as_div }}
@@ -25,9 +25,9 @@
{% trans "Links" %}
{% endblock %} diff --git a/templates/mailman-django/lists/subscriptions.html b/templates/mailman-django/lists/subscriptions.html index 1c58e0f..469f538 100644 --- a/templates/mailman-django/lists/subscriptions.html +++ b/templates/mailman-django/lists/subscriptions.html @@ -9,7 +9,7 @@
{% trans "About" %}
{% if form_subscribe %} - + {{ form_subscribe.as_div }}
diff --git a/templates/mailman-django/public/base.html b/templates/mailman-django/public/base.html deleted file mode 100644 index 93efe69..0000000 --- a/templates/mailman-django/public/base.html +++ /dev/null @@ -1,36 +0,0 @@ - -{% load i18n %} - - - - - - - - - - - - - - - - -HALLO -
-

{% block heading %}{% endblock %}

- {% block header%}{% endblock %} - {% block actionButtonsList %}{% endblock %} - {% block smallBoxLeft %}{% endblock %} - {% block smallBoxRight %}{% endblock %} - -
- Regression:
- {% block content%}{% endblock %} - {% block menu%}{% endblock %} - - - - diff --git a/templates/mailman-django/public/list_summary.html b/templates/mailman-django/public/list_summary.html deleted file mode 100644 index e59734d..0000000 --- a/templates/mailman-django/public/list_summary.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "mailman-django/base.html" %} -{% load i18n %} - -{% block heading %} - {{list.list_name}} {{list.real_name}} -{% endblock %} - -{% block header %} -
-
About
- {{list.description}} -
-{% endblock %} - -{% block actionButtonsList %} - -{% endblock %} - -{% block smallBoxLeft %} -
-
{% trans "Contact" %}
- {% trans "Contact Owner" %} #TODO -
-{% endblock %} - -{% block smallBoxRight %} -
-
{% trans "Other Lists" %}
- {% trans "View overview of all URL TODO mailing lists" %} -
-{% endblock %} - -{% block footer %} - {% trans "Admin Interface" %} -{% endblock %} diff --git a/views.py b/views.py index 60b2452..c7e386a 100644 --- a/views.py +++ b/views.py @@ -81,6 +81,7 @@ def domains(request, template = 'mailman-django/domains.html'): message="" error="" + raise Exception("DOMAIN TODO")#todo if request.method == 'POST': form = DomainNew(request.POST) existing_domains = None @@ -106,7 +107,6 @@ return render_to_response('mailman-django/errors/generic.html', {'error': "REST API not found / Offline"},context_instance=RequestContext(request)) form = DomainNew() - return render_to_response(template, {'form': form, 'domains':existing_domains, 'message':message,