correctly display user info links in authentic (#7240 )

idp templates inherit from "base-page.html" (#7240 )
fix reader informations retreiving
2015-06-20 14:58:35 +02:00 · 2015-06-20 13:49:57 +02:00 · 2015-05-26 19:20:07 +02:00 · 2015-05-18 21:49:34 +02:00 · 2015-05-15 09:46:26 +02:00 · 2015-05-15 09:37:14 +02:00
22 changed files with 84 additions and 40 deletions
--- a/templates/404.html
+++ b/templates/404.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "common.html" %}
 {% block title %}Page inexistante{% endblock %}
 {% block content %}
 <div id="error-404">
--- a/templates/500.html
+++ b/templates/500.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "common.html" %}
 {% block title %}Erreur système{% endblock %}
 {% block content %}
 <div id="error-500">
--- a/templates/authentic2/base.html
+++ b/templates/authentic2/base.html
@ -0,0 +1,18 @@
+{% extends theme_base %}
+{% load i18n %}
+
+{% block user-info %}
+  {% if user.is_authenticated %}
+    <div id="toplinks">
+      <span>
+        <a class="logout" href="{% url 'auth_logout' %}">{% trans "Logout" %}</a>
+        {% if is_eservice_admin %}
+        <a class="restricted" href="{{ wcs_url }}admin/">Administration</a>
+        {% elif is_eservice_backoffice_user %}
+        <a class="restricted" href="{{ wcs_url }}backoffice/">Back office</a>
+        {% endif %}
+      </span>
+    </div>
+    <div id="username">{{ user.first_name }} {{ user.last_name }}</div>
+  {% endif %}
+{% endblock %}
--- a/templates/authentic2/login.html
+++ b/templates/authentic2/login.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}
 {% load staticfiles %}

--- a/templates/blurps/compte_lecteur.html
+++ b/templates/blurps/compte_lecteur.html
@ -1,5 +1,5 @@
  <h2>Compte lecteur</h2>
-{% with data=compte_lecteur %}
+{% with data=compte_lecteur.data %}
 {% if  data.d.ClientAccount.ShortAccount %}
 <p>Votre carte d'abonnement numéro {{ data.d.ClientAccount.Identity.BarCode }} est valable jusqu'au {{ data.d.ClientAccount.Identity.ExpirationDate }}.</p>
 <p>Vous avez actuellement {{ data.d.ClientAccount.ShortAccount.NombrePrets }} oeuvre(s) en prêt :
--- a/templates/combo/page_template.html
+++ b/templates/combo/page_template.html
@ -1,8 +1,27 @@
-{% extends "base.html" %}
-{% load combo %}
+{% extends "common.html" %}
+{% load combo gadjo i18n staticfiles %}

 {% block title %}{{ page.title }}{% endblock %}

+{% block extra_styles %}
+<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "combo.style.css" %}" >
+{% endblock %}
+
+
+{% block extra_scripts %}
+<script src="{{site_base}}{% xstatic 'jquery' 'jquery.min.js' %}"></script>
+<script src="{{site_base}}{% static 'js/combo.public.js' %}"></script>
+{% skeleton_extra_placeholder 'extra-head' %}
+{% endblock %}
+
+{% block bodyargs %}
+{% skeleton_extra_placeholder 'bodyargs' %}
+{% endblock %}
+
+{% block content_header %}
+{% skeleton_extra_placeholder 'content_header' %}
+{% endblock %}
+
 {% block menu %}
  {% show_menu %}
 {% endblock %}
@ -10,3 +29,20 @@
 {% block content %}
  {% placeholder "content" %}
 {% endblock %}
+
+{% block user-info %}
+  {% if user.is_authenticated %}
+    <div id="toplinks">
+      <span>
+        <a class="logout" href="{% url 'auth_logout' %}">{% trans "Logout" %}</a>
+        {% if is_eservice_admin %}
+        <a class="restricted" href="{{ wcs_url }}admin/">Administration</a>
+        {% elif is_eservice_backoffice_user %}
+        <a class="restricted" href="{{ wcs_url }}backoffice/">Back office</a>
+        {% endif %}
+      </span>
+    </div>
+    <div id="username">{{ user.first_name }} {{ user.last_name }}</div>
+  {% endif %}
+{% skeleton_extra_placeholder 'user-info' %}
+{% endblock %}
--- a/templates/common.html
+++ b/templates/common.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% load i18n static  %}
+{% load i18n staticfiles %}
 <html>
  <head>
    <meta charset="UTF-8"><!-- ☭ -->
@ -8,8 +8,8 @@
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <meta http-equiv="content-language" content="fr" />
    <title>Compte Citoyen :: Montpellier Méditerranée Métropole :: {% block title %}{% endblock %}</title>
