Mercurial > hg > savane-forge
changeset 246:dd181f68dae4
More presentation fixes on users and groups list
| author | Sylvain Beucler <beuc@beuc.net> |
|---|---|
| date | Sun, 08 Aug 2010 18:33:20 +0200 |
| parents | 87bd40d26c4c |
| children | 8da7cf2b1859 |
| files | savane/my/views.py savane/svmain/templatetags/qsup.py savane/svmain/urls.py templates/svmain/user_list.html |
| diffstat | 4 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/savane/my/views.py +++ b/savane/my/views.py @@ -39,7 +39,9 @@ @render_to('my/index.html', mimetype=None) def index(request, extra_context={}): svmain_models.Membership.tidy(user=request.user) - membership_list = svmain_models.Membership.objects.filter(user=request.user) + membership_list = svmain_models.Membership.objects \ + .filter(user=request.user) \ + .order_by('group__name') context = { 'object_list' : membership_list, } context.update(extra_context)
--- a/savane/svmain/templatetags/qsup.py +++ b/savane/svmain/templatetags/qsup.py @@ -1,4 +1,4 @@ -# Top-level menu +# Query_String UPdate to change an URL parameter from a template # Copyright (C) 2010 Sylvain Beucler # # This file is part of Savane. @@ -17,10 +17,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from django import template -from django.core.urlresolvers import reverse -from django.conf import settings -from django.utils.translation import ugettext as _ -import savane.svmain.models as svmain_models register = template.Library()
--- a/savane/svmain/urls.py +++ b/savane/svmain/urls.py @@ -50,7 +50,7 @@ urlpatterns += patterns ('', url(r'^u/$', search(object_list), - { 'queryset': auth_models.User.objects.all(), + { 'queryset': auth_models.User.objects.order_by('username'), 'paginate_by': 20, 'model_admin': UserAdmin, 'extra_context' : { 'title' : _("Users") }, @@ -70,7 +70,7 @@ urlpatterns += patterns ('', url(r'^p/$', search(object_list), - { 'queryset': auth_models.Group.objects.all(), + { 'queryset': auth_models.Group.objects.order_by('name'), 'paginate_by': 20, 'model_admin': GroupAdmin, 'extra_context' : { 'title' : _("Projects") },
--- a/templates/svmain/user_list.html +++ b/templates/svmain/user_list.html @@ -13,7 +13,7 @@ <table class="box"> <tr><th>{% trans "User" %}</th><th>{% trans "Full name" %}</th><th>{% trans "Profile" %}</th></tr> {% for object in object_list %} - <tr> + <tr class="{% cycle 'boxitem' 'boxitemalt' %}"> <td><a href="{% url savane:svmain:user_detail object.username %}">{{ object.username }}</a></td> <td><a href="{% url savane:svmain:user_detail object.username %}">{{ object.svuserinfo.get_full_name_display }}</a></td> <td>TODO</td>