summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFontenaySousBois pseudo user <fsb@fontenay-sous-bois.dev.entrouvert.org>2014-12-18 10:12:42 (GMT)
committerFontenaySousBois pseudo user <fsb@fontenay-sous-bois.dev.entrouvert.org>2014-12-18 10:12:42 (GMT)
commit270cf92941b1848f69b706192fd758997f506ca2 (patch)
tree2a5c717b7bc4e30bb8e16b32b674ccb8418f4ce3
parent1b799d2257325cb742cb2741947e64ace1dd5299 (diff)
downloadfontenay-sous-bois-270cf92941b1848f69b706192fd758997f506ca2.zip
fontenay-sous-bois-270cf92941b1848f69b706192fd758997f506ca2.tar.gz
fontenay-sous-bois-270cf92941b1848f69b706192fd758997f506ca2.tar.bz2
reorganisation rubriques sur portail et wcs
-rw-r--r--portail-citoyen/templates/base-cms.html10
-rw-r--r--portail-citoyen/templates/base.html18
-rw-r--r--portail-citoyen/templates/portail_citoyen/template_ezt.html23
3 files changed, 33 insertions, 18 deletions
diff --git a/portail-citoyen/templates/base-cms.html b/portail-citoyen/templates/base-cms.html
index 729a3fb..5c83072 100644
--- a/portail-citoyen/templates/base-cms.html
+++ b/portail-citoyen/templates/base-cms.html
@@ -6,6 +6,16 @@
<li class="last">{% page_attribute "page_title" %}</li>
{% endblock %}
+{% block rubriques %}
+{% page_attribute "slug" as slug %}
+<li class="menu1 level1 {% if slug == "accueil" %}active{% endif %}"><a href="{{ portal_url }}">{% if user.is_authenticated %}Mon compte{% else %}Accueil usager{% endif %}</a></li>
+<li class="menu2 level1"><a href="{{ idp_url }}/accounts/">Mon profil</a></li>
+<li class="menu3 level1 {% if slug == "famille" %}active{% endif %}"><a href="{{ portal_url }}/famille/">Ma famille</a></li>
+<li class="menu4 level1 {% if slug == "factures" %}active{% endif %}"><a href="{{ portal_url }}/factures/">Mes factures</a></li>
+<li class="menu6 level1"><a href="{{ wcs_url }}/{% if user.is_authenticated %}login/{% endif %}">Tous les<br />téléservices</a></li>
+{% endblock %}
+
+
{% block content %}
{% placeholder "content" %}
{% endblock %}
diff --git a/portail-citoyen/templates/base.html b/portail-citoyen/templates/base.html
index 840be85..87f7278 100644
--- a/portail-citoyen/templates/base.html
+++ b/portail-citoyen/templates/base.html
@@ -36,7 +36,7 @@
{% if request.user.is_authenticated %}
<ul class="links">
<li class="first">
- <a href="{{ idp_url }}/accounts/">{{ user.get_full_name }}</a>
+ <a href="{{ portal_url }}">{{ user.get_full_name }}</a>
</li>
<li>
<a href="{{ LOGOUT_URL }}">Déconnexion</a>
@@ -73,14 +73,14 @@
<ul class="menuTop">
<li class="home">
- <a href="{{ portal_url }}" target="_top"><span>fontenay-sous-bois.fr</span></a>
+ <a href="{{ portal_url }}" target="_top"><span>Mon compte</span></a>
</li>
{% block rubriques %}
- <li class="menu1 level1"><a href="{{ wcs_url }}">Démarches<br> en ligne</a></li>
- <li class="menu3 level1"><a href="{{ idp_url }}/accounts/">Mon compte</a></li>
- <li class="menu2 level1"><a href="{{ portal_url }}/famille">Ma famille</a></li>
- <li class="menu4 level1"><a href="{{ wcs_url }}/myspace/">Mes demandes</a></li>
- <li class="menu2 level1"><a href="{{ portal_url }}/factures">Mes factures</a></li>
+ <li class="menu1 level1"><a href="{{ portal_url }}">Mon compte</a></li>
+ <li class="menu2 level1"><a href="{{ idp_url }}/accounts/">Mon profil</a></li>
+ <li class="menu3 level1"><a href="{{ portal_url }}/famille/">Ma famille</a></li>
+ <li class="menu4 level1"><a href="{{ portal_url }}/factures/">Mes factures</a></li>
+ <li class="menu6 level1"><a href="{{ wcs_url }}/{% if user.is_authenticated %}login/{% endif %}">Tous les<br />téléservices</a></li>
{% endblock %}
</ul>
@@ -131,8 +131,8 @@
<h2>{{ user.get_full_name }}</h2>
<div class="content">
<ul class="submenu">
- <li class="first"><a href="{{ idp_url }}/accounts/">Mon compte</a></li>
- <li class=""><a href="{{ wcs_url }}/myspace/">Mes démarches en cours</a></li>
+ <li class="first"><a href="{{ portal_url }}">Mon compte</a></li>
+ <li class=""><a href="{{ idp_url }}/accounts/">Mon profil</a></li>
<li class="last"><a href="{{ LOGOUT_URL }}">Déconnexion</a></li>
</ul>
</div>
diff --git a/portail-citoyen/templates/portail_citoyen/template_ezt.html b/portail-citoyen/templates/portail_citoyen/template_ezt.html
index 411f663..d648e41 100644
--- a/portail-citoyen/templates/portail_citoyen/template_ezt.html
+++ b/portail-citoyen/templates/portail_citoyen/template_ezt.html
@@ -13,10 +13,10 @@
[if-any user]
<ul class="links">
<li class="first">
- <a href="[idp_url]/accounts/">[user.display_name]</a>
+ <a href="[portal_url]">[user.display_name]</a>
</li>
<li>
- <a href="[root_url]logout">Déconnexion</a>
+ <a href="/logout">Déconnexion</a>
</li>
</ul>
[else]
@@ -32,13 +32,18 @@
{% endblock %}
{% block rubriques %}
- <li class="menu1 level1"><a href="[root_url]">Démarches<br> en ligne</a></li>
- <li class="menu3 level1"><a href="[idp_url]/accounts/">Mon compte</a></li>
- <li class="menu2 level1"><a href="[portal_url]/famille">Ma famille</a></li>
- <li class="menu4 level1"><a href="[root_url]myspace/">Mes demandes</a></li>
- <li class="menu2 level1"><a href="[portal_url]/factures">Mes factures</a></li>
+[if-any user]
+<li class="menu1 level1"><a href="{{ portal_url }}">Mon compte</a></li>
+[else]
+<li class="menu1 level1"><a href="{{ portal_url }}">Accueil usager</a></li>
+[end]
+<li class="menu2 level1"><a href="{{ idp_url }}/accounts/">Mon profil</a></li>
+<li class="menu3 level1"><a href="{{ portal_url }}/famille/">Ma famille</a></li>
+<li class="menu4 level1"><a href="{{ portal_url }}/factures/">Mes factures</a></li>
+<li class="menu6 level1 active"><a href="{{ wcs_url }}/">Tous les<br />téléservices</a></li>
{% endblock %}
+
{% block breadcrumb %}
[if-any bigdiv]
<p id="ariane">Vous êtes ici&nbsp;:
@@ -65,8 +70,8 @@
<h2>[user.display_name]</h2>
<div class="content">
<ul class="submenu">
- <li class="first"><a href="[idp_url]/accounts/">Mon compte</a></li>
- <li class=""><a href="[wcs_url]/myspace/">Mes démarches en cours</a></li>
+ <li class="first"><a href="[portal_url]/">Mon compte</a></li>
+ <li class=""><a href="[idp_url]/accounts/">Mon profil</a></li>
[is session_user_admin_access "True"]
<li class=""><a href="<a id="logout" href="[root_url]logout">Déconnexion</a></li>