WIP: ehess: add initial theme (#76923) #260

Closed
pmarillonnet wants to merge 37 commits from wip/76923-ehess-initial-theme into wip/77463-fonts-add-butler-stencil
139 changed files with 1082 additions and 421 deletions

View File

@ -17,6 +17,6 @@ repos:
- id: djhtml
args: ['--tabwidth', '2']
- repo: https://git.entrouvert.org/pre-commit-debian.git
rev: v0.1
rev: v0.3
hooks:
- id: pre-commit-debian

14
README
View File

@ -423,6 +423,20 @@ copyright notices:
#
# https://github.com/sharanda/manrope
* Butler Stencil
# Copyright (c) 2019 Fabian De Smet, with Reserved Font Name "Butler Stencil"
#
# This Font Software is licensed under the Creative Commons Attribution-ShareAlike License, version 4.00
#
# https://www.fontsquirrel.com/license/butler
* Public Sans
# Copyright (c) 2015 Impallari Type (www.impallari.com), with Reserved Font Name “Public Sans”
#
# This Font Software is licensed under the SIL Open Font License, Version 1.1.
#
# https://www.fontsquirrel.com/license/public-sans
~~~~
Some theme variant files have their own specific licenses; refer to

11
debian/control vendored
View File

@ -2,16 +2,21 @@ Source: publik-base-theme
Section: web
Priority: optional
Maintainer: Frédéric Péters <fpeters@entrouvert.com>
Build-Depends: debhelper-compat (= 12), inkscape, python3, sassc (>= 3.4.2)
Build-Depends: debhelper-compat (= 12),
inkscape,
python3,
sassc (>= 3.4.2),
Standards-Version: 3.9.4
Homepage: http://git.entrouvert.org/publik-base-theme.git
Package: publik-base-theme
Architecture: all
Depends: python3-gadjo, ${misc:Depends}, ${shlibs:Depends}
Depends: python3-gadjo,
${misc:Depends},
${shlibs:Depends},
Conflicts: python-authentic2 (<< 2.1.20.742.gb6ee096-0),
python-django (<= 1:1.11),
python-xstatic-roboto-fontface (<< 0.5.0.0),
python3-xstatic-roboto-fontface (<< 0.5.0.0),
Breaks: combo (<< 0.7.1)
Breaks: combo (<< 0.7.1),
Description: Publik Base Theme

View File

@ -130,7 +130,15 @@ de classes CSS réutilisables.
</tr>
<tr>
<td><p><code>pk-blocks-zebra</code></p></td>
<td><p>Alterne les couleurs de fond des lignes des blocs de champs.</p></td>
<td><p>Alterne les couleurs de fond des lignes des blocs de champs.</p></td>
</tr>
<tr>
<td><p><code>pk-horizontal-checkboxes</code></p></td>
<td><p>Aligne horizontalement les cases à cocher dun champ « liste à choix multiple ».</p></td>
</tr>
<tr>
<td><p><code>pk-horizontal-radiobuttons</code></p></td>
<td><p>Aligne horizontalement les boutons radio dun champ « liste ».</p></td>
</tr>
</table>
</section>

View File

@ -296,6 +296,26 @@ paramètre, la deuxième sa description et la troisième la valeur par défaut.
<td><p>Espace entre les éléments</p></td>
<td><p><var>0px</var></p></td>
</tr>
<tr>
<td><p><code>$nav-font-family</code></p></td>
<td><p>Famille de police de la navigation</p></td>
<td><p><var>null</var></p></td>
</tr>
<tr>
<td><p><code>$nav-font-style</code></p></td>
<td><p>Style de la police de la navigation</p></td>
<td><p><var>null</var></p></td>
</tr>
<tr>
<td><p><code>$nav-font-size</code></p></td>
<td><p>Taille de la police de la navigation</p></td>
<td><p><var>null</var></p></td>
</tr>
<tr>
<td><p><code>$nav-font-weight</code></p></td>
<td><p>Graisse de la police de la navigation</p></td>
<td><p><var>bold</var></p></td>
</tr>
<tr>
<td><p><code>$nav-mobile-menu-background</code></p></td>
<td><p>Couleur de fond du menu en mode mobile</p></td>

View File

@ -75,18 +75,16 @@ div#header-wrapper {
padding-right: 100px;
}
span {
a {
color: inherit;
&:first-child {
&::before {
content: url('img/icone-connexion.svg');
display: inline-block;
width: 1em;
height: 1em;
margin-right: 0.3em;
vertical-align: sub;
}
a {
color: inherit;
&.account-link, &.login-link {
&::before {
content: url('img/icone-connexion.svg');
display: inline-block;
width: 1em;
height: 1em;
margin-right: 0.3em;
vertical-align: sub;
}
}
}

View File

@ -250,9 +250,9 @@ h3, .h3 {
}
a:not(.login-link) {
@extend %nav-chevron-link;
&:last-child {
border-bottom: none;
}
}
a.logout {
border-bottom: none;
}
a.login-link,
.toplinks--togglable-btn {
@ -265,22 +265,27 @@ h3, .h3 {
}
}
}
.logged-in {
display: block;
@include floating-nav;
.toplinks--togglable-menu {
z-index: 100;
top: 100%;
@media ($max-mobile-viewport) {
right: 0;
}
@include floating-nav;
display: none;
margin: 0;
padding: 0;
list-style: none;
.toplinks--list-item {
display: block;
}
}
.toplinks--panel-mask {
@include mask(-1);
background-color: transparent;
}
.toplinks--togglable-btn.toggled {
+ .logged-in,
+ .toplinks--togglable-menu,
~ .toplinks--panel-mask {
display: block;
}

View File

@ -79,8 +79,7 @@ $header-content-margin: 5px;
padding: 0;
box-shadow: unset;
.logged-in,
.login {
.toplinks--list {
display: flex;
justify-content: center;
align-items: center;
@ -100,20 +99,22 @@ $header-content-margin: 5px;
top: 25px;
}
a {
li {
flex: 1 1 50%;
color: white;
font-weight: bold;
height: $header-height;
}
}
&::before {
content: ' ';
font-family: 'FontAwesome';
font-size: 2.5em;
display: block;
padding-top: 15px;
font-weight: lighter;
}
a {
color: white;
font-weight: bold;
height: $header-height;
&::before {
content: ' ';
font-family: 'FontAwesome';
font-size: 2.5em;
display: block;
padding-top: 15px;
font-weight: lighter;
}
}

View File

@ -173,7 +173,7 @@ div#toplinks {
justify-content: center;
}
.logged-in, .login {
.toplinks--list {
display: flex;
flex-wrap: wrap;
@ -181,6 +181,7 @@ div#toplinks {
margin: 0 .3rem;
}
&-item,
a {
color: black;
font-weight: 500;
@ -197,6 +198,7 @@ div#toplinks {
background: center / contain no-repeat url('/assets/profile:icon');
margin-right: 0.5rem;
}
margin-right: 0.5em;
}
}
}

View File

@ -128,6 +128,6 @@ div.timetable-widget {
}
}
.user-info--separator::after {
.toplinks--list-item:not(:last-child)::after {
content: "·";
}

View File

@ -95,17 +95,11 @@
// User-info
#toplinks {
// Reset user links
border: none;
box-shadow: none;
border-radius: 0;
background-color: transparent;
color: white;
// position
top: auto;
bottom: 100%;
height: $topLinks_height;
padding: 0;
line-height: $topLinks_height;
a {
@ -115,7 +109,7 @@
}
// user icon
&::before {
li:first-child::before {
content: "\f2c0";
font-family: fontawesome;
margin-right: .33em;

View File

@ -12,6 +12,7 @@ $ff-ss-serif: 'Source Sans Pro', sans-serif;
$ff-script: 'Dancing Script', 'Brush Script MT', cursive;
$topLinks_height: 2.5rem;
$toplinks-style: none;
// font sizes
$fz-small: 0.875em;

View File

@ -105,7 +105,7 @@ p {
margin-bottom: 1rem;
}
.login {
> a {
a {
@extend .pk-button;
}
}

View File

@ -64,7 +64,7 @@ div#header-wrapper {
}
div#toplinks {
span.login a:first-child::before, span.logged-in a:first-child::before {
.toplinks--list-item:first-child a::before {
font-family: FontAwesome;
content: "\f007"; /* user */
padding-right: 1ex;

108
static/ehess/_custom.scss Normal file
View File

@ -0,0 +1,108 @@
@media($min-desktop-viewport) {
#top {
display: flex;
}
}
#logo a {
height: 100px;
line-height: 100px;
color: $primary-color;
text-transform: uppercase;
font-weight: normal;
@media screen and ($min-desktop-viewport) {
margin-top: .5em;
}
}
#toplinks {
a {
color: white;
}
}
#nav-wrapper {
margin-bottom: 10px;
@media($min-desktop-viewport) {
background: $nav-background;
}
div#nav > ul > li > a {
border-radius: $border-radius;
}
div.gru-nav ul li {
border-right: 1px solid $misc-blue;
&:last-child {
border-right: none;
}
}
@media screen and ($min-desktop-viewport) {
margin-top: 5em;
}
}
@media ($max-mobile-viewport) {
div.gru-nav .gru-nav-button + ul {
border: none;
}
}
main {
margin-top: 2em;
%button {
box-shadow: none;
}
%button:hover {
border: 1px solid #dcdcdc;;
box-shadow: none;
}
h1.form-content--title {
font-family: 'Work Sans', sans-serif;
text-transform: uppercase;
color: $secondary-color;
font-size: 1.3em;
font-weight: 500;
}
}
#rub_service {
h2 {
font-size: 1.8em;
}
h3 {
font-size: 1.6em;
}
h4 {
font-size: 1.4em;
}
h2, h3, h4 {
color: $primary-color;
}
}
#profile .field .label {
color: $tertiary-color;
}
@media screen and ($max-mobile-viewport) {
#logo a {
display: block;
height: 75px;
overflow: hidden;
}
}
#footer-wrapper {
a:hover {
color: $primary-color;
}
}
%inverted-button {
box-shadow: none;
&:hover {
box-shadow: none;
}
}

