From 93d66aeceed9df3661b39d2fa59f41f3a69b6ae9 Mon Sep 17 00:00:00 2001
From: "tristan.champomier" <rooty@rooty.me>
Date: Mon, 14 Dec 2020 01:29:25 +0100
Subject: [PATCH] Fixed template lcube6 for default admin rights template of
 coordination objects

---
 data/message/fr/datatables_rightadmin.txt     |  17 ++
 .../adminobject/rightadmin.mxt                | 218 ++++++++----------
 .../adminobject/adminobject.php               |  32 ++-
 3 files changed, 133 insertions(+), 134 deletions(-)
 create mode 100755 data/message/fr/datatables_rightadmin.txt

diff --git a/data/message/fr/datatables_rightadmin.txt b/data/message/fr/datatables_rightadmin.txt
new file mode 100755
index 0000000..9417cee
--- /dev/null
+++ b/data/message/fr/datatables_rightadmin.txt
@@ -0,0 +1,17 @@
+{
+	"sProcessing":   "Working...",
+	"sLengthMenu":   "Afficher _MENU_ droits",
+	"sZeroRecords":  "Aucun droit à afficher",
+	"sInfo":         "Affiche les droits _START_ à _END_ sur _TOTAL_ droit(s)",
+	"sInfoEmpty":    "Aucun droit à afficher",
+	"sInfoFiltered": "(filtré depuis un total de _MAX_ total droit(s))",
+	"sInfoPostFix":  "",
+	"sSearch":       "Recherche&nbsp;:",
+	"sUrl":          "",
+	"oPaginate": {
+		"sFirst":    "Première",
+		"sPrevious": "Précédente",
+		"sNext":     "Suivante",
+		"sLast":     "Dernière"
+	}
+}
diff --git a/data/template/lcube6/object_coordination/adminobject/rightadmin.mxt b/data/template/lcube6/object_coordination/adminobject/rightadmin.mxt
index 3b652d4..7eb90c4 100755
--- a/data/template/lcube6/object_coordination/adminobject/rightadmin.mxt
+++ b/data/template/lcube6/object_coordination/adminobject/rightadmin.mxt
@@ -1,9 +1,4 @@
-<script type="text/javascript" src="data/javascript/jquery.min.js"></script>
-<script type="text/javascript" src="data/javascript/jquery.ui.min.js"></script>
-<script type="text/javascript" src="data/javascript/jquery.tools.min.js"></script>
-<script type="text/javascript" src="data/javascript/jquery.datatables.min.js"></script>
-
-<ul class="nav container nav-tabs border-bottom-0">
+<ul class="nav container-fluid nav-tabs w-75 border-bottom-0">
 	<mx:bloc id="TabeB">
 	<li mXattribut="class:TabeView">
 		<a mXattribut="href:UrlTabeView" mXattribut="class:ClassTabeView">
@@ -13,131 +8,102 @@
 	</li>
     </mx:bloc id="TabeB">
 </ul>
-
-<div class="tab-content container px-2 py-2 border">
-	<!-- pour les infos courantes de l'interface -->
-	 <div class="legend">
-<!-- 		<h2><mx:text id="TabeBTabeNameView"/></h2> -->
-		<p><h3><strong><mx:text id="ObjectName"/> (<mx:text id="ObjectType"/>) <mx:text id="nbRight"/> <mx:text id="TxtNbRight"/></strong></h3></p>
-	</div> 
-	<div class="tabe">
-		<ul>
-		<li id="startTabe" class="WindowTabeData"><a mXattribut="class:ClassTabeView">&nbsp;</a></li>
+<div class="tab-content container-fluid px-2 py-2 w-75 border">
+	<ul class="nav container-fluid nav-tabs border-bottom-0">
 		<mx:bloc id="TabeSecond">
-			<li mXattribut="class:TabeView"><a mXattribut="href:UrlTabeView"  mXattribut="class:ClassTabeView"><i class="mr-1 fa fa-lg fa-<mx:text id="pictoTabe"/>"></i><mx:text id="TabeNameView"/></a></li>
+			<li mXattribut="class:TabeView">
+			<a mXattribut="href:UrlTabeView" mXattribut="class:ClassTabeView"><i class="mr-1 fa fa-lg fa-<mx:text id="pictoTabe"/>"></i><mx:text id="TabeNameView"/></a>
+			</li>
 		</mx:bloc id="TabeSecond">
