From e32693ed3166fe148420ad77f2a0c44b57c1646e Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Mon, 19 May 2025 11:31:00 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20fichiers=20et=20r=C3=A9pe?=
 =?UTF-8?q?rtoires?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _get_config.html                              |  2 +-
 inventaire.html => _inventory.html            |  8 +++----
 _nav.html                                     |  6 ++---
 ...taire_nonprop.html => _temp_inventory.html |  6 ++---
 archives.html                                 |  4 ++--
 config.html                                   |  4 ++--
 ..._mouvement.html => add_movement_type.html} |  0
 ...uvement.html => delete_movement_type.html} |  0
 ...uvement.html => modify_movement_type.html} |  0
 defaut.json => default.json                   |  0
 historique.html => equipment_history.html     | 22 +++++++++----------
 index.html                                    |  6 ++---
 ...ier_materiel.html => modify_equipment.html |  0
 .../_validate_modification.html               |  0
 .../add_new_equipment.html                    |  0
 .../copy_movement.html                        |  4 ++--
 .../delete_movement.html                      |  8 +++----
 .../input_equipment.html                      | 12 +++++-----
 {mouvements => movements}/input_return.html   |  6 ++---
 {mouvements => movements}/link.schema.json    |  0
 .../modify_movement.html                      |  4 ++--
 .../movement.schema.json                      |  0
 .../output_equipment.html                     | 12 +++++-----
 {mouvements => movements}/output_return.html  |  6 ++---
 snippets/user_details.html                    |  2 +-
 storage/delete_storage.html                   |  2 +-
 26 files changed, 57 insertions(+), 57 deletions(-)
 rename inventaire.html => _inventory.html (89%)
 rename inventaire_nonprop.html => _temp_inventory.html (90%)
 rename config/{ajouter_type_mouvement.html => add_movement_type.html} (100%)
 rename config/{supprimer_type_mouvement.html => delete_movement_type.html} (100%)
 rename config/{modifier_type_mouvement.html => modify_movement_type.html} (100%)
 rename defaut.json => default.json (100%)
 rename historique.html => equipment_history.html (91%)
 rename modifier_materiel.html => modify_equipment.html (100%)
 rename mouvements/valider_modification.html => movements/_validate_modification.html (100%)
 rename mouvements/ajouter_entree.html => movements/add_new_equipment.html (100%)
 rename mouvements/dupliquer_mouvement.html => movements/copy_movement.html (98%)
 rename mouvements/supprimer_mouvement.html => movements/delete_movement.html (91%)
 rename mouvements/entrees/repertorie.html => movements/input_equipment.html (89%)
 rename {mouvements => movements}/input_return.html (96%)
 rename {mouvements => movements}/link.schema.json (100%)
 rename mouvements/modifier_mouvement.html => movements/modify_movement.html (98%)
 rename {mouvements => movements}/movement.schema.json (100%)
 rename mouvements/sorties/stock_disponible.html => movements/output_equipment.html (94%)
 rename {mouvements => movements}/output_return.html (96%)

diff --git a/_get_config.html b/_get_config.html
index c95aaf7..3fe6f2d 100644
--- a/_get_config.html
+++ b/_get_config.html
@@ -6,7 +6,7 @@
 *}}
 
 {{* config par défaut *}}
-{{:read file="./defaut.json" assign="config_defaut"}}
+{{:read file="./default.json" assign="config_defaut"}}
 {{:assign config_defaut=$config_defaut|json_decode}}
 
 {{:assign var="directions.input" value="entrée"}}
diff --git a/inventaire.html b/_inventory.html
similarity index 89%
rename from inventaire.html
rename to _inventory.html
index fbda18f..4c2a8aa 100644
--- a/inventaire.html
+++ b/_inventory.html
@@ -63,21 +63,21 @@
 				{{:linkbutton
 				label="Sortie"
 				shape="minus"
-				href="mouvements/sorties/stock_disponible.html?key=%s"|args:$key
+				href="movements/output_equipment.html?key=%s"|args:$key
 				target="_dialog"}}
 			{{/if}}
 			{{:linkbutton
 			label="Entrée"
 			shape="plus"
-			href="mouvements/entrees/repertorie.html?key=%s"|args:$key
+			href="movements/input_equipment.html?key=%s"|args:$key
 			target="_dialog"}}
 			{{:linkbutton
 			label="Historique"
-			href="historique.html?key=%s&prop=1"|args:$key
+			href="equipment_history.html?key=%s&prop=1"|args:$key
 			shape="table"}}
 			{{:linkbutton
 			label="Modifier"
-			href="modifier_materiel.html?key=%s&prop=1&stock=%s"|args:$key:$col3
+			href="modify_equipment.html?key=%s&prop=1&stock=%s"|args:$key:$col3
 			shape="edit"
 			target="_dialog"}}
 		</td>
