From aaf8573c781567079a9bac75985b492c155ed63d Mon Sep 17 00:00:00 2001
From: Rooty <rooty@rooty.me>
Date: Mon, 11 Mar 2024 09:48:45 +0100
Subject: [PATCH] Fixed somme css and presentation issues.

---
 .../adminentrynode/actionadmin.mxt            | 13 ++---
 .../admingroup/actionadmin.mxt                | 53 +++++++------------
 .../adminnode/actionadmin.mxt                 |  4 +-
 .../adminobject/addobjectadmin.mxt            | 28 +++++-----
 .../adminuser/actionadmin.mxt                 | 28 +++++-----
 .../adminuser/changeuseradmin.mxt             | 13 +----
 6 files changed, 55 insertions(+), 84 deletions(-)

diff --git a/data/template/qware/object_coordination/adminentrynode/actionadmin.mxt b/data/template/qware/object_coordination/adminentrynode/actionadmin.mxt
index 492eac5..a41a5c3 100755
--- a/data/template/qware/object_coordination/adminentrynode/actionadmin.mxt
+++ b/data/template/qware/object_coordination/adminentrynode/actionadmin.mxt
@@ -5,27 +5,24 @@
 		<div class="card-footer border-0 bg-white text-center">
 			<button class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" data-bs-toggle="collapse" data-bs-target="#blockAddENode"><mx:text id="TxtNodeAdd"/></button>
 		</div>
-		<form id="configGroup" role="form" class="form-inline container-fluid" method="post" mXattribut="action:urlAction">
-			<div id="blockAddENode" class="card mx-3 mb-0 collapse">
-				<div class="card-header border-0 p-0 m-1 text-center">
-					<h3>Ajouter un accès</h3>
-				</div>
+		<form id="configGroup" role="form" class="form-inline" method="post" mXattribut="action:urlAction">
+			<div id="blockAddENode" class="card border-0 mb-1 collapse">
 				<div class="card-body form">
 					<div class="row w-100">
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-group"></i></span>
 								<mx:select id="GROUP" id="group_id"/>
 							</div>
 						</div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-user-secret"></i></span>
 								<mx:select id="USER" id="user_id"/>
 							</div>
 						</div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-indent"></i></span> <!--anchor, navicon, random, th-list, indent-->
 								<mx:select id="NODE" id="node_id"/>
 							</div>
diff --git a/data/template/qware/object_coordination/admingroup/actionadmin.mxt b/data/template/qware/object_coordination/admingroup/actionadmin.mxt
index b26ad05..d9c9c82 100755
--- a/data/template/qware/object_coordination/admingroup/actionadmin.mxt
+++ b/data/template/qware/object_coordination/admingroup/actionadmin.mxt
@@ -9,41 +9,28 @@
     </mx:bloc id="TabeB">
 </ul>
 
-<div class="tab-content container-fluid py-2 px-0 border w-75">
-	<form id="configGroup" role="form" class="form text-center px-0" method="post" mXattribut="action:urlAction">
-		<div class="card with-tab w-100 border-0">
-			<div class="card-header text-center">
-				<h3><mx:text id="TxtGroupAdd"/></h3>
-			</div>
-			<div class="card-body">
-				<div class="row mb-2">
-					<mx:bloc id="blocName">
-					<div class="input-group col-xs-12 col-sm-8 col-lg-6 p-0 m-0">
-						<div class="input-group-prepend">
-							<span class="input-group-text"><i class="fa fa-lg fa-group mr-2"></i><span class="fa"><span class="text-danger"> *</span></span></span>
+<div class="tab-content container-fluid py-0 w-75 px-0">
+	<div class="card w-100">
+		<form id="configGroup" role="form" class="form-inline" method="post" mXattribut="action:urlAction">
+			<div class="card-header"><h3><mx:text id="TxtGroupAdd"/></h3></div>
+			<div class="card-body form">
+				<div class="row mb-1 w-100">
+					<div class="col">
+						<mx:bloc id="blocName">
+						<div class="input-group justify-content-center">
+							<span class="input-group-text"><i class="fa fa-lg fa-group mr-2 text-danger"></i></span><mx:formField id="nameInput" id="nameInput"/><span class="input-group-text"><mx:image id="pictoLanguage"/></span>
 						</div>
