{% url list_index as url_list_index %} diff --git a/templates/mailman-django/menu/administration.html b/templates/mailman-django/menu/administration.html index f08b76c..28fbec7 100644 --- a/templates/mailman-django/menu/administration.html +++ b/templates/mailman-django/menu/administration.html @@ -1,8 +1,8 @@ {% load i18n %} {% block menu_administration %} -
-
Administration
+
{% endblock%}
diff --git a/templates/mailman-django/menu/general.html b/templates/mailman-django/menu/general.html
index 3674d4f..263b052 100644
--- a/templates/mailman-django/menu/general.html
+++ b/templates/mailman-django/menu/general.html
@@ -1,13 +1,14 @@
{% load i18n %}
-{% block menu_administration %}
-
- {% include "mailman-django/menu/administration.html" %} -
- {% include "mailman-django/menu/maintanance.html" %} -
- {% include "mailman-django/menu/general.html" %} -
- {% include "mailman-django/menu/info.html" %} -
- {% include "mailman-django/menu/subscriptions.html" %} +
- {% include "mailman-django/menu/administration.html" %} +
- {% include "mailman-django/menu/maintanance.html" %} +
- {% include "mailman-django/menu/general.html" %} +
- {% include "mailman-django/menu/info.html" %} +
- {% include "mailman-django/menu/subscriptions.html" %} +
- {% include "mailman-django/menu/user_options.html" %} {% comment %} {% if user in list.moderator %}{% endcomment %} ACL:TODO @@ -14,7 +15,6 @@ {% trans "Requests" %} Link:TODO - {% comment %}{% endif %}{% endcomment %} - + {% comment %}{% endif %}{% endcomment %}
-
{% trans "Archive" %} Link:TODO
@@ -12,7 +12,7 @@
{% trans "Auto Responder" %} Link:TODO
-
-
+
-
{% trans "Filter" %} Link:TODO
-
-
+
{% comment %} {% if user in list.admin %}{% endcomment %}
ACL:TODO
@@ -77,5 +77,5 @@
{% comment %}{% endif %}{% endcomment %}
-
-
- General
+{% block menu_general %}
+ {% trans "General" %}
+
+
+
{% endblock%}
diff --git a/templates/mailman-django/menu/index.html b/templates/mailman-django/menu/index.html
index fb6685f..f2c21a5 100644
--- a/templates/mailman-django/menu/index.html
+++ b/templates/mailman-django/menu/index.html
@@ -1,11 +1,12 @@
{% load i18n %}
{% with "new_list" as selected %}
-
-
-
+ {% trans "Info" %}
+
+
{% endblock%}
diff --git a/templates/mailman-django/menu/maintanance.html b/templates/mailman-django/menu/maintanance.html
index 6ac19f3..56d9d48 100644
--- a/templates/mailman-django/menu/maintanance.html
+++ b/templates/mailman-django/menu/maintanance.html
@@ -1,8 +1,8 @@
{% load i18n %}
{% block menu_maintanance %}
- -
- Maintanance
+ {% trans "Maintanance" %}
+
-
+ {% trans "Subscriptions" %}
+
+
{% endblock%}
diff --git a/templates/mailman-django/menu/user_options.html b/templates/mailman-django/menu/user_options.html
index e69de29..07550da 100644
--- a/templates/mailman-django/menu/user_options.html
+++ b/templates/mailman-django/menu/user_options.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+
+{% block menu_user_options %}
+ {% trans "User Options" %}
+
+{% endblock %}