-		<li id="endTabe" class="WindowTabeData"><a mXattribut="class:ClassTabeView">&nbsp;</a></li>
-		</ul>
-	</div>
-	<div class="fieldset">
-	<div class="box">
-		<!-- <div class="legend"><h2><mx:text id="TabeSecondTabeNameView"/></h2><p><mx:text id="TxtRightInformation"/></p></div> -->
-		<form name="configObject" method="post" mXattribut="action:urlAction">
-		<input type="hidden" name="urlReturn" mXattribut="value:urlReturn" class="hidden"/>
-		<div class="fieldset">
-			<div class="legend"><mx:text id="TxtAddRight"/></div>
-			<div class="field"><label><mx:text id="TxtAddNode"/></label><mx:select id="listNode"/></div>
-			<div class="field"><label><mx:text id="TxtAddMethod"/></label><mx:select id="METHOD"/></div>
-			<div class="action">&nbsp;&nbsp;<a href="javascript:visible('detail');" ><mx:text id="TxtDetail"/></a><br/>&nbsp;</div>
-			<div id="detail" style="display:none">
-				<div class="field">
-					<label><mx:text id="TxtAddGroup"/></label><mx:select id="GROUP"/>
+	</ul>
+	<div class="tab-content container-fluid px-2 py-2 w-100 border">
+		<form id="configObject" name="configObject" role="form" class="form text-center px-0" method="post" mXattribut="action:urlAction">
+			<input type="hidden" name="urlReturn" mXattribut="value:urlReturn"/>
+			<div class="card w-100 mb-0">
+				<div class="card-header">
+					<h3><mx:text id="ObjectName"/> (<mx:text id="ObjectType"/>) <mx:text id="nbRight"/> <mx:text id="TxtNbRight"/></h3>
 				</div>
-				<div class="field">
-					<label><mx:text id="TxtAddUser"/></label><mx:select id="USER"/>
+				<div class="card-title">
+					<h3><mx:text id="TabeSecondTabeNameView"/></h2><p><mx:text id="TxtRightInformation"/></h3>
+				</div>
+				<div class="card-header">
+					<h3><mx:text id="TxtAddRight"/></h3>
+				</div>
+				<div class="card-body">
+					<div class="row mb-2">
+						<div class="input-group col-xs-12 col-sm-8 col-lg-4 p-0 m-0">
+							<div class="input-group-prepend">
+								<span class="input-group-text"><i class="fa"><mx:text id="TxtAddNode"/></i></span>
+							</div>
+							<mx:select id="listNode"/>
+						</div>
+						<div class="input-group col-xs-12 col-sm-8 col-lg-4 p-0 m-0">
+							<div class="input-group-prepend">
+								<span class="input-group-text"><i class="fa"><mx:text id="TxtAddMethod"/></i></span>
+							</div>
+							<mx:select id="METHOD"/>
+						</div>
+						<div class="input-group col-xs-12 col-sm-8 col-lg-4 p-0 m-0">
+							<div class="input-group-prepend">
+								<span class="input-group-text"><i class="fa fa-lg fa-unlock"></i></span>
+							</div>
+							<a class="btn btn-outline-secondary btn-lg btn-sm" data-toggle="collapse" href="#collapseDetail" role="button" aria-expanded="false" aria-controls="collapseDetail">
+								<mx:text id="TxtDetail"/>
+							</a>
+						</div>
+					</div>
+					<div class="row collapse" id="collapseDetail">
+						<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"><mx:text id="TxtAddGroup"/></i></span>
+							</div>
+							<mx:select id="GROUP"/>
+						</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"><mx:text id="TxtAddUser"/></i></span>
+							</div>
+							<mx:select id="USER"/>
+						</div>
+					</div>
+				</div>
+				<div class="card-footer border-0 bg-white text-center">
+					<input type="reset" name="BtnReset" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" title="<mx:text id="BtnReset"/>" value="<mx:text id="BtnReset"/>" onclick="this.form.reset();"/>
+					<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="BtnValid" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" mXattribut="value:BtnValid"/>
+				</div>
+				<div class="card-header">
+					<h3><mx:text id="TxtListRight"/></h3>
+				</div>
+				<div class="card-body">
+					<table class="table table-sm table-responsive-sm table-bordered table-striped table-hover" id="tabRightAdmin" mXattribut="summary:TxtListright">
+					<thead class="thead-default">
+						<tr>
+							<th><mx:text id="TxtGroupName_without_dots"/></th>
+							<th><mx:text id="TxtUserName_without_dots"/></th>
+							<th><mx:text id="TxtMethodName"/></th>
+							<th><mx:text id="TxtTreeWay"/></th>
+							<th data-orderable="false"><mx:text id="ActionObject"/></th>
+						</tr>
+					</thead>
+					<tbody>
+						<mx:bloc id="RIGHT">
+						<tr>
+							<td><mx:text id="GroupName"/></td>
+							<td><mx:text id="UserFirstName"/> <mx:text id="UserLastName"/></td>
+							<td><mx:text id="MethodName"/></td>
+							<td><mx:text id="NodeName"/></td>
+							<td>
+							<mx:bloc id="DELETE">
+								<a class="fa fa-lg fa-trash text-danger" mXattribut="href:urlDeleteObject" mXattribut="title:BtnDelete"></a>
+							</mx:bloc id="DELETE">
+							</td>
+						</tr>
+						</mx:bloc id="RIGHT">
+					</tbody>
+					</table>
 				</div>
 			</div>
