diff --git a/_nav.html b/_nav.html index 895d4a1..88bb763 100644 --- a/_nav.html +++ b/_nav.html @@ -1,21 +1,21 @@ - {{if $current == 'index'}} + {{if $current == 'inventaire'}} {{/if}} - Inventaire + Inventaire Configuration - {{if $current == 'index'}} + {{if $current == 'inventaire'}} - Matériel permanent - Matériel temporaire + Matériels permanents + Matériels temporaires - {{if $subcurrent == 'mouvements'}} + {{if $subsubcurrent == 'mouvements'}} {{$eqpmt}} ({{$category}}) Mouvements 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" }}