diff --git a/data/template/lcube6/object_coordination/adminobject/rightdeleteadmin.mxt b/data/template/lcube6/object_coordination/adminobject/rightdeleteadmin.mxt index 5d07a18..88286b6 100755 --- a/data/template/lcube6/object_coordination/adminobject/rightdeleteadmin.mxt +++ b/data/template/lcube6/object_coordination/adminobject/rightdeleteadmin.mxt @@ -1,8 +1,22 @@ -
-
+
+ + +
+
+

()

+
+ + +
+ +
+ + + +
-
()
- + +
:

@@ -24,5 +38,5 @@
- -
+ + diff --git a/data/template/lcube6/object_coordination/coordinationobj/delete.mxt b/data/template/lcube6/object_coordination/coordinationobj/delete.mxt index b20dad8..79217a7 100755 --- a/data/template/lcube6/object_coordination/coordinationobj/delete.mxt +++ b/data/template/lcube6/object_coordination/coordinationobj/delete.mxt @@ -1,55 +1,49 @@ - - -
-
- -
-
-
- - -
- +
+ -
-
- - - -
: -

-
-
: -

-
-
- " class="back" onclick="javascript:window.location.href=''"/> - + +
+ + + +
+
+

+
+
+

#TODO: Details about tool deletion

+
+
+
+ : +
+ +
+ : +
+ +
+
+
+
+ " onclick="history.back();"/> + +
+
+
-
-
- diff --git a/lib/object_coordination/adminobject/adminobject.php b/lib/object_coordination/adminobject/adminobject.php index d88b63f..5fe79c9 100755 --- a/lib/object_coordination/adminobject/adminobject.php +++ b/lib/object_coordination/adminobject/adminobject.php @@ -1255,12 +1255,34 @@ Class AdminObject extends CoordinationObj */ function rightDeleteAdmin() { - /* On inclus la template (voir package.template.php) */ - withBlocPath("AdminObject", "rightDeleteAdmin"); - /* 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(){\$(\"#tabAdminObject\").dataTable({\"bPaginate\": true,\"sPaginationType\":\"full_numbers\",\"bAutoWidth\": true,\"bSort\": true,\"aaSorting\": [[ 1, \"asc\" ]],\"iDisplayLength\": 10,\"aLengthMenu\": [[5, 10, 25, -1], [5, 10, 25, \"All\"]],\"oLanguage\":{\"sUrl\": \"data/message/".$currentCode."/datatables_adminobject.txt\"}});});"; +// mxRawJs($arrayRawJs); + + /* On inclus la template (voir package.template.php) */ + withBlocPath("AdminObject", "rightDeleteAdmin"); + $this->tabeCreate(); /* Récuperation du radio sélectionné */ @@ -1295,11 +1317,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