-			<div class="action">
-				<input type="submit" name="BtnValid" mXattribut="value:BtnValid" class="save"/>
-			</div>
-		</div>
 		</form>
-		<div class="fieldset">
-		<div class="legend"><mx:text id="TxtListRight"/></div>
-		<div class="legende">
-				<mx:text id="TxtLegend"/>
-				<div class="linkdelete">&nbsp;</div><mx:text id="BtnDelete"/>
-		</div>
-<!-- 		<div id="TableauJsOrder"> -->
-		<table cellspacing="0" id="tabRightAdmin" class="display" mXattribut="summary:TxtListright">
-		<thead>
-			<tr>
-				<th class="header"><mx:text id="TxtGroupName_without_dots"/></th>
-				<th class="header"><mx:text id="TxtUserName_without_dots"/></th>
-				<th class="header"><mx:text id="TxtMethodName"/></th>
-				<th class="header"><mx:text id="TxtTreeWay"/></th>
-				<th class="header"><mx:text id="ActionObject"/></th>
-			</tr>
-		</thead>
-		<tbody>
-			<mx:bloc id="RIGHT">
-			<tr mXattribut="class:lineStyle">
-				<td><mx:text id="GroupName"/></td>
-				<td><mx:text id="UserFirstName"/> <mx:text id="UserLastName"/></td>
-				<td><mx:text id="MethodName"/></td>
-				<td><mx:text id="NodeName"/></td>
-				<td>
-				<mx:bloc id="DELETE">
-					<a mXattribut="href:urlDeleteObject" class="linkdelete" mXattribut="title:BtnDelete"></a>
-				</mx:bloc id="DELETE">
-				</td>
-			</tr>
-			</mx:bloc id="RIGHT">
-		</tbody>
-		</table>
-<!-- 		</div> -->
-		</div>
-	</div>
 	</div>
 </div>
