summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFontenaySousBois pseudo user <fsb@fontenay-sous-bois.dev.entrouvert.org>2014-12-18 21:42:46 (GMT)
committerFontenaySousBois pseudo user <fsb@fontenay-sous-bois.dev.entrouvert.org>2014-12-18 21:42:46 (GMT)
commit8eb66c89dc6316802031f9adb3b6757c2c23c0d7 (patch)
treeb5e9c11e70b84fb61ec2d3a7aa4eba9863858c56
parent5ef66bec7e1746c0afe2be8674a38eec9348b0a5 (diff)
downloadfontenay-sous-bois-8eb66c89dc6316802031f9adb3b6757c2c23c0d7.zip
fontenay-sous-bois-8eb66c89dc6316802031f9adb3b6757c2c23c0d7.tar.gz
fontenay-sous-bois-8eb66c89dc6316802031f9adb3b6757c2c23c0d7.tar.bz2
fil d'ariane inutile sur ce site
-rw-r--r--authentic2/templates/base.html9
-rw-r--r--authentic2/templates/idp/account_management.html37
-rw-r--r--authentic2/templates/idp/homepage.html1
-rw-r--r--common/static/f-s-b/css/entrouvert.css12
-rw-r--r--portail-citoyen/templates/base.html10
5 files changed, 29 insertions, 40 deletions
diff --git a/authentic2/templates/base.html b/authentic2/templates/base.html
index 0635011..4239ed7 100644
--- a/authentic2/templates/base.html
+++ b/authentic2/templates/base.html
@@ -94,17 +94,8 @@
</div><!-- headerContainer -->
<div id="corpus">
- <h1 class="hide">Accueil : contenu</h1>
<div id="content">
- {% block breadcrumb %}
- <p id="ariane">Vous êtes ici&nbsp;:
- <a href="{{ portal_url }}">Accueil</a>&nbsp;/
- <span></span>
- </p>
- {% endblock %}
-
- <br />
<div id="contentBlock-1">
{% block messages %}{% if messages %}
diff --git a/authentic2/templates/idp/account_management.html b/authentic2/templates/idp/account_management.html
index 4658bbc..e15fe95 100644
--- a/authentic2/templates/idp/account_management.html
+++ b/authentic2/templates/idp/account_management.html
@@ -1,44 +1,39 @@
{% extends "base.html" %}
{% load i18n %}
-{% block title %}
-{% trans "Authentic - Account Management" %}
-{% endblock %}
-
+{% block title %}Mon profil{% endblock %}
{% block content %}
-<h2>{% trans "Account Management" %}</h2>
-<h3>{% trans "Profile" %}</h3>
+<h1>Mon profil</h1>
+
<div id="profile">
{% if profile %}
-<dl>
-{% for key, values in profile %}
-<dt>{{ key|capfirst }}</dt>
-<dd>{% if values|length == 1 %}{{ values.0 }}{% else %}
<ul>
- {% for value in values %}
- <li>{{ value }}</li>
- {% endfor %}
-</ul>
-{% endif %}
-</dd>
+{% for key, values in profile %}
+<li>{{ key|capfirst }}&nbsp;:
+<strong>{% if values|length == 1 %}{{ values.0 }}{% else %}
+ <ul>{% for value in values %}<li>{{ value }}</li>
+{% endfor %}</ul>{% endif %}</strong></li>
{% endfor %}
-</dl>
{% endif %}
+
{% if allow_email_change %}
-<p><a href="{% url 'email-change' %}">{% trans "Change email" %}</a></p>
+<p><a href="{% url 'email-change' %}">Changer mon adresse électronique</a></p>
{% endif %}
{% if allow_profile_edit %}
-<p><a href="{% url 'profile_edit' %}">{% trans "Edit profile" %}</a></p>
+<p><a href="{% url 'profile_edit' %}">Modifier les autres information de mon profil</a></p>
{% endif %}
{% if allow_account_deletion %}
-<p><a href="{% url 'delete_account' %}">{% trans "Delete profile" %}</a></p>
+<p><a href="{% url 'delete_account' %}">Supprimer mon compte</a></p>
{% endif %}
</div>
+
<h3>{% trans "Credentials" %}</h3>
{% for html_block in frontends_block %}
{{ html_block|safe }}
{% endfor %}
+
+<!--
{% if federation_management %}
<div id="federation-management">
<h3>{% trans "Federation management" %}
@@ -60,5 +55,5 @@
</ul>
</div>
{% endif %}
-<p><a href="/">{% trans "Back" %}</a></p>
+-->
{% endblock %}
diff --git a/authentic2/templates/idp/homepage.html b/authentic2/templates/idp/homepage.html
index 9973c95..9b41d19 100644
--- a/authentic2/templates/idp/homepage.html
+++ b/authentic2/templates/idp/homepage.html
@@ -5,7 +5,6 @@
{% trans "Authentic" %}
{% endblock %}
-
{% block content %}
{% if account_management %}
diff --git a/common/static/f-s-b/css/entrouvert.css b/common/static/f-s-b/css/entrouvert.css
index c2cc1a1..181aab2 100644
--- a/common/static/f-s-b/css/entrouvert.css
+++ b/common/static/f-s-b/css/entrouvert.css
@@ -1,3 +1,15 @@
+/* modif de mainstyle.css */
+
+.interieur #content #contentBlock-1 {
+ margin-top: 2em;
+}
+
+interieur .agendaCalendar, .interieur .highlight.menu, #content .right, #content .colright, #content #contentBlock-2 {
+ margin-top: 1em;
+}
+
+/* classe "entrouvert" */
+
.interieur.entrouvert .agendaCalendar .calendar-table tr.calendar-header,
.interieur.entrouvert #headerContainer,
.interieur.entrouvert .agendaCalendar,
diff --git a/portail-citoyen/templates/base.html b/portail-citoyen/templates/base.html
index d16d9ad..c4d55ae 100644
--- a/portail-citoyen/templates/base.html
+++ b/portail-citoyen/templates/base.html
@@ -95,17 +95,9 @@
</div><!-- headerContainer -->
<div id="corpus">
- <h1 class="hide">Accueil : contenu</h1>
+ <h1 class="hide">Accueil</h1>
<div id="content">
- {% block breadcrumb %}
- <p id="ariane">Vous êtes ici&nbsp;:
- <a href="{{ portal_url }}">Accueil</a>&nbsp;/
- <span></span>
- </p>
- {% endblock %}
-
- <br />
<div id="contentBlock-1">
{% block messages %}{% if messages %}