From 4462c3b7cc81b9a85bd0a33cd6f06a1d71891819 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 12 Apr 2012 12:12:57 +0200 Subject: [PATCH] fix colors and some paginates, add wsgi example --- example/wsgi.py | 8 ++++++++ teleforma/htdocs/css/teleforma_black.css | 11 +++++++++-- teleforma/templates/postman/base_folder.html | 3 +-- .../templates/teleforma/course_detail.html | 8 ++++++++ teleforma/templates/teleforma/courses.html | 1 + teleforma/templates/telemeta/base.html | 17 ++++++++--------- teleforma/templates/telemeta/inc/user_list.html | 3 ++- teleforma/templates/telemeta/users.html | 2 +- teleforma/urls.py | 2 +- 9 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 example/wsgi.py diff --git a/example/wsgi.py b/example/wsgi.py new file mode 100644 index 00000000..d71b3b73 --- /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 fa9cb622..a3215b25 100644 --- 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 aca852d1..4ad9959a 100644 --- a/teleforma/templates/postman/base_folder.html +++ b/teleforma/templates/postman/base_folder.html @@ -17,7 +17,7 @@ {% trans "by message" %} {% endblock pm_by_modes %}
- +{% paginate %}
{% csrf_token %} @@ -61,7 +61,6 @@ {% endblock %} -{% paginate %} {% else %}

{% trans "No messages." %}

{% endif %} diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html index 312f780d..2986257c 100644 --- a/teleforma/templates/teleforma/course_detail.html +++ b/teleforma/templates/teleforma/course_detail.html @@ -14,6 +14,8 @@
{{ course.title }}{% if course.description %} - {{ course.description }}{% endif %}
+{% 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 %} +
+

{% trans "No document" %}

+
+{% endif %} + {% endblock course %} diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html index 9ddfe7f6..b0da6121 100644 --- a/teleforma/templates/teleforma/courses.html +++ b/teleforma/templates/teleforma/courses.html @@ -49,6 +49,7 @@ {% 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 076ff5eb..4511e7f5 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -78,8 +78,6 @@ alt="Telemeta Powered"/>--> {% if user.is_staff %}
  • {% trans "Archives" %} @@ -90,6 +88,14 @@ alt="Telemeta Powered"/>--> {% endif %} {% if user.is_authenticated %} + {% if user.is_staff %} +
  • {% trans "Admin" %} + +
    • + {% endif %} +
  • user{% if user.first_name and user.last_name %} {{ user.first_name }} {{ user.last_name }} {% else %} @@ -105,13 +111,6 @@ alt="Telemeta Powered"/>-->
    • - {% if user.is_staff %} -
  • {% trans "Admin" %} - -
    • - {% endif %} {% endif %} {% endif %} diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html index d115cffe..bbd020fe 100644 --- 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 %} {% endif %} - + {% endfor %} diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html index ab97b5a4..9a42ca5e 100644 --- a/teleforma/templates/telemeta/users.html +++ b/teleforma/templates/telemeta/users.html @@ -40,7 +40,7 @@ {% endif %} -
    {% trans "Users" %}
    +
    {% trans "Users" %}{% if training %} - {{ training }}{% endif %}

    {% if users %} {% include "telemeta/inc/user_list.html" %} diff --git a/teleforma/urls.py b/teleforma/urls.py index e99c13db..7cbc4fac 100644 --- 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.*)/export/$', user_export.by_training, name="teleforma-training-users-export"), -- 2.39.5
    {% trans "Message" %}{% trans "Message" %}