-						<mx:formField id="nameInput" id="nameInput"/>
-						<div class="input-group-append">
-							<span class="input-group-text"><mx:image id="pictoLanguage"/></span>
+						</mx:bloc id="blocName">
+					</div>
+					<div class="col">
+						<div class="input-group justify-content-center">
+							<span class="input-group-text" id="newsicon"><i class="fa fa-lg fa-file-picture-o"></i></span><mx:select id="icone" onchange="javascript:imgPicto();"/><span class="input-group-text"><mx:image id="pictoObject" id="pictoObject"/></span>
 						</div>
 					</div>
-					</mx:bloc id="blocName">
-				</div>
-				<div class="row mb-2">
-					<div class="input-group col-xs-12 col-sm-8 col-lg-6 p-0 m-0">
-						<div class="input-group-prepend">
-							<span class="input-group-text" id="newsicon"><i class="fa fa-lg fa-file-picture-o"></i></span>
+					<div class="col">
+						<div class="input-group justify-content-center">
+							<span class="input-group-text"><i class="fa fa-lg fa-group"></i></span><mx:select id="GROUP" id="IdGroup"/>
 						</div>
-						<mx:select id="icone" onchange="javascript:imgPicto();"/>
-						<div class="input-group-append">
-							<span class="input-group-text"><mx:image id="pictoObject" id="pictoObject"/></span>
-						</div>
-					</div>
-					<div class="input-group col-xs-12 col-sm-8 col-lg-6 p-0 m-0">
-						<div class="input-group-prepend">
-							<span class="input-group-text"><i class="fa fa-lg fa-group"></i></span>
-						</div>
-						<mx:select id="GROUP" id="IdGroup"/>
 					</div>
 				</div>
 			</div>
@@ -52,6 +39,6 @@
 				<input type="button" name="BtnReturn" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" value="<mx:text id="BtnReturn"/>" onclick="history.back();"/>
 				<input type="submit" name="BtnSave" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" MxAttribut="value:BtnSave"/>
 			</div>
-		</div>
-	</form>
+		</form>
+	</div>
 </div>
diff --git a/data/template/qware/object_coordination/adminnode/actionadmin.mxt b/data/template/qware/object_coordination/adminnode/actionadmin.mxt
index 9c47c49..daaa055 100755
--- a/data/template/qware/object_coordination/adminnode/actionadmin.mxt
+++ b/data/template/qware/object_coordination/adminnode/actionadmin.mxt
@@ -9,8 +9,8 @@
     </mx:bloc id="TabeB">
 </ul>
 <div class="tab-content container-fluid py-0 w-75 px-0">
-	<div class="card with-tab border-0 my-0">
-			<form id="configNode" role="form" class="form-inline px-0 container-fluid" method="post" mXattribut="action:urlAction">
+	<div class="card w-100">
+			<form id="configNode" role="form" class="form-inline" method="post" mXattribut="action:urlAction">
 				<div class="card-header"><h3><mx:text id="TxtNodeAdd"/></h3></div>
 				<div class="card-body form">
 					<div class="row mb-1 w-100">
diff --git a/data/template/qware/object_coordination/adminobject/addobjectadmin.mxt b/data/template/qware/object_coordination/adminobject/addobjectadmin.mxt
index 93cf6d4..d627dcb 100755
--- a/data/template/qware/object_coordination/adminobject/addobjectadmin.mxt
+++ b/data/template/qware/object_coordination/adminobject/addobjectadmin.mxt
@@ -9,23 +9,23 @@
     </mx:bloc id="TabeB">
 </ul>
 
