From 80f379eb40d98a5f3704034173e85c6dc219095a Mon Sep 17 00:00:00 2001 From: Rooty Date: Wed, 21 Aug 2024 23:03:55 +0200 Subject: [PATCH] Fixed template files of adminobject, adminentrynode and coordination objects (bootstrap upgrade) --- data/message/fr_FR-utf8/adminobject.ini | 6 +- data/message/fr_FR-utf8/main.ini | 2 +- .../adminentrynode/configuration.mxt | 95 ++++++++----------- .../adminobject/configuration.mxt | 40 ++++---- .../adminobject/rightadmin.mxt | 84 ++++++++-------- .../adminobject/rightdeleteadmin.mxt | 16 ++-- .../coordinationobj/configuration.mxt | 90 +++++++++--------- .../adminobject/adminobject.php | 8 +- 8 files changed, 158 insertions(+), 183 deletions(-) diff --git a/data/message/fr_FR-utf8/adminobject.ini b/data/message/fr_FR-utf8/adminobject.ini index f43b01b..46e33cf 100755 --- a/data/message/fr_FR-utf8/adminobject.ini +++ b/data/message/fr_FR-utf8/adminobject.ini @@ -20,7 +20,7 @@ TxtAddRecur = "Appliquer ce droit pour tous les sous-répertoires." TxtListRight = "Liste des droits accordés" TxtTypeObject = "Classe de l'outil" -TxtNode = "(*) Dans l'espace : " +TxtNode = "Espace : " TxtImage = "Icône de l'outil" TxtPerm = "Permissions" TxtInstallObject = "Installation" @@ -28,8 +28,8 @@ TxtInstallObject = "Installation" TxtGroup = "Groupes" TxtInfoPrincipal= "Saisie des informations" TxtConfiguration = "Configuration de l'outil (comportement)" -TxtNodeAdmin = "(*) Administre les outils depuis le l'espace :" -TxtGroupAdmin = "(*) Administre les groupes d'utilisateurs depuis le groupe :" +TxtNodeAdmin = "Administrer depuis l'espace :" +TxtGroupAdmin = "Administrer depuis le groupe :" TxtGroupAdminMultiple = "(*) Afficher les groupes suivants (CTRL clic = sélection multiple) :" TxtMethodName = "Droits" diff --git a/data/message/fr_FR-utf8/main.ini b/data/message/fr_FR-utf8/main.ini index fb7a7d7..f3a610a 100755 --- a/data/message/fr_FR-utf8/main.ini +++ b/data/message/fr_FR-utf8/main.ini @@ -124,7 +124,7 @@ TxtTabeView = "Visualiser" TxtTabePreview = "Prévisualiser" TxtTabeAdmin = "Administrer" TxtTabeAdd = "Ajouter" -TxtDetail = "Pour affecter des droits spécifiques cliquer ici" +TxtDetail = "Droits spécifiques" TextListSubject = "Agenda" TxtMyAccount = "Mon Compte" TxtTabeWrite = "Rédiger" diff --git a/data/template/qware/object_coordination/adminentrynode/configuration.mxt b/data/template/qware/object_coordination/adminentrynode/configuration.mxt index c18edae..6a108b4 100755 --- a/data/template/qware/object_coordination/adminentrynode/configuration.mxt +++ b/data/template/qware/object_coordination/adminentrynode/configuration.mxt @@ -1,14 +1,4 @@ - -
+
  • @@ -16,68 +6,63 @@
-
-
+
+ -
-
+
+

()

-
-
-
-
- -
- -
+
+
+
+
+
-
- -
- +
+
+ + + +
+
+
+
+
+ +
- -
-
-
- -
-
- -
-
-
-
-
- +
+
+
+ +
+
+
+
+
-
-
-

-
-
-
-
-
- +

