diff --git a/templates/mailman-django/base.html b/templates/mailman-django/base.html index ce29835..34afff3 100644 --- a/templates/mailman-django/base.html +++ b/templates/mailman-django/base.html @@ -1,61 +1,33 @@ - + {% load i18n %} - - - - - - - - - - Mailman + + + + + - - - - - - - - - - - - - - + + + + + + + + - -
{% include "mailman-django/list_selector.html" %}
-
- - -
- {% include "mailman-django/menu/index.html" %} +
+

{% block heading %}{% endblock %}

+ {% block header%}{% endblock %} + {% block actionButtonsList %}{% endblock %} + {% block smallBoxLeft %}{% endblock %} + {% block smallBoxRight %}{% endblock %} + - {% if message %} -

{{ message }}

- {% endif %} - {% if error %} -

{{ error }}

- {% endif %} -
- {% block content %}{% endblock %} -
- REGRESSION: - {% block links %}{% endblock %} - - - - - - - + + + - diff --git a/templates/mailman-django/base.html.old b/templates/mailman-django/base.html.old new file mode 100644 index 0000000..ce29835 --- /dev/null +++ b/templates/mailman-django/base.html.old @@ -0,0 +1,61 @@ + +{% load i18n %} + + + + + + + + + + Mailman + + + + + + + + + + + + + + + + + + + +
{% include "mailman-django/list_selector.html" %}
+
+ + +
+ {% include "mailman-django/menu/index.html" %} +
+ {% if message %} +

{{ message }}

+ {% endif %} + {% if error %} +

{{ error }}

+ {% endif %} +
+ {% block content %}{% endblock %} +
+
+ REGRESSION: + {% block links %}{% endblock %} + + + + + + + + + diff --git a/templates/mailman-django/lists/list_summary.html b/templates/mailman-django/lists/list_summary.html new file mode 100644 index 0000000..c91f4e4 --- /dev/null +++ b/templates/mailman-django/lists/list_summary.html @@ -0,0 +1,40 @@ +{% extends "mailman-django/public/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/templates/mailman-django/public/base.html b/templates/mailman-django/public/base.html index 78c17d5..6202bde 100644 --- a/templates/mailman-django/public/base.html +++ b/templates/mailman-django/public/base.html @@ -19,22 +19,17 @@

{% block heading %}{% endblock %}

-
- {% block header%}{% endblock %} -
-
    - {% block actionButtonsList %}{% endblock %} -
-
- {% block smallBoxLeft %}{% endblock %} -
-
- {% block smallBoxRight %}{% 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 index ed32fef..e59734d 100644 --- a/templates/mailman-django/public/list_summary.html +++ b/templates/mailman-django/public/list_summary.html @@ -1,4 +1,4 @@ -{% extends "mailman-django/public/base.html" %} +{% extends "mailman-django/base.html" %} {% load i18n %} {% block heading %} @@ -6,25 +6,33 @@ {% endblock %} {% block header %} -
About
- {{list.description}} +
+
About
+ {{list.description}} +
{% endblock %} {% block actionButtonsList %} -
  • {% trans "Subscribe" %}
    • -
  • {% trans "View Archives" %}
    • -
  • {% trans "Edit Options" %}
    • -
  • {% trans "Unsubscribe" %}
    • + {% endblock %} {% block smallBoxLeft %} -
    {% trans "Contact" %}
    - {% trans "Contact Owner" %} #TODO +
    +
    {% trans "Contact" %}
    + {% trans "Contact Owner" %} #TODO +
    {% endblock %} {% block smallBoxRight %} -
    {% trans "Other Lists" %}
    - {% trans "View overview of all URL TODO mailing lists" %} +
    +
    {% trans "Other Lists" %}
    + {% trans "View overview of all URL TODO mailing lists" %} +
    {% endblock %} {% block footer %} diff --git a/views.py b/views.py index 5bdb0b8..910ef1e 100644 --- a/views.py +++ b/views.py @@ -211,7 +211,7 @@ except AttributeError, e: return render_to_response('mailman-django/errors/generic.html', {'error': "REST API not found / Offline"},context_instance=RequestContext(request)) - return render_to_response('mailman-django/public/list_summary.html', + return render_to_response('mailman-django/lists/list_summary.html', {'fqdn_listname':fqdn_listname, 'list':current_list, 'message': None,