-<div class="tab-content container-fluid px-0 py-2 w-75 border">
-	<div class="card with-tab w-100 border-0">
-		<form id="frmAddObject" name="frmAddObject" role="form" class="container form-inline" method="post" mXattribut="action:urlAction">
-			<div class="card-body border-0">
-				<div class="row justify-content-center">
-					<div class="input-group">
-						<div class="input-group-prepend">
+<div class="tab-content container-fluid py-0 w-75 px-0">
+	<div class="card text-center border-0">
+		<form id="frmAddObject" name="frmAddObject" role="form" class="form-inline px-0 container-fluid" method="post" mXattribut="action:urlAction">
+			<div class="card-body form">
+				<div class="row mb-1 w-100">
+					<div class="col">
+						<div class="input-group justify-content-center">
 							<span class="input-group-text"><i class="fa fa-lg fa-indent"></i></span>
-						</div>
-						<select name="contentType" id="contentType" class="verylarge">
+							<select name="contentType" id="contentType" class="verylarge">
 							<mx:bloc id="actionAdminClass">
-							<option mXattribut="value:classValue"><mx:text id="className"/></option>
+								<option mXattribut="value:classValue"><mx:text id="className"/></option>
 							</mx:bloc id="actionAdminClass">
-						</select>
-						<div class="input-group-append">
-							<span class="input-group-input"><input type="submit" class="form btn btn-outline-secondary" MxAttribut="value:BtnValid" /></span>
-							<span class="input-group-input"><input type="button" name="BtnReturn" class="form btn btn-outline-secondary" aria-pressed="true" value="<mx:text id="BtnReturn"/>" onclick="history.back();"/></span>
+							</select>
+							<div class="input-group-append">
+								<span class="input-group-input"><input type="submit" class="form btn btn-outline-secondary" MxAttribut="value:BtnValid" /></span>
+								<span class="input-group-input"><input type="button" name="BtnReturn" class="form btn btn-outline-secondary" aria-pressed="true" value="<mx:text id="BtnReturn"/>" onclick="history.back();"/></span>
+							</div>
 						</div>
 					</div>
 				</div>
diff --git a/data/template/qware/object_coordination/adminuser/actionadmin.mxt b/data/template/qware/object_coordination/adminuser/actionadmin.mxt
index 27274cf..4ac7d75 100755
--- a/data/template/qware/object_coordination/adminuser/actionadmin.mxt
+++ b/data/template/qware/object_coordination/adminuser/actionadmin.mxt
@@ -5,32 +5,32 @@
 		<div class="card-footer border-0 bg-white text-center">
 			<button class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" data-bs-toggle="collapse" data-bs-target="#blockAddUser"><mx:text id="TxtUserAdd"/></button>
 		</div>
-		<form id="fmtextinfo" name="fmtextinfo" role="form" class="form-inline container-fluid" method="post" mXattribut="action:urlActionAdd">
-			<div id="blockAddUser" class="card mx-3 mb-1 collapse">
+		<form id="fmtextinfo" name="fmtextinfo" role="form" class="form-inline" method="post" mXattribut="action:urlActionAdd">
+			<div id="blockAddUser" class="card border-0 mb-1 collapse">
 				<div class="card-body form">
 					<input type="hidden" name="user_id" mXattribut="value:user_id"/>
 					<input type="hidden" name="urlReturnAdd" mXattribut="value:urlReturnAdd"/>
 					<div class="row mb-1 w-100">
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-genderless"></i></span>
 								<mx:select id="user_title"/>
 							</div>
 						</div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-user"></i></span>
 								<mx:formField id="user_first_name" id="firstname"/>
 							</div>
 						</div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-user"></i></span>
 								<mx:formField id="user_last_name" id="lastname"/>
 							</div>
 						</div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-envelope-o"></i></span>
 								<mx:formField id="user_mail" id="mail"/>
 							</div>
