diff --git a/data/message/fr/object.ini b/data/message/fr/object.ini index d22a854..2092620 100755 --- a/data/message/fr/object.ini +++ b/data/message/fr/object.ini @@ -20,7 +20,7 @@ methodactionuser = "Utiliser" classinstallmanager = "Installeur" methodactioninstall = "Administrer" -classhome = "Texte d'accueil de communauté" +classHome = "Texte d'accueil de communauté" classusermodif = "Mon compte personnel" classadminnode = "Gestion des espaces" TxtFormNode = "Configuration de l'outil de gestion des espaces" diff --git a/data/template/lcube6/object_coordination/coordinationobj/configuration.mxt b/data/template/lcube6/object_coordination/coordinationobj/configuration.mxt index e56891c..0dade34 100755 --- a/data/template/lcube6/object_coordination/coordinationobj/configuration.mxt +++ b/data/template/lcube6/object_coordination/coordinationobj/configuration.mxt @@ -1,83 +1,70 @@ - - -
- - - -
-
- -
-
- -
- +
+ + +
+ + + + + +
+
+

+
+
+
+
+
+ +
+ +
+ Picto +
+
+
+ +
+ +
+ + +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ " value="" onclick="this.form.reset();"/> + " onclick="history.back();"/> + +
+
+
-
-
-
-
/media/picto/object/defaultobject.gif" alt="Picto"/>
-
- -
- -
-
-
- -
-
-
- -
-
-
-
-
- - - diff --git a/lib/system/system_coordination/coordinationobj.php b/lib/system/system_coordination/coordinationobj.php index cfff70c..74cc58c 100755 --- a/lib/system/system_coordination/coordinationobj.php +++ b/lib/system/system_coordination/coordinationobj.php @@ -498,8 +498,13 @@ var $archivage= null; function configurePrint($url, $urlReturn, $groupIdPass, $nodeIdPass, $tabForbiddenPass) { /* gestion de la Template */ - addMessageFile("AdminObject.ini"); + addMessageFile("adminobject.ini"); + addMessageFile("adminnode.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"]; /* Récuperation du noeud à administrer sinon noeud d'entrée de l'admin */ $nodeId=($this->getData("nodeId")!="")?$this->getData("nodeId"):eid(); @@ -521,7 +526,8 @@ var $archivage= null; // --> recuperation du treeNode correspondant au noeurd $tabTreeNode[0]=$myTree; //--> treeNodeUnique.... - printTabTreeNode($tabTreeNode, $this->getNode(), "NODE", "node_id", false, ''); +// printTabTreeNode($tabTreeNode, $this->getNode(), "NODE", "node_id", false, ''); + printTabTreeNode($tabTreeNode, $this->getNode(), "NODE", "node_id", false, "", "", "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("TxtNodeIn"), ENT_QUOTES)."\""); /* -- Fin d'affichage des noeud d'ajout */ $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", $url); @@ -531,11 +537,23 @@ var $archivage= null; $name =getMessage("class".$value); $name =( (isset($name)) && ($name!="") )?$name:$value; +// var_dump($value); +// var_dump($name); +// var_dump($this->getId()); +// var_dump($this->getName($currentCode)); +// var_dump($this->getIcone()); + $GLOBALS['SYSTEM_TEMPLATE']->MxText("TxtContentType", $name); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("contentType", get_class($this)); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("objectId", $this->getId()); - $GLOBALS['SYSTEM_TEMPLATE']->MxText("resumeValue", $this->getResume()); + + +// $GLOBALS['SYSTEM_TEMPLATE']->MxText("resumeValue", $this->getResume()); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("resumeValue", "textarea", "resumeValue", $this->getResume(), "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("resumeObject"), ENT_QUOTES)."\"", getMessage("resumeObject")); + $GLOBALS['SYSTEM_TEMPLATE']->MxText("keyWordValue", $this->getKeyWord()); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("keyWordValue", "textarea", "keyWordValue", $this->getKeyWord(), "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("keywordObject"), ENT_QUOTES)."\"", getMessage("keywordObject")); + $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("parutionValue", $this->getParution()); $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("archivageValue", $this->getArchivage()); @@ -554,21 +572,18 @@ var $archivage= null; } @closedir($handle); asort($tabIcone); - $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("icone", "iconeN", $this->getIcone(), $tabIcone, '', '', 'onchange="javascript:imgPicto();" id="iconeN" '); - - /* gestion du lib en fonction de la langue courante */ - $currentCode=$GLOBALS["SYSTEM_USER_SESSION"]->langue->getCode(); - $defaultCode=$GLOBALS["SYSTEM_DEFAULT_LANGUAGE_CODE"]; + if ( $this->getIcone() == "") $nodeIcone = "defaultobject.gif"; else $nodeIcone = $this->getIcone(); + $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("icone", "iconeN", $nodeIcone, $tabIcone, 'Icône de l\'espace', '', 'onchange="javascript:imgPicto();" id="iconeN"', "class=\"form\" title=\"".htmlspecialchars(getMessage("TxtImage"), ENT_QUOTES)."\"", getMessage("TxtImage")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $chemintotal.$nodeIcone, $nodeIcone, "name=\"pictoObject\" id=\"pictoObject\""); for ($i=0; $igetIcone(); - $GLOBALS['SYSTEM_TEMPLATE']->MxImage("blocName.pictoLanguage", $img); - $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("blocName.nameInput", "name".$tab[$i]->getCode()); - + $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("blocName.pictoLanguage", $img); //Récupère le nom de l'objet dans la langue correspondante à la boucle $testnamenodeprint = $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("blocName.namelanguagevalue", htmlentitiesconv($this->getName($tab[$i]->getCode(), ENT_QUOTES))); - //var_dump($testnamenodeprint); +// $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("blocName.nameInput", "name".$tab[$i]->getCode()); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("blocName.nameInput", "text", "name".$tab[$i]->getCode(), $this->getName($tab[$i]->getCode()), "class=\"form\" required=\"true\" title=\"".htmlspecialchars(getMessage("nameObjectList"), ENT_QUOTES)."\"", getMessage("nameObjectList")); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocName", "loop"); } return "";