{% url list_index as url_list_index %} diff --git a/templates/mailman-django/domains.html b/templates/mailman-django/domains.html new file mode 100644 index 0000000..36dd3bc --- /dev/null +++ b/templates/mailman-django/domains.html @@ -0,0 +1,40 @@ +{% extends "mailman-django/base.html" %} +{% load i18n %} + +{% block content %} + +
{% trans "Add a new Domain" %}
+ + +| {% trans "Domain" %} | +{% trans "Contact Address" %} | +{% trans "Description" %} | +
|---|---|---|
| {{ domain.base_url }} | +{{ domain.contact_address }} | ++ {% if domain.description %} + {{ domain.description }} + {% endif %} + | +
+ +{% endblock %} diff --git a/templates/mailman-django/menu/administration.html b/templates/mailman-django/menu/administration.html new file mode 100644 index 0000000..bee4bb5 --- /dev/null +++ b/templates/mailman-django/menu/administration.html @@ -0,0 +1,26 @@ +{% load i18n %} +{% block menu_administration %} + +{% endblock%} diff --git a/templates/mailman-django/menu/general.html b/templates/mailman-django/menu/general.html new file mode 100644 index 0000000..323edda --- /dev/null +++ b/templates/mailman-django/menu/general.html @@ -0,0 +1,5 @@ +{% with "new_list" as selected %} + +{% include "mailman-django/menu/administration.html" %} + +{% endwith %} diff --git a/templates/mailman-django/menu/info.html b/templates/mailman-django/menu/info.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/templates/mailman-django/menu/info.html diff --git a/templates/mailman-django/menu/maintanance.html b/templates/mailman-django/menu/maintanance.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/templates/mailman-django/menu/maintanance.html diff --git a/templates/mailman-django/menu/subsciptions.html b/templates/mailman-django/menu/subsciptions.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/templates/mailman-django/menu/subsciptions.html diff --git a/templates/mailman-django/menu/user_options.html b/templates/mailman-django/menu/user_options.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/templates/mailman-django/menu/user_options.html diff --git a/templates/mailman-django/new_domain.html b/templates/mailman-django/new_domain.html deleted file mode 100644 index 980f0e4..0000000 --- a/templates/mailman-django/new_domain.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "mailman-django/base.html" %} -{% load i18n %} - -{% block content %} - -
{% trans "Add a new Domain" %}
- - -| {% trans "Domain" %} | -{% trans "Contact Address" %} | -{% trans "Description" %} | -
|---|---|---|
| {{ domain.base_url }} | -{{ domain.contact_address }} | -- {% if domain.description %} - {{ domain.description }} - {% endif %} - | -
- -{% endblock %} diff --git a/urls.py b/urls.py index 2c96a56..3a3f4ad 100644 --- a/urls.py +++ b/urls.py @@ -21,7 +21,7 @@ urlpatterns = patterns('mailman_django.views', (r'^$', 'list_index'), - url(r'^new_domain/', 'new_domain', name = 'new_domain'), + 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'), diff --git a/views.py b/views.py index f5c70bf..c980cb0 100644 --- a/views.py +++ b/views.py @@ -77,7 +77,7 @@ return _login_decorator @login_required -def new_domain(request, template = 'mailman-django/new_domain.html'): +def domains(request, template = 'mailman-django/domains.html'): if request.method == 'POST': form = DomainNew(request.POST) try: