Compare revisions

fd9d1cfd · fd9d1cfd · fd9d1cfd · fd9d1cfd · fd9d1cfd · fd9d1cfd
--- a/home/static/imgs/ratp/metro-7.svg
+++ b/home/static/imgs/ratp/metro-7.svg
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!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="Premier_plan" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="92px" height="92px" viewBox="0 0 92 92" style="enable-background:new 0 0 92 92;" xml:space="preserve">
+<g>
+	<g>
+		<circle style="fill-rule:evenodd;clip-rule:evenodd;fill:#FF82B4;" cx="46" cy="46" r="46"/>
+		<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M64.83,29.471v-8.274H29.286v8.49h24.679L41.589,52.712
+			c-4.461,8.274-6.26,12.592-6.26,19.283h11.584C46.914,64.009,53.678,48.826,64.83,29.471z"/>
+	</g>
+</g>
+</svg>
--- a/home/static/imgs/ratp/noctilien-122.svg
+++ b/home/static/imgs/ratp/noctilien-122.svg
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.3, 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="120px" height="77px" viewBox="0 0 120 77" enable-background="new 0 0 120 77" xml:space="preserve">
+<rect fill-rule="evenodd" clip-rule="evenodd" fill="#3C91DC" width="120" height="77"/>
+<rect fill-rule="evenodd" clip-rule="evenodd" fill="#0A0082" width="120" height="68.75"/>
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M34.341,38.708V8.516h-6.154v20.402h-0.085
+	c-0.089-0.373-0.371-0.975-0.845-1.807c-0.475-0.832-1.12-1.841-1.937-3.026L14.623,8.516h-6.11v30.192h6.196V19.081h0.086
+	c0.124,0.36,0.399,0.954,0.823,1.78c0.424,0.826,1.02,1.772,1.786,2.838l10.868,15.008H34.341z"/>
+<g>
+	<g>
+		<path fill="#FFFFFF" d="M52.421,62.018V34.909c-2.101,1.661-5.422,3.272-7.717,4.298l-2.345-5.275
+			c3.614-1.514,7.961-3.809,11.38-6.398h6.008v34.484H52.421z"/>
+		<path fill="#FFFFFF" d="M65.314,62.018v-4.543c0.879-4.005,4.836-7.668,9.428-11.674c2.295-2.002,4.786-4.493,4.786-7.814
+			c0-2.979-1.954-5.471-5.715-5.471c-3.028,0-5.128,2.198-5.959,3.126l-3.614-4.786c3.321-2.882,6.398-4.25,11.039-4.25
+			c6.057,0,11.771,3.517,11.771,10.551c0,5.91-3.761,8.693-7.913,12.455c-1.758,1.611-5.226,4.64-5.665,6.643h14.214v5.764H65.314z"
+			/>
+		<path fill="#FFFFFF" d="M92.666,62.018v-4.543c0.879-4.005,4.836-7.668,9.427-11.674c2.296-2.002,4.786-4.493,4.786-7.814
+			c0-2.979-1.953-5.471-5.715-5.471c-3.027,0-5.128,2.198-5.959,3.126l-3.613-4.786c3.32-2.882,6.398-4.25,11.038-4.25
+			c6.057,0,11.771,3.517,11.771,10.551c0,5.91-3.761,8.693-7.913,12.455c-1.758,1.611-5.227,4.64-5.666,6.643h14.214v5.764H92.666z"
+			/>
+	</g>
+</g>
+</svg>
--- a/home/static/imgs/ratp/noctilien-14.svg
+++ b/home/static/imgs/ratp/noctilien-14.svg
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!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="120px" height="77px" viewBox="0 0 120 77" style="enable-background:new 0 0 120 77;" xml:space="preserve">
+<g>
+	<rect style="fill-rule:evenodd;clip-rule:evenodd;fill:#82DC73;" width="120" height="77"/>
+	<rect style="fill-rule:evenodd;clip-rule:evenodd;fill:#0A0082;" width="120" height="68.75"/>
+</g>
+<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;" d="M34.341,38.708V8.517h-6.154v20.402h-0.085
+	c-0.089-0.373-0.371-0.975-0.845-1.807c-0.475-0.832-1.12-1.841-1.937-3.026L14.623,8.517h-6.11v30.191h6.196V19.082h0.086
+	c0.124,0.36,0.399,0.954,0.823,1.78c0.424,0.826,1.02,1.772,1.786,2.838l10.868,15.008H34.341z"/>
+<g>
+	<path style="fill:#FFFFFF;" d="M62.141,61.902V28.07c-2.621,2.072-6.767,4.084-9.632,5.364l-2.926-6.583
+		c4.511-1.89,9.937-4.755,14.203-7.986h7.498v43.037H62.141z"/>
+	<path style="fill:#FFFFFF;" d="M105.894,52.941v8.961h-8.534v-8.961H77.975v-7.986l16.702-26.09h11.217v27.371h5.06v6.705H105.894z
+		 M97.359,26.424h-0.122c-0.183,0.731-1.402,3.353-3.109,6.035l-8.777,13.777h12.009V26.424z"/>
+</g>
+</svg>
--- a/home/static/imgs/ratp/noctilien-21.svg
+++ b/home/static/imgs/ratp/noctilien-21.svg
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!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="120px" height="77px" viewBox="0 0 120 77" style="enable-background:new 0 0 120 77;" xml:space="preserve">
+<g>
+	<rect style="fill-rule:evenodd;clip-rule:evenodd;fill:#82DC73;" width="120" height="77"/>
+	<rect style="fill-rule:evenodd;clip-rule:evenodd;fill:#0A0082;" width="120" height="68.75"/>
+</g>
+<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;" d="M34.341,38.708V8.517h-6.154v20.402h-0.085
+	c-0.089-0.373-0.371-0.975-0.845-1.807c-0.475-0.832-1.12-1.841-1.937-3.026L14.623,8.517h-6.11v30.191h6.196V19.082h0.086
+	c0.124,0.36,0.399,0.954,0.823,1.78c0.424,0.826,1.02,1.772,1.786,2.838l10.868,15.008H34.341z"/>
+<g>
+	<path style="fill:#FFFFFF;" d="M48.023,61.902v-5.669c1.097-4.999,6.034-9.571,11.765-14.569c2.865-2.5,5.974-5.608,5.974-9.753
+		c0-3.719-2.438-6.828-7.132-6.828c-3.779,0-6.4,2.743-7.438,3.901l-4.511-5.974c4.146-3.597,7.986-5.304,13.777-5.304
+		c7.559,0,14.69,4.389,14.69,13.167c0,7.376-4.693,10.85-9.875,15.544c-2.194,2.012-6.522,5.791-7.071,8.29h17.739v7.193H48.023z"/>
+	<path style="fill:#FFFFFF;" d="M92.056,61.902V28.07c-2.621,2.072-6.767,4.084-9.632,5.364l-2.926-6.583
+		c4.511-1.89,9.937-4.755,14.203-7.986h7.498v43.037H92.056z"/>
+</g>
+</svg>
--- a/home/static/imgs/ratp/rer-B.svg
+++ b/home/static/imgs/ratp/rer-B.svg
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg version="1.1" baseProfile="tiny" id="Premier_plan"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="92px" height="92px"
+	 viewBox="0 0 92 92" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#FFFFFF" d="M46,5.333c-22.412,0-40.655,18.208-40.655,40.752c0,22.372,18.242,40.581,40.655,40.581
+			s40.654-18.209,40.654-40.581C86.654,23.542,68.412,5.333,46,5.333z"/>
+		<path fill="#3C91DC" d="M46,92C20.575,92,0,71.463,0,46.083C0,20.537,20.575,0,46,0c25.426,0,46,20.537,46,46.083
+			C92,71.463,71.426,92,46,92z M46,6.846c-21.578,0-39.142,17.531-39.142,39.237c0,21.54,17.563,39.071,39.142,39.071
+			s39.143-17.531,39.143-39.071C85.143,24.377,67.578,6.846,46,6.846z"/>
+		<path fill="#3C91DC" d="M62.917,55.029c0-6.084-3.778-9.61-8.286-10.219v-0.121c3.352-0.608,6.885-3.954,6.885-8.394
+			c0-9.306-8.592-10.888-15.599-10.888H29.831v42.94h15.416C53.412,68.35,62.917,65.855,62.917,55.029z M52.438,37.573
+			c0,4.927-5.059,4.865-8.288,4.865h-4.753v-9.853h4.631C47.137,32.586,52.438,32.464,52.438,37.573z M53.352,54.785
+			c0,5.597-3.961,6.447-8.41,6.447h-5.545V49.251h5.058C47.563,49.251,53.352,49.434,53.352,54.785z"/>
+	</g>
+</g>
+</svg>
--- a/home/static/imgs/tcl/34.svg
+++ b/home/static/imgs/tcl/34.svg
+<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
--- a/home/static/imgs/tcl/60.svg
+++ b/home/static/imgs/tcl/60.svg
+<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
--- a/home/static/imgs/tcl/64.svg
+++ b/home/static/imgs/tcl/64.svg
+<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
--- a/home/static/imgs/tcl/B.svg
+++ b/home/static/imgs/tcl/B.svg
+<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
--- a/home/static/imgs/tcl/T1.svg
+++ b/home/static/imgs/tcl/T1.svg
+<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
--- a/home/static/imgs/tcl/T6.svg
+++ b/home/static/imgs/tcl/T6.svg
+<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
--- a/home/static/js/vis-timeline.min.js
+++ b/home/static/js/vis-timeline.min.js
--- a/home/templates/400.html
+++ b/home/templates/400.html
 {% extends "base.html" %}

