From 1b6c1727101e5e0b7f901d9d2c95585ce21242af Mon Sep 17 00:00:00 2001
From: Serghei Mihai <smihai@entrouvert.com>
Date: Sun, 10 May 2015 16:16:23 +0200
Subject: [PATCH] management page improved

---
 .../templates/organization/base.html             |   6 +++---
 .../templates/organization/manage.html           |   8 +++++++-
 uauth/organization/views.py                      |   2 +-
 uauth/static/css/icons/icon-personnes-hover.png  | Bin 0 -> 1588 bytes
 uauth/static/css/icons/icon-personnes.png        | Bin 0 -> 1609 bytes
 uauth/static/css/style.css                       |   5 ++++-
 6 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 uauth/static/css/icons/icon-personnes-hover.png
 create mode 100644 uauth/static/css/icons/icon-personnes.png

diff --git a/uauth/organization/templates/organization/base.html b/uauth/organization/templates/organization/base.html
index ba275fb..8c595a1 100644
--- a/uauth/organization/templates/organization/base.html
+++ b/uauth/organization/templates/organization/base.html
@@ -4,6 +4,6 @@
 {% block logout-url %}{% url "logout" %}{% endblock %}
 
 {% block more-user-links %}
-  {{ block.super }}
-  <a href="{% url "manage-users" organization.slug %}">{% trans 'User management' %}</a>
-  {% endblock %}
+  <a href="{% url "organization-home" organization.slug %}" class="icon-home-space">{% trans 'Homepage' %}</a>
+  <a href="{% url "manage" organization.slug %}">{% trans 'Management' %}</a>
+{% endblock %}
diff --git a/uauth/organization/templates/organization/manage.html b/uauth/organization/templates/organization/manage.html
index f8dd9ab..e47c5d3 100644
--- a/uauth/organization/templates/organization/manage.html
+++ b/uauth/organization/templates/organization/manage.html
@@ -1,2 +1,8 @@
-{% extends "uauth/base.html" %}
+{% extends "organization/base.html" %}
 {% load i18n %}
+
+{% block content %}
+<ul class="apps">
+  <li class="users"><a href="{% url 'manage-users' organization.slug %}">{% trans 'Users' %}</a></li>
+</ul>
+{% endblock %}
diff --git a/uauth/organization/views.py b/uauth/organization/views.py
index 1270ff0..fb66fd2 100644
--- a/uauth/organization/views.py
+++ b/uauth/organization/views.py
@@ -33,7 +33,7 @@ class OrganizationMixin(object):
         ctx['organization'] = Organization.objects.get(slug=self.kwargs['organization_slug'])
         return ctx
 
-class ManageView(TemplateView):
+class ManageView(OrganizationMixin, TemplateView):
     template_name = 'organization/manage.html'
 
 manage = ManageView.as_view()
