https://dev.entrouvert.org/https://dev.entrouvert.org/favicon.ico?15861920342019-08-10T10:29:37ZRedmine Entr’ouvertPlugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1866312019-08-10T10:29:37ZBenjamin Dauvergne
<ul></ul><p>C'est dans authentic2_auth_fc/{login.html,login_registration.html} je veux bien mettre tout le monde dans button-wrapper avec une classe différenciante, comme cela :</p>
<pre><code class="diff syntaxhl"><span class="CodeRay"><span class="line comment">diff --git a/src/authentic2_auth_fc/templates/authentic2_auth_fc/login.html b/src/authentic2_auth_fc/templates/authentic2_auth_fc/login.html</span>
<span class="line comment">index c88d4f69..9633c34f 100644</span>
<span class="line head"><span class="head">--- </span><span class="filename">a/src/authentic2_auth_fc/templates/authentic2_auth_fc/login.html</span></span>
<span class="line head"><span class="head">+++ </span><span class="filename">b/src/authentic2_auth_fc/templates/authentic2_auth_fc/login.html</span></span>
<span class="line change"><span class="change">@@</span> -2,7 +2,7 <span class="change">@@</span></span>
{% load i18n %}
<span class="tag"><link</span> <span class="attribute-name">rel</span>=<span class="string"><span class="delimiter">"</span><span class="content">stylesheet</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">text/css</span><span class="delimiter">"</span></span> <span class="attribute-name">href</span>=<span class="string"><span class="delimiter">"</span><span class="content">{% static 'authentic2_auth_fc/css/fc.css' %}</span><span class="delimiter">"</span></span><span class="tag">></span>
<span class="line delete"><span class="delete">-</span><span class="tag"><div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-button-wrapper</span></span><span class="string"><span class="delimiter">"</span></span><span class="tag">></span></span>
<span class="line insert"><span class="insert">+</span><span class="tag"><div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-button-wrapper</span></span><span class="eyecatcher"><span class="string"><span class="content"> fc-login</span></span></span><span class="string"><span class="delimiter">"</span></span><span class="tag">></span></span>
<span class="tag"><div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-button</span><span class="delimiter">"</span></span><span class="tag">></span>
<span class="tag"><a</span> <span class="attribute-name">href</span>=<span class="string"><span class="delimiter">"</span><span class="content">{{ login_url }}</span><span class="delimiter">"</span></span>
<span class="attribute-name">class</span>=<span class="string"><span class="delimiter">"</span><span class="content">button connexion{% if popup %} js-fc-popup{% endif %}</span><span class="delimiter">"</span></span><span class="tag">></span>
<span class="line comment">diff --git a/src/authentic2_auth_fc/templates/authentic2_auth_fc/login_registration.html b/src/authentic2_auth_fc/templates/authentic2_auth_fc/login_registration.html</span>
<span class="line comment">index 4916a1ec..258cc65a 100644</span>
<span class="line head"><span class="head">--- </span><span class="filename">a/src/authentic2_auth_fc/templates/authentic2_auth_fc/login_registration.html</span></span>
<span class="line head"><span class="head">+++ </span><span class="filename">b/src/authentic2_auth_fc/templates/authentic2_auth_fc/login_registration.html</span></span>
<span class="line change"><span class="change">@@</span> -3,15 +3,14 <span class="change">@@</span></span>
<span class="tag"><link</span> <span class="attribute-name">rel</span>=<span class="string"><span class="delimiter">"</span><span class="content">stylesheet</span><span class="delimiter">"</span></span> <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">text/css</span><span class="delimiter">"</span></span> <span class="attribute-name">href</span>=<span class="string"><span class="delimiter">"</span><span class="content">{% static 'authentic2_auth_fc/css/fc.css' %}</span><span class="delimiter">"</span></span><span class="tag">></span>
<span class="line delete"><span class="delete">-</span><span class="tag"><div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-registration-user-info</span><span class="delimiter">"</span></span><span class="tag">></span></span>
<span class="line delete"><span class="delete">-</span> <span class="tag"><h3></span>{% trans "Create your account with FranceConnect" %}<span class="tag"></h3></span></span>
<span class="line delete"><span class="delete">-</span> <span class="tag"><p</span> <span class="attribute-name">class</span>=<span class="string"><span class="delimiter">"</span><span class="content">certified</span><span class="delimiter">"</span></span><span class="tag">></span></span>
<span class="line delete"><span class="delete">-</span> <span class="tag"><span</span> <span class="attribute-name">class</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-user-full-name</span><span class="delimiter">"</span></span><span class="tag">></span>{{ fc_user_info.given_name }} {{ fc_user_info.family_name }}<span class="tag"></span></span></span>
<span class="line delete"><span class="delete">-</span> {% if fc_user_info.email %}<span class="tag"><span</span> <span class="attribute-name">class</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-user-email</span><span class="delimiter">"</span></span><span class="tag">></span>{{ fc_user_info.email }}<span class="tag"></span></span>{% endif %}</span>
<span class="line delete"><span class="delete">-</span> <span class="tag"></p></span></span>
<span class="line delete"><span class="delete">-</span><span class="tag"></div></span></span>
<span class="line delete"><span class="delete">-</span></span>
<span class="line delete"><span class="delete">-</span><span class="tag"><div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-button-wrapper</span><span class="delimiter">"</span></span><span class="tag">></span></span>
<span class="line insert"><span class="insert">+</span><span class="tag"><div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-button-wrapper fc-registration</span><span class="delimiter">"</span></span><span class="tag">></span></span>
<span class="line insert"><span class="insert">+</span> <span class="tag"><div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-registration-user-info</span><span class="delimiter">"</span></span><span class="tag">></span></span>
<span class="line insert"><span class="insert">+</span> <span class="tag"><h3></span>{% trans "Create your account with FranceConnect" %}<span class="tag"></h3></span></span>
<span class="line insert"><span class="insert">+</span> <span class="tag"><p</span> <span class="attribute-name">class</span>=<span class="string"><span class="delimiter">"</span><span class="content">certified</span><span class="delimiter">"</span></span><span class="tag">></span></span>
<span class="line insert"><span class="insert">+</span> <span class="tag"><span</span> <span class="attribute-name">class</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-user-full-name</span><span class="delimiter">"</span></span><span class="tag">></span>{{ fc_user_info.given_name }} {{ fc_user_info.family_name }}<span class="tag"></span></span></span>
<span class="line insert"><span class="insert">+</span> {% if fc_user_info.email %}<span class="tag"><span</span> <span class="attribute-name">class</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-user-email</span><span class="delimiter">"</span></span><span class="tag">></span>{{ fc_user_info.email }}<span class="tag"></span></span>{% endif %}</span>
<span class="line insert"><span class="insert">+</span> <span class="tag"></p></span></span>
<span class="line insert"><span class="insert">+</span> <span class="tag"></div></span></span>
<span class="tag"><div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">"</span><span class="content">fc-button</span><span class="delimiter">"</span></span><span class="tag">></span>
<span class="tag"><a</span> <span class="attribute-name">href</span>=<span class="string"><span class="delimiter">"</span><span class="content">{{ registration_url }}</span><span class="delimiter">"</span></span>
<span class="attribute-name">class</span>=<span class="string"><span class="delimiter">"</span><span class="content">button connexion{% if popup %} js-fc-popup{% endif %}</span><span class="delimiter">"</span></span><span class="tag">></span>
</span></code></pre>
<p>Ça irait ?</p> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1866352019-08-10T11:25:59ZFrédéric Pétersfpeters@entrouvert.com
<ul></ul><blockquote>
<p>tout le monde dans button-wrapper<br />(...)<br />Ça irait ?</p>
</blockquote>
<p>Pas bien sûr des conséquences, il y a pas mal de style déjà appliqué à div#fc-button-wrapper, du coup je pense plus sûr que fc-button-wrapper reste uniquement à entourer fc-button.</p>
<p>À l'origine de ce ticket c'était l'intégration graphique Quimper mais je ne me souviens plus du point particulier que j'aurais aimé y traiter; par contre, pour le point récent qui serait de pouvoir faire monter le bloc FC au-dessus du bloc de connexion par mot de passe, au retour de FC, en mobile, ça doit se jouer plus haut, en gros, pouvoir arriver à quelque chose comme :</p>
<pre>
{% block login-blocks %}
{% for id, login_block in blocks.iteritems %}
-<div class="block block-{{id}}">
+<div class="block block-{{id}} {{ login_block.extra_css_class }}">
</pre> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1866462019-08-10T13:10:23ZBenjamin Dauvergne
<ul><li><strong>Assigné à</strong> mis à <i>Benjamin Dauvergne</i></li></ul> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1866472019-08-10T13:44:17ZBenjamin Dauvergne
<ul><li><strong>Fichier</strong> <a href="/attachments/36547">0001-auth_fc-differentiate-registration-login-block-with-.patch</a> <a class="icon-only icon-download" title="Télécharger" href="/attachments/download/36547/0001-auth_fc-differentiate-registration-login-block-with-.patch">0001-auth_fc-differentiate-registration-login-block-with-.patch</a> ajouté</li><li><strong>Statut</strong> changé de <i>Nouveau</i> à <i>Solution proposée</i></li><li><strong>Patch proposed</strong> changé de <i>Non</i> à <i>Oui</i></li></ul> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1902122019-09-09T11:44:48ZSerghei Mihai
<ul></ul><p>Tu peux mettre à jour le patch par rapport à master?<br />Aussi, dans <code>authentic2_auth_fc/authenticators.py</code> tu peux remplacer le <code>render(...)</code> qui reste par <code>TemplateResponse</code> et virer l'import ?<br /><pre>
from django.shortcuts import render
</pre></p> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1902152019-09-09T11:48:42ZBenjamin Dauvergne
<ul><li><strong>Fichier</strong> <a href="/attachments/37141">0001-auth_fc-differentiate-registration-login-block-with-.patch</a> <a class="icon-only icon-download" title="Télécharger" href="/attachments/download/37141/0001-auth_fc-differentiate-registration-login-block-with-.patch">0001-auth_fc-differentiate-registration-login-block-with-.patch</a> ajouté</li></ul><p>ok.</p> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1902272019-09-09T12:17:58ZSerghei Mihai
<ul><li><strong>Statut</strong> changé de <i>Solution proposée</i> à <i>Solution validée</i></li></ul><p>Go.<br />Il faut rajouter la déclaration de la classe dans publik-base-theme (j'ai pas trouvé de ticket).</p> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1902302019-09-09T12:19:45ZSerghei Mihai
<ul><li><strong>Lié à</strong> <i><a class="issue tracker-2 status-5 priority-4 priority-default closed" href="/issues/35949">Development #35949</a>: prise en compte des classes CSS pour chaque type d'authentification</i> ajouté</li></ul> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1904092019-09-10T08:11:30ZBenjamin Dauvergne
<ul><li><strong>Statut</strong> changé de <i>Solution validée</i> à <i>Résolu (à déployer)</i></li></ul><pre>commit 2884230fe48148805ef30ad6c82d3723fb8de3ba
Author: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Sat Aug 10 15:12:43 2019 +0200
auth_fc: differentiate registration login block with a class (#29227)</pre> Plugin FS FranceConnect - Development #29227: classe CSS pour différencier le bloc de connexion du bloc de "inscription après login sur FC"https://dev.entrouvert.org/issues/29227?journal_id=1907792019-09-11T14:15:22ZFrédéric Pétersfpeters@entrouvert.com
<ul><li><strong>Statut</strong> changé de <i>Résolu (à déployer)</i> à <i>Solution déployée</i></li></ul>