+{% block title %}400 Invalid{% endblock %}
+
 {% block "content" %}
 <h2>Requête invalide</h2>
 <p>Votre requête au serveur est invalide et n'a donc pas pu être traitée.</p>

--- a/home/templates/403.html
+++ b/home/templates/403.html
 {% extends "base.html" %}

+{% block title %}403 Forbidden{% endblock %}
+
 {% block "content" %}
 <h2>Accès refusé</h2>
 <p>Vous n'avez pas la permission pour consulter cette page.</p>

--- a/home/templates/404.html
+++ b/home/templates/404.html
 {% extends "base.html" %}

+{% block title %}404 Not Found{% endblock %}
+
 {% block "content" %}
 <h2>Page introuvable</h2>
 <p>La page que vous avez demandée n'existe plus ou n'a jamais existé.</p>

--- a/home/templates/500.html
+++ b/home/templates/500.html
 {% extends "base.html" %}

+{% block title %}500 Internal Error{% endblock %}
+
 {% block "content" %}
 <h2>Erreur interne</h2>
 <p>Un incident technique est survenu pendant l'affichage de cette page.</p>

--- a/home/templates/_planning.html
+++ b/home/templates/_planning.html
+<div id="planning" style="margin-left: calc(-49vw + 50%); width: 97vw; background-color: white; padding: 10px;"></div>
+<!--
+In order to limit the planning's width, we cheat using the timeline's groups
+I.E we set all dates to the first day (Friday) and set groups allowing vertical display:
+-->
+<script type="text/javascript">
+	// https://visjs.org/
+	// DOM element where the Timeline will be attached
+	const container = document.getElementById('planning');
+
+	const groups = new vis.DataSet([
+		{id: 0, content: "Ven.", order: 0},
+		{id: 1, content: "Sam.", order: 1},
+		{id: 2, content: "Dim.", order: 2},
+	]);
+
+	// Items in the timeline
+	const items = new vis.DataSet([
+	{% for slot in planning %}
+		{% if slot.start_day == slot.end_day %}
+			{
+				content: '<div style="background-color: yellow;"><a class="hidden" href="#{{ slot.activity.slug }}"><div><strong>{{ slot }}</strong><br>{{ slot.room|default:"" }}</div></a></div>',
+				title: '<strong>{{ slot }}</strong><br>{{ slot.room|default:"" }}',
+				start: '{{ slot.planning_start|date:"Y-m-d H:i:s"}}',
+				align: 'left',
+				group: {{ slot.start_day }},
+				end:'{{ slot.planning_end|date:"Y-m-d H:i:s"}}',
+				className: "color-{{ slot.color }}",
+			},
+		{% else %} // activity spans multiple days
+			{
+				content: '<a class="hidden" href="#{{ slot.activity.slug }}"><div><strong>{{ slot }}</strong><br>{{ slot.room|default:"" }}</div></a>',
+				title: '<strong>{{ slot }}</strong><br>{{ slot.room|default:"" }}',
+				start: '{{ slot.planning_start|date:"Y-m-d H:i:s"}}',
+				align: 'left',
+				group: {{ slot.start_day }},
+				end:'{{ settings.date_2|date:"Y-m-d"}} 04:00:00',
+				className: "color-{{ slot.color }}",
+			},
+			{
+				content: '<a class="hidden" href="#{{ slot.activity.slug }}"><div><strong>{{ slot }}</strong><br>{{ slot.room|default:"" }}</div></a>',
+				title: '<strong>{{ slot }}</strong><br>{{ slot.room|default:"" }}',
+				start: '{{ settings.date_start|date:"Y-m-d"}} 04:00:00',
+				align: 'left',
+				group: {{ slot.end_day }},
+				end:'{{ slot.planning_end|date:"Y-m-d H:i:s"}}',
+				className: "color-{{ slot.color }}",
+			},
+		{% endif %}
+	{% endfor %}
+	]);
+
+	// Configuration for the Timeline
+	const start = '{{ settings.date_start|date:"Y-m-d"}} 08:00:00';
+	const end = '{{ settings.date_start|date:"Y-m"}}-{{ saturday }} 04:00:00';
+	const options = {
+		showMajorLabels: false,
+		showCurrentTime: false,
+		locale: "fr",
+		groupOrder: "order",
+		start: start,
+		min: start,
+		end: end,
+		max: end,
+		selectable: false,
+		zoomable: false,
+	};
+
+	// Create a Timeline
+	const timeline = new vis.Timeline(container, items, options);
+	timeline.setGroups(groups);
+	// timeline.on('select', function (properties) {
+	// 	alert('selected items: ' + properties.items);
+	// });
+</script>
+
+<style>
+	.vis-item {
+		background-color: var(--color_bg_1);
+		color: white;
+	}
+	.vis-item-content {
+		width: 100%;
+	}
+	.vis-item a, .vis-item a:link, .vis-item a:visited {
+		text-decoration: none;
+		color: white;
+		width: 100%;
+	}
+	.vis-item a div {
+		width: 100%;
+	}
+	.vis-item:hover {
+		background-color: var(--color_bg_2);
+	}
+	.vis-time-axis .grid.vis-odd {
+		background: #444;
+	}
+
+	/* Color specific things */
+	:root {
+		/* red */
+		--color_1: #e84855;
+		--color_1_hover: #da1b2b;
+		--color_1_fg: white;
+
+		/* orange */
+		--color_2: #dd7230;
+		--color_2_hover: #c15d1f;
+		--color_2_fg: white;
+
+		/* yellow */
+		--color_3: #f9dc5c;
+		--color_3_hover: #f7d126;
+		--color_3_fg: black;
+
+		/* green */
+		--color_4: #7cae7a;
+		--color_4_hover: #5f8b55;
+		--color_4_fg: white;
+
+		/* blue */
+		--color_5: #3185fc;
+		--color_5_hover: #0467f1;
+		--color_5_fg: white;
+
+		/* dark blue */
+		--color_6: #4c4c7c;
+		--color_6_hover: #26263c;
+		--color_6_fg: white;
+
+		/* black */
+		--color_7: #483D3F;
+		--color_7_hover: #2c2627;
+		--color_7_fg: white;
+
+	}
+	.vis-item.color-a {
+		background-color: var(--color_1);
+	}
+	.vis-item.color-a a, .vis-item.color-a a:link, .vis-item.color-a a:visited {
+		color: var(--color_1_fg);
+	}
+	.vis-item.color-a:hover {
+		background-color: var(--color_1_hover)
+	}
+	.vis-item.color-b {
+		background-color: var(--color_2);
+	}
+	.vis-item.color-b a, .vis-item.color-b a:link, .vis-item.color-b a:visited {
+		color: var(--color_2_fg);
+	}
+	.vis-item.color-b:hover {
+		background-color: var(--color_2_hover)
+	}
+	.vis-item.color-c {
+		background-color: var(--color_2);
+	}
+	.vis-item.color-c a, .vis-item.color-c a:link, .vis-item.color-c a:visited {
+		color: var(--color_2_fg);
+	}
+	.vis-item.color-c:hover {
+		background-color: var(--color_2_hover)
+	}
+	.vis-item.color-c {
+		background-color: var(--color_3);
+	}
+	.vis-item.color-c a, .vis-item.color-c a:link, .vis-item.color-c a:visited {
+		color: var(--color_3_fg);
+	}
+	.vis-item.color-c:hover {
+		background-color: var(--color_3_hover)
+	}
+	.vis-item.color-d {
+		background-color: var(--color_4);
+	}
+	.vis-item.color-d a, .vis-item.color-d a:link, .vis-item.color-d a:visited {
+		color: var(--color_4_fg);
+	}
+	.vis-item.color-d:hover {
+		background-color: var(--color_4_hover)
+	}
+	.vis-item.color-e {
+		background-color: var(--color_5);
+	}
+	.vis-item.color-e a, .vis-item.color-e a:link, .vis-item.color-e a:visited {
+		color: var(--color_5_fg);
+	}
+	.vis-item.color-e:hover {
+		background-color: var(--color_5_hover)
+	}
+	.vis-item.color-f {
+		background-color: var(--color_6);
+	}
+	.vis-item.color-f a, .vis-item.color-f a:link, .vis-item.color-f a:visited {
+		color: var(--color_6_fg);
+	}
+	.vis-item.color-f:hover {
+		background-color: var(--color_6_hover)
+	}
+	.vis-item.color-g {
+		background-color: var(--color_7);
+	}
+	.vis-item.color-g a, .vis-item.color-g a:link, .vis-item.color-g a:visited {
+		color: var(--color_7_fg);
+	}
+	.vis-item.color-g:hover {
+		background-color: var(--color_7_hover)
+	}
+
+</style>
+{% if settings.has_caption %}
+<div class="caption">
+	<p><strong>Légende :</strong></p>
+	<ul style="list-style-type: none; margin-left:-20px">
+		{% if settings.caption_red %}<li><span style="background-color: var(--color_1);">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> {{ settings.caption_red }}</li>{% endif %}
+		{% if settings.caption_orange %}<li><span style="background-color: var(--color_2);">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> {{ settings.caption_orange }}</li>{% endif %}
+		{% if settings.caption_yellow %}<li><span style="background-color: var(--color_3);">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> {{ settings.caption_yellow }}</li>{% endif %}
+		{% if settings.caption_green %}<li><span style="background-color: var(--color_4);">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> {{ settings.caption_green }}</li>{% endif %}
+		{% if settings.caption_blue %}<li><span style="background-color: var(--color_5);">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> {{ settings.caption_blue }}</li>{% endif %}
+		{% if settings.caption_dark_blue %}<li><span style="background-color: var(--color_6);">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> {{ settings.caption_dark_blue }}</li>{% endif %}
+		{% if settings.caption_black %}<li><span style="background-color: var(--color_7);">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> {{ settings.caption_black }}</li>{% endif %}
+	</ul>
+</div>
+{% endif %}
+{% if settings.planning_file %}
+	<div><p><a class="button" href="{{ settings.planning_file.url }}"><i class="fa fa-download"></i> Télécharger le planning</a></p></div>
+{% endif %}
--- a/home/templates/activites.html
+++ b/home/templates/activites.html
 {% extends "base.html" %}