diff --git a/_nav.html b/_nav.html
index 78b0cb5..4e69986 100644
--- a/_nav.html
+++ b/_nav.html
@@ -6,7 +6,7 @@
 			{{if $subsubcurrent == null && $cat == 0}}
 				{{:linkbutton label="Ajouter une catégorie" shape="plus" href="categories/add_category.html" target="_dialog"}}
 			{{else}}
-				{{:linkbutton label="Ajouter un nouveau matériel" shape="plus" href="mouvements/ajouter_entree.html" target="_dialog"}}
+				{{:linkbutton label="Ajouter un nouveau matériel" shape="plus" href="movements/add_new_equipment.html" target="_dialog"}}
 			{{/if}}
 		</aside>
 	{{/if}}
@@ -46,8 +46,8 @@
 			</aside>
 		{{elseif $subcurrent == 'typesES'}}
 			<aside>
-				{{:linkbutton label="Ajouter un type d'entrée" shape="plus" href="config/ajouter_type_mouvement.html?dir=input" target="_dialog"}}
-				{{:linkbutton label="Ajouter un type de sortie" shape="plus" href="config/ajouter_type_mouvement.html?dir=output" target="_dialog"}}
+				{{:linkbutton label="Ajouter un type d'entrée" shape="plus" href="config/add_movement_type.html?dir=input" target="_dialog"}}
+				{{:linkbutton label="Ajouter un type de sortie" shape="plus" href="config/add_movement_type.html?dir=output" target="_dialog"}}
 			</aside>
 		{{/if}}
 		<ul class="sub">
diff --git a/inventaire_nonprop.html b/_temp_inventory.html
similarity index 90%
rename from inventaire_nonprop.html
rename to _temp_inventory.html
index f05d372..bf8db8a 100644
--- a/inventaire_nonprop.html
+++ b/_temp_inventory.html
@@ -58,15 +58,15 @@
 			{{:linkbutton
 			label="Entrée"
 			shape="plus"
-			href="mouvements/entrees/repertorie.html?key=%s"|args:$key
+			href="movements/input_equipment.html?key=%s"|args:$key
 			target="_dialog"}}
 			{{:linkbutton
 			label="Historique"
-			href="historique.html?key=%s&prop=0"|args:$key
+			href="equipment_history.html?key=%s&prop=0"|args:$key
 			shape="table"}}
 			{{:linkbutton
 			label="Modifier"
-			href="modifier_materiel.html?key=%s&prop=0"|args:$key
+			href="modify_equipment.html?key=%s&prop=0"|args:$key
 			shape="edit"
 			target="_dialog"}}
 		</td>
diff --git a/archives.html b/archives.html
index 64d72c3..087ac1c 100644
--- a/archives.html
+++ b/archives.html
@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{:admin_header title="Matériels archivés" custom_css=$custom_css current="module_equipment"}}
+{{:admin_header title="Matériels archivés" current="module_equipment"}}
 {{:include file="_nav.html" current="archives"}}
 
 {{if $_GET.ok}}