74
static/ehess/_vars.scss Normal file
View File

@ -0,0 +1,74 @@
$primary-color: #00B9AF;
$secondary-color: #0A1C66;
$tertiary-color: #5A6473;
$clay-white: #FAF7ED;
$minium-orange: #EB5E45;
$nickel-yellow: #FFF26B;
$misc-blue: #4c8da6;
$width: 1160px;
$border-radius: 0px;
$box-shadow: none;
$notification_error_color: $minium-orange;
$notification_warning_color: $nickel-yellow;
$link-color: $primary-color;
$link-decoration: none;
$font-color: $secondary-color;
$font-size: 0.938em;
$font-family: 'Public Sans', sans-serif;
$title-background: white;
$title-color: $primary-color;
$title-font-family: 'Butler Stencil';
$title-font-size: 1.5em;
$title-weight: 700;
$toplinks-background: $primary-color;
$toplinks-border-radius: 0;
$toplinks-box-shadow: none;
$nav-background: white;
$nav-submenu-background: #eee;
$nav-submenu-color: #333;
$nav-button-background: $primary-color;
$nav-border-color: transparent;
$nav-color: $misc-blue;
$nav-active-color: $misc-blue;
$nav-item-selected-color: $misc-blue;
$nav-item-selected-background: white;
$nav-item-hover-color: white;
$nav-item-hover-background: $misc-blue;
$nav-item-transform: uppercase;
$nav-after-image: true;
$responsive-menu: top-to-bottom;
$nav-font-family: 'Public Sans', sans-serif;
$nav-font-size: 1em;
$nav-font-style: normal;
$nav-font-weight: 400;
$widget-focus-border: 1px solid $misc-blue;
$widget-focus-box-shadow: 0 0 4px $misc-blue;
$widget-focus-outline: none;
$widget-border: 1px solid $misc-blue;
$widget-box-shadow: none;
$widget-border-radius: 5px;
$button-background: $primary-color;
$button-focus-outline-offset: 1px;
$button-box-shadow: none;
$button-hover-background: white;
$button-hover-color: $primary-color;
$button-border-radius: 5px;
$cancel-button-style: "%inverted-button";
$cell-image-position: top;
$cell-image-padding: none;
$cell-border: none;
$cell-entry-hover-background: $clay-white;
$cell-entry-hover-color: $primary-color;
$cell-entry-border: 1px solid $tertiary-color;
$footer-background: $misc-blue;
$footer-link-color: white;

14
static/ehess/config.json Normal file
View File

@ -0,0 +1,14 @@
{
"label": "École des hautes études en sciences sociales",
"variables": {
"theme_color": "#00B9AF"
},
"settings": {
"combo": {
"COMBO_ASSET_SLOTS.update": {
"header:background": { "label": "Têtière : fond" },
"header:logo": { "label": "Têtière : logo" }
}
}
}
}

8
static/ehess/style.scss Normal file
View File

@ -0,0 +1,8 @@
@charset "UTF-8";
@import '../includes/fonts/butler-stencil';
@import '../includes/fonts/publicsans';
@import '../includes/fonts/worksans';
@import 'vars';
@import '../includes/publik';
@import 'custom';

View File

