From: yomguy Date: Tue, 10 Apr 2012 15:53:10 +0000 (+0200) Subject: add user list filter by training, fix some style X-Git-Tag: 0.2~73 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4142f1fd72e5a5acece22abb67d2f41088ddebad;p=teleforma.git add user list filter by training, fix some style --- diff --git a/teleforma/htdocs/css/teleforma_black.css b/teleforma/htdocs/css/teleforma_black.css index 5e1c83a5..51584688 100644 --- a/teleforma/htdocs/css/teleforma_black.css +++ b/teleforma/htdocs/css/teleforma_black.css @@ -59,7 +59,7 @@ a img { border: none; } #content { /*margin-top: 1em;*/ position: relative; - margin-left: 10%; + margin-left: 5%; margin-right: 2em; margin-bottom: 0em; } @@ -438,7 +438,7 @@ form.login .submit { background-repeat:repeat; font: normal verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif; border-top: 1px solid #333; - padding-left:10%; + padding-left: 5.5%; } #menu a, #menu a:visited{ @@ -853,7 +853,7 @@ table.listing tbody td, table.listing tbody th { font-weight: normal; } table.listing tbody td { - font-weight: bold; + font-weight: normal; } table.listing tbody td.tmp { width: 100%; @@ -1338,10 +1338,17 @@ input,textarea{ .desk_center { float: left; - width:58%; + width:55%; + padding: 0em 0em 0em 1em; + } + +.desk_large { + float: left; + width:75%; padding: 0em 0em 0em 1em; } + .course { margin: 0em 0em 2em 0em; background-color: #FFF; @@ -1412,7 +1419,7 @@ input,textarea{ } .pm_body { - padding: 0em 0em 0em 1em; + padding: 0em 0em 0em 0em; } .pm_message { @@ -1420,7 +1427,7 @@ input,textarea{ -moz-border-radius: 8px 0px 8px 8px; -webkit-border-radius: 8px 0px 8px 8px; border-radius: 8px 0px 8px 8px; - padding: 0.8em 0.8em 0.8em 1em; + } #pm_messages { diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html index 0efe8449..ce4d8987 100644 --- a/teleforma/templates/teleforma/course_media.html +++ b/teleforma/templates/teleforma/course_media.html @@ -62,7 +62,7 @@ $(document).ready(function(){ {% block chat %} {% if room %} -
+

rss{% trans "Questions" %}

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index 8c61487b..3073781d 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -68,14 +68,14 @@ alt="Telemeta Powered"/>--> {% endif %} {% if user.is_authenticated %} +
  • {% trans "Messages" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}
  • {% trans "Users" %}
    • -
  • {% trans "Advanced search" %}
    • +
  • {% trans "Search" %}
    • {% if user.is_staff %} -
  • {% trans "Archives" %}
    • -
  • {% trans "Admin" %} - -
    • + {% else %} +
  • {% trans "Help" %}
    • {% endif %} {% if user.is_authenticated %} -
  • user{% if user.first_name and user.last_name %} +
  • user{% if user.first_name and user.last_name %} {{ user.first_name }} {{ user.last_name }} {% else %} {{ user.username }} @@ -108,8 +105,14 @@ alt="Telemeta Powered"/>-->
    • + {% if user.is_staff %} +
  • {% trans "Admin" %} + +
    • + {% endif %} {% endif %} - {% endif %} diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html index ff5bde51..4b174782 100644 --- a/teleforma/templates/telemeta/users.html +++ b/teleforma/templates/telemeta/users.html @@ -4,14 +4,33 @@ {% block head_title %}{% trans "Users" %} - {{ block.super }}{% endblock %} + {% block title %} - user {% trans "Users" %} + {% endblock %} {% block content %} +
    +
    +

    playlists{% trans "Trainings" %}

    +
    +
      +{% block courses %} +{% for training in trainings %} +
    • {{ training.code }}
      • +{% endfor %} +{% endblock courses %} +
    +
    +
    +
    + +
    +
    {% trans "Users" %}
    {% if users %} {% include "telemeta/inc/user_list.html" %} {% else %}

    {% trans "No users" %}

    {% endif %} +
    {% endblock %} diff --git a/teleforma/urls.py b/teleforma/urls.py index 503410b1..6ede556d 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -57,7 +57,9 @@ urlpatterns = patterns('', # Postman url(r'^messages/', include('postman.urls')), + # Users url(r'^all_users/$', UsersView.as_view(), name="teleforma-users"), + url(r'^all_users/by_trainings/(\w+)$', UsersTrainingView.as_view(), name="teleforma-training-users"), # CSS+Images (FIXME: for developement only) url(r'^teleforma/css/(?P.*)$', 'django.views.static.serve', diff --git a/teleforma/views.py b/teleforma/views.py index 9e3bf748..89b48713 100755 --- a/teleforma/views.py +++ b/teleforma/views.py @@ -125,4 +125,17 @@ class UsersView(ListView): paginate_by = 12 def get_queryset(self): - return User.objects.all().order_by('last_name') + return User.objects.all().select_related(depth=1).order_by('last_name') + + def get_context_data(self, **kwargs): + context = super(UsersView, self).get_context_data(**kwargs) + context['trainings'] = Training.objects.all() + return context + +class UsersTrainingView(UsersView): + + def get_queryset(self): + users = User.objects.all().select_related(depth=2) + trainings = Training.objects.filter(id=self.args[0]) + return User.objects.filter(student__training__in=trainings) +