fix footer, reload loaders

diff --git a/example/settings.py b/example/settings.py
index 5b56103fdef72896cb63542a1a6f335f5d47c05b..757a535c17743abece5e0e46f12a47f425bd937c 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -94,12 +94,12 @@ STATICFILES_FINDERS = (
 SECRET_KEY = 'a8l7%06wr2k+3=%#*#@#rvop2mmzko)44%7k(zx%lls^ihm9^5'
 
 # List of callables that know how to import templates from various sources.
-#TEMPLATE_LOADERS = (
-#    ('django.template.loaders.cached.Loader', (
-#        'django.template.loaders.filesystem.Loader',
-#        'django.template.loaders.app_directories.Loader',
-#    )),
-#)
+TEMPLATE_LOADERS = (
+    ('django.template.loaders.cached.Loader', (
+        'django.template.loaders.filesystem.Loader',
+        'django.template.loaders.app_directories.Loader',
+    )),
+)
 
 
 MIDDLEWARE_CLASSES = (

diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css
index 627b96c8f4c7b3f164e6a9c3b155dbf15aeb56b8..4f313a5b6109b3ca8882d6f7889e8b6da7264cb1 100644 (file)
--- a/teleforma/htdocs/css/teleforma.css
+++ b/teleforma/htdocs/css/teleforma.css
@@ -571,8 +571,8 @@ color:#FFF;
     font-size: 0.8125em;
     border-top: 1px solid #FFF;
     border-bottom: 1px solid #000;
-    height: 29px;
-    padding: 0em 0.5em 1em 0.5em;
+    height: 30px;
+    padding: 0em 0.5em 10px 0.5em;
     margin-top: 2.5em;
 }
 #footer :link, #footer :visited { color: #FFF; }
@@ -1543,7 +1543,7 @@ input,textarea{
 
 #spacing td {
     padding: 1em 1em 1em 0.3em;
-    font-size: 0.9125em;
+    font-size: 0.8125em;
     font-weight: normal;
     }
 

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 9f391547cef8d875b81bb85ca7b33f2b48ddc63d..a25768b8594c52e3532b09d6ec7b2a1c0e2c8896 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -155,18 +155,17 @@ alt="Telemeta Powered"/>-->
     <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{% url telemeta-images "logo_mini_2.png" %}"
    alt="Telemeta Powered"/></a>
     <p class="left">
-    {% trans "Powered by" %} <a href="{% telemeta_url %}" target="_blank"><strong>Telemeta {% telemeta_version %}</strong></a><br />
-    {% trans "By" %} <a href="http://www.parisson.com/">Parisson SARL</a>
+    {% trans "Powered by" %} <a href="{% telemeta_url %}" target="_blank"><br /><strong>Telemeta {% telemeta_version %}</strong></a><br />
     </p>
    </td>
    <td>
     <p class="center">
-    {% trans "Usage of the archives in the respect of cultural heritage of the original communities." %}
+
     </p>
    </td>
    <td>
     <p class="right">
-    Copyright &copy; {% current_year %} {% organization %}<br />
+    Copyright &copy; {% current_year %} {% organization %} |
     <a href="{% url telemeta-flatpage "legal_notices" %}">{% trans "Legal notices" %}</a>
     </p>
    </td>

diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html
index f5b651f6eca4c7fc7363dac2563539f452cfd622..e08b410d57bd2c497d062fc87cdb922425343228 100644 (file)
--- a/teleforma/templates/telemeta/inc/user_list.html
+++ b/teleforma/templates/telemeta/inc/user_list.html
@@ -10,7 +10,6 @@
    <thead>
    <tr><th>{% trans "Last Name"%}</th>
     <th>{% trans "First Name"%}</th>
-    <th>{% trans "User"%}</th>
     <th>{% trans "IEJ"%}</th>
     <th>{% trans "Procedure"%}</th>
     <th>{% trans "Oral spe"%}</th>
@@ -23,9 +22,8 @@
     <tbody id="spacing">
     {% for user in users %}
     <tr>
-     <td>{{ user.last_name }}</td>
-     <td>{{ user.first_name }}</td>
-     <td><a href="{% url telemeta-profile-detail user.username %}">{{user.username}}</a></td>
+     <td><a href="{% url telemeta-profile-detail user.username %}">{{ user.last_name }}</a></td>
+     <td><a href="{% url telemeta-profile-detail user.username %}">{{ user.first_name }}</a></td>
 
      {% if user.student.get %}
       {% with user.student.get as student %}

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index b91677e1998b48c2a679d3a9da2acf886f85482c..ee8159a62ad41364cbc67a63bd33dce25d0fe2bc 100644 (file)
--- a/teleforma/templates/telemeta/users.html
+++ b/teleforma/templates/telemeta/users.html
@@ -32,7 +32,7 @@
 
 </div>
 
-<div class="desk_large">
+<div class="desk_messages">
 
 {% if user.is_staff %}
 <div style="float:right;">

diff --git a/teleforma/views.py b/teleforma/views.py
index e7f3ad46d66b24a411e2c38fa7cc78f173223661..2befd4b6b21cea8e11601ce1fffc9081b6acdc38 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -158,7 +158,7 @@ class UsersView(ListView):
     model = User
     template_name='telemeta/users.html'
     context_object_name = 'users'
-    paginate_by = 12
+    paginate_by = 15
 
     def get_queryset(self):
         return User.objects.all().select_related(depth=1).order_by('last_name')