feat: moved back index jsp in main form

InseeFr · Jan 18, 2024 · 3209986 · 3209986
1 parent 407f23e
commit 3209986
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 80 deletions.
diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/gererExport.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/gererExport.jsp
@@ -22,17 +22,18 @@
 
 <body class="bg-body">
 
-<c:import url="tiles/header.jsp">
-	<c:param name="currentPage" value="export" />
-</c:import>
-
 <form
 	spellcheck="false"
 	action="selectExport.action"
 	id="selectExport"
 	method="post"
 	accept-charset="UTF-8"
 >
+
+<c:import url="tiles/header.jsp">
+	<c:param name="currentPage" value="export" />
+</c:import>
+
 	<div class="container-fluid">
 		<c:import url="/WEB-INF/jsp/tiles/template_environment.jsp"></c:import>
 		<div class="row">

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/gererFamilleNorme.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/gererFamilleNorme.jsp
@@ -13,14 +13,13 @@
 </head>
 
 <body class="bg-body">
+	<form id="selectFamilleNorme" action="selectFamilleNorme.action"
+		spellcheck="false" method="post">
 
 	<c:import url="tiles/header.jsp">
 		<c:param name="currentPage" value="familyManagement" />
 	</c:import>
 
-	<form id="selectFamilleNorme" action="selectFamilleNorme.action"
-		spellcheck="false" method="post">
-
 		<div class="container-fluid">
 			<div class="row">
 				<div class="col-md-4">

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/gererNomenclature.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/gererNomenclature.jsp
@@ -19,11 +19,6 @@
 </c:if>
 
 <body class="bg-body">
-
-<c:import url="tiles/header.jsp">
-	<c:param name="currentPage" value="externalFile" />
-</c:import>
-
 <form
 	spellcheck="false"
 	action="selectListNomenclatures.action"
@@ -32,6 +27,10 @@
 	accept-charset="UTF-8"
 >
 
+<c:import url="tiles/header.jsp">
+	<c:param name="currentPage" value="externalFile" />
+</c:import>
+
 	<div class="container-fluid">
 		<div class="row">
 				<!-- left column -->

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/gererNorme.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/gererNorme.jsp
@@ -20,10 +20,6 @@
 
 <body class="bg-body">
 
-<c:import url="tiles/header.jsp">
-	<c:param name="currentPage" value="normManagement" />
-</c:import>
-
 <form
 	spellcheck="false"
 	id="selectNorme"
@@ -32,6 +28,10 @@
 	accept-charset="UTF-8"
 >
 
+<c:import url="tiles/header.jsp">
+	<c:param name="currentPage" value="normManagement" />
+</c:import>
+
 <div class="container-fluid">
 	<div class="row">
 		<div class="col-md-6">

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/gererPilotageBAS.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/gererPilotageBAS.jsp
@@ -15,15 +15,14 @@
 
 <body class="bg-body">
 
-	<c:import url="tiles/header.jsp">
-		<c:param name="currentPage" value="envManagement" />
-	</c:import>		
-
-
 	<form spellcheck="false" id="selectPilotageBAS" action="selectPilotageBAS.action"
 		method="post"
 		accept-charset="UTF-8">
 
+	<c:import url="tiles/header.jsp">
+		<c:param name="currentPage" value="envManagement" />
+	</c:import>		
+
 		<div class="container-fluid">
 			<c:import url="/WEB-INF/jsp/tiles/template_environment.jsp"></c:import>
 			<div class="row">

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/gererWebservice.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/gererWebservice.jsp
@@ -15,15 +15,14 @@
 </c:if>
 
 <body class="bg-body">
+	<form id="selectWebserviceContext" action="selectWebserviceContext.action"
+	spellcheck="false" method="post" accept-charset="UTF-8">
+
 	<c:import url="tiles/header.jsp">
 		<c:param name="currentPage" value="webserviceManagement" />
 	</c:import>
 
-	<form id="selectWebserviceContext" action="selectWebserviceContext.action"
-	spellcheck="false" method="post" accept-charset="UTF-8">
-
 		<div class="container-fluid">
-
 			<div class="row">
 				<!-- left column -->
 				<div class="col-md-5">

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/index.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -15,34 +15,33 @@
 </head>
 
 <body class="bg-body">
