Merge pull request 'Ajout de la permanence du samedi de 14h à18h' (#4) from nouvelle-perm into main

Reviewed-on: #4

css/style.css

@@ -393,6 +393,10 @@ main > aside {
     text-decoration: none !important;
 }
 
+#main-nav > a {
+    display: inline-block;
+}
+
 /* Affiches */
 
 .affiche {

index.html

@@ -44,7 +44,6 @@
 			<a property="url" href="https://listes.infini.fr/listes.labolyon.fr/subscribe/discussions">Liste de diffusion</a>
 			<a property="url" href="https://nerdculture.de/@labolyon">Fédiverse</a>
 			<a property="url" href="https://matrix.to/#/#general:chat.labolyon.fr">Salon Matrix</a>
-			<a property="url" href="/presentation.html">Présentation</a>
 		</nav>
 	</header>
 
@@ -112,15 +111,23 @@
 					<p>On parle technique mais aussi logiciel libre, hacking, de nos projets personnels ou collectifs</p>
 				</div>
 
-				<p class="event-hours"><strong><span property="eventSchedule" typeof="Schedule">
+				<p>
-					Tous les <data property="byDay" content="Tuesday">mardis</data> à partir de&nbsp;<data property="startTime" content="19:00">19h</data>
+          <span class="event-hours"><strong><span property="eventSchedule" typeof="Schedule">
-				</span><br/>
+            Tous les <data property="byDay" content="Tuesday">mardis</data> à partir de&nbsp;<data property="startTime" content="19:00">19h</data>
+          </span></strong></span><br/>
+
+          et<br/>
+
+          <span class="event-hours"><strong><span property="eventSchedule" typeof="Schedule">
+            Tous les <data property="byDay" content="Saturday">samedis</data> de <data property="startTime" content="14:00">14h</data> à <data property="endTime" content="19:00">19h</data>
+          </span></strong></span><br/>
+
 					au <span property="location" href="https://labolyon.fr/">local du LOL</span></strong></p>
 
 				<p>Adhésion conseillée (prix libre)</p>
 			</article>
 
-			<article class="event affiche affiche-drags-nerds-hackathon">
+			<!--<article class="event affiche affiche-drags-nerds-hackathon">
 				<style>
 					@font-face {
 						font-family: "Press Start 2P";
@@ -232,7 +239,7 @@
 					Inscrivez vous en envoyant un email à<br/><a href="mailto:drags-nerds@epickiwi.fr">drags‑nerds@epickiwi.fr</a><br/>
 					Ou rendez vous sur <a href="https://drags-nerds.net/" target="_blank">drags‑nerds.net</a>
 				</p>
-			</article>
+			</article>-->
 
 			<!--<article class="event affiche affiche-debian-release-party" property="event" typeof="Event">
 				<style>

spaceapi/space.json

@@ -0,0 +1,30 @@
+{
+  "api_compatibility": ["14", "15"],
+  "space": "Laboratoire Ouvert Lyonnais",
+  "logo": "https://labolyon.fr/images/logo_picto.svg",
+  "url": "https://labolyon.fr/",
+  "location": {
+    "address": "7 Place Louis Chazette 69001 Lyon, France",
+    "lon": 4.8372366,
+    "lat": 45.7732494,
+    "country_code": "FR",
+    "timezone": "Europe/Paris"
+  },
+  "contact": {
+    "irc": "ircs://irc.geeknode.org:6697/labolyon",
+    "ml": "discussions@listes.labolyon.fr",
+    "mastodon": "@labolyon@nerdculture.de",
+    "matrix": "#general:chat.labolyon.fr"
+  },
+  "state": {
+    "icon": {
+      "closed": "https://labolyon.fr/status/status.ferm%C3%A9.png",
+      "open": "https://labolyon.fr/status/status.ouvert.png"
+    },
+    "open": false
+  },
+  "projects": [
+    "https://git.labolyon.fr/",
+    "https://wiki.labolyon.fr/"
+  ]
+}

status/set-status.sh

@@ -8,10 +8,16 @@ if [ "$#" = "0" ]; then
     exit 1
 fi
 
+SPACE_JSON=/var/www/html/spaceapi/space.json
+
 if [ "$1" = "opened" ]; then
     ln -sf "index.ouvert.html" "/var/www/html/status/index.html"
+    jq "setpath([\"state\", \"open\"]; true) | setpath([\"state\", \"lastchange\"]; $(date +%s))" < $SPACE_JSON > $SPACE_JSON.new &&
+	    mv -f $SPACE_JSON.new $SPACE_JSON
 fi
 
 if [ "$1" = "closed" ]; then
     ln -sf "index.fermé.html" "/var/www/html/status/index.html"
-fi
+    jq "setpath([\"state\", \"open\"]; false) | setpath([\"state\", \"lastchange\"]; $(date +%s))" < $SPACE_JSON > $SPACE_JSON.new &&
+	    mv -f $SPACE_JSON.new $SPACE_JSON
+fi