+
+
+
+
+
-
-
-
- +
+
+
-
diff --git a/data/template/qware/object_coordination/adminobject/configuration.mxt b/data/template/qware/object_coordination/adminobject/configuration.mxt index 6b4a53c..35cb991 100755 --- a/data/template/qware/object_coordination/adminobject/configuration.mxt +++ b/data/template/qware/object_coordination/adminobject/configuration.mxt @@ -1,4 +1,4 @@ -
    + +
    • @@ -16,18 +16,16 @@
    -
    - +
    + -
    -
    -

    ()

    -
    -
    -
    -
    +
    +

    ()

    +
    +
    +
    @@ -36,7 +34,7 @@
    -
    +
    @@ -46,15 +44,15 @@
    -
    +
    -
    +
    -
    +
    @@ -67,13 +65,13 @@
    -
    +
    -
    +
    @@ -85,7 +83,7 @@
    -
    +
    @@ -93,7 +91,7 @@
    -
    +
    preview
    @@ -106,7 +104,7 @@
    -
    +
    diff --git a/data/template/qware/object_coordination/adminobject/rightadmin.mxt b/data/template/qware/object_coordination/adminobject/rightadmin.mxt index ec34dd3..ee8e336 100755 --- a/data/template/qware/object_coordination/adminobject/rightadmin.mxt +++ b/data/template/qware/object_coordination/adminobject/rightadmin.mxt @@ -1,4 +1,4 @@ -
      + +
      • @@ -16,54 +16,48 @@
      -
      - +
      + -
      -
      -

      ()

      -
      -
      +
      +

      ()

      + +

      +
      +
      +
      +
      +
      -
      -
      -
      - +
      +
      +
      - -
      -
      -
      - -
      -
      -
      -
      -
      - +
      +
      +
      + +
      -
      -
      -
      - +
      +
      +
      +
      + +
      +
      +
      +
      +
      -
      @@ -72,7 +66,7 @@ " onclick="history.back();"/>
      -
      +

      @@ -94,9 +88,9 @@ - - - + + + diff --git a/data/template/qware/object_coordination/adminobject/rightdeleteadmin.mxt b/data/template/qware/object_coordination/adminobject/rightdeleteadmin.mxt index 51c92dc..5311664 100755 --- a/data/template/qware/object_coordination/adminobject/rightdeleteadmin.mxt +++ b/data/template/qware/object_coordination/adminobject/rightdeleteadmin.mxt @@ -1,22 +1,22 @@ -
      - +
      + -
      -
      +
      +

      ()

      -
      +
      :
      -
      +
      :
      -
      +
      :
      -
      +
      : 
      diff --git a/data/template/qware/object_coordination/coordinationobj/configuration.mxt b/data/template/qware/object_coordination/coordinationobj/configuration.mxt index 0f9f57f..b06e9b1 100755 --- a/data/template/qware/object_coordination/coordinationobj/configuration.mxt +++ b/data/template/qware/object_coordination/coordinationobj/configuration.mxt @@ -1,4 +1,4 @@ -
        + +
        • @@ -16,55 +16,53 @@
        -
        - - - - - -
        -
        -

        -
        -
        -
        -
        -
        - +
        +
        + +

        + + + +
        +
        +
        +
        + + Picto +
        - -
        - Picto +
        +
        + + + +
        +
        +
        +
        + +
        -
        - -
        - +
        +
        +
        + +
        +
        +
        +
        + +
        - -
        -
        -
        - -
        -
        - -
        +
        + " value=""/> + "/> +
        - -
        -
        -
        -
        -
        - " value="" onclick="this.form.reset();"/> - " onclick="history.back();"/> - -
        -
        - + +
        diff --git a/lib/object_coordination/adminobject/adminobject.php b/lib/object_coordination/adminobject/adminobject.php index fec0eb0..6c65997 100755 --- a/lib/object_coordination/adminobject/adminobject.php +++ b/lib/object_coordination/adminobject/adminobject.php @@ -532,7 +532,7 @@ Class AdminObject extends CoordinationObj addMessageFile("adminobject.ini"); /* creation des onglets principaux */ - $this->tabeCreate(); + // $this->tabeCreate(); $this->subTabeInstallCreate(); return $data; /* donne le retour de __createObject */ @@ -653,7 +653,7 @@ Class AdminObject extends CoordinationObj addMessageFile("adminobject.ini"); /* creation des onglets principaux */ - $this->tabeCreate(); + // $this->tabeCreate(); $this->subTabeCreate($obj->getId()); return $data; /* donne le retour de __updateObject */ @@ -805,7 +805,7 @@ Class AdminObject extends CoordinationObj addMessageFile("adminobject.ini"); /* creation des onglets principaux */ - $this->tabeCreate(); + // $this->tabeCreate(); $this->subTabeCreate($obj->getId()); return $data; /* donne le retour de __deleteObject */ @@ -946,7 +946,7 @@ Class AdminObject extends CoordinationObj $tabAllowed=(is_array($this->getData("tabAllowed")))?$this->getData("tabAllowed"):$GLOBALS["SYSTEM_REGISTER"]["COORDINATION_OBJ"]; $groupId=($this->getData("groupId")!="")?$this->getData("groupId"):1; /* Tous les Groupes par défaut */ $objectId=( (isset($_GET["objectId"])) && ($_GET["objectId"]!="") )?$_GET["objectId"]:NULL; - $this->tabeCreate(); + // $this->tabeCreate(); $this->subTabeCreate($objectId); # --> A voir en fonction des restrictions des objets