-    <link rel="shortcut icon" href="{% static "themes/django-montpellier/favicon.png" %}" />
-    <link rel="stylesheet" type="text/css" href="{% static "themes/django-montpellier/style.css" %}" >
+    <link rel="shortcut icon" href="{{ site_base }}{% static "themes/django-montpellier/favicon.png" %}" />
+    <link rel="stylesheet" type="text/css" href="{{ site_base }}{% static "themes/django-montpellier/style.css" %}" >
    {% block extra_styles %}
    {% endblock %}
    <link href='https://fonts.googleapis.com/css?family=Lato:400,700,700italic,400italic|Carme|Arvo' rel='stylesheet' type='text/css'>
@ -26,26 +26,15 @@
      <div id="header">
        <div id="top">
          {% if user.is_authenticated %}
-            <a href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo={{ site_agglo_montpellier_url }}&amp;AuthId=default-sp" accesskey="1"><img src="{{ STATIC_URL }}/themes/django-montpellier/logo.png"
+            <a href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo={{ site_agglo_montpellier_url }}&amp;AuthId=default-sp" accesskey="1"><img src="{{ site_base }}{% static "themes/django-montpellier/logo.png" %}"
              title="Montpellier Méditerranée Métropole" /></a>
          {% else %}
-            <a href="{{ site_agglo_montpellier_url }}" accesskey="1"><img src="{% static "themes/django-montpellier/logo.png" %}"
+            <a href="{{ site_agglo_montpellier_url }}" accesskey="1"><img src="{{ site_base }}{% static "themes/django-montpellier/logo.png" %}"
              title="Montpellier Méditerranée Métropole" /></a>
          {% endif %}
          <div class="region-header">
-            {% if user.is_authenticated %}
-              <div id="toplinks">
-                <span>
-                  <a class="logout" href="{% url 'auth_logout' %}">{% trans "Logout" %}</a>
-                  {% if is_eservice_admin %}
-                  <a class="restricted" href="{{ wcs_url }}admin/">Administration</a>
-	  {% elif is_eservice_backoffice_user %}
-	  <a class="restricted" href="{{ wcs_url }}backoffice/">Back office</a>
-                  {% endif %}
-                </span>
-              </div>
-              <div id="username">{{ user.first_name }} {{ user.last_name }}</div>
-            {% endif %}
+          {% block user-info %}
+          {% endblock %}
          </div>
        </div>
        {% block messages %}
@ -76,13 +65,14 @@
          {% endif %}
         </div>
        <div id="menu">
+          
          {% block menu %}
          {% if user.is_authenticated %}
          <ul>
            <li id="top-menu-accueil" class="sibling">
              <a href="{{ portal_url }}">Accueil</a>
            </li>
-            <li id="top-menu-mon-compte" class="selected">
+            <li id="top-menu-mon-compte" class="sibling">
              <a href="{{ idp_url }}/accounts">Mon compte</a>
            </li>
            <li id="top-menu-mes-abonnements" class="sibling">
--- a/templates/idp/account_management.html
+++ b/templates/idp/account_management.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n staticfiles %}

 {% block extra_styles %}
--- a/templates/idp/homepage.html
+++ b/templates/idp/homepage.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block title %}
--- a/templates/idp/logout.html
+++ b/templates/idp/logout.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block title %}{% trans "Logging out" %}{% endblock %}
--- a/templates/idp/openid/decide.html
+++ b/templates/idp/openid/decide.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}

 {% block content %}
 <form method="post" action="{% url 'openid-provider-decide' %}">
--- a/templates/profiles/edit_profile.html
+++ b/templates/profiles/edit_profile.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}
--- a/templates/profiles/email_change.html
+++ b/templates/profiles/email_change.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}
--- a/templates/registration/activation_complete.html
+++ b/templates/registration/activation_complete.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block title %}Compte citoyen{% endblock %}
--- a/templates/registration/delete_account.html
+++ b/templates/registration/delete_account.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}
--- a/templates/registration/password_reset_complete.html
+++ b/templates/registration/password_reset_complete.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}class="narrow-page"{% endblock %}
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}
--- a/templates/registration/password_reset_done.html
+++ b/templates/registration/password_reset_done.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}class="narrow-page"{% endblock %}
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}class="narrow-page"{% endblock %}
--- a/templates/registration/registration_complete.html
+++ b/templates/registration/registration_complete.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}class="narrow-page"{% endblock %}
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base-page.html" %}
 {% load i18n %}

 {% block bodyargs %}
Author	SHA1	Message	Date
Frédéric Péters	eca214d040	correctly display user info links in authentic (#7240 )	2015-06-20 14:58:35 +02:00
Serghei Mihai	2ac4bc0c20	idp templates inherit from "base-page.html" (#7240 )	2015-06-20 13:49:57 +02:00
Serghei Mihai	aac294ed1e	fix reader informations retreiving	2015-05-26 19:20:07 +02:00
Serghei Mihai	59630aae2f	use common logo (#7240 )	2015-05-18 21:49:34 +02:00
Serghei Mihai	8ebb4b6910	authentic: templates inherit from base.html provided by combo	2015-05-15 09:46:26 +02:00
Serghei Mihai	c3637724c8	common template for combo and error pages	2015-05-15 09:37:14 +02:00