-<script>
-//<![CDATA[
-$(document).ready(function() 
-{ 
-      $('#tabRightAdmin').dataTable( {
-	      "bPaginate": true,
-	      "sPaginationType": "full_numbers",
-	      "bAutoWidth": true,
-      // 	"bSort": true,
-	      "aaSorting": [[ 0, "asc" ]],
-	      "iDisplayLength": 10,
-	      "aLengthMenu": [[5, 10, 25, -1], [5, 10, 25, "All"]],
-		"oLanguage": {
-			"sUrl": "data/message/<mx:text id="langCode"/>/datatables_rightadmin.txt"
-		}
-      } );
-} 
-);
-// ]]>
-</script>
-<script type="text/javascript">
-//<![CDATA[
-function visible(element)
-{
-	// cas ns6
-	if (document.getElementById)
-	{
-		if (document.getElementById(element).style.display=='none')
-		{
-			document.getElementById(element).style.display='';
-		}
-		else
-		{
-			document.getElementById(element).style.display='none';
-		}
-	}
-	// cas ie 5.5
-	else if (document.all)
-	{
-		if (document.all[element].style.display=='none')
-		{
-			document.all[element].style.display='';
-		}
-		else
-		{
-			document.all[element].style.display='none';
-		}
-	}
-}
-// ]]>
-</script>
diff --git a/lib/object_coordination/adminobject/adminobject.php b/lib/object_coordination/adminobject/adminobject.php
index bfe8ef3..d88b63f 100755
--- a/lib/object_coordination/adminobject/adminobject.php
+++ b/lib/object_coordination/adminobject/adminobject.php
@@ -905,12 +905,33 @@ Class AdminObject extends CoordinationObj
 */
 	function rightAdmin()
 	{
-		/* On inclus la template (voir package.template.php) */
-		withBlocPath("AdminObject", "rightAdmin");
-
 		/* Ajout du fichier AdminObject.ini pour les traductions */
 		addMessageFile("adminobject.ini");
 		addMessageFile("object.ini");
+		
+		/* gestion du lib en fonction de la langue courante */
+		$currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode();
+		$defaultCode=$GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"];
+		/* -- fin récupération des codes par defaut */
+		
+		mxPageTitle("");
+		
+		$arrayCallCss = array();
+		$arrayCallCss[] = "data/css/dataTables.bootstrap4/1.10.22/dataTables.bootstrap4.min.css";
+		$arrayCallCss[] = "data/css/bootstrap-toggle/2.2.2/bootstrap-toggle.min.css";
+		mxCallCss($arrayCallCss);
+
+		$arrayCallJs = array();
+		$arrayCallJs[] = "data/javascript/jquery.dataTables/1.10.22/jquery.dataTables.min.js";
+		$arrayCallJs[] = "data/javascript/dataTables.bootstrap4/1.10.22/dataTables.bootstrap4.min.js";
+		$arrayCallJs[] = "data/javascript/bootstrap-toggle/2.2.2/bootstrap-toggle.min.js";
+		mxCallJs($arrayCallJs);
+		
+		$arrayRawJs[] = "\$(document).ready(function(){\$(\"#tabRightAdmin\").dataTable({\"bPaginate\": true,\"sPaginationType\": \"full_numbers\",\"bAutoWidth\": true,\"aaSorting\": [[ 0, \"asc\" ]],\"iDisplayLength\": 10,\"aLengthMenu\": [[5, 10, 25, -1], [5, 10, 25, \"All\"]],\"oLanguage\": {\"sUrl\": \"data/message/".$currentCode."/datatables_rightadmin.txt\"}});});";
+		mxRawJs($arrayRawJs);
+		
+		/* On inclus la template (voir package.template.php) */
+		withBlocPath("AdminObject", "rightAdmin");
 
 		/* Récuperation du radio sélectionné */
 		$optList=(( (isset($_POST["optList"])) && ($_POST["optList"]!="") )?$_POST["optList"]:((isset($_GET["optList"]) && ($_GET["optList"]!=""))?$_GET["optList"]:0));
@@ -956,11 +977,6 @@ Class AdminObject extends CoordinationObj
 		/* Récupération des objets de la communautée dans SYSTEM_CONTROL */
 		$tabObject		=$GLOBALS["SYSTEM_MANAGER"]["COORDINATION_OBJ"]->createInstanceFromNodeIds($arrayOfNodes);
 
-		/* gestion du lib en fonction de la langue courante */
-		$currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode();
-		$defaultCode=$GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"];
-		/* -- fin récupération des codes par defaut */
-
 		// Verification de l'administrabilitée de l'objets
 		$isValid=false;
 		for ($i=0; $i<count($tabObject); $i++)