@ -49,3 +49,22 @@ div.gru-nav {
}
}
}
/* custom est-ensemble menu entry */
li.menu-est-ensemble a {
background: $ee-red;
span {
font-size: 80%;
color: white;
text-transform: none;
font-weight: 600;
&:hover {
text-decoration: underline;
}
&::before {
content: '\f015';
font-family: FontAwesome;
margin-right: 5px;
}
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -72,7 +72,7 @@ div#header {
transform-origin: top left;
transform: skewX(-21deg);
}
> span {
ul {
position: absolute;
display: inline-flex;
align-items: text-end;
@ -94,9 +94,8 @@ div#header {
overflow: hidden;
background-color: currentColor;
margin: 0 .66em;
}
> a:last-child {
li:last-child {
order: 1;
}
}

View File

@ -471,7 +471,7 @@ div#toplinks {
max-width: 100%;
margin-top: 1px;
}
span.logged-in {
.logged-in {
background: $body-background;
border-radius: 1.5em;
padding: 1.2ex 1.5em;

View File

@ -594,10 +594,8 @@ div#login-page {
}
@media ($min-desktop-viewport) {
.user-info--separator {
&::after {
content: "/";
}
.login .toplinks--list-item:not(:last-child)::after {
content: "/";
}
}
@ -609,3 +607,7 @@ a#ars {
color: #00789b;
text-decoration: underline;
}
div.login-actions ul li p a {
font-weight: bold;
}

View File

@ -346,6 +346,14 @@ input[type="radio"] {
}
}
.CheckboxesWidget.pk-horizontal-checkboxes .content li {
display: inline-block;
}
.RadiobuttonsWidget.pk-horizontal-radiobuttons .content label {
display: inline-block;
}
div.content label {
margin-right: 1em;
}

View File

@ -2,6 +2,10 @@ $nav-background: white !default;
$nav-full-width-background: false !default;
$nav-color: black !default;
$nav-border-radius: $border-radius !default;
$nav-font-family: null !default;
$nav-font-style: null !default;
$nav-font-size: null !default;
$nav-font-weight: bold !default;
$nav-active-color: #005EA9 !default;
@ -69,6 +73,9 @@ div.gru-nav {
padding: 0;
height: $nav-height;
border-radius: $nav-border-radius;
font-family: $nav-font-family;
font-style: $nav-font-style;
font-size: $nav-font-size;
}
div.gru-nav > ul {
@ -94,7 +101,7 @@ div.gru-nav > ul > li {
div.gru-nav > ul > li a {
color: $nav-color;
font-weight: bold;
font-weight: $nav-font-weight;
padding: 0.75em 20px;
display: inline-block;
line-height: 150%;

View File

@ -49,3 +49,14 @@ $toplinks-border: null !default;
padding-right: 0;
}
}
.toplinks--list {
margin: 0;
padding: 0;
list-style: none;
&-item {
display: inline;
margin: 0;
padding: 0;
}
}

View File

@ -0,0 +1,18 @@
$butler-stencil-font-path: '/static/fonts/ButlerStencil' !default;
@mixin butler-stencil-font($type, $weight, $style: normal) {
@font-face {
font-family: 'Butler Stencil';
src: url('#{$butler-stencil-font-path}/ButlerStencil-#{$type}.woff2') format('woff2');
font-weight: $weight;
font-style: $style;
}
}
@include butler-stencil-font('UltraLight', 200);
@include butler-stencil-font('Light', 300);
@include butler-stencil-font('Regular', 400);
@include butler-stencil-font('Medium', 500);
@include butler-stencil-font('Bold', 700);
@include butler-stencil-font('ExtraBold', 800);
@include butler-stencil-font('Black', 900);

View File

@ -0,0 +1,25 @@
$publicsans-font-path: '/static/fonts/PublicSans' !default;
@mixin publicsans-font($type, $weight, $style: normal) {
@font-face {
font-family: 'Public Sans';
src: url('#{$publicsans-font-path}/PublicSans-#{$type}.woff2') format('woff2');
font-weight: $weight;
font-style: $style;
}
}
@mixin publicsans-font-pair($type, $weight) {
@include publicsans-font($type, $weight);
@include publicsans-font(#{$type}Italic, $weight, italic);
}
@include publicsans-font-pair('Thin', 100);
@include publicsans-font-pair('ExtraLight', 200);
@include publicsans-font-pair('Light', 300);
@include publicsans-font-pair('Regular', 400);
@include publicsans-font-pair('Medium', 500);
@include publicsans-font-pair('SemiBold', 600);
@include publicsans-font-pair('Bold', 700);
@include publicsans-font-pair('ExtraBold', 800);
@include publicsans-font-pair('Black', 900);

View File

@ -57,9 +57,8 @@ $(function() {
var $dialog = null;
if (user_is_authenticated()) {
$dialog = $('<div id="plus1-dialog">'
+ '<p>Vous allez confirmer le signalement.'
+ 'Vous pouvez également décider de recevoir un message une fois celui-ci pris en charge.</p>'
+ '<label><input type="checkbox">Recevoir un message</input></label>'
+ '<p>Souhaitez-vous être informé·e du traitement de cette demande ?</p>'
+ '<label><input type="checkbox">Oui, je souhaite être informé·e par courriel</input></label>'
+ '</div>');
} else {
$dialog = $('<div id="plus1-dialog">'

View File

@ -55,8 +55,13 @@ div#header {
text-overflow: ellipsis;
right: 1rem;
text-transform: uppercase;
display: flex;
align-items: center;
.toplinks--list {
display: flex;
align-items: center;
&-item {
margin-left: 1em;
}
}
a {
color: white;
}

View File

@ -36,7 +36,7 @@ a:hover {
border: 0;
box-shadow: none;
.logged-in {
a:first-child::after {
.toplinks--list-item:first-child a::after {
content: "|";
}
.logout {

View File

@ -30,18 +30,14 @@ button::-moz-focus-inner {
box-shadow: none;
padding-left: 0.5em;
width: $width - $nav-menu-side - $pwa-desktop-nav-width;
a, span {
a, span, .toplinks--list-item::after {
color: $darkblue;
display: inline-block;
float: left;
font-size: 0.812rem;
font-weight: 500;
}
span {
padding: 0 0.5rem;
}
a.hello {
padding-left: 10px;
max-width: 200px;
white-space: nowrap;
overflow: hidden;
@ -52,6 +48,13 @@ button::-moz-focus-inner {
overflow: hidden;
}
}
.toplinks--list-item:first-child::after {
margin-left: 0.6em;
content: " - ";
}
.registration {
margin-left: 0.5em;
}
a.logout {
background: url(img/CROIX.svg) center right no-repeat;
padding-right: 30px;

View File

@ -11,3 +11,8 @@
display: inline-block;
}
}
.form-content--body--title {
display: none;
visibility: hidden;
}

View File

@ -1,5 +1,5 @@
{
"label": "miribel",
"label": "Miribel",
"variables": {
"theme_color": "#57BCD7",
"email_header_asset": "emails:logo"

View File

@ -268,58 +268,25 @@ ul.logout-list {
}
#toplinks {
background: transparent;
position: relative;
float: right;
padding: 5px 5px 5px 5px;
}
#toplinks span,
#toplinks a {
background-color: white;
}
#toplinks span.connected-user {
display: inline-block;
position: relative;
z-index: 100;
}
#toplinks span.login,
#toplinks a.logout {
display: inline-block;
margin: 0;
padding: 0;
padding-right: 1ex;
color: #888;
min-width: 10em;
background: white url(button_connexion.gif) left center no-repeat;
padding-left: 30px;
margin-top: 5px;
a {
color: inherit;
}
border: 1px solid #e9e9e9;
line-height: 20px;
height: 22px;
}
#toplinks a {
color: #888;
border: 1px solid transparent;
}
#toplinks a.logout {
padding-left: 30px;
}
#toplinks a:hover {
text-decoration: none;
color: #222;
}
#toplinks a.restricted {
color: white;
float: right;
padding: 0 1ex;
border: 1px outset #888;
background: #ea5b0c;
a {
line-height: 20px;
}
ul.toplinks--list.logged-in li:first-child {
padding-left: 10px;
}
ul.toplinks--list.login li:first-child,
ul.toplinks--list.logged-in li:last-child {
display: inline-block;
background: white url(button_connexion.gif) left center no-repeat;
padding-left: 30px;
}
padding-right: 10px;
}
ul.newsList {
@ -879,16 +846,9 @@ body.authentic-page {
padding: 1em;
}
.region-header {
top: 10px;
right: 0;
display: inline-block;
width: auto;
#toplinks a.account-link {
#toplinks .logged-in li:first-child {
display: none;
}
@media screen and ($max-mobile-viewport) {
top: 0;
}
}
div#welcome h3 {
padding: 0;

View File

@ -44,3 +44,6 @@ $wcs-step-background: #fbfbfb;
$or-separator: false;
$cell-map-mobile-height: calc(100vh - 198px);
$toplinks-style: none;
$toplinks-background: white;

View File

@ -1,21 +1,6 @@
@charset "UTF-8";
@import 'vars';
@import '../includes/utils';
@import '../includes/general';
@import '../includes/title';
@import '../includes/layout';
@import '../includes/nav';
@import '../includes/cells';
@import '../includes/jqueryui';
@import '../includes/forms';
@import '../includes/wcs';
@import '../includes/misc';
@import '../includes/a11y';
@import '../includes/transitions/_ball_running_dots';
@import '../includes/back-top';
@import '../includes/library';
@import '../includes/authentic';
@import '../includes/publik';
@import '../montpellier-ville/chantiers';
@import 'custom';

View File

@ -1,8 +1,4 @@
// Header
#toplinks {
display: none;
}
#toplinks a {
@extend %button;
border-color: white;

View File

@ -137,11 +137,6 @@ div#toplinks {
div.cell {
padding-right: 0;
h2:first-child {
margin-left: 10px !important;
margin-right: 10px !important;
}
}
main {
@ -201,45 +196,16 @@ main {
}
}
body.authentic-page, body.registration-page {
div#header {
background: $authentik-header-background;
#logo {
display: none;
}
}
div.gru-nav-wrapper {
background: $authentik-header-background;
li:hover > a {
background-color: $authentik-header-background;
color: black;
text-decoration: underline;
}
}
#nav > *:not(#back-portal) {
display: none;
}
div#footer-wrapper {
background: $authentik-header-background;
}
%button {
background: $authentik-button-background;
color: $authentik-button-color;
&:hover {
background: $authentik-button-hover-background;
color: $authentik-button-hover-color;
}
}
}
.combo-placeholder{
&--columns-top,
&--columns-bottom {
margin-right: 0;
margin-right: 2em;
div.text-cell {
h3, h4, h5, p, table {
margin: 0;
}
}
}
&--columns-bottom {

View File

@ -74,7 +74,7 @@ div#header-wrapper {
width: 400px;
text-align: center;
padding-top: 5px;
span.logged-in {
.logged-in {
white-space: nowrap;
display: inline-block;
a {

View File

@ -484,7 +484,7 @@ div#rub_service div.dataview, div#rub_service dl#evolutions, div#rub_service for
margin-bottom: 1rem;
}
ul > li > a {
color: #929292;
color: #535353;
border-bottom: 0;
border-top: 1px solid #9e9e9e;
}
@ -580,7 +580,7 @@ div#profile {
color: #5caac2;
}
div.value {
color: #929292;
color: #535353;
}
}
@ -632,9 +632,9 @@ div.apa-user {
}
}
p {
border-top: 1px solid #929292;
border-top: 1px solid #535353;
padding-top: 1rem;
color: #929292;
color: #535353;
}
a.remove {
right: 2rem;
@ -657,7 +657,7 @@ table.pk-data-table {
}
tbody tr td {
background: #d8ebf0;
color: #929292;
color: #535353;
border-bottom-width: 2px;
}
}
@ -727,7 +727,7 @@ div#rub_service > h2:first-child,
padding: 2rem;
& + div {
background: white;
color: #929292;
color: #535353;
padding: 0;
}
}
@ -760,7 +760,7 @@ div#content div.cell.apa-user-info {
div.apa-user-info {
margin-right: 2rem;
color: #929292;
color: #535353;
span.label {
display: block;
color: #00a0bc;
@ -844,7 +844,7 @@ div.apa-droits {
}
#content div.individu {
max-width: 25rem;
color: #929292;
color: #535353;
h3, p {
border-top: 1px solid #bee2e8;
padding: 0.5rem 0;
@ -865,7 +865,7 @@ div.apa-droits {
}
}
.dossier {
color: #929292;
color: #535353;
h3 {
margin-top: 1rem;
color: $darkblue2;

View File

@ -1589,3 +1589,23 @@ div.RadiobuttonsWidget.template-evaluation {
}
}
}
.gadjo-password-field {
position: relative;
.title {
padding-right: 6em;
}
}
.password-visibility-checkbox {
display: flex;
position: absolute;
top: 0;
right: 0;
input + label {
margin: 0;
}
input {
margin: 0 0.25em 0 0;
}
}

View File

@ -201,7 +201,7 @@ div.gru-nav {
justify-content: space-between;
align-items: center;
}
ul {
ul:not(.toplinks--list) {
margin: 0;
> li > a {
font-weight: 500;

View File

@ -477,48 +477,49 @@ div#main-content-wrapper,
// Toplinks
#toplinks {
// reset
position: static;
border: none;
border-radius: 0;
background: none;
box-shadow: none;
padding: 0;
line-height: 1.25;
@media screen and ($max-mobile-viewport) {
text-align: left;
}
// Keep Space for burger btn
margin-right: $nav-btn-width-mobile;
@media ($min-desktop-viewport) {
margin-right: $nav-btn-width-desktop;
}
}
.toplinks--list {
// layout
display: flex;
align-items: center;
> span {
span {
margin-right: $theme-gutter;
}
// login / registration & account in 2 lines
.registration {
display: block;
}
span.sep, .account-link {
.account-link {
display: none;
}
// add icon
> span {
.toplinks--list-item-home,
.toplinks--sublist--logged-in,
.toplinks--sublist--login {
padding-left: calc( 20px + .66em);
background: no-repeat left center;
background-size: 20px auto;
line-height: $fz-h4;
&.login {
&.toplinks--sublist--login {
background-image: url(img/user.svg);
}
&.logged-in {
&.toplinks--sublist--logged-in {
background-image: url(img/deconnexion.svg);
}
&.theme-back-home {
&.toplinks--list-item-home {
background-image: url(img/home.svg);
// hide back home link on mobile
@media (max-width: $very-small-limit) {
@ -527,6 +528,14 @@ div#main-content-wrapper,
}
}
.toplinks--sublist {
list-style: none;
margin: 0;
&--item {
margin: 0;
padding: 0;
}
}
}
// Nav (hamburger in right)

View File

@ -98,3 +98,5 @@ $back-top-layout-position: static (center);
$footer-full-width-background: false;
$footer-background: $primary-color;
$toplinks-style: none;

View File

@ -1 +1 @@
{% extends "emails/subject.txt" %}{% block email-subject %}suppression de compte{% endblock %}
{% extends "emails/subject.txt" %}{% block email-subject %}Suppression de compte{% endblock %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}confirmation de la suppression de compte{% endblock %}
{% block email-subject %}Confirmation de la suppression de compte{% endblock %}

View File

@ -34,7 +34,7 @@
{% if LAST_LOGIN %}
<div class="field">
<span class="label">Dernière connexion</span>
<span class="value">{{ LAST_LOGIN }}</span>
<div class="value">{{ LAST_LOGIN }}</div>
</div>
{% endif %}
</div>

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}finaliser la création de votre compte{% endblock %}
{% block email-subject %}Finaliser la création de votre compte{% endblock %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}changement de ladresse électronique de votre compte{% endblock %}
{% block email-subject %}Changement de ladresse électronique de votre compte{% endblock %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}changement de mot de passe{% endblock %}
{% block email-subject %}Changement de mot de passe{% endblock %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}votre compte a été créé{% endblock %}
{% block email-subject %}Votre compte a été créé{% endblock %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}confirmation de changement dadresse électronique{% endblock %}
{% block email-subject %}Confirmation de changement dadresse électronique{% endblock %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}mot de passe de votre compte modifié{% endblock %}
{% block email-subject %}Mot de passe de votre compte modifié{% endblock %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}mot de passe oublié{% endblock %}
{% block email-subject %}Mot de passe oublié{% endblock %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}création de votre compte terminée{% endblock %}
{% block email-subject %}Création de votre compte terminée{% endblock %}

View File

@ -1 +1 @@
{% extends "emails/subject.txt" %}{% block email-subject %}suppression automatique de votre compte{% endblock %}
{% extends "emails/subject.txt" %}{% block email-subject %}Suppression automatique de votre compte{% endblock %}

View File

@ -1 +1 @@
{% extends "emails/subject.txt" %}{% block email-subject %}votre compte a été automatiquement supprimé{% endblock %}
{% extends "emails/subject.txt" %}{% block email-subject %}Votre compte a été automatiquement supprimé{% endblock %}

View File

@ -0,0 +1,42 @@
{% load wcs %}
{% with parametres=cards|objects:"pn-v2-parametres-generaux"|get_full|first|get:"fields" %}
{% with cat=request.GET.categorie filtre=cards|objects:"pn_categoriesmessages"|filter_by:"origin"|filter_value:pn_producteurs_id %}
<!-- Filtres -->
{% if filtre|count > 0 %}
<p>
<a class="pk-button" style="margin-right:10px;" href="{{ eservices_url }}backoffice/data/pn_modelesmessages/add/?origin={{pn_producteurs_id}}">+ Nouveau message</a>
<a class="pk-button" style="margin-right:10px;" href="{{ eservices_url }}backoffice/data/pn_categoriesmessages/add/?origin={{pn_producteurs_id}}">+ Nouvelle catégorie</a>
<a class="pk-button" href="{{ eservices_url }}backoffice/data/pn_categoriesmessages/?offset=0&limit=20&order_by=f2&q=&filter-3-value={{pn_producteurs_id}}&filter-3=on&id=on&1=on&3=on&2=on">Voir la liste des catégories</a>
</p><br>
<p><b>Filter par : </b>
{% if not cat %}
<b><a href="?categorie=">Toutes les catégories</a></b>
{%else %}
<a href="?categorie=">Toutes les catégories</a>
{% endif %}
|
{% for unit in filtre %}
{% with id=unit.id %}
{% if id|decimal == cat|decimal %}
<b><a href="?categorie={{ unit.id }}">{{ unit.text }}</a></b> |
{% else %}
<a href="?categorie={{ unit.id }}">{{ unit.text }}</a> |
{% endif %}
{% endwith %}
{% endfor %}
</p>
{% else %}
<p>Vous devez créer une catégorie de message avant de créer un message.<br>
<a style="color:{{colorcrea}};" href="{{ eservices_url }}backoffice/data/pn_categoriesmessages/add/?origin={{pn_producteurs_id}}">+ Nouvelle catégorie</a></p>
{% endif %}
{% endwith %}
{% endwith %}
{# <p>json brut :</p> <pre>{{ json|pprint }}</pre> #}

View File

@ -0,0 +1,44 @@
{% with var=json.fields varwf=json.workflow.fields %}
<div style="
max-width: 100%;
margin-left: auto;
margin-right: auto;">
{% with img=var.detail_image %}
{% if img %}
{% with urlimg=img|get:"url" %}
<img style="max-width:100%; max-height: 600px; width: 100%; object-fit: cover" src="{% make_public_url url=urlimg %}">
{% endwith %}
{% endif %}
{% endwith %}
</div>
<h1 style="padding:0px 20px;" >{{ var.detail_titre }}</h1>
<div style="padding:0px 20px;" >
<h3>{{ var.detail_chapeau|linebreaksbr }}</h3>
<p>{{ var.detail_description|linebreaksbr }}</p>
{% if var.detail_lien1 or var.detail_lien2 or var.detail_lien3 %}
<p><strong>Liens</strong></p>
{% if var.detail_lien1 %}<p><a href="{{ var.detail_lien1 }}">{{ var.detail_lien1_libelle }}</a>{% endif %}
{% if var.detail_lien2 %}<br><a href="{{ var.detail_lien2 }}">{{ var.detail_lien2_libelle }}</a>{% endif %}
{% if var.detail_lien3 %}<br><a href="{{ var.detail_lien3 }}">{{ var.detail_lien3_libelle }}</a>{% endif %}
</p>
{% endif %}
</div>
{% if var.detail_encart == True %}
<div style="padding:20px;background-color:whitesmoke;" >
<p><strong>{{ var.titre_encart|upper }}</p>
<p>{{ var.contenu_encart|linebreaksbr }}</p>
{% if var.detail_lien3 %}<p><a href="{{ var.lien_encart }}">{{ var.libelle_lien_encart }}</p>{% endif %}
</div>
{% endif %}
{% endwith %}
{# <pre>{{json|pprint}}</pre> #}

View File

@ -0,0 +1,56 @@
{% with var=json.fields varwf=json.workflow.fields %}
{% if var.utiliser_img_modele is True %}
<!-- Recup image du modèle -->
<div style="
max-width: 100%;
margin-left: auto;
margin-right: auto;">
{% with param=cards|objects:"pn_modelesmessages"|filter_by_internal_id:var.modelemsg_structured.id|get_full|first|get:"fields" %}
{% with img=param|get:"detail_image" %}
{% if img %}
{% with urlimg=img|get:"url" %}
<img style="max-width:100%; max-height: 300px; width: 100%; object-fit: cover" src="{% make_public_url url=urlimg %}">
{% endwith %}
{% endif %}
{% endwith %}
{% endwith %}
</div>
{% elif var.imgalerte %}
<div style="
max-width: 100%;
margin-left: auto;
margin-right: auto;">
{% with urlimg=var.imgalerte|get:"url" %}
<img style="max-width:100%; max-height: 300px; width: 100%; object-fit: cover" src="{% make_public_url url=urlimg %}">
{% endwith %}
</div>
{% endif %}
<h1 style="padding:0px 20px;" >{{ var.detail_titre }}</h1>
<div style="padding:0px 20px;" >
<strong>{{ var.detail_chapeau|linebreaks }}</strong>
<p>{{ var.detail_description|linebreaks }}</p>
{% if var.detail_lien1 or var.detail_lien2 or var.detail_lien3 %}
<p><strong>Liens</strong></p>
{% if var.detail_lien1 %}<p><a href="{{ var.detail_lien1 }}">{{ var.detail_lien1_libelle }}</a>{% endif %}
{% if var.detail_lien2 %}<br><a href="{{ var.detail_lien2 }}">{{ var.detail_lien2_libelle }}</a>{% endif %}
{% if var.detail_lien3 %}<br><a href="{{ var.detail_lien3 }}">{{ var.detail_lien3_libelle }}</a>{% endif %}
</p>
{% endif %}
</div>
{% if var.detail_encart == True %}
<div style="padding:20px;background-color:whitesmoke;" >
<p><strong>{{ var.titre_encart|upper }}</strong></p>
<p>{{ var.contenu_encart|linebreaksbr }}</p>
{% if var.lien_encart %}<p><a href="{{ var.lien_encart }}">{{ var.libelle_lien_encart }}</a></p>{% endif %}
</div>
{% endif %}
{% endwith %}
{# <pre>{{json|pprint}}</pre> #}

View File

@ -0,0 +1,47 @@
{% load assets %}{% load wcs %}
{% with parametres=cards|objects:"pn_parametres_cellules"|get_full|first|get:"fields" %}
<div style="margin-bottom: 10px;"><h2>Aperçu des alertes</h2></div>
{% for fiche in json.data %}
<div style="
{% if parametres|get:"utiliser_style_alternatif" is True %}
{{ parametres|get:"style_alternatif" }};
{% else %}
border: solid thin #ccc;
padding: 10px 10px 5px 10px;
margin: 0px 10px 10px 10px;
{% endif %}">
{% if parametres|get:"affiche_image" is True %}
<div class="fx-grid">
<div class="size--d1-6">
{% with refimgc="pn:thematique:"|add:fiche.fields.thematique_raw %}
<img style="max-width: 100%; height: auto;"
src="{% asset_url refimgc %}"/>
{% endwith %}
</div>
<div class="size--d5-6">
<strong>{{ fiche.fields.objet }}</strong><br>
{% if parametres|get:"affiche_thematique" is True and fiche.fields.thematique %}[{{ fiche.fields.thematique }}]<br>{% endif %}
{{ fiche.fields.contenu|linebreaksbr }}
{% if fiche.workflow.fields.lien %}
<br><a href="{{ fiche.workflow.fields.lien }}">En savoir plus</a>
{% endif %}
</div>
</div>
{% else %}
<div>
<strong>{{ fiche.fields.objet }}</strong><br>
{% if parametres|get:"affiche_thematique" is True and fiche.fields.thematique %}[{{ fiche.fields.thematique }}]<br>{% endif %}
{{ fiche.fields.contenu|linebreaksbr }}
{% if fiche.workflow.fields.lien %}
<br><a href="{{ fiche.workflow.fields.lien }}">En savoir plus</a>
{% endif %}
</div>
{% endif %}
</div>
{% endfor %}
{% endwith %}
{# <pre>{{json|pprint}}</pre> #}

View File

@ -0,0 +1,98 @@
{% load wcs %}
{% if not json_error %}
{% with parametres=cards|objects:"pn_parametres_cellules"|get_full|first|get:"fields" %}
{% if parametres|get:"affiche_titre" is True %}
<div {% if parametres|get:"affiche_marge_titre" is True %}style="margin-bottom: 10px;"{% endif %}><h2>{{ parametres|get:"titre" }}</h2></div>
{% endif %}
{% for fiche in json.data %}
{# Notifications personnalisées #}
{% if request.user|has_role:"Publik Notification - Usager" %}{# Début vérification role #}
{# Notifications personnalisées "Adresses" #}
{% if fiche.fields.zone_diffusion_raw == "zone" %}
{% with pref_adresses=cards|objects:"pn_preferences_usagers_adresses"|get_full|filter_by_user:request.user|filter_by:"type"|filter_value:"Adresse"|filter_by:"thqs_quartier"|filter_value:fiche.fields.thematique_raw|set_geo_center_lat:fiche.geolocations.base.lat|set_geo_center_lon:fiche.geolocations.base.lon|filter_by_distance:fiche.fields.rayon %}
{% if pref_adresses|count > 0 %}
{% for unit in pref_adresses %}
{% ifchanged %}
{% include "combo/publik-notifications/single-alerte.html" %}
{% endifchanged %}
{% endfor %}
{% endif %}
{% endwith %}
{% endif %}
{# Fin des notifications personnalisées "Adresses" #}
{# Notifications personnalisées "communes" #}
{% if fiche.fields.zone_diffusion_raw == "commune" %}
{% with pref_adresses=cards|objects:"pn_preferences_usagers_adresses"|get_full|filter_by_user:request.user|filter_by:"commune"|filter_value:fiche.fields.commune_raw %}
{% if pref_adresses|count > 0 %}
{% for unit in pref_adresses %}
{% with adresse_thqs_quartier=unit|get:"fields"|get:"thqs_quartier_raw" message_thq=fiche.fields.thematique_raw %}
{% if message_thq in adresse_thqs_quartier %}
{% ifchanged %}
{% include "combo/publik-notifications/single-alerte.html" %}
{% endifchanged %}
{% endif %}
{% endwith %}
{% endfor %}
{% endif %}
{% endwith %}
{% endif %}
{# Fin des notifications personnalisées "communes" #}
{# Début des notifications personnalisées "Tout le territoire" #}
{% with cards|objects:"pn_preferencesusager"|filter_by_user:request.user|get_full|first as preference %} {# Debut with fiche préférence usager #}
{% with thememessage=fiche.fields.thematique preferencetheme=preference.fields.thematiques %}{# Début with thememessage & preferencetheme #}
{% if thememessage in preferencetheme and fiche.fields.zone_diffusion_raw == "metro" and preference.fields.metro == True %}
{% include "combo/publik-notifications/single-alerte.html" %}
{% endif %}
{% endwith %}
{% endwith %}
{# Fin des notifications personnalisées "Tout le territoire" #}
{% endif %} {# Fin verif rôle usager #}
{# Début des notifications non personnalisées #}
{% if fiche.fields.priseencompte == "Non" %}
{% include "combo/publik-notifications/single-alerte.html" %}
{% endif %}
{# Fin des notifications non personnalisées #}
{% endfor %} {# Fin de la bouche sur les fiches #}
{% if parametres|get:"affiche_lien_inscription" is True %}
<div style="{{ parametres|get:"style_div_inscription" }}">
{% if request.user|has_role:"Publik Notification - Usager" %}
<a class="pk-button" href="{{ portal_url }}{{ parametres|get:"uri_page_pref_usagers" }}">{{ parametres|get:"libelle_bouton_tb_usager" }}</a>
{% elif parametres|get:"affiche_elements_non_abonnes" is True %}
{% if parametres|get:"incitation_non_abonne" %}
<p><strong>{{ parametres|get:"incitation_non_abonne"|linebreaksbr }}</strong></p>
{% endif %}
<a class="pk-button" href="{{ eservices_url }}{{ parametres|get:"uri_inscription" }}">{{ parametres|get:"libelle_bouton_form_inscription" }}</a>
{% endif %}
</div>
{% endif %}
{% endwith %} {# Fin with pour les paramètres #}
{% endif %} {# Fin test json.error #}
{# <pre>{{json|pprint}}</pre> #}

View File

@ -0,0 +1,38 @@
{% load assets %}
<div style="
{% if parametres|get:"utiliser_style_alternatif" is True %}
{{ parametres|get:"style_alternatif" }};
{% else %}
border: solid thin #ccc;
padding: 10px 10px 5px 10px;
margin: 0px 10px 10px 10px;
{% endif %}">
{% if parametres|get:"affiche_image" is True %}
<div class="fx-grid">
<div class="size--d1-6">
{% with refimgc="pn:thematique:"|add:fiche.fields.thematique_raw %}
<img style="max-width: 100%; height: auto;"
src="{% asset_url refimgc %}"/>
{% endwith %}
</div>
<div class="size--d5-6">
<strong>{{ fiche.fields.objet }}</strong><br>
{% if parametres|get:"affiche_thematique" is True and fiche.fields.thematique %}[{{ fiche.fields.thematique }}]<br>{% endif %}
{{ fiche.fields.contenu|linebreaksbr }}
{% if fiche.workflow.fields.lien %}
<br><a href="{{ fiche.workflow.fields.lien }}">En savoir plus</a>
{% endif %}
</div>
</div>
{% else %}
<div>
<strong>{{ fiche.fields.objet }}</strong><br>
{{ fiche.fields.contenu|linebreaksbr }}
{% if parametres|get:"affiche_thematique" is True and fiche.fields.thematique %}[{{ fiche.fields.thematique }}]<br>{% endif %}
{% if fiche.workflow.fields.lien %}
<br><a href="{{ fiche.workflow.fields.lien }}">En savoir plus</a>
{% endif %}
</div>
{% endif %}
</div>

View File

@ -1,25 +1,30 @@
{% if include_top_links != False %}
<div id="toplinks">
{% block user-info %}
{% if user.is_authenticated %}
{% block logged-in %}
<span class="logged-in">
{% if account_url %}<a class="account-link" href="{{ account_url }}">{% endif %}
<span class="connected-user">{% block user-info-user-name %}{% include "includes/user-info-user-name.html" %}{% endblock %}</span>{% if account_url %}</a>{% endif %}
<a accesskey="o" class="logout" href="{{ logout_url }}">{% block user-info-logout-label %}{% include "includes/user-info-logout-label.html" %}{% endblock %}</a>
</span>
{% endblock %}
{% else %}
{% block login %}
<span class="login"><a accesskey="2" class="login-link" href="{{ login_url }}"
>{% block user-info-login-label %}{% include "includes/user-info-login-label.html" %}{% endblock %}
{% if registration_url and include_registration_link != False %}
</a>
<span class="user-info--separator"></span>
<a class="registration" href="{{registration_url}}"
>{% block user-info-registration-label %}{% include "includes/user-info-registration-label.html" %}{% endblock %}{% endif %}</a></span>
{% endblock %}
{% endif %}
{% endblock %}
<ul class="toplinks--list {{ user.is_authenticated|yesno:"logged-in,login" }}">
{% block user-info %}
{% if user.is_authenticated %}
{% block logged-in %}
<li class="toplinks--list-item">
{% if account_url %}<a class="account-link" href="{{ account_url }}">{% endif %}
<span class="connected-user">{% block user-info-user-name %}{% include "includes/user-info-user-name.html" %}{% endblock %}</span>{% if account_url %}</a>{% endif %}
</li><li class="toplinks--list-item">
<a accesskey="o" class="logout" href="{{ logout_url }}">{% block user-info-logout-label %}{% include "includes/user-info-logout-label.html" %}{% endblock %}</a>
</li>
{% endblock %}
{% else %}
{% block login %}
<li class="toplinks--list-item">
<a accesskey="2" class="login-link" href="{{ login_url }}"
>{% block user-info-login-label %}{% include "includes/user-info-login-label.html" %}{% endblock %}
{% if registration_url and include_registration_link != False %}
</a>
</li><li class="toplinks--list-item">
<a class="registration" href="{{registration_url}}"
>{% block user-info-registration-label %}{% include "includes/user-info-registration-label.html" %}{% endblock %}{% endif %}</a>
</li>
{% endblock %}
{% endif %}
{% endblock %}
</ul>
</div>
{% endif %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}votre facture n° {{ invoice.id }} est disponible en ligne{% endblock %}
{% block email-subject %}Votre facture n° {{ invoice.id }} est disponible en ligne{% endblock %}

View File

@ -16,7 +16,9 @@
{% endlocalize %}
></div>
{% block list-header %}
<h3>Si votre signalement ne figure pas dans la liste ci-dessous, continuez</h3>
<h3>Si votre signalement figure dans la liste ci-dessous, cliquez sur le
bouton +1. Dans le cas contraire, poursuivez votre demande.
</h3>
{% endblock %}
<ul class="nearby-forms">
{% with distance=global_context.form_option_distance|default:100|add:50 %}

View File

@ -1,2 +1,2 @@
{% extends "emails/subject.txt" %}
{% block email-subject %}{% if existing_accounts %}votre compte existe déjà{% else %}activation de votre compte{% endif %}{% endblock %}
{% block email-subject %}{% if existing_accounts %}Votre compte existe déjà{% else %}Activation de votre compte{% endif %}{% endblock %}

View File

@ -9,8 +9,7 @@
{% endif %}
<div class="mes-dossiers">
{% if json.data.dossier.DEMANDES.AD %}
<a href="ad/?dossi
er={{json.data.id}}" class="dossier-autonomie" style="background-image: url('{% asset_url "social:dossiers:autonomie" %}')">Dossier AUTONOMIE</a>
<a href="ad/?dossier={{json.data.id}}" class="dossier-autonomie" style="background-image: url('{% asset_url "social:dossiers:autonomie" %}')">Dossier AUTONOMIE</a>
{% endif %}
{% if json.data.dossier.DEMANDES.PH %}
<a href="ph/?dossier={{json.data.id}}" class="dossier-handicap" style="background-image: url('{% asset_url "social:dossiers:handicap" %}')">Dossier HANDICAP</a>

View File

@ -1,6 +1,6 @@
<!-- Titre -->
{% if json %}
<h2>{{ json.title|default:"" }} {{ json.first_name }} {{ json.last_name|upper }}</h2>
<h2 class="cell--title">{{ json.title|default:"" }} {{ json.first_name }} {{ json.last_name|upper }}</h2>
{% endif %}
<!-- Fin Titre -->

View File

@ -1,6 +1,6 @@
<!-- Titre -->
{% if json %}
<h2>{{ json.title|default:"" }} {{ json.first_name }} {{ json.last_name|upper }}</h2>
<h2 class="cell--title">{{ json.title|default:"" }} {{ json.first_name }} {{ json.last_name|upper }}</h2>
{% endif %}
<!-- Fin Titre -->

View File

@ -4,7 +4,8 @@
<p>
Vous navez pas de compte ? <br>
<span class="small">
Retrouvez votre démarche à laide du code de suivi qui vous a été envoyé par mail ou par courrier
Retrouvez votre démarche à laide du code de suivi qui vous a été envoyé
par mail ou par courrier.
</span>
</p>
{% endblock %}

View File

@ -1,25 +1,29 @@
{% extends "includes/user-info.html" %}
{% block logged-in %}
<div class="toplinks--toggled-wrapper">
<button aria-label="{% include "includes/user-info-user-name.html" %}" class="toplinks--togglable-btn togglable">
<svg class="toplinks-icon">
<use href="{{site_base}}/static/{{css_variant}}/img/toplinks-icon.svg#icon" />
</svg>
<span class="desktop-only">
{% include "includes/user-info-user-name.html" %}
</span>
</button>
{{ block.super }}
<div class="toplinks--panel-mask"></div>
<script>
const toplinksBtn = document.querySelector('.toplinks--togglable-btn')
const toplinksMask = document.querySelector('.toplinks--panel-mask')
toplinksMask.addEventListener('click', function(){
toplinksBtn.click()
});
</script>
</div>
<li class="toplinks--list-item">
<div class="toplinks--toggled-wrapper">
<button aria-label="{% include "includes/user-info-user-name.html" %}" class="toplinks--togglable-btn togglable">
<svg class="toplinks-icon">
<use href="{{site_base}}/static/{{css_variant}}/img/toplinks-icon.svg#icon" />
</svg>
<span class="desktop-only">
{% include "includes/user-info-user-name.html" %}
</span>
</button>
<ul class="toplinks--togglable-menu">
{{ block.super }}
</ul>
<div class="toplinks--panel-mask"></div>
<script>
const toplinksBtn = document.querySelector('.toplinks--togglable-btn')
const toplinksMask = document.querySelector('.toplinks--panel-mask')
toplinksMask.addEventListener('click', function(){
toplinksBtn.click()
});
</script>
</div>
</li>
{% endblock %}
{% block user-info-login-label %}

View File

@ -1,6 +1,6 @@
{% if cell.link_page %}
<div class="demarche-link">
<h2>{{ cell.link_page.title }}</h2>
<h2 class="cell--title">{{ cell.link_page.title }}</h2>
<p class="demarche-link--description">{{ cell.link_page.description }}</p>
<div class="demarche-link--arrow-container">
<a href="{{ url }}" class="demarche-link--arrow">{{ title }}</a>

View File

@ -1,6 +1,6 @@
{% if cell.link_page and cell.link_page.picture %}
<div class="internal-page-link" style="background-image: url({{cell.link_page.picture.url}})">
<h2><a href="{{ url }}">{{ title }}</a></h2>
<h2 class="cell--title"><a href="{{ url }}">{{ title }}</a></h2>
<p class="internal-page-link--description">{{ cell.link_page.description }}</p>
<div class="internal-page-link--arrow-container">
<a href="{{ url }}" class="internal-page-link--arrow"><span class="sr-only">{{ title }}</span></a>

View File

@ -0,0 +1,9 @@
{% extends "theme.html" %}
{% load combo %}
{# Move nav block into header-content block #}
{% block header-content %}
{% block nav %}{% endblock %}
{{ block.super }}
{% endblock %}
{% block after-header %}{% endblock %}

Some files were not shown because too many files have changed in this diff Show More