@@ -54,7 +54,7 @@
 		<td class="actions">
 			{{:linkbutton
 				label="Historique"
-				href="historique.html?key=%s&prop=1&current=archives"|args:$key
+				href="equipment_history.html?key=%s&prop=1&current=archives"|args:$key
 				shape="table"}}
 			{{:linkbutton
 				label="Modifier"
diff --git a/config.html b/config.html
index 7928f03..d7661ab 100644
--- a/config.html
+++ b/config.html
@@ -38,9 +38,9 @@
 					<td class="actions">
 						{{:assign var="locked" from="locked_%ss"|args:$direction}}
 						{{if ! $locked|has:$label}}
-							{{:linkbutton label="Supprimer" shape="delete" href="config/supprimer_type_mouvement.html?dir=%s&op_key=%s"|args:$direction:$key target="_dialog"}}
+							{{:linkbutton label="Supprimer" shape="delete" href="config/delete_movement_type.html?dir=%s&op_key=%s"|args:$direction:$key target="_dialog"}}
 						{{/if}}
-							{{:linkbutton label="Modifier" shape="edit" href="config/modifier_type_mouvement.html?dir=%s&op_key=%s"|args:$direction:$key target="_dialog"}}
+							{{:linkbutton label="Modifier" shape="edit" href="config/modify_movement_type.html?dir=%s&op_key=%s"|args:$direction:$key target="_dialog"}}
 					</td>
 				</tr>
 			{{/foreach}}
diff --git a/config/ajouter_type_mouvement.html b/config/add_movement_type.html
similarity index 100%
rename from config/ajouter_type_mouvement.html
rename to config/add_movement_type.html
diff --git a/config/supprimer_type_mouvement.html b/config/delete_movement_type.html
similarity index 100%
rename from config/supprimer_type_mouvement.html
rename to config/delete_movement_type.html
diff --git a/config/modifier_type_mouvement.html b/config/modify_movement_type.html
similarity index 100%
rename from config/modifier_type_mouvement.html
rename to config/modify_movement_type.html
diff --git a/defaut.json b/default.json
similarity index 100%
rename from defaut.json
rename to default.json
diff --git a/historique.html b/equipment_history.html
similarity index 91%
rename from historique.html
rename to equipment_history.html
index 7c46dbf..1500a7c 100644
--- a/historique.html
+++ b/equipment_history.html
@@ -124,11 +124,11 @@
 		<aside>
 			{{if $_GET.prop}}
 				{{if $equipment.stock > 0}}
-					{{:linkbutton label="Sortie" shape="minus" href="mouvements/sorties/stock_disponible.html?key=%s"|args:$_GET.key target="_dialog"}}
+					{{:linkbutton label="Sortie" shape="minus" href="movements/output_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
 				{{/if}}
-				{{:linkbutton label="Entrée" shape="plus" href="mouvements/entrees/repertorie.html?key=%s"|args:$_GET.key target="_dialog"}}
+				{{:linkbutton label="Entrée" shape="plus" href="movements/input_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
 		{{else}}
-			{{:linkbutton label="Entrée" shape="plus" href="mouvements/entrees/repertorie.html?key=%s"|args:$_GET.key target="_dialog"}}
+			{{:linkbutton label="Entrée" shape="plus" href="movements/input_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
 		{{/if}}
 		</aside>
 	</nav>
@@ -212,7 +212,7 @@
 							{{if $temp_ext != null && $temp_ext > 0}}
 								{{:linkbutton
 								label="Retour"
-								href="mouvements/output_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
+								href="movements/output_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
 								shape="reset"
 								target="_dialog"}}
 							{{/if}}
@@ -222,18 +222,18 @@
 						{{else}}
 							{{:linkbutton
 								label="Dupliquer"
-								href="mouvements/dupliquer_mouvement.html?key=%s&prop=%s"|args:$key:$_GET.prop
+								href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
 								shape="plus"
 								target="_dialog"}}
 						{{/if}}
 						{{:linkbutton
 							label="Modifier"
-							href="mouvements/modifier_mouvement.html?key=%s"|args:$key
+							href="movements/modify_movement.html?key=%s"|args:$key
 							shape="edit"
 							target="_dialog"}}
 						{{:linkbutton
 							label="Supprimer"
-							href="mouvements/supprimer_mouvement.html?key=%s&prop=%s"|args:$key:$_GET.prop
+							href="movements/delete_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
 							shape="delete"
 							target="_dialog"}}
 					{{/if}}
@@ -305,24 +305,24 @@
 						{{if $temp_in != null && $temp_in > 0}}
 							{{:linkbutton
 							label="Retour"
-							href="mouvements/input_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
+							href="movements/input_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
 							shape="reset"
 							target="_dialog"}}
 						{{/if}}
 					{{/if}}
 					{{:linkbutton
 						label="Dupliquer"
-						href="mouvements/dupliquer_mouvement.html?key=%s&prop=%s"|args:$key:$_GET.prop
+						href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
 						shape="plus"
 						target="_dialog"}}
 					{{:linkbutton
 						label="Modifier"
-						href="mouvements/modifier_mouvement.html?key=%s"|args:$key
+						href="movements/modify_movement.html?key=%s"|args:$key
 						shape="edit"
 						target="_dialog"}}
 					{{:linkbutton
 						label="Supprimer"
-						href="mouvements/supprimer_mouvement.html?key=%s&prop=%s"|args:$key:$_GET.prop
+						href="movements/delete_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
 						shape="delete"
 						target="_dialog"}}
 				</td>
diff --git a/index.html b/index.html
index a3b0fa1..ad592e1 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{:admin_header title="Gestion des matériels" custom_css=$custom_css current="module_equipment"}}
+{{:admin_header title="Gestion des matériels" current="module_equipment"}}
 
 {{* barre de navigation *}}
 {{if $_GET.prop == null || $_GET.prop}}
@@ -30,9 +30,9 @@
 	<p class="block alert">Il n'y a aucune catégorie : vous devez en ajouter.</p>
 {{else}}
 	{{if $_GET.prop == null || $_GET.prop == "1"}}
-		{{:include file="./inventaire.html"}}
+		{{:include file="./_inventory.html"}}
 	{{else}}
-		{{:include file="./inventaire_nonprop.html"}}
+		{{:include file="./_temp_inventory.html"}}
 	{{/if}}
 {{/if}}
 
diff --git a/modifier_materiel.html b/modify_equipment.html
similarity index 100%
rename from modifier_materiel.html
rename to modify_equipment.html
diff --git a/mouvements/valider_modification.html b/movements/_validate_modification.html
similarity index 100%
rename from mouvements/valider_modification.html
rename to movements/_validate_modification.html
diff --git a/mouvements/ajouter_entree.html b/movements/add_new_equipment.html
similarity index 100%
rename from mouvements/ajouter_entree.html
rename to movements/add_new_equipment.html
diff --git a/mouvements/dupliquer_mouvement.html b/movements/copy_movement.html
similarity index 98%
rename from mouvements/dupliquer_mouvement.html
rename to movements/copy_movement.html
index 3a0ec44..6c76a55 100644
--- a/mouvements/dupliquer_mouvement.html
+++ b/movements/copy_movement.html
@@ -135,7 +135,7 @@
 
 	{{* Vérifier la cohérence des mouvements du matériel *}}
 	{{:include
-		file="./valider_modification.html"
+		file="./_validate_modification.html"
 		keep="erreur"
 		movements=$movements_new
 	}}
@@ -192,7 +192,7 @@
 		user=$user.id
 		storage=$_POST.storage
 	}}
-	{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
+	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
 {{/form}}
 
 {{:admin_header title="Dupliquer un mouvement" current="module_equipment"}}
diff --git a/mouvements/supprimer_mouvement.html b/movements/delete_movement.html
similarity index 91%
rename from mouvements/supprimer_mouvement.html
rename to movements/delete_movement.html
index 6a91b3b..aea6243 100644
--- a/mouvements/supprimer_mouvement.html
+++ b/movements/delete_movement.html
@@ -29,7 +29,7 @@
 				{{:assign link_key=$key}}
 			{{/load}}
 			{{if $link_key != null}}
-				{{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
+				{{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
 			{{/if}}
 		{{else}}
 			{{:assign dispo=0}}
@@ -62,7 +62,7 @@
 
 					{{* problème ? *}}
 					{{if $dispo < 0 || $nonprop < 0}}
-						{{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
+						{{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
 					{{/if}}
 				{{/if}}
 			{{/load}}
@@ -83,7 +83,7 @@
 				{{:assign link_key=$key}}
 			{{/load}}
 			{{if $link_key != null}}
-				{{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
+				{{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
 			{{/if}}
 		{{elseif $type_operation == 'retour'}}
 			{{#load type="link" where="$$.return = :key" :key=$_GET.key}}
@@ -148,7 +148,7 @@
 			out=$curr_eqpmt.out
 			notowned=$curr_eqpmt.notowned
 		}}
-		{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
+		{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
 	{{else}}
 		{{* supprimer le matériel *}}
 		{{:delete key=$curr_eqpmt.key}}
diff --git a/mouvements/entrees/repertorie.html b/movements/input_equipment.html
similarity index 89%
rename from mouvements/entrees/repertorie.html
rename to movements/input_equipment.html
index f366d36..7811779 100644
--- a/mouvements/entrees/repertorie.html
+++ b/movements/input_equipment.html
@@ -8,11 +8,11 @@
 
 {{* barre de navigation *}}
 {{if ! $dialog}}
-	{{:include file="../../_nav.html" current="entrees"}}
+	{{:include file="../_nav.html" current="entrees"}}
 {{/if}}
 
 {{* récupérer la config des entrées/sorties *}}
-{{:include file="../../_get_config.html" keep="config"}}
+{{:include file="../_get_config.html" keep="config"}}
 
 {{* types d'entrées *}}
 {{#foreach from=$config.input_nature key=key}}
@@ -50,7 +50,7 @@
 
 	{{:save
 		key=$equipment.key
-		validate_schema="../../equipment.schema.json"
+		validate_schema="../equipment.schema.json"
 		type="equipment"
 		category=$equipment.category
 		name=$equipment.name
@@ -64,7 +64,7 @@
 	{{:assign mvt_key=""|uuid}}
 	{{:save
 		key=$mvt_key
-		validate_schema="../movement.schema.json"
+		validate_schema="./movement.schema.json"
 		type="movement"
 		direction="input"
 		operation=$_POST.operation
@@ -80,10 +80,10 @@
 	{{else}}
 		{{:assign prop=1}}
 	{{/if}}
-	{{:redirect force="../../historique.html?key=%s&ok=1&msg=entrée&prop=%s"|args:$equipment.key:$prop}}
+	{{:redirect force="../equipment_history.html?key=%s&ok=1&msg=entrée&prop=%s"|args:$equipment.key:$prop}}
 {{/form}}
 
-{{:admin_header title="Entrée de matériel" custom_css="./../../style.css" current="module_equipment"}}
+{{:admin_header title="Entrée de matériel" custom_css="../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{* formulaire de saisie d'une entrée de matériel *}}
diff --git a/mouvements/input_return.html b/movements/input_return.html
similarity index 96%
rename from mouvements/input_return.html
rename to movements/input_return.html
index a47615c..a311473 100644
--- a/mouvements/input_return.html
+++ b/movements/input_return.html
@@ -107,7 +107,7 @@
 
 	{{* Vérifier la cohérence des mouvements du matériel *}}
 	{{:include
-		file="./valider_modification.html"
+		file="./_validate_modification.html"
 		keep="erreur, pb"
 		movements=$movements_new
 	}}
@@ -161,10 +161,10 @@
 		temp_key=$_GET.key
 		return=$mvt_key
 	}}
-	{{:redirect force="../historique.html?ok=1&key=%s&prop=0&msg=retour"|args:$mvt_new.equipment}}
+	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=0&msg=retour"|args:$mvt_new.equipment}}
 {{/form}}
 
-{{:admin_header title="Retour de matériel" custom_css="./../../style.css" current="module_equipment"}}
+{{:admin_header title="Retour de matériel" custom_css="../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{* barre de navigation *}}
diff --git a/mouvements/link.schema.json b/movements/link.schema.json
similarity index 100%
rename from mouvements/link.schema.json
rename to movements/link.schema.json
diff --git a/mouvements/modifier_mouvement.html b/movements/modify_movement.html
similarity index 98%
rename from mouvements/modifier_mouvement.html
rename to movements/modify_movement.html
index 3d8d30f..93b3ca3 100644
--- a/mouvements/modifier_mouvement.html
+++ b/movements/modify_movement.html
@@ -126,7 +126,7 @@
 
 	{{* Vérifier la cohérence des mouvements du matériel *}}
 	{{:include
-		file="./valider_modification.html"
+		file="./_validate_modification.html"
 		keep="erreur"
 		movements=$movements_new
 	}}
@@ -207,7 +207,7 @@
 		user=$user_id
 		storage=$_POST.storage
 	}}
-	{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
+	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
 {{/form}}
 
 {{:admin_header title="Modifier un mouvement" current="module_equipment"}}
diff --git a/mouvements/movement.schema.json b/movements/movement.schema.json
similarity index 100%
rename from mouvements/movement.schema.json
rename to movements/movement.schema.json
diff --git a/mouvements/sorties/stock_disponible.html b/movements/output_equipment.html
similarity index 94%
rename from mouvements/sorties/stock_disponible.html
rename to movements/output_equipment.html
index eec388e..da10405 100644
--- a/mouvements/sorties/stock_disponible.html
+++ b/movements/output_equipment.html
@@ -6,7 +6,7 @@
 *}}
 
 {{* récupérer la config des entrées/sorties *}}
-{{:include file="../../_get_config.html" keep="config"}}
+{{:include file="../_get_config.html" keep="config"}}
 
 {{* types de sorties *}}
 {{#foreach from=$config.output_nature key=key}}
@@ -119,7 +119,7 @@
 
 	{{:save
 		key=$equipment.key
-		validate_schema="../../equipment.schema.json"
+		validate_schema="../equipment.schema.json"
 		type="equipment"
 		category=$equipment.category
 		name=$equipment.name
@@ -133,7 +133,7 @@
 	{{:assign mvt_key=""|uuid}}
 	{{:save
 		key=$mvt_key
-		validate_schema="../movement.schema.json"
+		validate_schema="./movement.schema.json"
 		type="movement"
 		direction="output"
 		operation=$_POST.operation
@@ -143,13 +143,13 @@
 		comment=$_POST.remarques|trim
 		user=$user.id
 	}}
-	{{:redirect force="../../historique.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}}
+	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}}
 {{/form}}
 
-{{:admin_header title="Sortie de matériel" custom_css="./../../style.css" current="module_equipment"}}
+{{:admin_header title="Sortie de matériel" custom_css="../style.css" current="module_equipment"}}
 {{if ! $dialog}}
 	{{* barre de navigation *}}
-	{{:include file="../../_nav.html" current="sorties"}}
+	{{:include file="../_nav.html" current="sorties"}}
 {{/if}}
 
 {{#load key=$equipment.category assign="category"}}{{/load}}
diff --git a/mouvements/output_return.html b/movements/output_return.html
similarity index 96%
rename from mouvements/output_return.html
rename to movements/output_return.html
index aa011b0..49d09e9 100644
--- a/mouvements/output_return.html
+++ b/movements/output_return.html
@@ -107,7 +107,7 @@
 
 	{{* Vérifier la cohérence des mouvements du matériel *}}
 	{{:include
-		file="./valider_modification.html"
+		file="./_validate_modification.html"
 		keep="erreur, pb"
 		movements=$movements_new
 	}}
@@ -162,13 +162,13 @@
 		return=$mvt_key
 	}}
 	{{if $_GET.user == null}}
-		{{:redirect force="../historique.html?ok=1&key=%s&prop=1&msg=retour"|args:$mvt_new.equipment}}
+		{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=retour"|args:$mvt_new.equipment}}
 	{{else}}
 		{{:redirect force="/admin/users/details.php?id=%s"|args:$_GET.user}}
 	{{/if}}
 {{/form}}
 
-{{:admin_header title="Retour de matériel" custom_css="./../../style.css" current="module_equipment"}}
+{{:admin_header title="Retour de matériel" custom_css="../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{* barre de navigation *}}
diff --git a/snippets/user_details.html b/snippets/user_details.html
index 07cf0ee..6d364be 100644
--- a/snippets/user_details.html
+++ b/snippets/user_details.html
@@ -80,7 +80,7 @@
 						{{if $direction == "output" && $type_mvt == "temporaire"}}
 							{{:linkbutton
 							label="Retour"
-							href="%smouvements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id
+							href="%smovements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id
 							shape="history"
 							target="_dialog"}}
 						{{/if}}
diff --git a/storage/delete_storage.html b/storage/delete_storage.html
index b50e1a6..03facb6 100644
--- a/storage/delete_storage.html
+++ b/storage/delete_storage.html
@@ -17,7 +17,7 @@
 {{/form}}
 
 
-{{:admin_header title="Lieux de stockage" custom_css="./style.css" current="module_equipment"}}
+{{:admin_header title="Lieux de stockage" custom_css="../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{#load key=$_GET.key limit="1" assign="store"}}{{/load}}