diff --git a/src/mailmanweb/static/mailmanweb/default/css/style.css b/src/mailmanweb/static/mailmanweb/default/css/style.css
index fb53d9b..21ea4ec 100755
--- a/src/mailmanweb/static/mailmanweb/default/css/style.css
+++ b/src/mailmanweb/static/mailmanweb/default/css/style.css
@@ -118,4 +118,16 @@
color: #A22630;
}
-
+/* settings table */
+.mm_settings table, .mm_settings td {
+ border: solid 1px gray;
+ padding: 0.7em
+}
+.mm_settings th {
+ border: solid 1px gray;
+ margin: 2em;
+ padding: 2em
+ font-weight: bold;
+ background-image: -webkit-linear-gradient(#FAFAFA, #EFEFEF);
+ background-image: -moz-linear-gradient(#FAFAFA, #EFEFEF);
+}
diff --git a/src/mailmanweb/templates/mailmanweb/menu/user_nav.html b/src/mailmanweb/templates/mailmanweb/menu/user_nav.html
index c7dee40..cf92471 100644
--- a/src/mailmanweb/templates/mailmanweb/menu/user_nav.html
+++ b/src/mailmanweb/templates/mailmanweb/menu/user_nav.html
@@ -1,6 +1,7 @@
{% load i18n %}
diff --git a/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html b/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html
new file mode 100644
index 0000000..3ca19cd
--- /dev/null
+++ b/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html
@@ -0,0 +1,56 @@
+{% extends extend_template %}
+{% load i18n %}
+
+{% block main %}
+ {% include 'mailmanweb/menu/user_nav.html' %}
+ {{ user }}'s Profile
+
+ Mailman display name: {{ mm_user.real_name}}
+ Django email: {{ user.email }}
+ Mailman primary email: {{ mm_user.email }}
+ Mailman display name: {{ mm_user.real_name}}
+ Valid addresses with this account:
+
+ {% for address in mm_user.addresses %}
+ - {{ address }}
+ {% endfor %}
+
+
+{% endblock main %}
+~
diff --git a/src/mailmanweb/templates/mailmanweb/user_profile.html b/src/mailmanweb/templates/mailmanweb/user_profile.html
index 95d4a7d..60fd533 100644
--- a/src/mailmanweb/templates/mailmanweb/user_profile.html
+++ b/src/mailmanweb/templates/mailmanweb/user_profile.html
@@ -4,4 +4,6 @@
{% block main %}
{% include 'mailmanweb/menu/user_nav.html' %}
{{ user }}'s Profile
+
+ Mailman display name: {{ mm_user.real_name}}
{% endblock main %}
diff --git a/src/mailmanweb/urls.py b/src/mailmanweb/urls.py
index 4db7978..5fe9be4 100644
--- a/src/mailmanweb/urls.py
+++ b/src/mailmanweb/urls.py
@@ -31,6 +31,7 @@
url(r'^accounts/membership/(?:(?P[^/]+)/)?$',
'user_settings', kwargs={"tab": "membership"},
name='membership_settings'),
+ url(r'^accounts/mailmansettings/$', 'user_mailmansettings', name='user_mailmansettings'),
# /settings/
url(r'^settings/$', 'site_settings', name="site_settings"),
url(r'^settings/domains/$', 'domain_index', name='domain_index'),
diff --git a/src/mailmanweb/views.py b/src/mailmanweb/views.py
index 773d945..8281d35 100644
--- a/src/mailmanweb/views.py
+++ b/src/mailmanweb/views.py
@@ -431,6 +431,10 @@
,context_instance=RequestContext(request))
@login_required
+def user_mailmansettings(request):
+ return render_to_response('mailmanweb/user_mailmansettings.html',
+ context_instance=RequestContext(request))
+@login_required
def user_settings(request, tab = "membership",
template = 'mailmanweb/user_settings.html',
fqdn_listname = None,):
@@ -560,10 +564,15 @@
return render_to_response(template, {'form': form,},
context_instance=RequestContext(request))
-def user_profile(request):
+def user_profile(request, user_email = None):
if not request.user.is_authenticated():
return redirect('user_login')
+ #try:
+ # the_user = User.objects.get_or_404(email=user_email)
+ #except MailmanApiError:
+ # return utils.render_api_error(request)
return render_to_response('mailmanweb/user_profile.html',
+ # {'mm_user': the_user},
context_instance=RequestContext(request))
def user_todos(request):