+{% load static %}
+
+{% block head %}
+<script src="{% static 'js/vis-timeline.min.js' %}"></script>
+{% endblock %}

 {% block nav_activite %}current{% endblock %}

 {% block "content" %}
+
+	{% if settings.activity_submission_open %}
+	<ul class="messagelist">
+		<li class="info">
+			Vous pouver proposer une activité en remplissant <a href="{% url 'activity_submission' %}">ce formulaire</a>.
+		</li>
+	</ul>{% endif %}
+
+	{% if settings.display_planning %}
+		<h2>Planning</h2>
+		{% include "_planning.html" %}
+	{% endif %}
+
 	<h2>Activités</h2>
 	<p>Durant tout l'événement, des jeux seront en libre-service et des tables disponibles pour jouer.
-		Certaines activités (JDRs, murders...) ne pourront se faire qu'avec inscription au vue d'un nombre de places limité.
-	</p>
-	<p>
-	TODO : planning et infos si vous voulez proposez une activité
+		Certaines activités ne pourront se faire qu'avec inscription au vue d'une préparation en amont ou d'un nombre de places limité.
 	</p>
+	{% if settings.activity_submission_form %}
+	<p>Vous pouver proposer une activité en remplissant <a href="{{ settings.activity_submission_form }}">ce formulaire</a>.</p>
+	{% endif %}
+
+	{% if activities %}
+	<p id="act-list"><strong>Liste des activités&nbsp;:</strong></p>
+	<ul>
+		{% for activity in activities %}
+		<li><a href="#{{ activity.slug }}">{{ activity.title }}</a></li>
+		{% endfor %}
+	</ul>
+	{% endif %}

 	{% for activity in activities %}
