diff --git a/src/mailmanweb/static/mailmanweb/default/css/style.css b/src/mailmanweb/static/mailmanweb/default/css/style.css index 801647d..fb53d9b 100755 --- a/src/mailmanweb/static/mailmanweb/default/css/style.css +++ b/src/mailmanweb/static/mailmanweb/default/css/style.css @@ -50,6 +50,7 @@ .mm_metaNav .mm_todos, .mm_metaNav .mm_settings, .mm_metaNav .mm_logout, +.mm_metaNav .mm_lists, .mm_metaNav .mm_user { background-color: transparent; background-image: url(../img/icons.png); @@ -60,13 +61,25 @@ .mm_settings { background-position: 0px -30px; } .mm_user { background-position: 0px -65px; } .mm_logout { background-position: 0px -240px; } +.mm_lists { background-position: 0px -311px; } .mm_todos:hover { background-position: 0px -100px; } .mm_settings:hover { background-position: 0px -135px; } .mm_user:hover { background-position: 0px -170px; } .mm_logout:hover { background-position: 0px -205px; } +.mm_lists:hover { background-position: 0px -276px; } +.mm_subHeader { + padding-top: 10px; +} +.mm_context { + display: block; + float: left; + padding-top: 9px; + font-size: 20px; + font-style: italic; +} .mm_nav { - padding: 20px 0 30px 0; + padding: 10px 0 30px 0; margin: 0; float: right; } diff --git a/src/mailmanweb/static/mailmanweb/default/img/icons.png b/src/mailmanweb/static/mailmanweb/default/img/icons.png index 9065265..844cee0 100644 --- a/src/mailmanweb/static/mailmanweb/default/img/icons.png +++ b/src/mailmanweb/static/mailmanweb/default/img/icons.png Binary files differ diff --git a/src/mailmanweb/templates/mailmanweb/base.html b/src/mailmanweb/templates/mailmanweb/base.html index 91f98b9..370c886 100644 --- a/src/mailmanweb/templates/mailmanweb/base.html +++ b/src/mailmanweb/templates/mailmanweb/base.html @@ -21,8 +21,11 @@
- +
    +
  • + Lists +
    • {% if user.is_authenticated %}
  • Todos diff --git a/src/mailmanweb/templates/mailmanweb/lists/settings/autorespond.html b/src/mailmanweb/templates/mailmanweb/lists/settings/autorespond.html new file mode 100644 index 0000000..5a72e87 --- /dev/null +++ b/src/mailmanweb/templates/mailmanweb/lists/settings/autorespond.html @@ -0,0 +1,5 @@ +{% extends "mailmanweb/base.html" %} +{% load i18n %} + +{% block main %} +{% endblock main %} diff --git a/src/mailmanweb/templates/mailmanweb/lists/settings/basic.html b/src/mailmanweb/templates/mailmanweb/lists/settings/basic.html new file mode 100644 index 0000000..0d310b8 --- /dev/null +++ b/src/mailmanweb/templates/mailmanweb/lists/settings/basic.html @@ -0,0 +1,26 @@ +{% extends "mailmanweb/base.html" %} +{% load i18n %} + +{% block main %} + {% include 'mailmanweb/menu/list_nav.html' %} +

    {{list.real_name}} - {{list.fqdn_listname}}

    + +
      + {% for section in form_sections %} +
    • {{section.0}}
      • + {% endfor %} +
    + + {% if visible_section %} +
    + {{ form.as_p }} + +
    + {% endif %} + +{% endblock main %} diff --git a/src/mailmanweb/templates/mailmanweb/lists/settings/digest.html b/src/mailmanweb/templates/mailmanweb/lists/settings/digest.html new file mode 100644 index 0000000..5a72e87 --- /dev/null +++ b/src/mailmanweb/templates/mailmanweb/lists/settings/digest.html @@ -0,0 +1,5 @@ +{% extends "mailmanweb/base.html" %} +{% load i18n %} + +{% block main %} +{% endblock main %} diff --git a/src/mailmanweb/templates/mailmanweb/lists/settings/message.html b/src/mailmanweb/templates/mailmanweb/lists/settings/message.html new file mode 100644 index 0000000..5a72e87 --- /dev/null +++ b/src/mailmanweb/templates/mailmanweb/lists/settings/message.html @@ -0,0 +1,5 @@ +{% extends "mailmanweb/base.html" %} +{% load i18n %} + +{% block main %} +{% endblock main %} diff --git a/src/mailmanweb/templates/mailmanweb/menu/list_nav.html b/src/mailmanweb/templates/mailmanweb/menu/list_nav.html index dc8608b..de46757 100644 --- a/src/mailmanweb/templates/mailmanweb/menu/list_nav.html +++ b/src/mailmanweb/templates/mailmanweb/menu/list_nav.html @@ -1,9 +1,12 @@ {% load i18n %} - +
    + {{ list.fqdn_listname }} + +
    diff --git a/src/mailmanweb/urls.py b/src/mailmanweb/urls.py index e33fc06..01a887f 100644 --- a/src/mailmanweb/urls.py +++ b/src/mailmanweb/urls.py @@ -22,7 +22,7 @@ urlpatterns = patterns('mailmanweb.views', - (r'^$', 'list_index'), + (r'^$', 'user_profile'), url(r'^accounts/login/$', 'user_login', name='user_login'), url(r'^accounts/logout/$', 'user_logout', name='user_logout'), url(r'^accounts/profile/$', 'user_profile', name='user_profile'), diff --git a/src/mailmanweb/views.py b/src/mailmanweb/views.py index 967cf24..e8a0ae0 100644 --- a/src/mailmanweb/views.py +++ b/src/mailmanweb/views.py @@ -544,7 +544,7 @@ def user_logout(request): logout(request) - return redirect('list_index') + return redirect('user_login') def user_login(request,template = 'mailmanweb/login.html'): if request.method == 'POST': @@ -555,7 +555,7 @@ logger.debug(user) if user.is_active: login(request,user) - return redirect(request.GET.get('next', 'list_index')) + return redirect(request.GET.get('next', 'user_profile')) else: form = AuthenticationForm() return render_to_response(template, {'form': form,},