From ea7656ed2c361ba1b3f1b4ef65a4e06474ebbdf5 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 22 Jun 2011 17:51:12 +0200 Subject: [PATCH] add user tab and page, fix urls --- telemeta/__init__.py | 2 +- telemeta/htdocs/css/telemeta.css | 1 + telemeta/locale/de/LC_MESSAGES/django.mo | Bin 420 -> 420 bytes telemeta/locale/de/LC_MESSAGES/django.po | 78 ++++++++-------- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 12944 -> 12944 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 83 ++++++++++-------- .../templates/telemeta/inc/user_list.html | 1 + telemeta/templates/telemeta/users.html | 1 + .../telemeta_default/admin_users.html | 23 +---- telemeta/templates/telemeta_default/base.html | 11 ++- .../telemeta_default/inc/user_list.html | 23 +++++ .../templates/telemeta_default/users.html | 18 ++++ telemeta/templatetags/telemeta_utils.py | 4 + telemeta/urls.py | 9 +- telemeta/web/base.py | 4 + 15 files changed, 153 insertions(+), 105 deletions(-) create mode 100644 telemeta/templates/telemeta/inc/user_list.html create mode 100644 telemeta/templates/telemeta/users.html create mode 100644 telemeta/templates/telemeta_default/inc/user_list.html create mode 100644 telemeta/templates/telemeta_default/users.html diff --git a/telemeta/__init__.py b/telemeta/__init__.py index 3f685b80..323b0cad 100644 --- a/telemeta/__init__.py +++ b/telemeta/__init__.py @@ -12,7 +12,7 @@ U{http://telemeta.org} """ __docformat__ = 'epytext en' -__version__ = '0.9.8' +__version__ = '0.9.9' __url__ = 'http://telemeta.org' __copyright__ = '(C) 2007-2011 Parisson' __license__ = 'CeCILL-2' diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index dcf3d592..8b00566c 100644 --- a/telemeta/htdocs/css/telemeta.css +++ b/telemeta/htdocs/css/telemeta.css @@ -466,6 +466,7 @@ form.login .submit { #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 } diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index e3f75cd76f4e68b395f8b10af959ab81992f5ea3..b3bc812ba719dda895476d99efdc98cfad7a00b9 100644 GIT binary patch delta 15 WcmZ3&yo7neWEOKP6QhmOc^LsHg9M`h delta 15 WcmZ3&yo7neWEK-E6O)b8c^LsHbp)aS diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index cd9879c0..19a696e8 100644 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" 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 \n" "Language-Team: LANGUAGE \n" @@ -525,6 +525,9 @@ msgstr "" #: 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 "" @@ -558,39 +561,17 @@ msgid "No enumerations" 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 @@ -629,25 +610,25 @@ msgstr "" 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 "" @@ -687,7 +668,7 @@ msgid "Save" 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 "" @@ -967,7 +948,7 @@ 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 "" @@ -1055,10 +1036,20 @@ 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 "" @@ -1151,7 +1142,7 @@ 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 "" @@ -1159,6 +1150,19 @@ 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" @@ -1325,11 +1329,11 @@ msgid_plural "%(count)d collections" 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 "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 26d53884562f5efc96474e1c5f7617dbeb7decea..e062ccc6f58f32558d7161f169b8e6de7602bac3 100644 GIT binary patch delta 2459 zcmX|?4@{J09LJxFJN_Kf!5yS{C8D6Bh*Bm7VUcNyocV_kOC+hIOh)Ch*wW5ov`nq5 zSGP_#(o%A(*`Euuu({>5hOHHr70r#Uz@(bmYU__{eZIV}_skEU=Xu}f`8~hq&+A3Q z(QvdTl5C6#WgC-(YjGN`$Emmp`|x_4f}g}5+>WotTb=i>I6jCK=LpvLqgeed{x6|P=Rzm4H#<;N`d+}(Tjwj$sT!J-03(mtEvHI`AN_02Q!mnY) zdmn3IJ(wxX39Rw`IT5?Vk33L-VXTZV;9~qI9+~(WV@A;~!P=1uti%>$1**gRGmZSw z1drnkyv=FHZ~^T@SaD8cB{mSDqKVI8P4uhdzpw(kN81B3u=P- zW399mYoa!+L_4q&iekm-#JM=~Iu#B480+j#Vg>BQ+QL4p#D2mGbP+4izgRnw#zAVu zxmf*6uqL?G@qDcQ)mZ)OvEo07{mgG3p`uLNu@Z@5O&G)MzBzz3um@jIUjC}1%UG_V4@@jR>rEW}#q z3OpA#VkOv#C*e1-Cho)P_dQm;L97J+z&e@#Fl#oMg?9g`SQ}GX=zIj_&VwpEofp+u z6SZLl?7#}N6D!d!tN@3w0)K!x4D%J%i48mLe{d1)0NE-|CD!;F?8dbbD$0D7<1kjo zN3jBK!Ri>p9^8rN;Qd$$oW;p_2y07!!y0!9>qxzm?Zn4njh~76zRYZ_xRH?aVma29 z)ng^pk$(zvr-aYPa)z zA5JszE^oPeZ3)l2;cie-|Jm>&Y=$2|<$7C*zeCij;Uqi(%C8Ns6z%X+Fv+U&1(vP3 z@))N%^#%A@I0E`PxCeGX4`|iz!MAWTl*3U-6zhO*TE5oW3^Njsjp2Jslw#|WFOaj9 z_FK>dI=(8HVC81!MK~X`5MG6sVG#5~qtXvLi%n`!?t))NYR0^PIlx4zq4oyM2c5$> zxF5Pe=erYBK80x`HU5Ls1-OOAao7%bIxi%BS1Pp-0^PO-Q27SFggCqlVYmTQ_Cp=C zs6p8U`S3Y#N6ZGWz%E>oPHLaPF{>&o=t{R5vVs|-XfLsQ7_ZflmDezr)>2pu^B@%# zf$r#spc1oX*5U`?3)lj);5;-!FR0uBpN-V`#jsrdVCi^T9w>r2@DY3mWzYdHfj*r9 zD1|Xrh*8&4dmEmI6`*n(oB@8Q%xTyN55a0!WySnK*S%J^e@5j@+RNb_9E68KWx6dh z760ti@54U09aciX$`4HTEpZeG_C gj_=J4rn<|@XO+f}HGx z23EWQtOpy!ENRXp1?>QroB>y`0{nrM@n3j0{ufUye1kEuv1Mu@cP2MK~Ahi33=P zY{7cc$Fb(MV9lt_-@k;l z^GC2Q^HHok-gSH$E8b678+aKjuTiWG`V(t@Os4%D-b^+jf{r{o6mSmK#B%J$^RXVF z2J1mr;CpZ*R)W2F20nqc@Oi9p7qQ}vVkPho*2#FX>=RGM8lRu#yadHgM;X>mRpMM+ zi?vV?E8t$NKrdq@dK_zfKW0Drq{xGmg`wNK%aYmLYG zl5`Yr!aDFnIb>KV@o7P}YvM=aHT*pM40^{@E`V;y(`rzb!j*}dG0$P`XSh^Tc^&4# z&5#BG=mTAhgP`&y%$}%mi**6+qcI43VIhQzZkNguSO7P|YEbzezJUb?Fcx;ZuKqr_M{y=nFLQmch3m~W^{~R~O7OeZTKx%mrTMh$;8!>bO`vkCEt7*s zocemK_w;^v7!s{?U$$o&wGyk^=TBNrtplQ<5blOWR-4c7nqhVMPI}fgwLID!s!Ckw l3H78TN4X113JOA}(mP#|6-`^VHU~lrGHN12Ju^q6{sTCS^lbnD diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 9152948d..4c7efbc5 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" 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 \n" "Language-Team: LANGUAGE \n" @@ -531,6 +531,9 @@ msgstr "Administration générale" #: 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" @@ -564,40 +567,18 @@ msgid "No enumerations" 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 @@ -635,19 +616,19 @@ msgstr "Géo-Navigateur" 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." @@ -655,7 +636,7 @@ msgstr "" "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" @@ -695,7 +676,7 @@ msgid "Save" 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" @@ -976,7 +957,7 @@ msgstr "Mot de passe oublié" #: 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" @@ -1064,10 +1045,20 @@ msgstr "Formation" 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" @@ -1160,7 +1151,7 @@ msgstr "Etat/Continent" 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" @@ -1168,6 +1159,19 @@ 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 @@ -1340,17 +1344,20 @@ msgid_plural "%(count)d collections" 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" diff --git a/telemeta/templates/telemeta/inc/user_list.html b/telemeta/templates/telemeta/inc/user_list.html new file mode 100644 index 00000000..09c47422 --- /dev/null +++ b/telemeta/templates/telemeta/inc/user_list.html @@ -0,0 +1 @@ +{% extends "telemeta_default/inc/user_list.html" %} diff --git a/telemeta/templates/telemeta/users.html b/telemeta/templates/telemeta/users.html new file mode 100644 index 00000000..8a03ebf4 --- /dev/null +++ b/telemeta/templates/telemeta/users.html @@ -0,0 +1 @@ +{% extends "telemeta_default/users.html" %} diff --git a/telemeta/templates/telemeta_default/admin_users.html b/telemeta/templates/telemeta_default/admin_users.html index 31edf784..38580cd5 100644 --- a/telemeta/templates/telemeta_default/admin_users.html +++ b/telemeta/templates/telemeta_default/admin_users.html @@ -6,28 +6,7 @@

{% trans "Users" %}

{% if users %} - - - - - - - - - - - {% for user in users %} - - - - - - - - {% endfor %} - -
{% trans "User"%}{% trans "First Name"%}{% trans "Last Name"%}{% trans "E-mail"%}{% trans "Groups"%}
{{user.username}}{{ user.first_name }}{{ user.last_name }}{{ user.email }}{% for group in user.groups.all %}{{ group }} {% endfor %}
- + {% include "telemeta/inc/user_list.html" %} {% else %}

{% trans "No users" %}

{% endif %} diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index 65160a03..c6822733 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -52,11 +52,11 @@ user {% 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 %} -{% trans "Account" %} | +{% trans "Profile" %} | {% trans "Help" %} | {% trans "Sign out" %} logout @@ -83,8 +83,11 @@ {% trans "Items" %} {% trans "Geo Navigator" %} {% trans "Advanced search" %} + {% if user.is_authenticated %} + {% trans "Users" %} + {% endif %} {% if user.is_staff or user.is_superuser %} - {% trans "Admin" %} + {% trans "Admin" %} {% endif %} {% endblock %} diff --git a/telemeta/templates/telemeta_default/inc/user_list.html b/telemeta/templates/telemeta_default/inc/user_list.html new file mode 100644 index 00000000..a82240a9 --- /dev/null +++ b/telemeta/templates/telemeta_default/inc/user_list.html @@ -0,0 +1,23 @@ +{% load i18n %} +{% load telemeta_utils %} + + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} + +
{% trans "User"%}{% trans "First Name"%}{% trans "Last Name"%}{% trans "E-mail"%}{% trans "Groups"%}
{{user.username}}{{ user.first_name }}{{ user.last_name }}{{ user.email }}{% for group in user.groups.all %}{{ group }} {% endfor %}
\ No newline at end of file diff --git a/telemeta/templates/telemeta_default/users.html b/telemeta/templates/telemeta_default/users.html new file mode 100644 index 00000000..4f73df1e --- /dev/null +++ b/telemeta/templates/telemeta_default/users.html @@ -0,0 +1,18 @@ +{% extends "telemeta/base.html" %} +{% load i18n %} +{% load telemeta_utils %} + +{% block head_title %}{% trans "Users" %} - {{ block.super }}{% endblock %} + +{% block title %} + user {% trans "Users" %} +{% endblock %} + +{% block content %} + {% if users %} +
+ {% include "telemeta/inc/user_list.html" %} + {% else %} +

{% trans "No users" %}

+ {% endif %} +{% endblock %} diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index a63a1309..048467c6 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -299,3 +299,7 @@ def current_year(): @register.filter def html_line_break(text): return text.replace('\n', '
') + +@register.simple_tag +def profile(user): + return user.get_profile() diff --git a/telemeta/urls.py b/telemeta/urls.py index 70ee6af7..fbf1a78a 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -240,9 +240,12 @@ urlpatterns = patterns('', name="telemeta-login"), url(r'^logout/$', general_view.logout, name="telemeta-logout"), - # Profile - url(r'^accounts/(?P[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"), - url(r'^accounts/(?P[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[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"), + url(r'^users/(?P[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"), diff --git a/telemeta/web/base.py b/telemeta/web/base.py index ab2496bd..69162689 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -313,6 +313,10 @@ class GeneralView(object): 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""" -- 2.39.5