-		<h3>{{ activity.title }}</h3>
+		<h3 id="{{ activity.slug }}">{{ activity.title }}</h3>
+
 		<dl>
-			<dt>Durée :</dt><dd>{{ activity.duration }}</dd>
-			<dt>MJ :</dt><dd>{{ activity.host_name }}</dd>
-			<dt>Nombre de places :</dt><dd>{{ activity.nb_participants }}</dd>
-			<dt>Sur inscription :</dt><dd>{% if activity.must_subscribe %} Oui {% else %} Non {% endif %}</dd>
-			<dt>Description :</dt><dd>{{ activity.description|linebreaksbr }}</dd>
+			<dt>Durée :</dt><dd>{{ activity.pretty_duration }}</dd>
+			{% if activity.host_name %}
+			<dt>Orga :</dt><dd>{{ activity.host_name }}</dd>
+			{% endif %}
+			{% if settings.show_host_emails and activity.show_email %}
+			<dt>Contact :</dt><dd><a href="mailto:{{ activity.host_email }}">{{ activity.host_email }}</a></dd>
+			{% endif %}
+			<dt>Type :</dt><dd>{{ activity.pretty_type }}</dd>
+			<dt>Places :</dt><dd>{{ activity.nb_participants }}</dd>
+			{% if activity.slots and settings.display_planning %}
+			<dt>Heure/Lieu :</dt><dd>{% for slot in activity.slots %}
+				{{ slot.start|date:"l H:i" }}{% if slot.room %} {{ slot.room }}{% endif %}{% if not forloop.last %},<br> {% endif %}
+				{% endfor %}
+			</dd>
+			{% endif %}
+			<dt>Description :</dt>
 		</dl>
