"""
__docformat__ = 'epytext en'
-__version__ = '0.9.8'
+__version__ = '0.9.9'
__url__ = 'http://telemeta.org'
__copyright__ = '(C) 2007-2011 Parisson'
__license__ = 'CeCILL-2'
#menu .darkgreen { border-bottom-color: #006a12; }
#menu .black { border-bottom-color: #000000; }
#menu .red { border-bottom-color: #DD0000; }
+#menu .indogo { border-bottom-color: #4B0082; }
* html #menu :link, * html #menu :visited { background-position: 1px 0 }
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-22 14:44+0200\n"
+"POT-Creation-Date: 2011-06-22 17:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#: templates/telemeta_default/admin.html:20
#: templates/telemeta_default/admin_instruments.html:6
#: templates/telemeta_default/admin_users.html:6
+#: templates/telemeta_default/base.html:87
+#: templates/telemeta_default/users.html:5
+#: templates/telemeta_default/users.html:8
msgid "Users"
msgstr ""
msgstr ""
#: templates/telemeta_default/admin_instruments.html:15
-#: templates/telemeta_default/admin_users.html:32
+#: templates/telemeta_default/admin_users.html:11
+#: templates/telemeta_default/users.html:16
msgid "No users"
msgstr ""
-#: templates/telemeta_default/admin_users.html:12
-#: templates/telemeta_default/inc/module_revisions.html:14
-msgid "User"
-msgstr ""
-
-#: templates/telemeta_default/admin_users.html:13
-#: templates/telemeta_default/profile_detail.html:32
-msgid "First Name"
-msgstr ""
-
-#: templates/telemeta_default/admin_users.html:14
-#: templates/telemeta_default/profile_detail.html:33
-msgid "Last Name"
-msgstr ""
-
-#: templates/telemeta_default/admin_users.html:15
-msgid "E-mail"
-msgstr ""
-
-#: templates/telemeta_default/admin_users.html:16
-msgid "Groups"
-msgstr ""
-
#: templates/telemeta_default/base.html:53
msgid "Welcome"
msgstr ""
#: templates/telemeta_default/base.html:59
-msgid "Account"
+msgid "Profile"
msgstr ""
#: templates/telemeta_default/base.html:60
msgid "Advanced search"
msgstr ""
-#: templates/telemeta_default/base.html:87
+#: templates/telemeta_default/base.html:90
msgid "Admin"
msgstr ""
-#: templates/telemeta_default/base.html:113
+#: templates/telemeta_default/base.html:116
msgid "Powered by"
msgstr ""
-#: templates/telemeta_default/base.html:114
+#: templates/telemeta_default/base.html:117
msgid "By"
msgstr ""
-#: templates/telemeta_default/base.html:119
+#: templates/telemeta_default/base.html:122
msgid ""
"Usage of the archives in the respect of cultural heritage of the original "
"communities."
msgstr ""
-#: templates/telemeta_default/base.html:125
+#: templates/telemeta_default/base.html:128
#: templates/telemeta_default/collection_detail.html:137
msgid "Legal notices"
msgstr ""
msgstr ""
#: templates/telemeta_default/collection_detail.html:5
-#: templates/telemeta_default/collection_detail_dc.html:5 web/base.py:324
+#: templates/telemeta_default/collection_detail_dc.html:5 web/base.py:328
msgid "Collection"
msgstr ""
#: templates/telemeta_default/mediaitem_add.html:5
#: templates/telemeta_default/mediaitem_copy.html:5
-#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:453
+#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:457
msgid "Item"
msgstr ""
msgid "User Profile"
msgstr ""
-#: templates/telemeta_default/profile_detail.html:8 web/base.py:1154
+#: templates/telemeta_default/profile_detail.html:8 web/base.py:1158
msgid "User profile"
msgstr ""
+#: templates/telemeta_default/profile_detail.html:32
+#: templates/telemeta_default/inc/user_list.html:7
+msgid "First Name"
+msgstr ""
+
+#: templates/telemeta_default/profile_detail.html:33
+#: templates/telemeta_default/inc/user_list.html:8
+msgid "Last Name"
+msgstr ""
+
#: templates/telemeta_default/profile_detail.html:34
msgid "Email"
msgstr ""
msgid "No item"
msgstr ""
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1185
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1189
msgid "Last changes"
msgstr ""
msgid "Date"
msgstr ""
+#: templates/telemeta_default/inc/module_revisions.html:14
+#: templates/telemeta_default/inc/user_list.html:6
+msgid "User"
+msgstr ""
+
+#: templates/telemeta_default/inc/user_list.html:9
+msgid "E-mail"
+msgstr ""
+
+#: templates/telemeta_default/inc/user_list.html:10
+msgid "Groups"
+msgstr ""
+
#: templates/telemeta_default/registration/password_change_done.html:3
#: templates/telemeta_default/registration/password_change_form.html:4
msgid "Documentation"
msgstr[0] ""
msgstr[1] ""
-#: web/base.py:323 web/base.py:452 web/base.py:683 web/base.py:1153
+#: web/base.py:327 web/base.py:456 web/base.py:687 web/base.py:1157
msgid "Access not allowed"
msgstr ""
-#: web/base.py:325 web/base.py:454 web/base.py:685 web/base.py:1155
+#: web/base.py:329 web/base.py:458 web/base.py:689 web/base.py:1159
msgid ""
"Please login or contact the website administator to get a private access."
msgstr ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-22 14:44+0200\n"
+"POT-Creation-Date: 2011-06-22 17:41+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#: templates/telemeta_default/admin.html:20
#: templates/telemeta_default/admin_instruments.html:6
#: templates/telemeta_default/admin_users.html:6
+#: templates/telemeta_default/base.html:87
+#: templates/telemeta_default/users.html:5
+#: templates/telemeta_default/users.html:8
msgid "Users"
msgstr "Utilisateurs"
msgstr "Pas d'énumérations"
#: templates/telemeta_default/admin_instruments.html:15
-#: templates/telemeta_default/admin_users.html:32
+#: templates/telemeta_default/admin_users.html:11
+#: templates/telemeta_default/users.html:16
msgid "No users"
msgstr "Pas d'utilisateurs"
-#: templates/telemeta_default/admin_users.html:12
-#: templates/telemeta_default/inc/module_revisions.html:14
-msgid "User"
-msgstr "Utilisateur"
-
-#: templates/telemeta_default/admin_users.html:13
-#: templates/telemeta_default/profile_detail.html:32
-msgid "First Name"
-msgstr "Prénom"
-
-#: templates/telemeta_default/admin_users.html:14
-#: templates/telemeta_default/profile_detail.html:33
-msgid "Last Name"
-msgstr "Nom"
-
-#: templates/telemeta_default/admin_users.html:15
-msgid "E-mail"
-msgstr "Courriel"
-
-#: templates/telemeta_default/admin_users.html:16
-msgid "Groups"
-msgstr "Groupes"
-
#: templates/telemeta_default/base.html:53
msgid "Welcome"
msgstr "Bienvenue"
#: templates/telemeta_default/base.html:59
-msgid "Account"
-msgstr "Compte"
+msgid "Profile"
+msgstr "Profil"
#: templates/telemeta_default/base.html:60
#: templates/telemeta_default/base.html:64
msgid "Advanced search"
msgstr "Recherche avancée"
-#: templates/telemeta_default/base.html:87
+#: templates/telemeta_default/base.html:90
msgid "Admin"
msgstr "Admin"
-#: templates/telemeta_default/base.html:113
+#: templates/telemeta_default/base.html:116
msgid "Powered by"
msgstr "Propulsé par"
-#: templates/telemeta_default/base.html:114
+#: templates/telemeta_default/base.html:117
msgid "By"
msgstr "Par"
-#: templates/telemeta_default/base.html:119
+#: templates/telemeta_default/base.html:122
msgid ""
"Usage of the archives in the respect of cultural heritage of the original "
"communities."
"Usage des archives réservé dans le respect du patrimoine culturel des "
"communautés d'origine."
-#: templates/telemeta_default/base.html:125
+#: templates/telemeta_default/base.html:128
#: templates/telemeta_default/collection_detail.html:137
msgid "Legal notices"
msgstr "Mentions légales"
msgstr "Enregistrer"
#: templates/telemeta_default/collection_detail.html:5
-#: templates/telemeta_default/collection_detail_dc.html:5 web/base.py:324
+#: templates/telemeta_default/collection_detail_dc.html:5 web/base.py:328
msgid "Collection"
msgstr "Collection"
#: templates/telemeta_default/mediaitem_add.html:5
#: templates/telemeta_default/mediaitem_copy.html:5
-#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:453
+#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:457
msgid "Item"
msgstr "Item"
msgid "User Profile"
msgstr "Profil utilisateur"
-#: templates/telemeta_default/profile_detail.html:8 web/base.py:1154
+#: templates/telemeta_default/profile_detail.html:8 web/base.py:1158
msgid "User profile"
msgstr "Profil utilisateur"
+#: templates/telemeta_default/profile_detail.html:32
+#: templates/telemeta_default/inc/user_list.html:7
+msgid "First Name"
+msgstr "Prénom"
+
+#: templates/telemeta_default/profile_detail.html:33
+#: templates/telemeta_default/inc/user_list.html:8
+msgid "Last Name"
+msgstr "Nom"
+
#: templates/telemeta_default/profile_detail.html:34
msgid "Email"
msgstr "Courriel"
msgid "No item"
msgstr "Aucun item"
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1185
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1189
msgid "Last changes"
msgstr "Dernières modifications"
msgid "Date"
msgstr ""
+#: templates/telemeta_default/inc/module_revisions.html:14
+#: templates/telemeta_default/inc/user_list.html:6
+msgid "User"
+msgstr "Utilisateur"
+
+#: templates/telemeta_default/inc/user_list.html:9
+msgid "E-mail"
+msgstr "Courriel"
+
+#: templates/telemeta_default/inc/user_list.html:10
+msgid "Groups"
+msgstr "Groupes"
+
#: templates/telemeta_default/registration/password_change_done.html:3
#: templates/telemeta_default/registration/password_change_form.html:4
#, fuzzy
msgstr[0] "%(count)d collection"
msgstr[1] "%(count)d collections"
-#: web/base.py:323 web/base.py:452 web/base.py:683 web/base.py:1153
+#: web/base.py:327 web/base.py:456 web/base.py:687 web/base.py:1157
msgid "Access not allowed"
msgstr "Accès non autorisé"
-#: web/base.py:325 web/base.py:454 web/base.py:685 web/base.py:1155
+#: web/base.py:329 web/base.py:458 web/base.py:689 web/base.py:1159
msgid ""
"Please login or contact the website administator to get a private access."
msgstr ""
"Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site "
"pour obtenir un accès privé."
+#~ msgid "Account"
+#~ msgstr "Compte"
+
#~ msgid "username"
#~ msgstr "nom d'utilisateur"
--- /dev/null
+{% extends "telemeta_default/inc/user_list.html" %}
--- /dev/null
+{% extends "telemeta_default/users.html" %}
<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>
- <th>{% trans "Groups"%}</th>
- </tr>
- </thead><tbody>
- {% for user in users %}
- <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>
- <td>{% for group in user.groups.all %}{{ group }} {% endfor %}</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
+ {% include "telemeta/inc/user_list.html" %}
{% else %}
<p class="help">{% trans "No users" %}</p>
{% endif %}
<img src="images/user.png" alt="user" style="vertical-align:middle" />
{% trans "Welcome" %},
{% if user.first_name and user.last_name %}
-{{ user.first_name }} {{ user.last_name }}.
+{{ user.first_name }} {{ user.last_name }} |
{% else %}
-{{ user.username }}.
+{{ user.username }} |
{% endif %}
-<a href="{% url telemeta-profile-detail user.username %}">{% trans "Account" %}</a> |
+<a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a> |
<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
<a href="{% url telemeta-logout %}">{% trans "Sign out" %}
<img src="images/logout.png" alt="logout" style="vertical-align:middle" /></a>
<a href="{% url telemeta-items %}" class="green">{% trans "Items" %}</a>
<a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a>
<a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a>
+ {% if user.is_authenticated %}
+ <a href="{% url telemeta-users %}" class="red">{% trans "Users" %}</a>
+ {% endif %}
{% if user.is_staff or user.is_superuser %}
- <a href="{% url telemeta-admin %}" class="red">{% trans "Admin" %}</a>
+ <a href="{% url telemeta-admin %}" class="black">{% trans "Admin" %}</a>
{% endif %}
{% endblock %}
--- /dev/null
+{% load i18n %}
+{% load telemeta_utils %}
+
+ <table class="listing" width="100%">
+ <thead>
+ <tr><th>{% trans "User"%}</th>
+ <th>{% trans "First Name"%}</th>
+ <th>{% trans "Last Name"%}</th>
+ <th>{% trans "E-mail"%}</th>
+ <th>{% trans "Groups"%}</th>
+ </tr>
+ </thead><tbody>
+ {% for user in users %}
+ <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>
+ <td>{% for group in user.groups.all %}{{ group }} {% endfor %}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
\ No newline at end of file
--- /dev/null
+{% extends "telemeta/base.html" %}
+{% load i18n %}
+{% load telemeta_utils %}
+
+{% block head_title %}{% trans "Users" %} - {{ block.super }}{% endblock %}
+
+{% block title %}
+ <img src="{% url telemeta-images "user_red.png" %}" alt="user" style="vertical-align:middle" /> {% trans "Users" %}
+{% endblock %}
+
+{% block content %}
+ {% if users %}
+ <br />
+ {% include "telemeta/inc/user_list.html" %}
+ {% else %}
+ <p class="help">{% trans "No users" %}</p>
+ {% endif %}
+{% endblock %}
@register.filter
def html_line_break(text):
return text.replace('\n', '<br />')
+
+@register.simple_tag
+def profile(user):
+ return user.get_profile()
name="telemeta-login"),
url(r'^logout/$', general_view.logout, name="telemeta-logout"),
- # Profile
- url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"),
- url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"),
+ # Users
+ url(r'^users/$', general_view.users, name="telemeta-users"),
+
+ # Profiles
+ url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"),
+ url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"),
# Registration
url(r'^accounts/password_change/$', 'django.contrib.auth.views.password_change', {'template_name': 'telemeta/registration/password_change_form.html'}, name="telemeta-password-change"),
return HttpResponse("\n".join(data))
+ def users(self, request):
+ users = User.objects.all()
+ return render(request, 'telemeta/users.html', {'users': users})
+
class CollectionView(object):
"""Provide Collections web UI methods"""