From af04fd8bd8e3d5d34f9c61aba7e050b7d9c1ffe8 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 27 Apr 2011 16:20:09 +0200
Subject: [PATCH] fix user and enumeration listing in admin

---
 telemeta/__init__.py                          |  2 +-
 .../telemeta_default/admin_enumerations.html  | 33 +++++++++++--------
 .../telemeta_default/admin_users.html         | 21 ++++++++++--
 .../telemeta_default/instrument_edit.html     |  4 +--
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/telemeta/__init__.py b/telemeta/__init__.py
index 7b7acd78..487997a2 100644
--- a/telemeta/__init__.py
+++ b/telemeta/__init__.py
@@ -12,7 +12,7 @@ U{http://telemeta.org}
 """
 
 __docformat__ = 'epytext en'
-__version__ = '0.7.0'
+__version__ = '0.7.1'
 __url__ = 'http://telemeta.org'
 __copyright__ = '(C) 2007-2011 Parisson'
 __license__ = 'CeCILL-2'
diff --git a/telemeta/templates/telemeta_default/admin_enumerations.html b/telemeta/templates/telemeta_default/admin_enumerations.html
index 238f5b81..9c68d74f 100644
--- a/telemeta/templates/telemeta_default/admin_enumerations.html
+++ b/telemeta/templates/telemeta_default/admin_enumerations.html
@@ -1,20 +1,27 @@
 {% extends "telemeta/admin.html" %}
+{% load telemeta_utils %}
+{% load i18n %}
 
-{% block tab %}
-<div class="tabs">
+{% block tabcontents %}
+ <h4>{% trans "Enumerations" %}</h4>
+ 
 {% if enumerations %}
-    <ul>
+
+  <table class="listing">
+   <thead>
+    <tr><th>{% trans "Title"%}</th></tr>
+   </thead><tbody>
     {% for enum in enumerations %}
-        {%ifequal enum.id enumeration_id %}
-            <li class="active">{{ enum.name|capfirst }}</li>
-        {%else%}
-            <li><a href="{% url telemeta-enumeration-edit enum.id %}">
-                {{ enum.name|capfirst }}</a></li>
-        {%endifequal%}
+         <tr><td><a href="{% url telemeta-enumeration-edit enum.id %}">
+                {{ enum.name|capfirst }}</a></td></tr>    
     {% endfor %}
-    </ul>
-{% endif %}
-</div>
-{% endblock tab %}
+    </tbody>
+  </table>
+ 
+  {% else %}
+    <p class="help">{% trans "No enumerations" %}</p>
+ {% endif %}
+
+{% endblock %}
 
 
diff --git a/telemeta/templates/telemeta_default/admin_users.html b/telemeta/templates/telemeta_default/admin_users.html
index 9e6b3719..c4a0aa78 100644
--- a/telemeta/templates/telemeta_default/admin_users.html
+++ b/telemeta/templates/telemeta_default/admin_users.html
@@ -4,11 +4,28 @@
 
 {% block tabcontents %}
  <h4>{% trans "Users" %}</h4>
-
+ 
  {% if users %}
+ 
+  <table class="listing">
+   <thead>
+    <tr><th>{% trans "User"%}</th>
+    <th>{% trans "First Name"%}</th>
+    <th>{% trans "Last Name"%}</th>
+    <th>{% trans "E-mail"%}</th>
+    </tr>
+   </thead><tbody>
     {% for user in users %}
-     <li><a href="{% url telemeta-profile-detail user.username %}">{{user.username}}</a></li>
+    <tr>
+     <td><a href="{% url telemeta-profile-detail user.username %}">{{user.username}}</a></td>
+     <td>{{ user.first_name }}</td>
+     <td>{{ user.last_name }}</td>
+     <td><a href="mailto:{{ user.email }}">{{ user.email }}</a></td>
+    </tr>
     {% endfor %}
+    </tbody>
+  </table>
+
  {% else %}
     <p class="help">{% trans "No users" %}</p>
  {% endif %}
diff --git a/telemeta/templates/telemeta_default/instrument_edit.html b/telemeta/templates/telemeta_default/instrument_edit.html
index dce8389d..e9bd6ff9 100644
--- a/telemeta/templates/telemeta_default/instrument_edit.html
+++ b/telemeta/templates/telemeta_default/instrument_edit.html
@@ -25,9 +25,7 @@
  <form id="_updateinstru" method="POST" action="{% url telemeta-instrument-update %}">{% csrf_token %}
   <table class="listing">
    <thead>
-    <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th>
-
-    </tr>
+    <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th></tr>
    </thead><tbody>
     {% for record in instruments %}
     <tr>
-- 
2.39.5