From 58c9de9870ff00c8881c02dafd7c6f9c52a7a242 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Sat, 16 Nov 2024 10:25:16 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20navigation/onglets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _nav.html       | 12 ++++++------
 historique.html |  7 +++++--
 index.html      |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/_nav.html b/_nav.html
index 895d4a1..88bb763 100644
--- a/_nav.html
+++ b/_nav.html
@@ -1,21 +1,21 @@
 <nav class="tabs">
-	{{if $current == 'index'}}
+	{{if $current == 'inventaire'}}
 		<aside>
 			{{:linkbutton label="Ajouter un nouveau matériel" shape="plus" href="mouvements/ajouter_entree.html" target="_dialog"}}
 		</aside>
 	{{/if}}
 
 	<ul>
-		<li {{if $current == 'index'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Inventaire</a></li>
+		<li {{if $current == 'inventaire'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Inventaire</a></li>
 		<li {{if $current == 'config'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Configuration</a></li>
 	</ul>
 
-	{{if $current == 'index'}}
+	{{if $current == 'inventaire'}}
 		<ul class="sub">
-			<li {{if $subcurrent == 'proprio'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Matériel permanent</a></li>
-			<li {{if $subcurrent == 'nonproprio'}} class="current"{{/if}}><a href="{{$module.url}}inventaire_nonprop.html">Matériel temporaire</a></li>
+			<li {{if $subcurrent == 'proprio'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Matériels permanents</a></li>
+			<li {{if $subcurrent == 'nonproprio'}} class="current"{{/if}}><a href="{{$module.url}}inventaire_nonprop.html">Matériels temporaires</a></li>
 		</ul>
-		{{if $subcurrent == 'mouvements'}}
+		{{if $subsubcurrent == 'mouvements'}}
 			<ul class="sub">
 				<li class="title"><strong>{{$eqpmt}} ({{$category}})</strong></li>
 				<li class="current"><a>Mouvements</a></li>
diff --git a/historique.html b/historique.html
index 82011d2..cb9cdc2 100644
--- a/historique.html
+++ b/historique.html
@@ -39,9 +39,12 @@
 {{/if}}
 
 {{* barre de navigation *}}
-{{if ! $dialog}}
-	{{:include file="./_nav.html" current="index" subcurrent="mouvements" eqpmt=$equipment.designation category=$category.name}}
+{{if $_GET.prop == 1}}
+	{{:assign proprio="proprio"}}
+{{else}}
+	{{:assign proprio="nonproprio"}}
 {{/if}}
+{{:include file="./_nav.html" current="inventaire" subcurrent=$proprio subsubcurrent="mouvements" eqpmt=$equipment.designation category=$category.name}}
 
 {{* récupérer la config des entrées/sorties *}}
 {{:include file="./_get_config.html" keep="config"}}
diff --git a/index.html b/index.html
index 7302d78..d0360a2 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
 {{:admin_header title="Gestion des matériels" custom_css=$custom_css current="module_equipment"}}
 
 {{* barre de navigation *}}
-{{:include file="_nav.html" current="index" subcurrent="proprio"}}
+{{:include file="_nav.html" current="inventaire" subcurrent="proprio"}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg == "ajout" }}