@@ -39,25 +39,25 @@
 
 					<div class="row mb-1 w-100">
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-user-secret"></i></span>
 								<mx:formField id="user_login" id="user_login"/>
 							</div>
 						</div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-lock"></i></span>
 								<mx:formField id="user_password" id="user_password"/>
 							</div>
 						</div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-lock"></i></span>
 								<mx:formField id="user_password2" id="user_password2"/>
 							</div>
 						</div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-birthday-cake"></i></span>
 								<mx:formField id="user_birthdate" id="birthdate" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-language="fr"/>
 							</div>
@@ -65,14 +65,12 @@
 					</div>
 
 					<div class="row mb-1 mt-3">
-						<div class="col"></div>
 						<div class="col">
-							<div class="input-group">
+							<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-group"></i></span>
 								<mx:select id="GROUP" id="idGroup"/>
 							</div>
 						</div>
-						<div class="col"></div>
 					</div>
 				</div>
 				<div class="card-footer border-0 bg-white text-center">
@@ -87,7 +85,6 @@
 		<form id="FManageUser" name="FManageUser" role="form" class="form-inline container-fluid" method="post" mXattribut="action:urlAction">
 			<div class="card-body form">
 				<div class="row mb-1 w-100">
-<!-- 					<div class="col w-25"></div> -->
 					<div class="col">
 						<div class="input-group justify-content-center">
 								<span class="input-group-text"><i class="fa fa-lg fa-group"></i></span>
@@ -102,9 +99,8 @@
 								<span class="input-group-input"><input type="submit" class="form btn btn-outline-secondary" mXattribut="onclick:urlExport" MxAttribut="value:BtnExport" /></span>
 						</div>
 					</div>
-<!-- 					<div class="col w-25"></div> -->
 				</div>
-				<div class="row mt-5 mb-1 w-100">
+				<div class="row mt-3 mb-1 w-100">
 				<table class="table table-sm table-responsive-sm table-bordered table-striped table-hover" id="tabAdminUser">
 					<thead class="thead-default">
 						<tr>
diff --git a/data/template/qware/object_coordination/adminuser/changeuseradmin.mxt b/data/template/qware/object_coordination/adminuser/changeuseradmin.mxt
index a36b25a..a345f9b 100755
--- a/data/template/qware/object_coordination/adminuser/changeuseradmin.mxt
+++ b/data/template/qware/object_coordination/adminuser/changeuseradmin.mxt
@@ -60,11 +60,6 @@
 						</div>
 					</div>
 				</div>
-<!-- 			</div> -->
-			<!--<div class="card-header text-center">
-				<h3><mx:text id="formUser2"/></h3>
-			</div>-->
-<!-- 			<div class="card-body center-block"> -->
 				<div class="row mb-1 w-100">
 					<div class="col">
 						<div class="input-group">
@@ -104,12 +99,9 @@
 							<mx:formField id="user_fax" id="fax"/>
 						</div>
 					</div>
+					<div class="col"></div>
+					<div class="col"></div>
 				</div>
-<!-- 			</div> -->
-			<!--<div class="card-header text-center">
-				<h3><mx:text id="formUserIM"/></h3>
-			</div>-->
-<!-- 			<div class="card-body center-block"> -->
 				<div class="row mb-1 w-100">
 					<div class="col">
 						<div class="input-group">
@@ -136,7 +128,6 @@
 						</div>
 					</div>
 				</div>
-<!-- 			</div> -->
 			<div class="card-footer border-0 bg-white text-center">
 				<input type="reset" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReset" title="<mx:text id="ResetChange"/>" value="<mx:text id="BtnReset"/>" onclick="this.form.reset();"/>
 				<input type="button" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" name="BtnReturn" value="<mx:text id="BtnReturn"/>" onclick="history.back();"/>