fix colors and some paginates, add wsgi example

diff --git a/example/wsgi.py b/example/wsgi.py
new file mode 100644 (file)
index 0000000..d71b3b7
--- /dev/null
+++ b/example/wsgi.py
@@ -0,0 +1,8 @@
+import os
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+# This application object is used by the development server
+# as well as any WSGI server configured to use this file.
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()

diff --git a/teleforma/htdocs/css/teleforma_black.css b/teleforma/htdocs/css/teleforma_black.css
index fa9cb622a9c57e62a2c48901dc3f7db87c772e24..a3215b257f3a6c27cf0450551482e6e38c9b944c 100644 (file)
--- a/teleforma/htdocs/css/teleforma_black.css
+++ b/teleforma/htdocs/css/teleforma_black.css
@@ -471,7 +471,7 @@ form.login .submit {
 #menu .orange { border-bottom-color:  #e65911; }
 #menu .darkgreen { border-bottom-color:  #006a12; }
 #menu .black { border-bottom-color:  #000000; }
-#menu .red { border-bottom-color:  #DD0000; }
+#menu .red { border-bottom-color:  #cc0000; }
 #menu .violet { border-bottom-color:  #A00020; }
 #menu .origin { border-bottom-color: transparent; }
 
@@ -1161,7 +1161,14 @@ a.image-link {
     background-color:  #3c9200;
     color: #FFF;
     padding:0.8em 0.8em 0.8em 0.8em;
-        }
+   }
+
+#action_orange {
+    background-color: #e65911;
+    color: #FFF;
+    padding:0.8em 0.8em 0.8em 0.8em;
+   }
+
 
 .list_item, .list_item:visited, .list_item:hover{
     display:block;

diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html
index aca852d170e4f6b918fdd39e4c93a46a87c1a448..4ad9959adc45b17341012d6151de80448569676d 100644 (file)
--- a/teleforma/templates/postman/base_folder.html
+++ b/teleforma/templates/postman/base_folder.html
@@ -17,7 +17,7 @@
 <a href="{{ by_message_url }}" class="component_icon button icon_filter">{% trans "by message" %}</a>
 </div>{% endblock pm_by_modes %}
 <br />
-
+{% paginate %}
 <form id="_messageForm" action="{% block pm_form_action %}{% endblock %}" method="post">{% csrf_token %}
 
 <table id="pm_messages" class="listing" >
@@ -61,7 +61,6 @@
 </span>{% endblock %}
 
 </form>
-{% paginate %}
 {% else %}
 <p>{% trans "No messages." %}</p>
 {% endif %}

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 312f780d9d3aa3794334a2a2b720ba056789468f..2986257cfa549a2937de4d58cfc825ba740376fe 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -14,6 +14,8 @@
 <div class="course_title">{{ course.title }}{% if course.description %} - {{ course.description }}{% endif %}
 </div>
 
+{% if course.conference.all or course.document.all or course.media.all %}
+
 {% block document %}
 {% with course as course and %}
 {% include "teleforma/inc/document_list.html" %}
@@ -32,6 +34,12 @@
 {% endwith %}
 {% endblock %}
 
+{% else %}
+<div class="course_content">
+<h2>{% trans "No document" %}</h2>
+</div>
+{% endif %}
+
 </div>
 </div>
 {% endblock course %}

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 9ddfe7f649fa967f861d0e9388b3fe50333b9229..b0da61218d809c8f776ae33925de3f1186417a25 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -49,6 +49,7 @@
         </div>
 
         {% if course.conference.all or course.document.all or course.media.all %}
+
         {% block document %}
         {% with course as course %}
         {% include "teleforma/inc/document_list.html" %}

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 076ff5eb5c1e6cae29bd96faa74dd2f8f290b667..4511e7f5a7cec0754d82495faf7d768b01cfb8ac 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -78,8 +78,6 @@ alt="Telemeta Powered"/>-->
  {% if user.is_staff %}
  <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
  <ul>
- <li><a href="{% url telemeta-fonds %}">{% trans "Fonds" %}</a></li>
- <li><a href="{% url telemeta-corpus %}">{% trans "Corpus" %}</a></li>
  <li><a href="{% url telemeta-collections %}">{% trans "Collections" %}</a></li>
  <li><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li>
  </ul>
@@ -90,6 +88,14 @@ alt="Telemeta Powered"/>-->
  {% endif %}
 
  {% if user.is_authenticated %}
+  {% if user.is_staff %}
+ <li><a href="#admin#" class="blue">{% trans "Admin" %}</a>
+  <ul>
+    <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
+  </ul>
+ </li>
+ {% endif %}
+
  <li><a href="#profil#" class="blue"><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 %}
@@ -105,13 +111,6 @@ alt="Telemeta Powered"/>-->
     </ul>
  </li>
 
- {% if user.is_staff %}
- <li><a href="#admin#" class="blue">{% trans "Admin" %}</a>
-  <ul>
-    <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
-  </ul>
- </li>
- {% endif %}
  {% endif %}
 {% endif %}
 

diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html
index d115cffe4e80a43ad9c38da963e71bc523d9d465..bbd020feffbb7623bec7c13c9c2e5023a63399a3 100644 (file)
--- a/teleforma/templates/telemeta/inc/user_list.html
+++ b/teleforma/templates/telemeta/inc/user_list.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load telemeta_utils %}
 {% load teleforma_tags %}
+{% load pagination_tags %}
 
 {% if is_paginated %}
 <div class="pagination" id="user_pagination">
@@ -55,7 +56,7 @@
         <td></td>
 
     {% endif %}
-    <td><a href="{% url postman_write user.username %}" class="component_icon button" id="action_red">{% trans "Message" %}</a></td>
+    <td><a href="{% url postman_write user.username %}" class="component_icon button" id="action_orange">{% trans "Message" %}</a></td>
     </tr>
     {% endfor %}
     </tbody>

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index ab97b5a4e3935a17853a1e04f52936ac77ca79a4..9a42ca5e593e40a6eb19e214a2a46d0d9faa9458 100644 (file)
--- a/teleforma/templates/telemeta/users.html
+++ b/teleforma/templates/telemeta/users.html
@@ -40,7 +40,7 @@
 </div>
 {% endif %}
 
-<div class="course_title">{% trans "Users" %}</div>
+<div class="course_title">{% trans "Users" %}{% if training %} - {{ training }}{% endif %}</div>
 <br />
  {% if users %}
   {% include "telemeta/inc/user_list.html" %}

diff --git a/teleforma/urls.py b/teleforma/urls.py
index e99c13db4e59a4c9580a3c0c0d4c9db673f95d94..7cbc4fac67d0b8718e93550537c5180aded36391 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -60,7 +60,7 @@ urlpatterns = patterns('',
 
     # Users
     url(r'^user/all/$', UsersView.as_view(), name="teleforma-users"),
-    url(r'^user/by_training/(\w+)$', UsersTrainingView.as_view(), name="teleforma-training-users"),
+    url(r'^user/by_training/(\w+)/$', UsersTrainingView.as_view(), name="teleforma-training-users"),
     url(r'^user/all/export/$', user_export.all, name="teleforma-users-xls-export"),
     url(r'^user/by_training/(?P<id>.*)/export/$', user_export.by_training, name="teleforma-training-users-export"),