diff --git a/README.md b/README.md
index a68e1efec9c34b6379e41ec509edf743171262a3..8c36eaeaa7c272fdd4b4301c324bed5058a496b0 100644
--- a/README.md
+++ b/README.md
@@ -112,7 +112,7 @@ Le site se gère depuis deux pages d'administration:
## En production
-Le serveur a besoin d'être configuré pour HTTPS et d'être configuré pour livrer directement les fichiers situés des `/static/`.
+Le serveur a besoin d'être configuré pour HTTPS et d'être configuré pour livrer directement les fichiers situés dans `/static/` et `/media/`.
1. Installer les dépendances `make install`
diff --git a/home/static/css/style.css b/home/static/css/style.css
index b7740e2f60e90130917dcb70c01f230be375ded8..c9394ad529811e6f0b96f2ce1960e37f1ab0fdb0 100644
--- a/home/static/css/style.css
+++ b/home/static/css/style.css
@@ -451,40 +451,54 @@ ul.messagelist li.info:before {
height: 35px;
margin: 0 5px 0 0;
}
-#transport-metro-icon,
-#transport-metro-stop,
-#transport-bus-1-icon,
-#transport-bus-1-stop {
+#transport-ratp-metro-icon,
+#transport-ratp-metro-stop,
+#transport-ratp-bus-1-icon,
+#transport-ratp-bus-1-stop,
+#transport-tcl-metro,
+#transport-tcl-bus-1 {
grid-row: 1;
}
-#transport-rer-icon,
-#transport-rer-stop,
-#transport-bus-2-icon,
-#transport-bus-2-stop {
+#transport-ratp-rer-icon,
+#transport-ratp-rer-stop,
+#transport-ratp-bus-2-icon,
+#transport-ratp-bus-2-stop,
+#transport-tcl-tram-1,
+#transport-tcl-bus-2,
+#transport-tcl-stop {
grid-row: 2;
}
-#transport-noctilien-icon,
-#transport-noctilien-stop {
+#transport-ratp-noctilien-icon,
+#transport-ratp-noctilien-stop,
+#transport-tcl-tram-2,
+#transport-tcl-bus-3 {
grid-row: 3;
}
-#transport-metro-icon,
-#transport-rer-icon {
+#transport-ratp-metro-icon,
+#transport-ratp-rer-icon{
grid-column: 1;
justify-self: end;
}
-#transport-metro-stop,
-#transport-rer-stop {
+#transport-ratp-metro-stop,
+#transport-ratp-rer-stop,
+#transport-tcl-stop {
grid-column: 2;
}
-#transport-bus-1-icon,
-#transport-bus-2-icon,
-#transport-noctilien-icon {
+#transport-ratp-bus-1-icon,
+#transport-ratp-bus-2-icon,
+#transport-ratp-noctilien-icon,
+#transport-tcl-metro,
+#transport-tcl-tram-1,
+#transport-tcl-tram-2 {
grid-column: 3;
justify-self: end;
}
-#transport-bus-1-stop,
-#transport-bus-2-stop,
-#transport-noctilien-stop {
+#transport-ratp-bus-1-stop,
+#transport-ratp-bus-2-stop,
+#transport-ratp-noctilien-stop,
+#transport-tcl-bus-1,
+#transport-tcl-bus-2,
+#transport-tcl-bus-3 {
grid-column: 4;
}
@@ -497,39 +511,39 @@ ul.messagelist li.info:before {
grid-template-rows: auto auto auto auto auto;
align-items: center;
}
- #transport-metro-icon,
- #transport-metro-stop {
+ #transport-ratp-metro-icon,
+ #transport-ratp-metro-stop {
grid-row: 1;
}
- #transport-rer-icon,
- #transport-rer-stop {
+ #transport-ratp-rer-icon,
+ #transport-ratp-rer-stop {
grid-row: 2;
}
- #transport-bus-1-icon,
- #transport-bus-1-stop {
+ #transport-ratp-bus-1-icon,
+ #transport-ratp-bus-1-stop {
grid-row: 3;
}
- #transport-bus-2-icon,
- #transport-bus-2-stop {
+ #transport-ratp-bus-2-icon,
+ #transport-ratp-bus-2-stop {
grid-row: 4;
}
- #transport-noctilien-icon,
- #transport-noctilien-stop {
+ #transport-ratp-noctilien-icon,
+ #transport-ratp-noctilien-stop {
grid-row: 5;
}
- #transport-metro-icon,
- #transport-rer-icon,
- #transport-bus-1-icon,
- #transport-bus-2-icon,
- #transport-noctilien-icon {
+ #transport-ratp-metro-icon,
+ #transport-ratp-rer-icon,
+ #transport-ratp-bus-1-icon,
+ #transport-ratp-bus-2-icon,
+ #transport-ratp-noctilien-icon {
grid-column: 1;
justify-self: end;
}
- #transport-metro-stop,
- #transport-rer-stop,
- #transport-bus-1-stop,
- #transport-bus-2-stop,
- #transport-noctilien-stop {
+ #transport-ratp-metro-stop,
+ #transport-ratp-rer-stop,
+ #transport-ratp-bus-1-stop,
+ #transport-ratp-bus-2-stop,
+ #transport-ratp-noctilien-stop {
grid-column: 2;
}
}
diff --git a/home/static/imgs/cof.svg b/home/static/imgs/2021/cof.svg
similarity index 100%
rename from home/static/imgs/cof.svg
rename to home/static/imgs/2021/cof.svg
diff --git a/home/static/imgs/ens_psl.png b/home/static/imgs/2021/ens_psl.png
similarity index 100%
rename from home/static/imgs/ens_psl.png
rename to home/static/imgs/2021/ens_psl.png
diff --git a/home/static/imgs/favicon.ico b/home/static/imgs/2021/favicon.ico
similarity index 100%
rename from home/static/imgs/favicon.ico
rename to home/static/imgs/2021/favicon.ico
diff --git a/home/static/imgs/logo.png b/home/static/imgs/2021/logo.png
similarity index 100%
rename from home/static/imgs/logo.png
rename to home/static/imgs/2021/logo.png
diff --git a/home/static/imgs/logo_easter_egg.png b/home/static/imgs/2021/logo_easter_egg.png
similarity index 100%
rename from home/static/imgs/logo_easter_egg.png
rename to home/static/imgs/2021/logo_easter_egg.png
diff --git a/home/static/imgs/logo_grey.png b/home/static/imgs/2021/logo_grey.png
similarity index 100%
rename from home/static/imgs/logo_grey.png
rename to home/static/imgs/2021/logo_grey.png
diff --git a/home/static/imgs/logointerludes.png b/home/static/imgs/2021/logointerludes.png
similarity index 100%
rename from home/static/imgs/logointerludes.png
rename to home/static/imgs/2021/logointerludes.png
diff --git a/home/static/imgs/2022/bul.png b/home/static/imgs/2022/bul.png
new file mode 100644
index 0000000000000000000000000000000000000000..57e08844f91c8d4f02bba3cb896d9041d7b50495
Binary files /dev/null and b/home/static/imgs/2022/bul.png differ
diff --git a/home/static/imgs/2022/ens_lyon.svg b/home/static/imgs/2022/ens_lyon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..08a1c0e25227df12029bca7c35720dbe2c8ad878
--- /dev/null
+++ b/home/static/imgs/2022/ens_lyon.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="561.182px" height="235.275px" viewBox="0 0 561.182 235.275" enable-background="new 0 0 561.182 235.275"
+ xml:space="preserve">
+<g>
+ <path d="M40.278,35.72c0,0.807-0.149,1.384-0.446,1.733c-0.297,0.347-0.591,0.521-1.158,0.521c-0.551,0-0.86-0.184-1.162-0.549
+ c-0.303-0.366-0.454-0.934-0.454-1.706V27.1H34.71v8.62c0,1.346,0.376,2.387,1.128,3.123c0.753,0.737,1.619,1.105,2.836,1.105
+ c1.218,0,2.062-0.365,2.815-1.101c0.752-0.733,1.128-1.775,1.128-3.128V27.1h-2.339V35.72z"/>
+ <polygon points="50.723,35.172 50.672,35.191 46.996,27.1 44.64,27.1 44.64,39.766 46.996,39.766 46.996,31.684 47.045,31.667
+ 50.723,39.766 53.062,39.766 53.062,27.1 50.723,27.1 "/>
+ <rect x="55.424" y="27.1" width="2.339" height="12.666"/>
+ <polygon points="65.112,39.766 68.476,27.1 66.005,27.1 63.997,36.555 63.906,37.016 63.857,37.016 63.765,36.531 61.773,27.1
+ 59.303,27.1 62.665,39.766 "/>
+ <polygon points="76.998,37.791 72.245,37.791 72.245,34.207 76.287,34.207 76.287,32.233 72.245,32.233 72.245,29.075
+ 76.981,29.075 76.981,27.1 69.891,27.1 69.891,39.767 76.998,39.767 "/>
+ <path d="M83.912,35.25c0.245,0.348,0.367,0.839,0.367,1.471v0.861c0,0.436,0.025,0.86,0.075,1.277
+ c0.049,0.418,0.17,0.72,0.363,0.906h2.43v-0.184c-0.194-0.18-0.328-0.468-0.406-0.864c-0.076-0.399-0.114-0.771-0.114-1.119v-0.895
+ c0-0.766-0.137-1.404-0.41-1.915c-0.272-0.511-0.718-0.876-1.334-1.097c0.54-0.282,0.949-0.665,1.23-1.143
+ c0.282-0.478,0.422-1.049,0.422-1.71c0-1.171-0.337-2.085-1.012-2.744c-0.676-0.658-1.604-0.988-2.79-0.988h-3.924v12.658h2.346
+ v-5.038h1.702C83.315,34.729,83.665,34.904,83.912,35.25 M82.725,32.755h-1.57v-3.672h1.578c0.474,0,0.836,0.173,1.083,0.514
+ c0.247,0.342,0.371,0.803,0.371,1.383c0,0.569-0.124,1.006-0.371,1.314C83.568,32.602,83.204,32.755,82.725,32.755"/>
+ <path d="M92.926,32.371c-0.722-0.329-1.229-0.629-1.521-0.899c-0.291-0.27-0.438-0.614-0.438-1.031c0-0.451,0.13-0.828,0.393-1.127
+ c0.261-0.299,0.627-0.447,1.095-0.447c0.502,0,0.89,0.179,1.165,0.54c0.276,0.359,0.413,0.828,0.413,1.409h2.282l0.016-0.053
+ c0.022-1.107-0.326-2.025-1.041-2.754c-0.717-0.728-1.649-1.091-2.794-1.091c-1.13,0-2.058,0.325-2.785,0.978
+ c-0.728,0.652-1.091,1.498-1.091,2.536c0,1.05,0.312,1.866,0.938,2.448c0.625,0.583,1.563,1.104,2.814,1.562
+ c0.611,0.278,1.038,0.562,1.28,0.849c0.244,0.287,0.365,0.679,0.365,1.172c0,0.475-0.12,0.851-0.361,1.129
+ c-0.239,0.279-0.606,0.417-1.102,0.417c-0.634,0-1.108-0.17-1.421-0.511c-0.314-0.344-0.471-0.906-0.471-1.689h-2.29l-0.017,0.053
+ c-0.026,1.316,0.379,2.327,1.218,3.031c0.842,0.704,1.835,1.058,2.981,1.058c1.15,0,2.073-0.312,2.768-0.931
+ c0.695-0.621,1.042-1.48,1.042-2.577c0-1.06-0.289-1.902-0.865-2.525S94.066,32.778,92.926,32.371"/>
+ <rect x="98.383" y="27.1" width="2.338" height="12.666"/>
+ <polygon points="102.186,29.075 104.879,29.075 104.879,39.767 107.226,39.767 107.226,29.075 109.938,29.075 109.938,27.1
+ 102.186,27.1 "/>
+ <polygon points="117.583,23.933 117.559,23.882 115.086,23.882 113.632,26.19 115.525,26.196 "/>
+ <polygon points="113.847,37.791 113.847,34.207 117.889,34.207 117.889,32.233 113.847,32.233 113.847,29.075 118.583,29.075
+ 118.583,27.1 111.492,27.1 111.492,39.767 118.599,39.767 118.599,37.791 "/>
+ <path d="M38.337,42.279h-3.635v12.665h3.635c1.235,0,2.254-0.489,3.059-1.47c0.804-0.979,1.206-2.244,1.206-3.792V47.55
+ c0-1.549-0.402-2.814-1.206-3.797S39.573,42.279,38.337,42.279 M40.254,49.679c0,0.993-0.176,1.789-0.532,2.39
+ c-0.355,0.601-0.862,0.901-1.516,0.901h-1.149v-8.717h1.149c0.654,0,1.161,0.3,1.516,0.896c0.356,0.599,0.532,1.392,0.532,2.378
+ V49.679z"/>
+ <polygon points="46.993,49.386 51.034,49.386 51.034,47.411 46.993,47.411 46.993,44.252 51.727,44.252 51.727,42.279
+ 44.638,42.279 44.638,54.944 51.745,54.944 51.745,52.97 46.993,52.97 "/>
+ <polygon points="59.74,42.279 57.385,42.279 57.385,54.944 63.842,54.944 63.842,52.97 59.74,52.97 "/>
+ <polygon points="67.282,47.707 67.232,47.707 65.247,42.279 62.679,42.279 66.058,50.282 66.058,54.944 68.407,54.944
+ 68.407,50.438 71.843,42.279 69.29,42.279 "/>
+ <path d="M76.657,42.097c-1.267,0-2.281,0.421-3.04,1.264c-0.761,0.845-1.14,2.007-1.14,3.485v3.548c0,1.485,0.379,2.646,1.14,3.481
+ c0.759,0.834,1.776,1.253,3.049,1.253s2.292-0.419,3.058-1.253c0.765-0.836,1.148-1.996,1.148-3.481v-3.548
+ c0-1.479-0.384-2.641-1.155-3.485C78.945,42.518,77.926,42.097,76.657,42.097 M78.534,50.396c0,0.919-0.16,1.608-0.48,2.067
+ c-0.319,0.46-0.782,0.688-1.388,0.688c-0.611,0-1.075-0.228-1.389-0.688c-0.312-0.459-0.47-1.148-0.47-2.067v-3.577
+ c0-0.913,0.153-1.599,0.462-2.058c0.309-0.461,0.772-0.69,1.388-0.69c0.613,0,1.078,0.231,1.397,0.693
+ c0.32,0.464,0.48,1.147,0.48,2.055V50.396z"/>
+ <polygon points="88.996,50.351 88.946,50.369 85.269,42.279 82.913,42.279 82.913,54.943 85.269,54.943 85.269,46.863
+ 85.319,46.846 88.996,54.943 91.334,54.943 91.334,42.279 88.996,42.279 "/>
+ <path d="M112.127,142.275c-0.009,11.787-0.019,27.052-0.019,27.19c0,19.518-15.883,35.401-35.424,35.405
+ c-0.069,0-0.136-0.004-0.203-0.006h-0.009h-0.003c-0.068,0.002-0.134,0.006-0.202,0.006c-19.542-0.004-35.426-15.889-35.426-35.405
+ c0-0.14-0.009-15.414-0.017-27.19H34.3c0.01,11.768,0.019,27.03,0.019,27.193c0,23.116,18.811,41.926,41.933,41.926
+ c0.076,0,0.149-0.005,0.223-0.005c0.075,0,0.147,0.005,0.223,0.005c23.123,0,41.933-18.81,41.933-41.926
+ c0-0.16,0.009-15.414,0.018-27.193H112.127z"/>
+ <path d="M99.046,142.275c-0.01,11.852-0.018,27.126-0.018,27.17c0,12.315-10.018,22.335-22.331,22.335
+ c-0.073,0-0.143-0.006-0.216-0.009v-0.003c0,0-0.005,0.003-0.009,0.003c0,0-0.001-0.003-0.003-0.003v0.003
+ c-0.072,0.003-0.143,0.009-0.215,0.009c-12.314,0-22.331-10.02-22.331-22.335c0-0.044-0.009-15.323-0.019-27.17h-6.567
+ l0.013,20.296c0.004,4.075,0.006,6.825,0.006,6.878c0,15.935,12.969,28.898,28.912,28.898c0.07,0,0.137-0.003,0.207-0.003
+ c0.068,0,0.137,0.003,0.207,0.003c15.941,0,28.913-12.965,28.913-28.898c0-0.053,0.001-2.803,0.005-6.878l0.013-20.296H99.046
+ L99.046,142.275z"/>
+ <path d="M85.884,142.275c-0.008,12.051-0.019,26.914-0.019,26.957c0,5.168-4.183,9.378-9.342,9.414h-0.048h-0.049
+ c-5.157-0.036-9.342-4.246-9.342-9.414c0-0.043-0.009-14.9-0.019-26.957h-6.582c0.01,12.057,0.019,26.914,0.019,26.957
+ c0,8.813,7.161,15.98,15.967,15.995v0.003h0.006h0.005l0.001-0.003c8.807-0.015,15.968-7.183,15.968-15.995
+ c0-0.043,0.009-14.906,0.019-26.957H85.884z"/>
+ <rect x="34.468" y="129.298" width="84.191" height="6.49"/>
+ <rect x="34.468" y="116.319" width="84.191" height="6.49"/>
+ <path d="M120.642,68.449c0,0-0.134-0.244-0.406-0.542c-0.269-0.304-0.949-0.714-1.276-1.034c-0.323-0.334-0.712-0.853-0.903-0.986
+ c-0.184-0.138-0.574-0.753-0.753-0.894c-0.199-0.137-0.417-1.142-0.443-1.253c-0.021-0.107-0.1-0.413-0.4-0.572
+ c-0.17-0.072-0.635-0.381-0.939-0.623c-0.293-0.246-1.048-0.981-1.048-0.981s-0.198-1.223-0.491-1.87
+ c-0.295-0.657-0.414-0.9-0.554-1.146c-0.13-0.247-0.216-0.297-0.289-0.68c0,0-0.411-0.031-0.793,0.214c0,0-0.786-0.598-1.57-1.058
+ c-0.791-0.467-1.721-0.951-2.105-1.027c-0.371-0.086-0.88-0.381-1.077-0.572c0,0-0.557-0.027-1.009,0.05
+ c-0.325,0.042-1.401,0.152-1.972,0.238c-0.568,0.075-1.971,0.311-2.291,0.333c-0.677,0.047-0.817,0.099-1.835,0.291
+ c0,0-0.806,0.142-1.08,0.247c-0.276,0.109-1.145,0.447-1.748,0.522c-0.661,0.08-1.352,0.083-2.148,0.211
+ c-0.357,0.064-1.706,0.603-2.342,0.751c-0.286,0.07-0.671,0.115-0.671,0.115s0.13,0.451,0.482,0.532c0,0-0.188,0.404-0.625,0.618
+ c-0.435,0.225-0.892,0.41-1.488,0.632c-0.606,0.209-1.553,0.589-1.798,0.783c0,0,0.19,0.378,0.562,0.579
+ c0,0,0.09,0.052-0.423,0.313c-0.522,0.279-1.701,0.769-2.234,1.012c-0.552,0.248-1.296,0.689-1.662,0.869
+ c-0.52,0.271-0.571,0.284-1.067,0.594c-0.486,0.296-0.239,0.279-0.239,0.279s0.244,0.054,0.589,0.079
+ c0.357,0.027,0.547,0.165,0.547,0.165s0.038,0.189-0.211,0.411c-0.244,0.215-0.599,0.7-1.439,1.276
+ c-0.417,0.282-0.78,0.607-1.238,0.929c-0.462,0.319-0.929,0.869-1.093,0.98l0.492,0.434l-0.074,0.34
+ c-0.213,0.133-0.48,0.281-0.818,0.414c-0.382,0.168-3.65,0.608-7.427,0.562c-6.309-0.087-8.048-0.9-11.26-1.046
+ c-3.219-0.15-5.606,0.563-8.544,1.458c-0.578,0.176-1.031,0.353-1.374,0.527c-1.235,0.256-2.481,0.6-3.623,1.04
+ c-4.087,1.567-11.221,7.473-13.218,8.313c-1.969,0.832-3.079,0.872-4.478,0.697c-1.397-0.172-1.948-0.524-1.948-0.524
+ s-0.713-1.516-1.533-2.134c-1.069-0.786-3.702-1.718-3.702-1.718s-0.459,1.729,0.475,3.396c1.123,1.987,3.317,1.862,4.11,2.187
+ c1.399,0.563,4.736,1.239,7.551,0.109c2.526-1.016,5.088-2.697,6.912-3.722c1.817-1.018,4.73-1.903,7.183-2.178
+ c-0.114,0.426-0.238,0.843-0.369,1.213c-0.687,2.087-3.223,6.515-3.74,7.251c-0.597,0.866-2.968,3.738-3.387,4.088
+ c-0.408,0.357-1.413,0.754-2.673,0.986c-1.385,0.258-5.36,0.657-5.36,0.657s-0.701,3.553-1.582,5.722
+ c-0.359,0.882-1.209,2.636-1.209,2.636s1.492,1.391,1.966,3.132c0.233,0.446,0.624,1.179,0.93,1.407v6.168h0.006v0.178h84.191
+ v-6.488h-0.002c0.157-0.494,0.384-1.61-0.587-2.074c-1.257-0.6-0.246-1.075-3.162-2.181c-0.835-0.318-2.228-0.765-2.7-1.154
+ c-0.469-0.381-2.995-3.911-4.248-5.397c-1.263-1.497-3.837-4.915-3.837-4.915l-0.567-1.35l0.102-1.02
+ c0.159-0.167,0.331-0.331,0.481-0.522c0.457-0.49,1.152-1.218,1.349-1.623c0.479-0.97,0.309-0.023,0.605-0.55
+ c0.222-0.4,1.087-0.877,1.447-1.106c0.354-0.215,0.882-0.869,0.882-0.869s0.013,0.39,0.16,0.767c0,0,0.252-0.208,0.653-0.699
+ c0.401-0.487,0.264-0.534,0.755-1.029c0.492-0.485,0.841-1.456,1.151-2.089c0.318-0.621,0.503-0.803,0.585-0.938
+ c0,0,0.208,0.498,0.345,0.849c0,0,0.322-0.311,0.457-0.621c0.132-0.311,0.224-0.714,0.446-1.067c0.222-0.36,0.39-0.823,0.605-0.915
+ c0.227-0.092,0.65-0.354,1.104-0.377c0.33-0.016,0.784,0.173,1.195,0.258c0.391,0.095,0.576-0.085,0.846,0.267
+ c0.264,0.357,0.625,0.543,0.625,0.543s0.006-0.056,0.331-0.219c0.33-0.167,0.349-0.162,0.655-0.38
+ c0.302-0.221,0.254-0.33,0.482-0.549c0.251-0.214,0.392-0.459,0.492-0.872c0.113-0.399-0.073-0.642,0.124-0.832
+ c0.193-0.187,0.583-0.196,0.782-0.668c0.188-0.457,0.131-0.54,0.214-0.618c0.079-0.083,0.13-0.41,0.13-0.41s0.551-0.46,0.629-0.84
+ c0.078-0.379,0.161-0.519,0.332-0.684C121.52,69.451,121.376,68.902,120.642,68.449 M76.793,89.907
+ c0.589,0.271,2.061,0.904,3.655,1.511c0.158,0.416,0.275,1.017,0.225,1.854c-0.145,2.091-2.219,4.689-2.219,4.689
+ s1.05,2.591,1.35,2.969c0.294,0.37,1.254,1.144,1.578,1.767c0.092,0.186,0.208,0.437,0.3,0.637h-5.697
+ c0.094-0.778-0.417-1.104-0.554-1.237c-0.311-0.308-0.581-0.915-1.342-1.184c-2.661-0.948-2.619-0.564-3.387-1.18
+ c-0.522-0.416-1.844-1.293-2.143-1.832c-0.297-0.538-0.836-2.983-0.845-5.072c0.004-1.263-0.087-2.462-0.175-3.212
+ C69.991,89.192,73.858,88.584,76.793,89.907 M37.519,95.526c0.854-0.354,2.739,0.37,4.623,0.026
+ c2.878-0.523,6.984-1.96,8.368-2.582c1.257-0.548,3.501-2.704,4.196-3.275c0.683-0.578,1.401-0.743,1.401-0.743
+ s0.834,0.896,2.511,2.38c1.682,1.489,2.25,2.181,2.836,2.664c0.573,0.484,1.276,1.471,1.392,1.864
+ c0.462,1.482,0.298,3.948,0.298,3.948s2.62,0.929,3.46,1.678c0.592,0.525,1.088,1.386,1.33,1.848H41.117
+ c0.067-0.445,0.098-1.435-0.87-1.775c-0.704-0.298-0.561-0.556-2.051-1.072c-0.599-0.214-0.934-0.462-1.242-1.241
+ c-0.298-0.784-0.302-2.082-0.302-2.082S36.786,95.824,37.519,95.526 M104.179,98.05c0,0,2.712,1.033,3.361,1.943
+ c0.422,0.596,2.881,1.294,2.881,1.294s0.751,0.053,1.728,0.947c0.746,0.684,0.986,0.966,1.453,1.099H88.694
+ c0.077-0.406,0.1-1.081-0.503-1.425c-0.397-0.223-0.741-0.657-1.187-0.873c-1.718-0.82-1.906-0.521-2.625-1.095
+ c-0.404-0.297-0.673-1.614-0.673-1.614s3.143-3.1,3.744-3.883c0.755-0.977,1.053-1.367,1.391-1.85
+ c2.364-0.222,4.844-0.647,5.697-1.135c0.242-0.145,0.462-0.274,0.671-0.396c0.269,0.152,0.507,0.291,0.714,0.416
+ c1.26,0.747,4.436,2.085,5.554,2.976C102.599,95.356,104.179,98.05,104.179,98.05"/>
+ <rect x="174.743" y="25.038" width="1.096" height="186.355"/>
+ <path d="M230.258,79.797h90.524v12.284h-90.524V79.797z M230.258,115.657v-12.038h90.655v12.038H230.258z M320.782,127.689v12.28
+ h-90.524v-12.28H320.782z"/>
+ <path d="M333.062,79.796h67.562c15.308,0,22.962,4.098,22.962,12.283H333.06V79.796H333.062z M333.062,103.62h23.502v12.032
+ h-23.502V103.62z M356.563,127.691v12.274l-23.502,0.129v-12.403H356.563L356.563,127.691z M400.623,103.62h23.101v12.032h-23.101
+ V103.62z M400.623,127.691h22.964v12.28h-22.964V127.691z"/>
+ <path d="M526.718,127.691c0,8.182-7.742,12.274-23.232,12.274h-67.29v-12.274H526.718z M459.424,79.794h67.294v12.281h-90.523
+ C436.194,83.894,443.94,79.794,459.424,79.794 M526.718,115.653h-90.522v-12.03h90.522V115.653z"/>
+ <polygon points="381.374,153.397 390.235,153.397 390.235,154.829 383.162,154.829 383.162,160.764 389.875,160.764
+ 389.875,162.199 383.162,162.199 383.162,168.608 390.545,168.608 390.545,170.043 381.374,170.043 "/>
+ <polygon points="394.101,153.397 396.354,153.397 405.558,168.036 405.604,168.036 405.604,153.397 407.397,153.397
+ 407.397,170.043 404.985,170.043 395.938,155.683 395.888,155.683 395.888,170.043 394.101,170.043 "/>
+ <path d="M411.127,167.914c1.06,0.618,2.308,0.979,3.99,0.979c2.228,0,4.069-1.047,4.069-3.409c0-3.266-8.293-3.672-8.293-8.033
+ c0-2.672,2.539-4.34,5.728-4.34c0.887,0,2.308,0.119,3.555,0.555l-0.284,1.499c-0.81-0.405-2.078-0.625-3.3-0.625
+ c-1.866,0-3.911,0.722-3.911,2.863c0,3.343,8.294,3.36,8.294,8.225c0,3.365-3.135,4.698-5.938,4.698
+ c-1.762,0-3.131-0.336-4.092-0.716L411.127,167.914z"/>
+ <path d="M431.631,153.397h4.481c6.477,0,9.043,3.437,9.043,8.301c0,6.03-4.377,8.343-10.366,8.343h-3.158V153.397z
+ M433.413,168.608h1.479c5.134,0,8.477-1.906,8.477-7.01c0-5.074-3.293-6.771-7.332-6.771h-2.624V168.608L433.413,168.608z"/>
+ <polygon points="449.069,153.397 457.935,153.397 457.935,154.829 450.857,154.829 450.857,160.764 457.57,160.764 457.57,162.199
+ 450.857,162.199 450.857,168.608 458.246,168.608 458.246,170.043 449.069,170.043 "/>
+ <polygon points="469.077,153.397 470.868,153.397 470.868,168.608 478.129,168.608 478.129,170.043 469.077,170.043 "/>
+ <polygon points="482.66,162.986 475.947,153.4 478.023,153.4 483.546,161.533 489.222,153.4 491.164,153.4 484.451,162.986
+ 484.451,170.037 482.66,170.037 "/>
+ <path d="M500.834,153.115c5.441,0,8.008,4.097,7.955,8.6c-0.053,5.104-2.75,8.608-7.955,8.608c-5.209,0-7.908-3.504-7.965-8.608
+ C492.823,157.211,495.387,153.115,500.834,153.115 M494.663,161.714c0,3.531,1.918,7.18,6.171,7.18c4.248,0,6.171-3.647,6.171-7.18
+ c0-3.523-1.923-7.167-6.171-7.167C496.581,154.547,494.663,158.191,494.663,161.714"/>
+ <polygon points="512.184,153.397 514.435,153.397 523.639,168.036 523.69,168.036 523.69,153.397 525.481,153.397 525.481,170.043
+ 523.072,170.043 514.021,155.683 513.968,155.683 513.968,170.043 512.184,170.043 "/>
+</g>
+</svg>
diff --git a/home/static/imgs/2022/favicon.ico b/home/static/imgs/2022/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a5f6069a2e507ab7dff39a674c66734e227d8800
Binary files /dev/null and b/home/static/imgs/2022/favicon.ico differ
diff --git a/home/static/imgs/2022/logo.png b/home/static/imgs/2022/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac92b2f9306198332cef7a3f544f63b04a765157
Binary files /dev/null and b/home/static/imgs/2022/logo.png differ
diff --git a/home/static/imgs/2022/trois_ptits_pois.png b/home/static/imgs/2022/trois_ptits_pois.png
new file mode 100644
index 0000000000000000000000000000000000000000..284865d448acefe06f1691999459305c6129b63e
Binary files /dev/null and b/home/static/imgs/2022/trois_ptits_pois.png differ
diff --git a/home/static/imgs/2022/trollune.png b/home/static/imgs/2022/trollune.png
new file mode 100644
index 0000000000000000000000000000000000000000..222ca5692a67bc5cbd0193be9466eeeaa88c153d
Binary files /dev/null and b/home/static/imgs/2022/trollune.png differ
diff --git a/home/static/imgs/tcl/34.svg b/home/static/imgs/tcl/34.svg
new file mode 100644
index 0000000000000000000000000000000000000000..aa0721c74cde5e91a7197926171a8802daa6965b
--- /dev/null
+++ b/home/static/imgs/tcl/34.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 83 28" enable-background="new 0 0 83 28"><g><g><path d="M3.592 0s-3.592 5.425-3.592 14.001c0 8.578 3.592 13.999 3.592 13.999h31.421v-28h-31.421z" fill="#EC2227"/><g fill="#fff"><path d="M5.871 8.355h3.838c2.432 0 3.503 1.25 3.503 2.678 0 1.584-.938 2.231-1.384 2.431.892.268 1.874 1.117 1.874 2.7 0 2.074-1.495 3.48-3.726 3.48h-4.105v-11.289zm3.301 4.597c1.026 0 1.696-.426 1.696-1.451 0-.715-.4-1.361-1.561-1.361h-1.072v2.812h.937zm.179 5.02c1.071 0 1.986-.38 1.986-1.719 0-1.05-.691-1.628-1.942-1.628h-1.16v3.347h1.116zM24.795 17.034c.76.401 1.607.826 2.878.826 1.071 0 1.606-.625 1.606-1.295 0-.915-.647-1.316-2.253-2.006-1.428-.603-2.433-1.34-2.433-3.192 0-1.785 1.361-3.279 3.994-3.279 1.295 0 2.275.358 2.877.692l-.714 1.941c-.581-.357-1.427-.625-2.296-.625-.937 0-1.585.423-1.585 1.16 0 .716.47 1.206 1.74 1.741 2.321.981 2.945 1.786 2.945 3.391 0 2.613-1.964 3.526-3.726 3.526-1.695 0-2.944-.602-3.769-1.162l.736-1.718zM20.833 15.717v-7.362h2.365v7.452c0 3.233-1.964 4.105-4.194 4.105-2.232 0-4.195-.872-4.195-4.105v-7.452h2.366v7.362c0 1.474.602 2.186 1.83 2.186 1.226-.001 1.828-.713 1.828-2.186z"/></g></g><path fill="#fff" stroke="#ED1C24" stroke-width="1.4" stroke-miterlimit="10" d="M40.414.7h42v26.6h-42z"/><g fill="#ED1C24"><path d="M47.477 22.042l.925-2.531c1.38.714 2.776 1.071 4.188 1.071 1.152 0 2.028-.276 2.629-.828s.901-1.274.901-2.167c0-1.704-1.137-2.557-3.409-2.557h-2.118v-2.679h1.656c1.055 0 1.915-.227 2.58-.682.666-.454.999-1.16.999-2.118 0-1.526-.918-2.289-2.752-2.289-1.558 0-3.076.455-4.553 1.364l-1.12-2.508c1.98-1.12 4.091-1.68 6.331-1.68 1.785 0 3.141.418 4.065 1.254.926.836 1.388 1.952 1.388 3.348 0 1.867-.917 3.23-2.751 4.09.941.325 1.672.873 2.191 1.644.52.771.779 1.717.779 2.837 0 1.688-.581 3.088-1.741 4.2-1.16 1.111-2.779 1.667-4.857 1.667-1.899.001-3.676-.478-5.331-1.436zM61.379 19.973v-2.824l6.452-12.49h4.358v12.612h2.362v2.702h-2.362v3.312h-3.067v-3.312h-7.743zm2.8-2.702h4.943v-10.081c-.163.617-.585 1.583-1.267 2.897l-3.676 7.184z"/></g><g fill="none"><path d="M.132 27.8c.05.03.164.08.288.08.224 0 .296-.142.293-.252-.002-.182-.166-.26-.335-.26h-.098v-.132h.098c.128 0 .29-.065.29-.22 0-.104-.066-.196-.228-.196-.104 0-.204.046-.26.086l-.048-.128c.07-.05.202-.1.342-.1.256 0 .372.152.372.31 0 .136-.082.25-.24.309v.004c.16.029.288.149.29.331 0 .208-.164.391-.474.391-.146 0-.274-.047-.338-.089l.048-.134zM1.66 28v-.355h-.604v-.115l.58-.829h.189v.807h.182v.137h-.182v.355h-.165zm0-.492v-.434l.006-.203h-.006l-.108.191-.318.441v.004h.426z"/></g></g></svg>
\ No newline at end of file
diff --git a/home/static/imgs/tcl/60.svg b/home/static/imgs/tcl/60.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cf3540e9c847e9f73c0458b9389cce2ac0d14f45
--- /dev/null
+++ b/home/static/imgs/tcl/60.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 83 28" enable-background="new 0 0 83 28"><g><g><path d="M3.592 0s-3.592 5.425-3.592 14.001c0 8.578 3.592 13.999 3.592 13.999h31.421v-28h-31.421z" fill="#EC2227"/><g fill="#fff"><path d="M5.871 8.355h3.838c2.432 0 3.503 1.25 3.503 2.678 0 1.584-.938 2.231-1.384 2.431.892.268 1.874 1.117 1.874 2.7 0 2.074-1.495 3.48-3.726 3.48h-4.105v-11.289zm3.301 4.597c1.026 0 1.696-.426 1.696-1.451 0-.715-.4-1.361-1.561-1.361h-1.072v2.812h.937zm.179 5.02c1.071 0 1.986-.38 1.986-1.719 0-1.05-.691-1.628-1.942-1.628h-1.16v3.347h1.116zM24.795 17.034c.76.401 1.607.826 2.878.826 1.071 0 1.606-.625 1.606-1.295 0-.915-.647-1.316-2.253-2.006-1.428-.603-2.433-1.34-2.433-3.192 0-1.785 1.361-3.279 3.994-3.279 1.295 0 2.275.358 2.877.692l-.714 1.941c-.581-.357-1.427-.625-2.296-.625-.937 0-1.585.423-1.585 1.16 0 .716.47 1.206 1.74 1.741 2.321.981 2.945 1.786 2.945 3.391 0 2.613-1.964 3.526-3.726 3.526-1.695 0-2.944-.602-3.769-1.162l.736-1.718zM20.833 15.717v-7.362h2.365v7.452c0 3.233-1.964 4.105-4.194 4.105-2.232 0-4.195-.872-4.195-4.105v-7.452h2.366v7.362c0 1.474.602 2.186 1.83 2.186 1.226-.001 1.828-.713 1.828-2.186z"/></g></g><path fill="#fff" stroke="#ED1C24" stroke-width="1.4" stroke-miterlimit="10" d="M40.414.7h42v26.6h-42z"/><g fill="#ED1C24"><path d="M54.075 23.503c-2.046 0-3.563-.755-4.554-2.264-.99-1.51-1.485-3.579-1.485-6.209 0-3.165.67-5.722 2.009-7.669 1.34-1.948 3.267-2.922 5.783-2.922 1.379 0 2.572.244 3.579.73l-.853 2.532c-.715-.357-1.453-.536-2.216-.536-1.412 0-2.548.516-3.408 1.546-.86 1.031-1.363 2.568-1.51 4.614 1.233-.779 2.572-1.169 4.018-1.169.552 0 1.079.073 1.582.219.503.146 1.002.395 1.498.743.495.349.889.864 1.181 1.546s.438 1.502.438 2.459c0 1.899-.553 3.438-1.656 4.614s-2.572 1.766-4.406 1.766zm.219-2.58c1.672 0 2.508-1.071 2.508-3.214 0-.941-.187-1.628-.56-2.058-.374-.43-.967-.646-1.778-.646-1.055 0-2.069.268-3.043.804 0 1.737.223 3.023.67 3.859.446.837 1.18 1.255 2.203 1.255zM70.838 22.979c-.803.35-1.749.523-2.836.523-1.088 0-2.029-.174-2.824-.523-.796-.349-1.429-.803-1.899-1.363-.471-.56-.845-1.266-1.12-2.118-.276-.853-.459-1.704-.548-2.557-.089-.852-.134-1.83-.134-2.934 0-1.299.098-2.479.292-3.543.195-1.063.523-2.065.986-3.007.463-.941 1.14-1.68 2.033-2.215.893-.536 1.964-.804 3.214-.804 1.022 0 1.923.183 2.702.548s1.408.844 1.887 1.437c.479.593.868 1.315 1.169 2.167s.508 1.712.621 2.581c.113.869.171 1.814.171 2.837 0 1.104-.045 2.082-.135 2.934-.089.853-.271 1.704-.548 2.557-.275.853-.649 1.559-1.119 2.118-.472.56-1.108 1.014-1.912 1.362zm-2.836-2.325c1.071 0 1.862-.499 2.374-1.497.511-.998.767-2.625.767-4.882 0-1.428-.081-2.617-.243-3.566-.163-.95-.483-1.737-.962-2.362s-1.124-.938-1.936-.938c-.601 0-1.112.167-1.534.5s-.747.824-.974 1.473c-.228.649-.386 1.364-.475 2.143-.09.779-.135 1.696-.135 2.751 0 2.257.256 3.884.768 4.882.511.997 1.294 1.496 2.35 1.496z"/></g><g fill="none"><path d="M.832 26.824l-.132.011c-.278.044-.422.243-.452.459h.004c.062-.084.172-.151.316-.151.229 0 .392.168.392.42 0 .239-.162.46-.434.46-.276 0-.458-.217-.458-.554 0-.256.09-.458.22-.586.108-.106.251-.172.416-.192l.128-.01v.143zm-.05.75c0-.186-.106-.298-.268-.298-.106 0-.206.064-.254.16l-.018.076c.002.214.102.373.288.373.15.001.252-.125.252-.311zM1.981 27.336c0 .442-.166.687-.452.687-.254 0-.428-.238-.432-.668 0-.438.19-.676.454-.676.272 0 .43.244.43.657zm-.705.02c0 .338.104.529.264.529.178 0 .264-.21.264-.541 0-.32-.08-.53-.264-.53-.152 0-.264.189-.264.542z"/></g></g></svg>
\ No newline at end of file
diff --git a/home/static/imgs/tcl/64.svg b/home/static/imgs/tcl/64.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ddbb219e8d504408628b70c3421365a95ec1514b
--- /dev/null
+++ b/home/static/imgs/tcl/64.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 83 28" enable-background="new 0 0 83 28"><g><g><path d="M3.592 0s-3.592 5.425-3.592 14.001c0 8.578 3.592 13.999 3.592 13.999h31.421v-28h-31.421z" fill="#EC2227"/><g fill="#fff"><path d="M5.871 8.355h3.838c2.432 0 3.503 1.25 3.503 2.678 0 1.584-.938 2.231-1.384 2.431.892.268 1.874 1.117 1.874 2.7 0 2.074-1.495 3.48-3.726 3.48h-4.105v-11.289zm3.301 4.597c1.026 0 1.696-.426 1.696-1.451 0-.715-.4-1.361-1.561-1.361h-1.072v2.812h.937zm.179 5.02c1.071 0 1.986-.38 1.986-1.719 0-1.05-.691-1.628-1.942-1.628h-1.16v3.347h1.116zM24.795 17.034c.76.401 1.607.826 2.878.826 1.071 0 1.606-.625 1.606-1.295 0-.915-.647-1.316-2.253-2.006-1.428-.603-2.433-1.34-2.433-3.192 0-1.785 1.361-3.279 3.994-3.279 1.295 0 2.275.358 2.877.692l-.714 1.941c-.581-.357-1.427-.625-2.296-.625-.937 0-1.585.423-1.585 1.16 0 .716.47 1.206 1.74 1.741 2.321.981 2.945 1.786 2.945 3.391 0 2.613-1.964 3.526-3.726 3.526-1.695 0-2.944-.602-3.769-1.162l.736-1.718zM20.833 15.717v-7.362h2.365v7.452c0 3.233-1.964 4.105-4.194 4.105-2.232 0-4.195-.872-4.195-4.105v-7.452h2.366v7.362c0 1.474.602 2.186 1.83 2.186 1.226-.001 1.828-.713 1.828-2.186z"/></g></g><path fill="#fff" stroke="#ED1C24" stroke-width="1.4" stroke-miterlimit="10" d="M40.414.7h42v26.6h-42z"/><g fill="#ED1C24"><path d="M54.075 23.503c-2.046 0-3.563-.755-4.554-2.264-.99-1.51-1.485-3.579-1.485-6.209 0-3.165.67-5.722 2.009-7.669 1.34-1.948 3.267-2.922 5.783-2.922 1.379 0 2.572.244 3.579.73l-.853 2.532c-.715-.357-1.453-.536-2.216-.536-1.412 0-2.548.516-3.408 1.546-.86 1.031-1.363 2.568-1.51 4.614 1.233-.779 2.572-1.169 4.018-1.169.552 0 1.079.073 1.582.219.503.146 1.002.395 1.498.743.495.349.889.864 1.181 1.546s.438 1.502.438 2.459c0 1.899-.553 3.438-1.656 4.614s-2.572 1.766-4.406 1.766zm.219-2.58c1.672 0 2.508-1.071 2.508-3.214 0-.941-.187-1.628-.56-2.058-.374-.43-.967-.646-1.778-.646-1.055 0-2.069.268-3.043.804 0 1.737.223 3.023.67 3.859.446.837 1.18 1.255 2.203 1.255zM61.379 19.973v-2.824l6.452-12.49h4.358v12.612h2.362v2.702h-2.362v3.312h-3.067v-3.312h-7.743zm2.8-2.702h4.943v-10.081c-.163.617-.585 1.583-1.267 2.897l-3.676 7.184z"/></g><g fill="none"><path d="M.832 26.824l-.132.011c-.278.044-.422.243-.452.459h.004c.062-.084.172-.151.316-.151.229 0 .392.168.392.42 0 .239-.162.46-.434.46-.276 0-.458-.217-.458-.554 0-.256.09-.458.22-.586.108-.106.251-.172.416-.192l.128-.01v.143zm-.05.75c0-.186-.106-.298-.268-.298-.106 0-.206.064-.254.16l-.018.076c.002.214.102.373.288.373.15.001.252-.125.252-.311zM1.66 28v-.355h-.604v-.115l.58-.829h.189v.807h.182v.137h-.182v.355h-.165zm0-.492v-.434l.006-.203h-.006l-.108.191-.318.441v.004h.426z"/></g></g></svg>
\ No newline at end of file
diff --git a/home/static/imgs/tcl/B.svg b/home/static/imgs/tcl/B.svg
new file mode 100644
index 0000000000000000000000000000000000000000..015a2548425c15db0644112f83de81d1c4d5eacd
--- /dev/null
+++ b/home/static/imgs/tcl/B.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 67 28" enable-background="new 0 0 67 28"><g><g><path d="M3.59 0s-3.59 5.428-3.59 14c0 8.578 3.59 14 3.59 14h31.418v-28h-31.418z" fill="#EC2227"/><path d="M20.693 23.307h-3.777l-3.337-10.91c-.098-.344-.364-1.341-.509-2.219l-.099 13.129h-3.922l.584-18.63h5.018l3.654 12.006c.217.755.437 1.756.437 2.412h.123c0-.656.219-1.657.437-2.412l3.653-12.007h5.018l.585 18.63h-3.921l-.1-13.129c-.145.877-.411 1.875-.51 2.219l-3.334 10.911z" fill="#fff"/></g><path fill="#007DC5" d="M39.007 0h28v28h-28z"/><path d="M47.688 24.284v-19.472h6.949c1.951 0 3.373.433 4.264 1.298s1.336 2.002 1.336 3.411c0 1.069-.25 1.943-.751 2.622-.5.679-1.115 1.154-1.845 1.425.983.204 1.815.705 2.494 1.502.679.798 1.019 1.876 1.019 3.233 0 1.799-.628 3.245-1.884 4.34s-2.868 1.642-4.837 1.642h-6.745zm3.334-11.276h2.621c1.019 0 1.85-.233 2.495-.7.645-.467.967-1.175.967-2.125 0-.797-.267-1.446-.802-1.947-.534-.5-1.345-.75-2.431-.75h-2.851v5.522zm0 8.629h3.08c1.001 0 1.857-.259 2.57-.776s1.069-1.319 1.069-2.405c0-2.02-1.027-3.029-3.08-3.029h-3.64v6.21z" fill="#fff"/><path d="M.152 26.673c.076-.019.198-.03.318-.03.174 0 .286.03.368.098.07.053.114.133.114.238 0 .132-.088.246-.228.296v.006c.128.03.278.136.278.336 0 .116-.046.206-.116.27-.092.086-.244.126-.464.126l-.27-.016v-1.324zm.174.552h.158c.182 0 .29-.098.29-.229 0-.155-.118-.22-.294-.22l-.154.013v.436zm0 .643l.146.008c.18 0 .346-.065.346-.262 0-.182-.158-.26-.348-.26h-.144v.514z" fill="none"/></g></svg>
\ No newline at end of file
diff --git a/home/static/imgs/tcl/T1.svg b/home/static/imgs/tcl/T1.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5076cb4346ed9ca715f32b930804d2d331e2929c
--- /dev/null
+++ b/home/static/imgs/tcl/T1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66 28" enable-background="new 0 0 66 28"><g><g><path d="M3.595 0s-3.59 5.425-3.595 13.991c-.003 8.572 3.58 13.991 3.58 13.991l31.397.018.017-27.981-31.399-.019z" fill="#EC2227"/><path fill="#fff" d="M17.496 8.469l-5.919-.003v-3.475l15.56.008-.003 3.475-5.92-.003-.008 15.244-3.72-.002z"/></g><path fill="#883F98" d="M38.105 0h28v28h-28z"/><path d="M46.253 24.896v-2.94h5.349v-14.897l-4.956 2.8-1.345-2.604 6.916-3.78h3.137v18.48h4.283v2.94h-13.384z" fill="#fff"/><path d="M.472 26.864h-.004l-.226.122-.034-.134.284-.151h.15v1.299h-.17v-1.136z" fill="none"/></g></svg>
\ No newline at end of file
diff --git a/home/static/imgs/tcl/T6.svg b/home/static/imgs/tcl/T6.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e4a061a61c235233912ffe2e50f7af1214920ef8
--- /dev/null
+++ b/home/static/imgs/tcl/T6.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66 28" enable-background="new 0 0 66 28"><g><g><path d="M3.595 0s-3.59 5.425-3.595 13.991c-.003 8.572 3.58 13.991 3.58 13.991l31.397.018.017-27.981-31.399-.019z" fill="#EC2227"/><path fill="#fff" d="M17.496 8.469l-5.919-.003v-3.475l15.56.008-.003 3.475-5.92-.003-.008 15.244-3.72-.002z"/></g><path fill="#883F98" d="M38.105 0h28v28h-28z"/><path d="M52.665 25.147c-2.352 0-4.098-.868-5.236-2.604-1.139-1.736-1.708-4.116-1.708-7.141 0-3.64.771-6.58 2.311-8.82s3.756-3.36 6.65-3.36c1.586 0 2.958.28 4.115.84l-.979 2.912c-.822-.411-1.671-.616-2.548-.616-1.624 0-2.932.593-3.92 1.778-.99 1.186-1.568 2.954-1.736 5.306 1.418-.896 2.958-1.344 4.62-1.344.634 0 1.241.084 1.819.252.579.168 1.152.453 1.723.854.569.402 1.021.994 1.357 1.778.336.785.504 1.727.504 2.829 0 2.184-.635 3.953-1.903 5.306-1.27 1.354-2.96 2.03-5.069 2.03zm.252-2.967c1.923 0 2.884-1.232 2.884-3.696 0-1.082-.215-1.871-.644-2.366-.43-.494-1.111-.741-2.044-.741-1.214 0-2.38.308-3.5.924 0 1.997.256 3.477.77 4.438.513.96 1.358 1.441 2.534 1.441z" fill="#fff"/><path d="M.832 26.824l-.132.011c-.278.044-.422.243-.452.459h.004c.062-.084.172-.151.316-.151.229 0 .392.168.392.42 0 .239-.162.46-.434.46-.276 0-.458-.217-.458-.554 0-.256.09-.458.22-.586.108-.106.251-.172.416-.192l.128-.01v.143zm-.05.75c0-.186-.106-.298-.268-.298-.106 0-.206.064-.254.16l-.018.076c.002.214.102.373.288.373.15.001.252-.125.252-.311z" fill="none"/></g></svg>
\ No newline at end of file
diff --git a/home/templates/base.html b/home/templates/base.html
index 8d732a9a4c630c5faa6a44eb0cd635126ee77599..ee9f41cf5defcdaed4b29cf11f0d056eba6f650b 100644
--- a/home/templates/base.html
+++ b/home/templates/base.html
@@ -2,28 +2,30 @@
{% load static %}
<!doctype html>
<html lang="fr">
- <head>
- <!-- WEBSITE VERSION {{ constants.WEBSITE_FULL_VERSION }} -->
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+<head>
+ <!-- WEBSITE VERSION {{ constants.WEBSITE_FULL_VERSION }} -->
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}Interludes{% if settings.date_start %} {{ settings.date_start.year }}{% endif %}{% endblock %}</title>
<meta name="description" content="Inscriptions et infos sur les interENS ludiques{% if settings.date_start %}, édition {{ settings.date_start.year }}{% endif %}">
- <meta name="keywords" content="Interludes ENS événement COF {% if settings.date_start %}{{ settings.date_start.year }} {% endif %}InterENS">
- <link rel="icon" type="image/png" href="{% static 'imgs/favicon.ico' %}">
+ <meta name="keywords" content="Interludes ENS {% if settings.date_start %}{{ settings.date_start.year }} {% endif %}InterENS">
+ <link rel="icon" type="image/png" href="{% static 'imgs/2022/favicon.ico' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/style.css' %}?v={{ constants.CSS_VERSION }}">
<link rel="stylesheet" type="text/css" href="{% static 'css/font-awesome-all.min.css' %}">
{% block head %}{% endblock %}
</head>
+
<body>
<header>
<div id="header_logo" class="easter_egg">
- <h1><a href="/"><img id="circle" src="{% static 'imgs/logo_easter_egg.png' %}"> Interludes{% if settings.date_start %} {{ settings.date_start.year }}{% endif %} </a></h1>
+ <h1><a href="/"><img id="circle" src="{% static 'imgs/2022/logo.png' %}"> Interludes{% if settings.date_start %} {{ settings.date_start.year }}{% endif %} </a></h1>
</div>
<div id="head_main_infos">
- <div id="location">ENS Ulm</div>
- <div id="date">{% if settings.date_start %}
+ <div id="location">{{ settings.hosting_school }}</div>
+ <div id="date">{% if settings.date_start %}
{% if settings.date_end %}
{{ settings.date_start.day }}-{{ settings.date_end }}
{% else %}
@@ -105,26 +107,32 @@
{% endblock %}
</main>
- <footer>
- <div id="sponsors">
- <a class="external" href="https://www.ens.psl.eu/">
- <img src="{% static "imgs/ens_psl.png" %}"
- alt="École Normale Supérieure de Paris | Université Paris Sciences et Lettres"
- title="École Normale Supérieure de Paris | Université Paris Sciences et Lettres"
- />
- </a>
- <a class="external" href="https://cof.ens.fr/">
- <img src="{% static "imgs/cof.svg" %}"
- alt="COF de l'ENS"
- title="COF de l'ENS"
- />
- </a>
- </div>
- {% if settings.contact_email %}
- <p>Pour tout problème, contacter :<br><span class="antispam">{{ settings.contact_email_reversed }}</span></p>
- {% endif %}
- </footer>
+ <footer>
+ <div id="sponsors">
+ <a class="external" href="https://www.ens-lyon.fr/">
+ <img src="{% static "imgs/2022/ens_lyon.svg" %}" alt="École Normale Supérieure de Lyon"
+ title="École Normale Supérieure de Lyon" />
+ </a>
+ <a class="external" href="https://discord.gg/27QWSDUNgM">
+ <img src="{% static "imgs/2022/bul.png" %}" alt="Bureau Ludique de l'ENS de Lyon"
+ title="Bureau Ludique de l'ENS de Lyon" />
+ </a>
+ <a class="external" href="https://www.trollune.fr/">
+ <img src="{% static "imgs/2022/trollune.png" %}" alt="Trollune"
+ title="Trollune" />
+ </a>
+ <a class="external" href="https://www.3ptitspois.fr/">
+ <img src="{% static "imgs/2022/trois_ptits_pois.png" %}" alt="Trois Ptits Pois"
+ title="Trois Ptits Pois" />
+ </a>
+ </div>
+ {% if settings.contact_email %}
+ <p>Pour tout problème, contacter :<br><span class="antispam">{{ settings.contact_email_reversed }}</span>
+ </p>
+ {% endif %}
+ </footer>
</body>
+
</html>
{% endspaceless %}
diff --git a/home/templates/faq.html b/home/templates/faq.html
index c3fa1848e6c259241bdf05b8c057104b0f75f91d..1fb78525cdfe08d40df8645ccde32685a58fec78 100644
--- a/home/templates/faq.html
+++ b/home/templates/faq.html
@@ -4,6 +4,9 @@
{% block "content" %}
+<h2>Quelle différence entre l'inscription sur HelloAsso et sur le site ?</h2>
+<p>L'inscription HelloAsso vous inscrit à l'événement, au logement et aux repas (selon l'option que vous prenez). Sur le site internet, vous pouvez créer un compte pour vous inscrire aux différentes activités qui seront proposées lors de l'événement. </p>
+
<h2>Quelles seront les mesures de protection sanitaire ?</h2>
<p>Les mesures définitives vous seront communiquées à l'arrivée à l'événement. Elles incluront probablement :</p>
<ul>
@@ -25,59 +28,44 @@
{% endif %}
<h2>Quelles seront les conditions pour dormir/manger ?</h2>
- <p> Il est possible que nous n'ayons pas le droit de faire dormir les participants et/ou
- de distribuer des repas pendant l'événement pour des raisons sanitaires.
- Nous communiquerons les plus tôt possible les mesures définitives.
- </p>
- <p>En l'état actuel, nous espérons pouvoir distribuer des repas qu'il faudra manger en extérieur ou
- dans des salles dédiées.
- </p>
- <p>
- Si vous dormez sur place il vous faudra prendre tapis de sol et duvet. Une salle (probablement le gymnase) y sera dédiée.
- </p>
-
-<h2>Comment se rendre à l'ENS Ulm ?</h2>
- <div>
- <p class="centered">
- <i class="fas fa-map-marker-alt"></i>
- 45 rue d'Ulm, 75005 Paris
- </p>
-
- <iframe id="interactive-map" width="750" height="400" src="https://www.openstreetmap.org/export/embed.html?bbox=2.334809303283692%2C48.8368567401711%2C2.3548936843872075%2C48.84636099015179&layer=hot&marker=48.841602029496684%2C2.344851493835449"></iframe>
- </div>
+<p> Nous proposerons un logement en tente, pour celleux qui le souhaitent</p>
+<p> Les repas seront préparés et servis sur place.</p>
+<p> Si vous dormez dans les tentes, pensez à prendre un tapis de sol et duvet.</p>
- <div id="public-transport-info">
- <div id="transport-metro-icon">
- <img src="{% static 'imgs/ratp/metro-7.svg' %}" alt="Métro 7">
- </div>
- <span id="transport-metro-stop">Censier Daubenton</span>
+<h2>Comment se rendre à l'événement ?</h2>
+<div>
+ <p class="centered">
+ <i class="fas fa-map-marker-alt"></i>
- <div id="transport-rer-icon">
- <img src="{% static 'imgs/ratp/rer-B.svg' %}" alt="RER B">
- </div>
- <span id="transport-rer-stop">Luxembourg</span>
-
- <div id="transport-bus-1-icon">
- <img src="{% static 'imgs/ratp/bus-24.svg' %}" alt="Bus 24">
- </div>
- <span id="transport-bus-1-stop">École Normale Supérieure</span>
+ </p>
- <div id="transport-bus-2-icon">
- <img src="{% static 'imgs/ratp/bus-21.svg' %}" alt="Bus 21">
- <img src="{% static 'imgs/ratp/bus-27.svg' %}" alt="Bus 27">
- </div>
- <span id="transport-bus-2-stop">Feuillantines</span>
+ <iframe id="interactive-map" width="750" height="400"
+ src="https://www.openstreetmap.org/export/embed.html?bbox=4.82691%2C45.73663%2C4.84084%2C45.72936&layer=hot&marker=45.73298%2C4.83397"></iframe>
+</div>
- <div id="transport-noctilien-icon">
- <img src="{% static 'imgs/ratp/noctilien-14.svg' %}" alt="Noctilien 14">
- <img src="{% static 'imgs/ratp/noctilien-21.svg' %}" alt="Noctilien 21">
- <img src="{% static 'imgs/ratp/noctilien-122.svg' %}" alt="Noctilien 122">
- </div>
- <span id="transport-noctilien-stop">Auguste Comte</span>
+<div id="public-transport-info">
+ <div id="transport-tcl-metro">
+ <img src="{% static 'imgs/tcl/B.svg' %}" alt="Métro B">
+ </div>
+ <div id="transport-tcl-tram-1">
+ <img src="{% static 'imgs/tcl/T1.svg' %}" alt="Tram T1">
+ </div>
+ <div id="transport-tcl-tram-2">
+ <img src="{% static 'imgs/tcl/T6.svg' %}" alt="Tram T6">
</div>
+ <div id="transport-tcl-bus-1">
+ <img src="{% static 'imgs/tcl/34.svg' %}" alt="Bus 34">
+ </div>
+ <div id="transport-tcl-bus-2">
+ <img src="{% static 'imgs/tcl/60.svg' %}" alt="Bus 60">
+ </div>
+ <div id="transport-tcl-bus-3">
+ <img src="{% static 'imgs/tcl/64.svg' %}" alt="Bus 64">
+ </div>
+ <span id="transport-tcl-stop">Arrêt : Debourg</span>
+</div>
<h2>Comment sont réparties les activités ?</h2>
-
<p>
La répartition est faite par un algorithme puis vérifiée à la main.
Dans la mesure du possible, l'algorithme essaie d'attribue au moins une activité par personne. Par conséquent, si vous ne mettez qu'une seule activité, vous avez plus de chance de l'avoir.
@@ -97,4 +85,6 @@
</ol>
<p>Le code est sur <a href="https://github.com/Imakoala/InterludesMatchings">github</a>, il ne marche pas encore parfaitement, et on risque de devoir bidouiller à la main en plus pour résoudre tous les cas particuliers (conflits d'horaires, activité présente plusieurs fois...).
+<h2>J'ai encore une question, je fais quoi ?</h2>
+<p> Hésite pas à nous passer un mail à <span class="antispam">{{ settings.contact_email_reversed }}</span> pour nous poser tes questions !</p>
{% endblock %}
diff --git a/home/templates/home.html b/home/templates/home.html
index fe066d899a4fe555a404d20ce81085b7ec9f7579..196033cc5c5a0279cba8de49f1992fc663fdd8b7 100644
--- a/home/templates/home.html
+++ b/home/templates/home.html
@@ -17,33 +17,31 @@
à l'honneur durant ce week-end de trois jours.
</p>
<p>
- Cette année, c'est au tour de l'ENS Ulm d'organiser les interludes.
- L'événement a habituellement lieu en février mais à cause du COVID,
- il a été retardé. Cette année il est prévu
- {% if settings.date_start %}{% if settings.date_end %}
- le week-end du <strong>{{ settings.date_start.day }}-{{ settings.date_end }}</strong>.
- {% else %}
- le week-end du <strong>{{ settings.date_start }}</strong>.
- {% endif %}
- {% else %}
- à une date non-fixée.
- {% endif %}
- </p>
+ Cette année, c'est au tour de l'{{ settings.hosting_school }} d'organiser les interludes.
+ Elles auront lieu
+ {% if settings.date_start %}{% if settings.date_end %}
+ le week-end du <strong>{{ settings.date_start.day }}-{{ settings.date_end }}</strong>.
+ {% else %}
+ le week-end du <strong>{{ settings.date_start }}</strong>.
+ {% endif %}
+ {% else %}
+ à une date non-fixée.
+ {% endif %}
+</p>
+
+<h2>Inscriptions</h2>
+
+ <h3>Inscription à l'événement</h3>
<p>
- La situation actuelle ne se prête malheureusement pas à un tel événement. Nous ne pouvons donc
- que proposer un événement à distance, qui passera principalement par un serveur discord.
- Vous trouverez une liste de sites utiles pour jouer en ligne dans la
- <a href="{% url 'FAQ' %}">FAQ</a> et sur le serveur discord.
+ L'inscription à l'événement,
+ à l'hébergement et aux repas se fait sur <a
+ href="https://www.helloasso.com/associations/bureau-ludique-de-l-ens-de-lyon/evenements/interludes-ens-de-lyon">le
+ formulaire HelloAsso</a>
</p>
- <h2>Inscriptions</h2>
- <ul class="messagelist"><li class="info">
- Les interlude étant à distance cette année, les inscriptions sont facultatives.
- </li></ul>
+ <h3>Inscription aux activités</h3>
<p>
- Ce site vous permettra de vous <a href="{% url 'inscription' %}">inscrire à l'événement</a> et
- de <a href="{% url 'activites' %}">voir les activités</a> qui y seront proposées. L'événement est
- <strong>gratuit</strong>.
+ Une fois votre inscription à l'événement effectuée, vous pourrez vous <a href="{% url 'inscription'%}">inscrire aux activités</a>
</p>
{% if settings.inscriptions_start and settings.inscriptions_end %}
<p>Les inscriptions seront ouvertes
@@ -56,16 +54,32 @@
<p>Les inscriptions fermerons le <strong>{{ settings.inscriptions_end|date:"l d F Y Ã H:i" }}</strong>.</p>
{% endif %}
+<h2>Tarifs</h2>
+<p>
+ Les tarifs sont différenciés entre salarié·es et non-salarié·es.
+ <ul>
+ <li><strong>Participation à l'événement :</strong> 6€/4€</li>
+ <li><strong>Repas (du vendredi soir au dimanche midi) :</strong> 10€/6€</li>
+ <li><strong>Logement en tente :</strong> 3€</li>
+ </ul>
+</p>
+
+<h2>Menu des repas</h2>
+<p>
+ Cette année, le menu sera entièrement végétarien, avec options végan et/ou sans gluten possibles.
+ <ul>
+ <li><strong>Vendredi soir :</strong> Chili sin carne, riz & compote</li>
+ <li><strong>Samedi midi :</strong> Brunch (Salade bar, Croques pesto-mozza, Houmous, Gâteaux)</li>
+ <li><strong>Samedi soir :</strong> Soupe de saison & Tartiflette (option vegan : gratin de pommes de terre aux champignons)</li>
+ <li><strong>Dimanche midi :</strong> Sandwich au choix</li>
+ </ul>
- <p>Pour plus de détails, consultez la <a href="{% url 'FAQ' %}">FAQ</a>.</p>
<h2>Liens divers</h2>
- <ul>
- <li>Le <a href="https://jeux.cof.ens.fr/">site du club jeux</a></li>
- <li>Le <a href="https://cof.ens.fr">site du COF</a>.</li>
- <li>Le <a href="https://wiki.crans.org/VieBdl/InterLudes">Le wiki de Paris-Saclay</a> qui recense les visuels, sites webs et photos des interludes passées.</li>
- <li>Le code source de ce site est sur <a href="https://git.eleves.ens.fr/dlesbre/site-interludes">gitlab</a> et <a href="https://github.com/dlesbre/site-interludes">github</a>.</li>
- <li>Un historique des interludes avec leurs visuels, site webs et photos est sur le <a href="https://wiki.crans.org/VieBdl/InterLudes">wiki de Paris-Saclay</a>.</li>
- </ul>
+<ul>
+ <li>Le code source de ce site est sur <a href="https://github.com/Pantoofle/site-interludes">github</a>.</li>
+ <li>Un historique des interludes avec leurs visuels, site webs et photos est sur le <a
+ href="https://wiki.crans.org/VieBdl/InterLudes">wiki de Paris-Saclay</a>.</li>
+</ul>
{% endblock %}
diff --git a/home/templates/inscription/closed.html b/home/templates/inscription/closed.html
index 32dacf025c041e4f502635284c5aa0a551f565bd..edcd674247d3691bf3d93832a784f0519d07e7e6 100644
--- a/home/templates/inscription/closed.html
+++ b/home/templates/inscription/closed.html
@@ -3,13 +3,19 @@
{% block nav_inscription %}current{% endblock %}
{% block "content" %}
- <h2>Inscriptions</h2>
+ <h2>Inscriptions à l'événement</h2>
+ <p>L'inscription à l'événement,
+ l'hébergement et aux repas se fait sur <a
+ href="https://www.helloasso.com/associations/bureau-ludique-de-l-ens-de-lyon/evenements/interludes-ens-de-lyon">le
+ formulaire HelloAsso</a>.</p>
+
+ <h2>Inscriptions aux activités</h2>
{% if settings.inscriptions_not_open_yet %}
- <p>Les inscriptions ne sont pas encores ouvertes.</p>
+ <p>Les inscriptions aux activités ne sont pas encores ouvertes.</p>
<p>Leur ouverture est prévue le <strong>{{ settings.inscriptions_start|date:"l d F Y à H:i" }}</strong>.</p>
<p>Nous communiquerons par mail via les BDE des différentes écoles pour leur ouverture.</p>
{% elif settings.inscriptions_have_closed %}
- <p>Les inscriptions sont fermées.</p>
+ <p>Les inscriptions aux activités sont fermées.</p>
<p>
Les inscriptions cette année sont facultatives,
tu peux quand même rejoindre le {% if settings.discord_link %}<a href="{{ settings.discord_link }}">serveur discord</a>{% else %}serveur discord{% endif %} et participer aux jeux libres et
@@ -19,7 +25,7 @@
<p>Pour tout problème, contacter :<br><span class="antispam">{{ settings.contact_email_reversed }}</span></p>
{% endif %}
{% else %}
- <p>Les inscriptions ne sont pas encores ouvertes ou ont été fermées.</p>
+ <p>Les inscriptions aux activités ne sont pas encores ouvertes ou ont été fermées.</p>
<p>Nous communiquerons par mail via les BDE des différentes écoles pour leur ouverture.</p>
{% endif %}
{% endblock %}
diff --git a/home/templates/inscription/form.html b/home/templates/inscription/form.html
index 65896edd608dcc764c5d748395501fcef16643b7..be74149e1a5b9f0f90d9778c8dd747737dedc857 100644
--- a/home/templates/inscription/form.html
+++ b/home/templates/inscription/form.html
@@ -4,36 +4,23 @@
{% block nav_inscription %}current{% endblock %}
{% block "content" %}
- <h2>Inscriptions</h2>
-
- <ul class="messagelist">
- <li class="info">
- Il est possible que nous n'ayons pas le droit de faire dormir les participants et/ou
- de distribuer des repas pendant l'événement pour des raisons sanitaires.<br>
-
- Nous communiquerons les mesures exactes quelques jours avant l'événement.
- </li>
- </ul>
+ <h2>Inscription à l'événement</h2>
+ L'inscription à l'événement,
+ à l'hébergement et aux repas se fait sur <a
+ href="https://www.helloasso.com/associations/bureau-ludique-de-l-ens-de-lyon/evenements/interludes-ens-de-lyon">le
+ formulaire HelloAsso</a>
+
+ <h2>Inscription aux activités</h2>
+ Une fois votre inscription à l'événement effectuée, vous pourrez
+ vous inscrire à certaines activités sur cette page. La plupart des
+ activités ne demandent pas d'inscription et seront en libre accès
+ durant tout l'événement, mais certaines demandent une inscription Ã
+ l'avance.
<form id="main_form" method="post" action="{% url 'inscription' %}">
{% csrf_token %}
- Cette année, l'événement est entièrement subventionné par le <a class="external" href="https://cof.ens.fr/">COF</a>. L'inscription est gratuite
- (mais n'inclut pas les frais de transport jusqu'Ã Paris).
-
-
<p>{{ form.school.label_tag }} {{ form.school }}</p>
- <p>{{ form.sleeps.label_tag }} {{ form.sleeps }}</p>
-
- <h3>Repas</h3>
- <table>
- <tr><td>Vendredi soir :</td><td>{{ form.meal_friday_evening }}</td></tr>
- <tr><td>Samedi matin :</td><td>{{ form.meal_saturday_morning }}</td></tr>
- <tr><td>Samedi midi :</td><td>{{ form.meal_saturday_midday }}</td></tr>
- <tr><td>Samedi soir :</td><td>{{ form.meal_saturday_evening }}</td></tr>
- <tr><td>Dimanche matin :</td><td>{{ form.meal_sunday_morning }}</td></tr>
- <tr><td>Dimanche midi :</td><td>{{ form.meal_sunday_midday }}</td></tr>
- </table>
<h3>Choix d'activités</h3>
diff --git a/home/templates/inscription/signin.html b/home/templates/inscription/signin.html
index 02f2e4a55e5f479392e9ff1fd05492d0fbb847a3..13252abbb82f534807e5e6bd31d51c4bb6897eda 100644
--- a/home/templates/inscription/signin.html
+++ b/home/templates/inscription/signin.html
@@ -4,8 +4,8 @@
{% block "content" %}
<h2>Inscriptions</h2>
- <p>Vous devez être connecté pour pouvoir vous inscrire à l'événement.</p>
- <p>Aller à la page de <a href="{% url 'accounts:login' %}">connexion</a> pour vous connectez
+ <p>Vous devez être connecté pour pouvoir vous inscrire à des activités. Pour vous inscrire à l'événement en lui même, suivez le lien HelloAsso sur la <a href="{% url 'home' %}">page d'accueil</a></p>
+ <p>Aller à la page de <a href="{% url 'accounts:login' %}">connexion</a> pour vous connecter
ou à celle de <a href="{% url 'accounts:create' %}">création de compte</a> si vous n'avez pas de compte.</p>
{% if settings.inscriptions_end %}
<p>Les inscriptions seront ouvertes jusqu'au {{ settings.inscriptions_end|date:"l d F Y Ã H:i" }})</p>
diff --git a/home/templates/profile.html b/home/templates/profile.html
index b3301a0363f732ce5187e57fe7146eae43805365..8adc1dd0e1f5b2abd02af3857226614a94521b85 100644
--- a/home/templates/profile.html
+++ b/home/templates/profile.html
@@ -65,18 +65,18 @@
{% endif %}
</ul>
{% else %}
- <strong>Vous n'êtes pas incrit à l'événement.</strong>
+ <strong>Vous n'avez pas encore renseigné vos choix d'activités.</strong>
{% if not settings.inscriptions_open %}
{% if settings.inscriptions_not_open_yet %}
- <p>Les inscriptions ne sont pas encores ouvertes. Elles ouvrirons le <strong>{{ settings.inscriptions_start|date:"l d F Y Ã H:i" }}</strong>.</p>
+ <p>Les inscriptions aux activités ne sont pas encores ouvertes. Elles ouvrirons le <strong>{{ settings.inscriptions_start|date:"l d F Y à H:i" }}</strong>.</p>
{% elif settings.inscriptions_have_closed %}
- <p>Les inscriptions sont fermées.</p>
+ <p>Les inscriptions aux activités sont fermées.</p>
{% else %}
- <p>Les inscriptions ne sont pas encores ouvertes ou ont été fermées.</p>
+ <p>Les inscriptions aux activités ne sont pas encores ouvertes ou ont été fermées.</p>
{% endif %}
{% elif settings.inscriptions_end %}
- <p>les inscriptions sont ouvertes jusqu'au {{ settings.inscriptions_end|date:"l d F Y Ã H:i" }}).</p>
+ <p>les inscriptions aux activités sont ouvertes jusqu'au {{ settings.inscriptions_end|date:"l d F Y à H:i" }}).</p>
{% endif %}
<br><br>
{% endif %}
diff --git a/interludes/urls.py b/interludes/urls.py
index 8654d9ffa944cc7960b9c1dd0c54649670ce2562..a254e6c2a7a1520a0b1f43b358f4d386612567b5 100644
--- a/interludes/urls.py
+++ b/interludes/urls.py
@@ -16,8 +16,11 @@ Including another URLconf
from django.contrib import admin
from django.urls import path, include
-urlpatterns = [
- path('admin/', admin.site.urls),
- path('', include('home.urls')),
- path('cas/', include('cas_server.urls', namespace="cas_server")),
-]
\ No newline at end of file
+from django.conf import settings
+from django.conf.urls.static import static
+
+urlpatterns = static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + [
+ path('admin/', admin.site.urls),
+ path('', include('home.urls')),
+ path('cas/', include('cas_server.urls', namespace="cas_server")),
+ ]
diff --git a/site_settings/migrations/0002_sitesettings_hosting_school.py b/site_settings/migrations/0002_sitesettings_hosting_school.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe5343e2ff52e7f8459dd393aec3e47bb98dd1a5
--- /dev/null
+++ b/site_settings/migrations/0002_sitesettings_hosting_school.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.9 on 2021-11-07 19:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('site_settings', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='sitesettings',
+ name='hosting_school',
+ field=models.CharField(blank=True, max_length=50, null=True, verbose_name="École hébergeant l'événement"),
+ ),
+ ]
diff --git a/site_settings/models.py b/site_settings/models.py
index 9f5e30ff3fbb92da119abc1515b7ecdd8a98ec00..1d4b5b041fb5e8614bdf9c66accf7365e5d58b70 100644
--- a/site_settings/models.py
+++ b/site_settings/models.py
@@ -9,7 +9,8 @@ from django.utils.timezone import now
class Colors(models.TextChoices):
"""Couleur d'affichage dans le planning
- Leur code HTML est hardcodé dans la template "_planning.html"."""
+ Leur code HTML est hardcodé dans la template '_planning.html'."""
+
RED = "a", "Rouge"
ORANGE = "b", "Orange"
YELLOW = "c", "Jaune"
@@ -67,10 +68,15 @@ class SingletonModel(models.Model):
class SiteSettings(SingletonModel):
"""Réglages globaux du site"""
+
contact_email = models.EmailField("Email contact", blank=True, null=True)
+ hosting_school = models.CharField(
+ "École hébergeant l'événement", max_length=50, blank=True, null=True
+ )
+
date_start = models.DateField("Date de début", blank=True, null=True)
date_end = models.DateField("Date de fin", blank=True, null=True)
-
+
registrations_open = models.BooleanField("Ouvrir la création de compte", default=True)
inscriptions_open = models.BooleanField("Ouvrir les inscriptions", default=False)
activity_submission_open = models.BooleanField(