diff --git a/uauth/static/css/icons/icon-personnes-hover.png b/uauth/static/css/icons/icon-personnes-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e8ec4a93e3d4f848574a78e514915d16d19ffe4
GIT binary patch
literal 1588
zcmV-42Fv-0P)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00004b3#c}2nYxW
zd<bNS00009a7bBm002cb002cb0epd1`2YX_8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H103UQkSaeirbZlh+M{aLzWgt^|ZDMb1X=5NsV{dLCRA^;wWsamN
zs{jB6hDk(0RCt{2o84<1RT##fce5cYM8#HxDlG)G&_>gkM5`Aj6dD>YYAa2xU$nF_
znNRIi5T)QB(5qm&*(B{%6-o%ASWs+PgHa)Bw-CJ5AQ5^YMUxaQnw{5+j1cI|?#!Gy
zvuDcuAOv>yyywZYXXebj&xVd3JA#bp<Qgp??PLZDk{KvSW}qPXIEt9MT>!A(ahyX$
z)CFK0fUN*-0=U7<m0T|ODS)fR()jH-=2Qg|-G#Mbqd%9+T>!8>z}uG{#~GTOp12}3
zsX|0H(A4c#0B4z54?QVS3BYKvG=3}6<O&h#8mNz$UCg`~#XJCDW}TTA^%1ix%6OFs
zZJ?>!twb~npiOY@HX@pJS8{5JvI5US+`Rv3bL*v+PzGwlMt{`P)(>XZwPB+_&YDRQ
z*g#Xa3+`?kzldD!f_p2JI>M~L{Rnoe5{2z<{nQcIK*w<o$rK{HzAOS8=ssacLw0>x
zggJ$`NmG$beJO-7aH}*G$<&uZ7z1xgQ;|%4DTFcbhBOt))R#hF1DUxZQ;6*PvIuOT
z+s~6HL~?yuggJ$;0$7%$W7(~rIszM5ERElG9A`*|2*+`T(%PvG)l8V2p19&RLt}%8
zN@?y;N6AD+0USU)Ev+TDUTh?t&qQkJ>mz1Y3{BM~W*#g}6=U0d8<Ef46`4pQwWL0k
zYxLP5Y#`9MT-em@R%TvAOxI%~>Il0MV+qz>Q!cwdNg^YkF~SULYJXyP=$Z5p^U-IX
z-rM)=-sk@K{)dIXLKgsF>UQUzj?T5p^=tn|8Ltf+{X{etWo!+4y1RP5yH@$}m!Jbe
z-3J<)b->W9>qPV$Gk;dCRwK8dn0darxp~ddte;HXexrTYlc~&S0*N+tJ8x*#hXB3+
z(7EZ*pCR>arWpVMXlLe&y}i8)Z=M=?IN(@i@|n5@zBBr6Gk_TYuX`L8HE=UM`F#Ex
z+kCsOF)HOVbvKdK)zvcqUh+D|%zqo26+&8Vi0JWZwR&;p((JyMUm4^Y?^7n9sks6T
z&FTj5p0J{D^p(rydY_6i`Akg%iRgXAbgL5vA{w2!G)pz!qD(&HYv5bf>4%tkARaxT
z*-<W+pRaLTnS93A!1eX@S8?ZsJ~4>swHk+&$!BVv!pCC}BEnJk4&V+{%4a+cG&HLn
zKzD44qOoOVWySLnqEbHNX&^K2i%*UaejlPT`HZK5M6@F|IRX%o=k0__`HbHRl=YYt
z3TA%9@0cq2Oe$C4CPuN5tHeR1e8z7VR$>JL@LhobP%Mq#V&*}Jo4CZxgHhW0eg@VQ
zo*;F*Go`6wg@`($p3X#6BBG9{;g;WHT2qu_5(uQjT{(s}Y<!$_K66+7v!T1O>?ERt
z%zPd|1shKl|G2*^%zU1R4ieGMIKr*O8wItPm^@djfe?tK^BJWK42!ATc>s?w^X_~;
zKmWnGvEL)s>1k?e`Zdb<R2pdN_JaUUGqVNY0RX60tGfV1GLV_ST3=spH8g7tz?Y8W
zj7?5Y%m*2px@(}R+XKw}Gc%uoYo1FS@xr|Tj^uK=uMN%m{N#zD`|1r$m4Sw49cSjt
z0KERNIP)0*7$_79-_{GdV)<r55*V7b2fzY=mL%t8=1)pfMbAtKNXZIx+xs6OVe<fh
zhz^^&ec11KDh!;Po9hG6-arYy-SJcy$jql2JpT(PPYijke&r2xcf!F2%V;eW3ZCCq
zP~O0nmX>1x?rF3R055vIsJwwh^i-oY02|+$@OoW&0|6+}+-2r1Uau=}ATujrAbh^9
zpuB;q#0yBPfdKArv;Y^+jVuiYDotjfAen)JWCjY787N3*pdgunf@B5?k{KvSYBCX3
m$yT5snSp|21`3iHD9C^GsTD+uYkEom0000<MNUMnLSTX`!O}+n

literal 0
HcmV?d00001

diff --git a/uauth/static/css/icons/icon-personnes.png b/uauth/static/css/icons/icon-personnes.png
new file mode 100644
index 0000000000000000000000000000000000000000..af29363dfbee2d7bb65c2b4aa99b88f4c5f10f34
GIT binary patch
literal 1609
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
Hu0mjfw*2Jy

literal 0
HcmV?d00001

diff --git a/uauth/static/css/style.css b/uauth/static/css/style.css
index 760ffd6..12bb306 100644
--- a/uauth/static/css/style.css
+++ b/uauth/static/css/style.css
@@ -71,4 +71,7 @@ div.example {
     background: #eee;
     border: 1px solid #bbb;
     font-family: Monospace;
-}
\ No newline at end of file
+}
+
+/* icons */
+li.users a {background-image: url(icons/icon-personnes.png);}
\ No newline at end of file