Fork: 0
kalle / postorius
Browse code
- made user profile the home page
- added lists link to metaNav
master
1 parent 38c40dd commit 95e8a0d35b72de982422e0f59b580b27d943a290
@Florian Fuchs Florian Fuchs authored on 14 Mar 2012
Patch
Unified Split
Showing 6 changed files
View
15
■■■■■
 src/mailmanweb/static/mailmanweb/default/css/style.css
}
.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);
background-repeat: no-repeat;
.mm_todos { background-position: 0px 5px; }
.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;
}
.mm_nav li {
View
src/mailmanweb/static/mailmanweb/default/img/icons.png
View
5
■■■■■
 src/mailmanweb/templates/mailmanweb/base.html
 
<header>
<div class="mm_header">
<div class="mm_canvas">
<a href="{% url list_index %}" class="mm_logo"><img src="{{ STATIC_URL }}/mailmanweb/default/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
<a href="{% url user_profile %}" class="mm_logo"><img src="{{ STATIC_URL }}/mailmanweb/default/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
<ul class="mm_metaNav">
<li>
<a class="mm_lists" href="{% url list_index %}">Lists</a>
</li>
{% if user.is_authenticated %}
<li>
<a class="mm_todos" href="#">Todos</a>
</li>
View
22
■■■■■
 src/mailmanweb/templates/mailmanweb/menu/list_nav.html
{% load i18n %}
<ul class="mm_nav">
<li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "Info" %}</a></li>
<li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
<li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "Settings" %}</a></li>
<li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
<li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
<li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
</ul>
<div class="mm_subHeader">
<span class="mm_context">{{ list.fqdn_listname }}</span>
<ul class="mm_nav">
<li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "Info" %}</a></li>
<li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
<li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "Settings" %}</a></li>
<li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
<li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
<li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
</ul>
</div>
View
2
■■■■■
 src/mailmanweb/urls.py
from django.conf.urls.static import static
 
 
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'),
url(r'^administration/$', 'administration', name='administration'),
View
4
■■■■■
 src/mailmanweb/views.py
,context_instance=RequestContext(request))
 
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':
form = AuthenticationForm(request.POST)
if user is not None:
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,},
context_instance=RequestContext(request))