toulouse-2022: [parsifal] manage capacity in catalog (#86840)

README

@@ -458,6 +458,13 @@ copyright notices:
   #
   # https://www.fontsquirrel.com/license/arimo
 
+* Kumbh Sans
+  # Copyright 2020 The KumbhSans Project Authors (https://github.com/xconsau/KumbhSans)
+  #
+  # This Font Software is licensed under the SIL Open Font License, Version 1.1.
+  #
+  # https://github.com/xconsau/KumbhSans/blob/master/OFL.txt
+
 ~~~~
 
 Some theme variant files have their own specific licenses; refer to

help/fr/misc-css-classes.page

@@ -140,6 +140,10 @@ de classes CSS réutilisables.
   <td><p><code>pk-horizontal-radiobuttons</code></p></td>
   <td><p>Aligne horizontalement les boutons radio d’un champ « liste ».</p></td>
  </tr>
+ <tr>
+  <td><p><code>pk-vertical-items</code></p></td>
+  <td><p>Aligne verticalement les items des champs « liste à choix multiple » et « liste » affichés sous forme d’images.</p></td>
+ </tr>
 </table>
 </section>
 

static/arles-2020/_custom.scss

@@ -585,6 +585,7 @@ hr {
 
 
 .list-with-images {
+	@extend .bare-list;
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: center;

static/entrouvert/_custom.scss

@@ -66,6 +66,10 @@ a.pk-button:hover {
 	border: none;
 	box-shadow: none;
 	font-size: 0.812rem;
+
+	@media($max-mobile-viewport) {
+		display: none;
+	}
 }
 
 .page-index {

static/includes/_forms.scss

@@ -366,9 +366,14 @@ CheckboxesWithImagesWidget, .RadiobuttonsWithImagesWidget {
 
 .CheckboxesWidget,
 .RadiobuttonsWidget {
-	.content label {
-		display: block;
-		padding-bottom: 0.7em;
+	.content {
+		label {
+			display: block;
+			padding-bottom: 0.7em;
+		}
+		ul {
+			@extend .bare-list;
+		}
 	}
 	&.widget-inline-radio .content li,
 	&.widget-inline-radio .content label {
@@ -389,12 +394,6 @@ div.content label {
 	margin-right: 1em;
 }
 
-div.widget div.content ul {
-	padding: 0;
-	margin: 0;
-	list-style: none;
-}
-
 span.helptext,
 div.hint {
 	display: block;
@@ -729,7 +728,7 @@ div.select2-search {
 	&::before, &::after {
 		font-family: FontAwesome;
 		--icon-color: currentColor;
-		--icon-hover-color: var(--color);
+		--icon-hover-color: var(--icon-color);
 	}
 	@if ($position == left) {
 		&::before {

static/includes/_utils.scss

@@ -141,3 +141,13 @@ $black: #000000 !default;
 [hidden] {
 	display: none !important;
 }
+
+// bare list : for ol / ul, remove default list styles
+@mixin bare-list {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+}
+.bare-list {
+	@include bare-list();
+}

static/includes/fonts/_kumbhsans.scss

@@ -0,0 +1,18 @@
+@mixin kumbhsans-font($type, $weight) {
+	@font-face {
+		font-family: 'Kumbh Sans';
+		src: url('/static/fonts/KumbhSans/KumbhSans-#{$type}.woff2') format('woff2');
+		font-weight: $weight;
+		font-style: normal;
+	}
+}
+
+@include kumbhsans-font('Thin', 100);
+@include kumbhsans-font('ExtraLight', 200);
+@include kumbhsans-font('Light', 300);
+@include kumbhsans-font('Regular', 400);
+@include kumbhsans-font('Medium', 500);
+@include kumbhsans-font('SemiBold', 600);
+@include kumbhsans-font('Bold', 700);
+@include kumbhsans-font('ExtraBold', 800);
+@include kumbhsans-font('Black', 900);

static/includes/wcs/_bulk.scss

@@ -60,7 +60,7 @@ div#rub_service {
 }
 
 .form-content--title,
-div#rub_service h2 {
+#rub_service > h2 {
 	@extend #{$form-title-style} !optional;
 }
 
@@ -792,6 +792,7 @@ div.section {
 div.section.foldable {
 	margin-bottom: 1rem;
 	> h2:first-child {
+		@extend %title;
 		&::after {
 			font-family: FontAwesome;
 			content: "\f106";  // angle-up

static/includes/wcs/_nearby-form.scss

@@ -48,15 +48,22 @@
 	border-radius: 3px;
 }
 
-.template-nearby-forms div.leaflet-div-icon {
-	box-sizing: content-box;
-	padding: 3px;
-	margin: auto;
-	border-radius: 3px;
-	display: flex;
+.template-nearby-forms .nearby-marker {
 	a {
-		line-height: 1;
-		margin: auto;
+		display: block;
+		padding: 0 3px;
+		border-radius: 3px;
+		background: $button-background;
+		color: $button-color;
+		min-width: 1.4em;
+		line-height: 1.4;
+		text-align: center;
+		text-decoration: none;
+		font-weight: bold;
+		outline: 1px solid white;
+		&:hover {
+			outline-width: 3px;
+		}
 	}
 }
 

static/js/plus1.js

@@ -41,8 +41,10 @@ $(function() {
           {
             pointToLayer: function (feature, latlng) {
               marker = L.divIcon({
+                                  className: "nearby-marker",
                                   iconAnchor: [0, 0],
                                   popupAnchor: [5, -45],
+                                  iconSize: null,
                                   html: '<a href="#nearby-' + feature.properties.counter + '" class="demand-map-marker">' +
                                          feature.properties.counter + '</a>'
                                  });

static/thonon-agglomeration-2021/_custom.scss

@@ -451,6 +451,36 @@ $cell-additional-padding : 10px;
 	}
 }
 
+// inline links list
+.inline-links-list {
+	.gru-content &.cell {
+		.links-list ul {
+			text-align: center;
+			> li {
+				display: inline-block;
+				div.description {
+					display: none;
+				}
+			}
+			> li > a {
+				&::before {
+					content: none;
+				}
+				@extend %button2;
+				--color: #{$blue-dark};
+				font-weight: bold !important;
+				margin-right: 0;
+				&:hover {
+					box-shadow: none;
+				}
+				&:not(:hover) {
+					border-color: transparent;
+				}
+			}
+		}
+	}
+}
+
 #sidebar .cell {
 	@extend .gray-cell; 
 }

static/univ-smb/_custom.scss

@@ -0,0 +1,105 @@
+@media screen and (min-width: $mobile-limit + 1) {
+	.gru-nav {
+		display: flex;
+	}
+	#logo.has-logo {
+		padding-bottom: 20px;
+		a {
+			min-height: 70px;
+		}
+	}
+}
+
+	div#header h1#logo {
+		margin-top: 1em;
+		display: flex;
+		justify-content: center;
+		a {
+			width: $width;
+			@media screen and (max-width: $mobile-limit) {
+				max-width: 720px;
+				min-height: 60px;
+				margin-bottom: 20px;
+			}
+		}
+	}
+
+#toplinks {
+	position: relative;
+	a {
+		color: white;
+	}
+	@media screen and (min-width: $mobile-limit + 1) {
+		right: unset;
+		height: 40px;
+		.toplinks--list {
+			position: absolute;
+			right: 120px;
+		}
+	}
+	@media screen and (max-width: $mobile-limit) {
+		max-width: 100%;
+	}
+}
+
+
+.header-width {
+	max-width: unset;
+}
+
+.site-header, #header-wrapper, #header {
+	box-sizing: content-box;
+}
+
+@media screen and (min-width: $mobile-limit + 1) {
+	div#header {
+		width: unset;
+		padding: unset;
+	}
+}
+
+@media screen and (max-width: $mobile-limit) {
+	body {
+		border-left: 0;
+	}
+	div#header {
+		padding: 0;
+	}
+}
+
+.gru-content div.cell h2:first-child {
+	border-bottom: 1px solid #e1e1e1;
+	&::before {
+		background: #1e1e1e;
+		bottom: 0;
+		content: '';
+		display: block;
+		height: 1px;
+		position: absolute;
+		width: 40px;
+	}
+}
+
+li.contains-subentries > a.menu--link {
+	span.menu--label::after {
+		content: "▼";
+		font-size: .6em;
+		margin-left: 1em;
+	}
+}
+
+%button { font-weight: bold; }
+
+.title label {
+	font-weight: bold;
+	.required {
+		color: $required-red;
+	}
+}
+
+#footer {
+	display: flex;
+	a[href]:hover {
+		text-decoration: none;
+	}
+}

static/univ-smb/_vars.scss

@@ -0,0 +1,79 @@
+$primary-color: #1a3e78;
+$secondary-color: #f2f2f2;
+$tertiary-color: #5a6473;
+
+$info-green: #4cad16;
+$notif-orange: #ef5e3B;
+$vivid-cyan-blue: #0693e3;
+$required-red: #790000;
+$nav-hover-blue: #4f8eda;
+
+$width: 1160px;
+$border-radius: 0px;
+$box-shadow: none;
+$notification_error_color: red;
+$notification_warning_color: yellow;
+$link-color: $primary-color;
+$link-decoration: none;
+
+$font-color: #333;
+$font-size: 0.938em;
+$font-family: Arimo, sans-serif;
+
+$title-background: white;
+$title-color: #7f7f7f;
+$title-transform: uppercase;
+$title-font-family: $font-family;
+$title-font-size: 1.4em;
+$title-weight: 400;
+
+$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: $secondary-color;
+$nav-button-color: $font-color;
+$nav-border-color: $font-color;
+$nav-color: $font-color;
+$nav-active-color: $nav-hover-blue;
+$nav-item-selected-color: $nav-hover-blue;
+$nav-item-selected-background: white;
+$nav-item-hover-color: $nav-hover-blue;
+$nav-item-hover-background: white;
+$nav-text-transform: uppercase;
+$nav-after-image: false;
+$responsive-menu: left-to-right;
+$nav-font-family: $font-family;
+$nav-font-size: 1em;
+$nav-font-style: normal;
+$nav-font-weight: 600;
+
+$widget-focus-border: 1px solid darken($vivid-cyan-blue, 20%);
+$widget-focus-box-shadow: 0 0 3px $vivid-cyan-blue;
+$widget-focus-outline: none;
+$widget-border: 1px solid #7f7f7f;
+$widget-box-shadow: none;
+$widget-border-radius: 3px;
+
+$button-background: $primary-color;
+$button-focus-outline-offset: 1px;
+$button-box-shadow: none;
+$button-hover-background: darken($primary-color, 10%);
+$button-hover-color: white;
+$button-border-radius: 5px;
+$cancel-button-style: "%inverted-button";
+
+$cell-image-position: top;
+$cell-image-padding: none;
+$cell-border: none;
+$cell-entry-hover-background: white;
+$cell-entry-hover-color: $primary-color;
+$cell-entry-border: 1px solid $tertiary-color;
+$cell-title-cover-border: true;
+
+$footer-background: $secondary-color;
+$footer-color: $title-color;
+$footer-link-color: $footer-color;

static/univ-smb/config.json

@@ -0,0 +1,15 @@
+{
+  "label": "Université Savoie Mont Blanc",
+  "variables": {
+    "theme_color": "#1A3E78",
+    "favicon": "univ-smb/img/favicon.png",
+    "include_registration_link": true
+  },
+  "settings": {
+    "combo": {
+      "COMBO_ASSET_SLOTS.update": {
+        "header:logo": { "label": "Têtière : logo" }
+      }
+    }
+  }
+}

static/univ-smb/style.scss

@@ -0,0 +1,6 @@
+@charset "UTF-8";
+@import '../includes/fonts/arimo';
+
+@import 'vars';
+@import '../includes/publik';
+@import 'custom';

static/vendargues-2024/_custom.scss

@@ -0,0 +1,44 @@
+#top h1#logo a {
+	background: transparent url(img/logo.jpg) top left no-repeat;
+	background-size: contain;
+	height: 140px;
+	text-indent: 250px;
+	line-height: 160px;
+	text-transform: uppercase;
+	color: rgb(35, 31, 32);
+	font-weight: 200;
+	@media screen and ($max-mobile-viewport) {
+		margin-top: 2em;
+		margin-bottom: 1em;
+		background-size: contain;
+		background-position: top center;
+		display: inline-block;
+		width: 100%;
+		text-indent: -10000px;
+	}
+}
+
+@media screen and ($max-mobile-viewport) {
+	#logo {
+		padding-left: 0;
+	}
+}
+
+footer {
+	background-image: url(img/V2.svg);
+	background-repeat: no-repeat;
+	background-size: auto;
+}
+
+#footer-wrapper {
+	background: transparent;
+}
+
+#toplinks a {
+	font-family: $title-font-family;
+	color: white;
+}
+
+ul#evolutions li span.item {
+	background: white !important;
+}

static/vendargues-2024/_vars.scss

@@ -0,0 +1,40 @@
+@import '../includes/fonts/roboto-slab';
+@import '../includes/fonts/kumbhsans';
+
+$darkblue: #223755;
+$yellow: #d3d800;
+$primary-color: $darkblue;
+$border-radius: 0;
+$font-family: "Roboto Slab", serif;
+$title-font-family: "Kumbh Sans", sans-serif;
+$font-size: 100%;
+$text-color: rgb(51, 51, 51);
+$width: 1300px;
+
+$title-background: $yellow;
+
+$button-background: $yellow;
+$button-hover-background: $darkblue;
+$button-color: black;
+$button-hover-color: white;
+
+$nav-font-family: $title-font-family;
+$nav-font-weight: 300;
+$nav-active-color: $yellow;
+$nav-text-transform: uppercase;
+$nav-submenu-background: white;
+$nav-submenu-color: black;
+$nav-item-hover-background: $yellow;
+$nav-item-hover-color: black;
+
+$title-text-transform: uppercase;
+
+$footer-background: white;
+$footer-color: rgb(51, 51, 51);
+
+$toplinks-style: none;
+$toplinks-background: $darkblue;
+$toplinks-padding: 1em;
+
+$widget-focus-outline: 2px solid $darkblue;
+$widget-focus-outline-offset: 0px;

static/vendargues-2024/config.json

@@ -0,0 +1,6 @@
+{
+  "label": "Vendargues (2024)",
+  "variables": {
+    "theme_color": "#223755"
+  }
+}

static/vendargues-2024/img/V-b.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Calque_1" data-name="Calque 1" viewBox="0 0 136 151"><title>V-b</title><polygon points="-0.19 0 33.66 0 33.66 91.12 101.34 0 135.19 0 33.66 151 -0.19 151 -0.19 0" fill="#5e82a2"/></svg>

static/vendargues-2024/img/V2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Calque_1" data-name="Calque 1" viewBox="0 0 82 151"><title>V2</title><polygon points="0 151 82 151 0 0 0 151" fill="#d3d800"/></svg>

static/vendargues-2024/style.scss

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+@import 'vars';
+@import '../includes/publik';
+@import 'custom';

templates/includes/user-info.html

@@ -10,7 +10,7 @@
             </li>
             {% if lingo_basket_enabled %}
               <li class="toplinks--list-item">
-                <a href="{{ lingo_url }}basket/"><span class="lingo--basket"><span class="sr-only">Panier</span><span class="lingo--basket-items"></span></span></a>
+                <a href="{{ lingo_url }}basket/?back_url={{request.build_absolute_uri|urlencode }}"><span class="lingo--basket"><span class="sr-only">Panier</span><span class="lingo--basket-items"></span></span></a>
                 <script src="{{ lingo_url }}basket/status.js"></script>
               </li>
             {% endif %}

templates/qommon/forms/widgets/famille-reservations-recurrentes.html

@@ -5,8 +5,8 @@
     {% regroup widget.get_options by options.day as options_list %}
     {% for day, options in options_list %}
       {% for option in options %}
-        <li data-date="{{ option.options.date }}"><label for="{{ widget.get_name_for_id }}_op_{{ forloop.counter0 }}"><input
-          id="{{ widget.get_name_for_id }}_op_{{ forloop.counter0 }}"
+        <li data-date="{{ option.options.date }}"><label for="{{ widget.get_name_for_id }}_op_{{ forloop.parentloop.counter0 }}_{{ forloop.counter0 }}"><input
+          id="{{ widget.get_name_for_id }}_op_{{ forloop.parentloop.counter0 }}_{{ forloop.counter0 }}"
           {% if option.selected %}checked="checked"
           {% elif widget.readonly or option.disabled %}disabled{% endif %}
           {% for attr in widget.attrs.items %}{{attr.0}}="{{attr.1}}"{% endfor %}

templates/variants/univ-smb/combo/page_template.html

@@ -0,0 +1,12 @@
+{% extends "combo/page_template.html" %}
+{% load combo %}
+
+{% block top-links %}
+{% endblock %}
+
+{% block header-title %}
+  {% skeleton_extra_placeholder top-links %}
+  {% include 'includes/user-info.html' %}
+{% end_skeleton_extra_placeholder %}
+{{ block.super }}
+{% endblock %}