entrouvert
/
publik-base-theme
15
1
Fork 1
Code Issues Pull Requests 12 Releases Wiki Activity

wip/73727-improve-cd06 (#73727) #141

Merged
fpeters merged 10 commits from wip/73727-improve-cd06 into main 2023-01-31 18:35:29 +01:00
Conversation 1 Commits 10 Files Changed 10 +153 -60
10 changed files with 153 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
static/alpes-maritimes-2022/_custom.scss
View File

@ -210,7 +210,7 @@ h3, .h3 {
font-size: 18rem / $base-font;
@media ($min-desktop-viewport) {
font-size: 24rem / $base-font;
align-self: end;
align-self: flex-end;
border-left: 1px solid #000;
padding-left: 0.75rem;
}
@ -288,7 +288,7 @@ h3, .h3 {
}
// Nav
.site-nav {
align-self: end;
align-self: flex-end;
}
div.gru-nav > ul {
margin: 0;
@ -413,16 +413,24 @@ main {
}
}
div#main-content-wrapper {
z-index: auto;
}
// placeholder 'page-title'
.combo-placeholder--page-title {
.cd06-page-title--wrapper {
@media ($max-mobile-viewport) {
padding: 0 0.7em;
}
.cd06-page-title--default,
.text-cell h1 {
@extend .page-title;
margin-left: 0;
margin-right: 0;
}
.text-cell + .cd06-page-title--default {
display: none;
}
}
// placeholder 'columns bottom'
@ -915,6 +923,13 @@ span.required {
&-mask {
@include mask(3000);
}
&-title {
@extend %title;
@extend .trapeze-title;
padding-left: 0;
border-bottom: none;
margin-bottom: 1em;
}
}
// toogled
&--voir-etapes.toggled + &--panel {
@ -978,30 +993,79 @@ span.required {
}
//
// a2
//
.a2-block {
max-width: none;
margin-top: 0;
margin-bottom: 1em;
form {
max-width: 45em;
}
form, p {
margin-left: 0;
margin-right: 0;
}
}
.block-saml button.cd06-adfs {
&, &:hover {
border: 0;
padding: 3px;
padding-bottom: 0;
background-color: transparent;
box-shadow: inset 0 0 10px $gray !important;
border-radius: 15px;
&:hover {
box-shadow: inset 0 0 10px $cyan-dark !important;
}
}
}
//
// PWA NAV
//
.pwa-navigation {
div > ul li {
&:not(:last-child) {
border-right: 1px dashed $primary-color;
}
a {
background-size: auto 25px;
padding-top: 35px;
display: flex;
align-items: center;
justify-content: center;
span {
height: auto;
font-size: $fz-small;
div > ul {
padding-top: 6px;
border-top: 2px solid #D1D1D1;
li {
&:not(:last-child) {
border-right: 1px dashed $primary-color;
}
&.selected {
font-weight: bold;
position: relative;
&::before {
content: "";
display: block;
position: absolute;
height: 4px;
width: 80%;
margin: 0 auto;
top: 0;
left: 0;
right: 0;
background-color: $primary-color;
transform: translateY(-8px);
}
}
a {
background-size: auto 25px;
background-position: 50% 5px;
padding-top: 30px;
display: flex;
align-items: center;
justify-content: center;
span {
height: auto;
font-size: $fz-small;
}
}
}
&.selected a,
a:hover {
background-blend-mode: color-dodge;
}
}
}

10
static/alpes-maritimes-2022/_vars.scss
View File

@ -47,7 +47,7 @@ $columns-gutter: 100px;
$sidebar-width: 33%;
$fx-grid-gutter: $columns-gutter;
$header-logo-size: 63px 60px;
$header-logo-size: 54px 60px;
$show-site-title: true;
$toplinks-style: none;
@ -71,11 +71,9 @@ $nav-button-background: $primary-color;
$nav-button-color: white;
$nav-mobile-bottom-bar-background: $gray-xlight;
$nav-mobile-bottom-bar-color: $primary-color;
$nav-mobile-bottom-bar-item-hover-background: $primary-color;
$nav-mobile-bottom-bar-item-hover-color: white;
$nav-mobile-bottom-bar-item-selected-background: $nav-mobile-bottom-bar-item-hover-background;
$nav-mobile-bottom-bar-item-selected-color: $nav-mobile-bottom-bar-item-hover-color;
$nav-mobile-bottom-bar-color: $font-color;
$nav-mobile-bottom-bar-item-hover-background: white;
$nav-mobile-bottom-bar-item-selected-color: $primary-color;
$title-transform: uppercase;
$title-background: transparent;

BIN
static/alpes-maritimes-2022/img/btn-connexion-agent-cd06.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

4
templates/variants/alpes-maritimes-2022/authentic2/base-page.html Normal file
View File

@ -0,0 +1,4 @@
{% extends "authentic2/base-page.html" %}
{# delete title, he's added via theme.html #}
{% block form-title %}{% endblock %}

13
templates/variants/alpes-maritimes-2022/authentic2_auth_saml/login_cd06-adfs.html Normal file
View File

@ -0,0 +1,13 @@
{% extends "authentic2_auth_saml/login.html" %}
{% load i18n static %}
{% block login %}
<form method="post">
<button class="submit-button cd06-adfs" name="{{ submit_name }}" title="{% trans "Login" %}">
<img src="{{site_base}}/static/{{css_variant}}/img/btn-connexion-agent-cd06.png" alt="Je suis agent, je m'identifie ici">
</button>
{% if cancel %}
<button class="cancel-button" name="cancel" formnovalidate>{% trans 'Cancel' %}</button>
{% endif %}
</form>
{% endblock %}

2
templates/variants/alpes-maritimes-2022/combo/json/lien-signalement-changement-coordonnees.html
View File

@ -1,4 +1,4 @@
<div class="link-list">
<div class="links-list">
<ul>
<li>
<a href="{{ eservices_url}}signaler-un-changement-de-coordonnees/?session_var_dossier={{request.GET.dossier}}&cancelurl={{ portal_url }}solidarite-social/page-de-suivi-social/accueil-dossier-social/?dossier={{request.GET.dossier}}">

14
templates/variants/alpes-maritimes-2022/combo/json/sous-dossier-autonomie.html
View File

@ -4,8 +4,8 @@
<h2>{% if json.data.dossier.IDENTIFICATION.0.PRENOM %}{{json.data.dossier.IDENTIFICATION.0.PRENOM}}{% endif %} {% if json.data.dossier.IDENTIFICATION.0.NOM %}{{json.data.dossier.IDENTIFICATION.0.NOM}}{% endif %}</h2>
<div>
{% if json.data.dossier.DEMANDES.AD %}
{% if json.data.dossier.DEMANDES.AD %}
<div class="cell--body">
<h3>Mes demandes</h3>
<div class="pk-table-wrapper">
<table class="pk-data-table">
@ -28,9 +28,11 @@
{% endfor %}
</table>
</div>
{% endif %}
</div>
{% endif %}
{% if json.data.dossier.DROITS.AD %}
{% if json.data.dossier.DROITS.AD %}
<div class="cell--body">
<h3>Mes droits</h3>
<div class="pk-table-wrapper">
<table class="pk-data-table">
@ -51,6 +53,6 @@
{% endfor %}
</table>
</div>
{% endif %}
</div>
</div>
{% endif %}
{% endif %}

53
templates/variants/alpes-maritimes-2022/combo/json/sous-dossier-handicap.html
View File

@ -4,12 +4,12 @@
<h2>{% if json.data.dossier.IDENTIFICATION.0.PRENOM %}{{json.data.dossier.IDENTIFICATION.0.PRENOM}}{% endif %} {% if json.data.dossier.IDENTIFICATION.0.NOM %}{{json.data.dossier.IDENTIFICATION.0.NOM}}{% endif %}</h2>
<div>
{% if json.data.dossier.DEMANDES.PH %}
{% if json.data.dossier.DEMANDES.PH %}
<div class="cell--body">
<h3>Mes demandes</h3>
<div class="pk-table-wrapper">
<table class="pk-data-table">
<caption>ÉTAT D’AVANCEMENT DE VOS DEMANDES À CE JOUR</caption>
<caption>État d’avancement de vos demandes à ce jour</caption>
<tr>
<th>Date</th>
<th>Objet</th>
@ -28,30 +28,31 @@
{% endfor %}
</table>
</div>
{% endif %}
</div>
{% endif %}
{% if json.data.dossier.DROITS.PH %}
<div class="cell pink-header">
<h3>Mes droits</h3>
<div class="pk-table-wrapper">
<table class="pk-data-table">
<caption>Droits en cours</caption>
{% if json.data.dossier.DROITS.PH %}
<div class="cell--body">
csechet commented 2023-01-25 17:54:04 +01:00
Review
Copy Link

Est-ce que c'est voulu d'avoir enlevé la classe pink-header ici ?

Est-ce que c'est voulu d'avoir enlevé la classe pink-header ici ?
tjund commented 2023-01-26 11:31:59 +01:00
Review
Copy Link

La class pink-header est un héritage obsolète de l'ancien thème.

La class pink-header est un héritage obsolète de l'ancien thème.
smihai commented 2023-01-26 11:34:56 +01:00
Review
Copy Link

Je confirme.

Je confirme.
<h3>Mes droits</h3>
<div class="pk-table-wrapper">
<table class="pk-data-table">
<caption>Droits en cours</caption>
<tr>
<th>Objet</th>
<th>Date de début</th>
<th>Date de fin</th>
<th>Décision</th>
</tr>
{% for droit in json.data.dossier.DROITS.PH %}
<tr>
<th>Objet</th>
<th>Date de début</th>
<th>Date de fin</th>
<th>Décision</th>
<td>{{droit.LIBELLE}}</td>
<td>{{droit.DATE_DEBUT}}</td>
<td>{{droit.DATE_FIN}}</td>
<td>{{droit.DEC_PREST}}</td>
</tr>
{% for droit in json.data.dossier.DROITS.PH %}
<tr>
<td>{{droit.LIBELLE}}</td>
<td>{{droit.DATE_DEBUT}}</td>
<td>{{droit.DATE_FIN}}</td>
<td>{{droit.DEC_PREST}}</td>
</tr>
{% endfor %}
</table>
</div>
{% endif %}
</div>
{% endfor %}
</table>
</div>
</div>
{% endif %}
{% endif %}

12
templates/variants/alpes-maritimes-2022/theme.html
View File

@ -10,5 +10,15 @@
{# page title #}
{% block content-pre %}
{% placeholder "page-title" outer_tag="header" name="Titre de la page" %}
<header class="cd06-page-title--wrapper">
{% placeholder "custom-page-title" name="Titre personnalisé de la page" %}
{% skeleton_extra_placeholder default-page-title %}
{% firstof page.title view.title as cd06_page_title %}
{% if cd06_page_title %}
<h1 class="cd06-page-title--default">
{{ cd06_page_title }}
</h1>
{% endif %}
{% end_skeleton_extra_placeholder %}
</header>
{% endblock %}

1
templates/variants/alpes-maritimes-2022/wcs/front/formdata_steps.html
View File

@ -20,6 +20,7 @@
FERMER
<span class="theme-steps--panel-close-icon"></span>
</a>
<h3 class="theme-steps--panel-title">Toutes les étapes</h3>
{{ block.super }}
</div>
<div class="theme-steps--panel-mask"></div>