+		<div class="desc">
+		{% if activity.desc_as_html %}
+			{{ activity.description|safe }}
+		{% else %}
+		<p class="indent">{{ activity.description|linebreaksbr }}</p>
+		{% endif %}
+		</div>
+		<a style="text-decoration: none;" href="#act-list"><i class="fa fa-arrow-up"></i> Retour à la liste</a>
+	{% empty %}
+
+	<p>Il n'y a aucune activité pour l'instant, revenez dans quelques jours pour avoir une liste plus remplie.</p>
+
 	{% endfor %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
--- a/home/templates/activity_submission.html
+++ b/home/templates/activity_submission.html
+{% extends "base.html" %}
+{% load static %}
+
+{% block nav_activite %}current{% endblock %}
+
+{% block "content" %}
+<h2>Proposer une activité</h2>
+
+{{ form.non_field_errors }}
+
+<form method="post" action="{% url 'activity_submission' %}">
+	{% csrf_token %}
+
+	<ul class="messagelist">
+		<li class="info">
+			Les informations publiques (qui apparaîtrons sur la page <a href="{% url 'activites' %}">activites</a>) sont
+			celles <span class="underline">soulignées</span>.<br>
+			Les autres ne serons vues que par les orgas.
+		</li>
+	</ul>
+
+	<table>
+		<tr><td><strong class="underline">Titre&nbsp;:</strong></td><td> {{ form.title }}</td></tr>
+		<tr><td><strong class="underline">Type d'activité&nbsp;:</strong></td><td> {{ form.act_type }}</td></tr>
+		<tr><td><strong class="underline">Type de jeu&nbsp;:</strong></td><td> {{ form.game_type }}</td></tr>
+	</table>
+
+	<p><strong class="underline">Description&nbsp;:</strong> ce texte sera affiché sur la page
+		<a href="{% url 'activites' %}">activités</a> pour présenter votre activité.
+	</p>
+		{{ form.description }}
+
+	<h3>Organisateurs</h3>
+
+	<table>
+		<tr><td><strong class="underline">Nom&nbsp;:</strong></td><td> {{ form.host_name }}</td></tr>
+		<tr><td><strong class="underline">Email&nbsp;:</strong></td><td> {{ form.host_email }}</td></tr>
+		<tr><td><strong>Compte associé&nbsp;:&nbsp;</strong></td><td> {{ request.user.email }}</td></tr>
+	</table>
+
+	<p>
+		L'email de votre compte sera le principal moyen de contact.
+		Si vous ne souhaitez pas qu'il soit affiché, précisez le ci-dessous.
+		Vous pouvez également spécifier d'autres moyens de contact, ainsi que d'autres
+		organisateurs si vous êtes plusieurs.
+	</p>
+
+		{{ form.host_info }}
+
+	<h3>Participants et inscription</h3>
+
+	<table>
+		<tr><td><strong class="underline">Nécessite une inscription&nbsp;:</strong></td><td> {{ form.must_subscribe }}</td></tr>
+		<tr><td><strong>Me communiquer la liste des participants à l'avance&nbsp;:</strong></td><td> {{ form.communicate_participants }}</td></tr>
+		<tr><td><strong class="underline">Nombre max de participants&nbsp;:</strong></td><td> {{ form.max_participants }} (mettez 0 pour illimité)</td></tr>
+		{% if form.max_participants.errors %}<tr><td></td><td>{{ form.max_participants.errors }}</td></tr>{% endif %}
+		<tr><td><strong class="underline">Nombre min de participants&nbsp;:</strong></td><td> {{ form.min_participants }}</td></tr>
+		{% if form.min_participants.errors %}<tr><td></td><td>{{ form.min_participants.errors }}</td></tr>{% endif %}
+	</table>
+
+	<h3>Durée et crénaux</h3>
+
+	<table>
+		<tr><td><strong class="underline">Durée approximative&nbsp;:</strong></td><td> {{ form.duration }} (format hh:mm:ss)</td></tr>
+		{% if form.duration.errors %}<tr><td></td><td>{{ form.duration.errors }}</td></tr>{% endif %}
+		<tr><td><strong>Nombre de crénaux souhaités&nbsp;:</strong></td><td> {{ form.desired_slot_nb }}</td></tr>
+		{% if form.desired_slot_nb.errors %}<tr><td></td><td>{{ form.desired_slot_nb.errors }}</td></tr>{% endif %}
+		<tr><td><strong>Disponibilités&nbsp;:</strong></td></tr>
+		<tr><td>&nbsp;-&nbsp;Vendredi soir&nbsp;:</td><td>{{ form.available_friday_evening }}</td></tr>
+		<tr><td>&nbsp;-&nbsp;Vendredi nuit&nbsp;:</td><td>{{ form.available_friday_night }}</td></tr>
+		<tr><td>&nbsp;-&nbsp;Samedi matin&nbsp;:</td><td>{{ form.available_saturday_morning }}</td></tr>
+		<tr><td>&nbsp;-&nbsp;Samedi après-midi&nbsp;:</td><td>{{ form.available_saturday_afternoon }}</td></tr>
+		<tr><td>&nbsp;-&nbsp;Samedi soir&nbsp;:</td><td>{{ form.available_saturday_evening }}</td></tr>
+		<tr><td>&nbsp;-&nbsp;Samedi nuit&nbsp;:</td><td>{{ form.available_saturday_night }}</td></tr>
+		<tr><td>&nbsp;-&nbsp;Dimanche matin &nbsp;:</td><td>{{ form.available_sunday_morning }}</td></tr>
+		<tr><td>&nbsp;-&nbsp;Dimanche après-midi&nbsp;:</td><td>{{ form.available_sunday_afternoon }}</td></tr>
+	</table>
+
+	<p>Si vous avez des contraintes particulières, vous pouvez les préciser ici&nbsp;:</p>
+
+	{{ form.constraints }}
+
+	<h3>Modalités pratiques</h3>
+
+	{% comment "En présentiel" %}<p><strong>Présentiel/distanciel&nbsp;:</strong> &nbsp;{{ form.status }}</p>{% endcomment %}
+
+	<p><strong>Besoins spécifiques&nbsp;:</strong></p>
+	<ul>
+		<li>Vous faut-il une ou plusieurs salles&nbsp;?</li>
+		<li>Vous faut-il du matériel spécial&nbsp;?</li>
+		<li>Et tout autre besoin de ce type...</li>
+	</ul>
+
+	{{ form.needs }}
+
+	<h3>Commentaires</h3>
+
+	<p>D'autre choses à nous communiquer qui ne rentre pas dans les champs précédents&nbsp;?</p>
+
+	{{ form.comments }}
+
+	<h3>Soumettre</h3>
+
+	<p>L'activité n'est plus modifiable une fois soumise. Les administrateurs la reliront avant de l'afficher sur le site.</p>
+
+	<div class="flex">
+		<input type="submit" value="Soumettre mon activité">
+		<a class="button" href="{% url 'profile' %}">Annuler</a>
+	</div>
+
+</form>
+{% endblock %}
--- a/home/templates/base.html
+++ b/home/templates/base.html
+{% spaceless %}
 {% load static %}
 <!doctype html>
 <html lang="fr">
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">

-		<title>Interludes {% if settings.date_start %}{{ settings.date_start.year }}{% endif %}</title>
+<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/2023/favicon.ico' %}">

-		<link rel="stylesheet" type="text/css" href="{% static 'css/style.css' %}">
+		<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">
-				<h1><a href="/">Interludes {% if settings.date_start %}{{ settings.date_start.year }}{% endif %}</a></h1>
+			<div id="header_logo"  class="easter_egg">
+				<h1><a href="/"><img src="{% static 'imgs/2023/logo.png' %}">&nbsp;Interludes{% if settings.date_start %} {{ settings.date_start.year }}{% endif %}&nbsp;</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 %}
@@ -33,7 +37,18 @@
 			</div>
 		</header>

