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 5e1c83a5313b351fb1fddb3fa80e57d7fb301216..5158468827692cb595e6f62f8bd9f167ec5e3785 100644 (file)
--- 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 0efe8449c537f7f6d1898db5e14c684448c8351d..ce4d8987f64db9abb839b87325b1a3e27ea051e1 100644 (file)
--- 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 %}
 
-<div id="module-set" style="width: 240px">
+<div id="module-set" style="width: 290px">
 
 <div class="module">
 <h3><img src="{% url telemeta-images "search_wh2.png" %}" alt="rss" style="vertical-align:middle" />{% trans "Questions" %}</h3>

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 8c61487b7b4e8c8cd09a96a494744158e5198fe8..3073781d16348b5e54e7e8c8629f5ca3a5adb438 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -68,14 +68,14 @@ alt="Telemeta Powered"/>-->
  {% endif %}
 
  {% if user.is_authenticated %}
+
  <li><a href="/messages" class="green">{% trans "Messages" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
 
  <li><a href="{% url teleforma-users %}" class="yellow">{% trans "Users" %}</a></li>
 
- <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li>
+ <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Search" %}</a></li>
 
  {% if user.is_staff %}
-
  <li><a href="#archives#" class="red">{% trans "Archives" %}</a>
  <ul>
  <li><a href="{% url telemeta-fonds %}">{% trans "Fonds" %}</a></li>
@@ -85,15 +85,12 @@ alt="Telemeta Powered"/>-->
  </ul>
  </li>
 
- <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
-  <ul>
-    <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
-  </ul>
- </li>
+ {% else %}
+  <li><a href="{% url telemeta-flatpage "help" %}" class="red">{% trans "Help" %}</a></li>
  {% endif %}
 
  {% if user.is_authenticated %}
- <li><a href="#profil#"  class="origin"><img src="{% url telemeta-images "user_tr.png" %}" alt="user" style="vertical-align:middle" width="13px" />{% if user.first_name and user.last_name %}
+ <li><a href="#profil#" class="violet"><img src="{% url telemeta-images "user_tr.png" %}" alt="user" style="vertical-align:middle" width="13px" />{% if user.first_name and user.last_name %}
  {{ user.first_name }} {{ user.last_name }}
  {% else %}
  {{ user.username }}
@@ -108,8 +105,14 @@ alt="Telemeta Powered"/>-->
     </ul>
  </li>
 
+ {% if user.is_staff %}
+ <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
+  <ul>
+    <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
+  </ul>
+ </li>
+ {% endif %}
  {% endif %}
-
 {% endif %}
 
 </ul>

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index ff5bde51b40a6727594e9be25ac5d1d43f41f4a9..4b174782f682d038ca51477949cdcda7c4995ee2 100644 (file)
--- 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 %}
- <img src="{% url telemeta-images "user_red.png" %}" alt="user" style="vertical-align:middle" /> {% trans "Users" %}
+
 {% endblock %}
 
 {% block content %}
+<div id="module-set-left" style="width: 20%">
+<div class="module">
+<h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlists" style="vertical-align:middle" />{% trans "Trainings" %}</h3>
+<div style="background: white;">
+<ul>
+{% block courses %}
+{% for training in trainings %}
+<li><a href="{% url teleforma-training-users training.id %}">{{ training.code }}</a></li>
+{% endfor %}
+{% endblock courses %}
+</ul>
+</div>
+</div>
+</div>
+
+<div class="desk_large">
+<div class="course_title">{% trans "Users" %}</div>
  {% if users %}
   {% include "telemeta/inc/user_list.html" %}
  {% else %}
     <p class="help">{% trans "No users" %}</p>
  {% endif %}
+</div>
 {% endblock %}

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 503410b1d76f819afb908817206e4c6a6352f72d..6ede556d97379bacc18bc3c585daa0c3e05c66ba 100644 (file)
--- 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<path>.*)$', 'django.views.static.serve',

diff --git a/teleforma/views.py b/teleforma/views.py
index 9e3bf748707093fbfe17a4eab4a279078ac4fcda..89b487135b93840d2da4c01ad3f352dd66165404 100755 (executable)
--- 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)
+