From ca9ac28b57930f6408021c5c6135fbdefd3b77bc Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Fri, 13 Apr 2012 13:21:43 +0200
Subject: [PATCH] fix footer, reload loaders

---
 example/settings.py                             | 12 ++++++------
 teleforma/htdocs/css/teleforma.css              |  6 +++---
 teleforma/templates/telemeta/base.html          |  7 +++----
 teleforma/templates/telemeta/inc/user_list.html |  6 ++----
 teleforma/templates/telemeta/users.html         |  2 +-
 teleforma/views.py                              |  2 +-
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/example/settings.py b/example/settings.py
index 5b56103f..757a535c 100644
--- 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 627b96c8..4f313a5b 100644
--- 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 9f391547..a25768b8 100644
--- 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 f5b651f6..e08b410d 100644
--- 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 b91677e1..ee8159a6 100644
--- 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 e7f3ad46..2befd4b6 100755
--- 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')
-- 
2.39.5