-		<nav>
+		<script type="text/javascript">
+			function toggle_menu() {
+				var nav = document.getElementById("nav");
+				if (nav.className === "") {
+					nav.className += "responsive";
+				} else {
+					nav.className = "";
+				}
+			}
+		</script>
+
+		<nav id="nav">
 			<a href="{% url 'home' %}" rel="text/html"
 				class="{% block nav_home %}{% endblock %}">
 				Accueil
@@ -47,54 +62,69 @@
 				Activités
 			</a>
 			<a href="{% url 'FAQ' %}" rel="text/html"
-				class="{% block nav_faq %}{% endblock %} ">
+				class="{% block nav_faq %}{% endblock %}">
 				FAQ
 			</a>
 			{% if request.user.is_authenticated %}
-				<a href="{% url 'accounts:profile' %}"
-					class="{% block nav_profile %}{% endblock %} ">
+				<a href="{% url 'profile' %}"
+					class="{% block nav_profile %}{% endblock %}">
 					Mon compte
 				</a>
 			{% else %}
 				<a href="{% url 'accounts:login' %}"
-					class="{% block nav_login %}{% endblock %} ">
+					class="{% block nav_login %}{% endblock %}">
 					Connexion
 				</a>
 			{% endif %}
+			{% if user.is_superuser %}
+			<a href="{% url 'admin_pages:index' %}"
+				class="{% block nav_admin %}{% endblock %}">
+				Administration
+			</a>
+			{% endif %}
+			<a href="javascript:void(0);" class="icon" onclick="toggle_menu()">
+				<i class="fa fa-bars"></i>
+			</a>
 		</nav>

 		<main>
 			{% if messages %}
 			<ul class="messagelist">