-	<c:import url="tiles/header.jsp">
-		<c:param name="currentPage" value="home" />
-	</c:import>
-
-	<form spellcheck="false" action="index" method="post" accept-charset="UTF-8">
-		<div class="container-fluid">
-			<div class="row justify-content-md-center">
-				<div class="col-md-8">
-					<div class="jumbotron jumbotron-fluid">
-						<div class="container">
-							<h1 class="display-4">
-								<spring:message code="home.welcome" />
-							</h1>
-							<p>${version}</p>
-						</div>
-					</div>
-				</div>
-			</div>
-			<hr />
-			<div class="row justify-content-md-center">
-				<div class="col-md-4">
-					<c:set var="view" value="${viewIndex}" scope="request"/>
-					<c:import url="tiles/templateVObject.jsp">
-						<c:param name="taille" value ="col-md" />
-					</c:import>
+<form spellcheck="false" action="index" method="post" accept-charset="UTF-8">
+<c:import url="tiles/header.jsp">
+	<c:param name="currentPage" value="home" />
+</c:import>
+<div class="container-fluid">
+	<div class="row justify-content-md-center">
+		<div class="col-md-8">
+			<div class="jumbotron jumbotron-fluid">
+				<div class="container">
+					<h1 class="display-4">
+						<spring:message code="home.welcome" />
+					</h1>
+					<p>${version}</p>
 				</div>
 			</div>
 		</div>
-	</form>
+	</div>
+	<hr />
+	<div class="row justify-content-md-center">
+		<div class="col-md-4">
+			<c:set var="view" value="${viewIndex}" scope="request"/>
+			<c:import url="tiles/templateVObject.jsp">
+				<c:param name="taille" value ="col-md" />
+			</c:import>
+		</div>
+	</div>
+</div>
+</form>
 </body>
 </html>
diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/maintenanceOperations.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/maintenanceOperations.jsp
@@ -21,10 +21,6 @@
 </c:if>
 <body class="bg-body">
 
-<c:import url="tiles/header.jsp">
-	<c:param name="currentPage" value="operations" />
-</c:import>
-
 <form
 	spellcheck="false"
 	action="selectExport.action"
@@ -33,27 +29,30 @@
 	accept-charset="UTF-8"
 >
 
-	<div class="container-fluid">
+<c:import url="tiles/header.jsp">
+	<c:param name="currentPage" value="operations" />
+</c:import>
 
-		<div class="row">
-				<div class="col-md-12">
-					<div class="row">
-						<div class="col-md">
-						<div id="viewOperations">
-							<button
-								id="viewOperations.generateErrorMessageInLogs"
-								class="btn btn-secondary btn-sm"
-								type="submit"
-								doAction="generateErrorMessageInLogsOperations"
-								scope="viewOperations;"
-								value="<spring:message code="gui.button.generateErrorMessageInLogs"/>"
-							><span class="fa fa-eye-open">&nbsp;</span><spring:message code="gui.button.generateErrorMessageInLogs"/></button>
-							</div>
+<div class="container-fluid">
+	<div class="row">
+			<div class="col-md-12">
+				<div class="row">
+					<div class="col-md">
+					<div id="viewOperations">
+						<button
+							id="viewOperations.generateErrorMessageInLogs"
+							class="btn btn-secondary btn-sm"
+							type="submit"
+							doAction="generateErrorMessageInLogsOperations"
+							scope="viewOperations;"
+							value="<spring:message code="gui.button.generateErrorMessageInLogs"/>"
+						><span class="fa fa-eye-open">&nbsp;</span><spring:message code="gui.button.generateErrorMessageInLogs"/></button>
 						</div>
 					</div>
-			</div>			
+				</div>
 		</div>
-	</div>	
+	</div>
+</div>
 </form>
 
 

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/maintenanceParameters.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/maintenanceParameters.jsp
@@ -21,10 +21,6 @@
 </c:if>
 <body class="bg-body">
 
-<c:import url="tiles/header.jsp">
-	<c:param name="currentPage" value="parameters" />
-</c:import>	
-
 <form
 	spellcheck="false"
 	action="selectExport.action"
@@ -33,8 +29,11 @@
 	accept-charset="UTF-8"
 >
 
-	<div class="container-fluid">
+<c:import url="tiles/header.jsp">
+	<c:param name="currentPage" value="parameters" />
+</c:import>	
 
+	<div class="container-fluid">
 		<div class="row">
 				<div class="col-md-12">
 					<div class="row">

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/tiles/header.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/tiles/header.jsp
@@ -2,7 +2,6 @@
 <%@taglib prefix="c" uri="jakarta.tags.core"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>  
 
-<form spellcheck="false" id="menu" action="" method="post" accept-charset="UTF-8">
 
 <div class="menu-box-style" style="display: flex;flex-direction:row;flex-wrap:nowrap;justify-content: space-between;position: fixed;top: 0;width: 100%;z-index: 2000;">
 
@@ -68,5 +67,3 @@
 </nav>
 
 <div class="float-left vh-menu-bar vw-menu-bar left-navbar collapse show"></div>
-
-</form>