-					{% for message in messages %}
+				{% for message in messages %}
 					<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-					{% endfor %}
+				{% endfor %}
 			</ul>
 			{% endif %}
+			{% if settings.global_message %}
+				{% if settings.global_message_as_html %}
+					{{ settings.global_message|safe }}
+				{% else %}
+					<ul class="messagelist"><li class="info">{{ settings.global_message }}</li></ul>
+				{% endif %}
+			{% endif %}

 			{% block "content" %}
 			{% 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&nbsp;:<br>{{ settings.contact_email }}</p>
-			{% endif %}
-		</footer>
+	<footer>
+		<div id="sponsors">
+			<a class="external" href="https://www.ens-paris-saclay.fr/">
+				<img src="{% static "imgs/2023/ens_ps.png" %}" alt="École Normale Supérieure Paris-Saclay"
+					title="École Normale Supérieure Paris-Saclay" />
+			</a>
+			<a class="external" href="https://wiki.crans.org/VieBdl">
+    			<img src="{% static "imgs/2023/bdl.png" %}" alt="Bureau des Loisirs de l'ENS de Paris-Saclay"
+    				title="Bureau des Loisirs de l'ENS Paris-Saclay" />
+			</a>
+		</div>
+		{% if settings.contact_email %}
+		<p>Pour tout problème, contacter&nbsp;:<br><span class="antispam">{{ settings.contact_email_reversed }}</span>
+		</p>
+		{% endif %}
+	</footer>

 	</body>
+
 </html>
+{% endspaceless %}
No results found