Fixed template lcube6 for tool configuration of adminobject object

This commit is contained in:
Rooty 2020-12-13 22:03:40 +01:00
parent e225955379
commit e5ce80d988
5 changed files with 272 additions and 266 deletions

View File

@ -21,7 +21,7 @@ TxtListRight = "Liste des droits accordés"
TxtTypeObject = "Type d'outil"
TxtNode = "(*) Dans l'espace : "
TxtImage = "(*) Icône : "
TxtImage = "Icône de l'outil"
TxtPerm = "Permissions"
TxtInstallObject = "Installation"
@ -53,7 +53,8 @@ deleteObject = "Voulez vous supprimer cet outil ? : "
nameObjectList = "Nom de l'outil"
classObject = "Type de brique"
resumeObject = "Resumé :"
resumeObject = "Resumé de l'outil"
keywordObject = "Mots clefs de l'outil"
TxtTreeWay = "Espace"
TxtRight = "Gestion des droits"
TxtPartage = "Partage"

View File

@ -1,4 +1,4 @@
<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">
@ -9,7 +9,7 @@
</mx:bloc id="TabeB">
</ul>
<div class="tab-content container px-2 py-2 border">
<div class="tab-content container-fluid px-2 py-2 w-75 border">
<div class="card w-100">
<form id="frmNode" name="frmNode" role="form" class="container form-inline" method="post" mXattribut="action:urlActionNode">
<input type="hidden" name="user_id" mXattribut="value:user_id" class="hidden"/>
@ -83,7 +83,7 @@
</tr>
</mx:bloc id="actionAdminObject">
</tbody>
<tfoot class="tfoot-default">
<!--<tfoot class="tfoot-default">
<tr>
<th>&nbsp;</th>
<th><mx:text id="nameObjectList"/></th>
@ -92,6 +92,6 @@
<th><mx:text id="TxtRight"/></th>
<th><mx:text id="ActionObject"/></th>
</tr>
</tfoot>
</tfoot>-->
</table>
</div>

View File

@ -1,4 +1,4 @@
<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">
@ -9,20 +9,27 @@
</mx:bloc id="TabeB">
</ul>
<div class="tab-content container px-2 py-2 border">
<form id="frmAddObject" method="post" mXattribut="action:urlAction">
<div class="fieldset">
<div class="legend"><mx:text id="TxtFormLegendAddObject"/></div>
<div class="field"><label for="contentType"><mx:text id="TxtAddObject"/></label>
<div class="tab-content container-fluid px-2 py-2 w-75 border">
<div class="card w-100">
<form id="frmAddObject" name="frmAddObject" role="form" class="container form-inline" method="post" mXattribut="action:urlAction">
<div class="card-body p-0 m-0 border-0">
<div class="row justify-content-center">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lg fa-indent"></i></span>
</div>
<select name="contentType" id="contentType">
<mx:bloc id="actionAdminClass">
<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>
</div>
</div>
<div class="action">
<input type="submit" name="BtnValid" mXattribut="value:BtnValid" class="save"/>
</div>
</div>
</form>
</div>
</div>

View File

@ -1,12 +1,4 @@
<script type="text/javascript">window.parent.document.title = "----------";</script>
<form id="configObject" method="post" mXattribut="action:urlAction">
<input type="hidden" name="urlReturn" mXattribut="value:urlActionReturn"/>
<input type="hidden" name="contentType" mXattribut="value:contentType"/>
<input type="hidden" name="objectId" mXattribut="value:objectId"/>
<div class="tabe">
<ul>
<li id="startTabe" class="WindowTabeData"></li>
<ul class="nav container nav-tabs border-bottom-0">
<mx:bloc id="TabeB">
<li mXattribut="class:TabeView">
<a mXattribut="href:UrlTabeView" mXattribut="class:ClassTabeView">
@ -15,11 +7,15 @@
</a>
</li>
</mx:bloc id="TabeB">
<li id="endTabe" class="WindowTabeData"></li>
</ul>
</div>
<fieldset class="framebox">
<div class="box">
</ul>
<form id="configObject" method="post" mXattribut="action:urlAction">
<input type="hidden" name="urlReturn" mXattribut="value:urlActionReturn"/>
<input type="hidden" name="contentType" mXattribut="value:contentType"/>
<input type="hidden" name="objectId" mXattribut="value:objectId"/>
<fieldset class="framebox">
<div class="box">
<div class="legend"><h2><mx:text id="TabeBTabeNameView"/></h2><p><mx:text id="configurationObject"/> (<mx:text id="TxtContentType"/>)</p></div>
<div class="tabe">
<ul>
@ -33,7 +29,7 @@
</ul>
</div>
<div class="box">
<div class="legend"><h2><mx:text id="TabeSecondTabeNameView"/></h2><p><mx:text id="TxtGeneral"/></p></div>
<div class="legend"><h2><mx:text id="TabeSecondTabeNameView"/></h2><p><mx:text id="TxtGeneral"/>2</p></div>
<div class="fieldset">
<div class="legend"><mx:text id="TxtFormLegend"/></div>
<div>
@ -75,8 +71,8 @@
</div>
<div class="info"><mx:text id="TxtField"/></div>
</div>
</div>
</fieldset>
</div>
</fieldset>
</form>
<script type="text/javascript">
//<![CDATA[

View File

@ -164,7 +164,7 @@ Class AdminObject extends CoordinationObj
$GLOBALS['SYSTEM_TEMPLATE']->MxText("langCode", $currentCode);
$GLOBALS['SYSTEM_TEMPLATE']->MxText("CurrentTemplate",$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.gif");
$GLOBALS['SYSTEM_TEMPLATE']->MxText("CurrentTemplate", $GLOBALS['CONF_DATA_PATH']."data/image/icons/object/defaultobject.gif");
if($optList==0)
{
@ -233,10 +233,7 @@ Class AdminObject extends CoordinationObj
$tabFatherTreeWay = $wayTreeNode->getFatherLibelleArray($currentCode);
$lib=$tabFatherTreeWay[0];
if ($lib=="")
{
$tabFatherTreeWay = $wayTreeNode->getFatherLibelleArray($defaultCode);
}
if ($lib==""){ $tabFatherTreeWay = $wayTreeNode->getFatherLibelleArray($defaultCode); }
}
else
{
@ -247,10 +244,7 @@ Class AdminObject extends CoordinationObj
$tabFatherTreeWay = $wayTreeNode->getFatherLibelleArray($currentCode);
$lib=$tabFatherTreeWay[0];
if ($lib=="")
{
$tabFatherTreeWay = $wayTreeNode->getFatherLibelleArray($defaultCode);
}
if ($lib==""){ $tabFatherTreeWay = $wayTreeNode->getFatherLibelleArray($defaultCode); }
}
/* Récupération des droits */
@ -275,11 +269,11 @@ Class AdminObject extends CoordinationObj
$resume =( (isset($resume)) && ($resume!=""))?$resume:$tabObject[$i]->getResume($defaultCode);
/* recuperation de l'icone */
if (file_exists($GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/".strtolower($tabObject[$i]->getIcone())) && ($tabObject[$i]->getIcone()!=""))
if (file_exists($GLOBALS['CONF_DATA_PATH']."data/image/icons/object/".$tabObject[$i]->getIcone()) && ($tabObject[$i]->getIcone()!=""))
{
$img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/".strtolower($tabObject[$i]->getIcone());
$img=$GLOBALS['CONF_DATA_PATH']."data/image/icons/object/".$tabObject[$i]->getIcone();
}else{
$img=$GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/object/defaultobject.gif";
$img=$GLOBALS['CONF_DATA_PATH']."data/image/icons/object/defaultobject.gif";
}
/* gestion de la template */
@ -447,13 +441,13 @@ Class AdminObject extends CoordinationObj
{
$this->autoRegister();
/* On inclus la template (voir package.template.php) */
withBlocPath("adminobject", "addobjectadmin");
/* Ajout du fichier AdminObject.ini */
addMessageFile("adminobject.ini");
addMessageFile("object.ini");
/* On inclus la template (voir package.template.php) */
withBlocPath("adminobject", "addobjectadmin");
/* creation des onglets principaux */
$this->tabeCreate();
@ -508,6 +502,11 @@ Class AdminObject extends CoordinationObj
{
$this->autoRegister();
mxPageTitle("createNewObjectAdminTitlePage");
$arrayRawJs[] = "function imgPicto(){if(document.getElementById){if(document.getElementById(\"configObject\")){document.getElementById(\"pictoObject\").src=\"data/image/icons/object/\"+document.getElementById(\"configObject\").iconeN.options[(document.getElementById(\"configObject\").iconeN.selectedIndex)].value;}}else if(document.all){if(document.all[\"configObject\"]){document.all[\"pictoObject\"].src=\"data/image/icons/object/\"+document.all[\"configObject\"].iconeN.options[(document.all[\"configObject\"].iconeN.selectedIndex)].value;}}}imgPicto();";
mxRawJs($arrayRawJs);
$nodeId=($this->getData("nodeId")!="")?$this->getData("nodeId"):eid();
$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 */
@ -593,6 +592,9 @@ Class AdminObject extends CoordinationObj
{
$this->autoRegister();
$arrayRawJs[] = "function imgPicto(){if(document.getElementById){if(document.getElementById(\"configObject\")){document.getElementById(\"pictoObject\").src=\"data/image/icons/object/\"+document.getElementById(\"configObject\").iconeN.options[(document.getElementById(\"configObject\").iconeN.selectedIndex)].value;}}else if(document.all){if(document.all[\"configObject\"]){document.all[\"pictoObject\"].src=\"data/image/icons/object/\"+document.all[\"configObject\"].iconeN.options[(document.all[\"configObject\"].iconeN.selectedIndex)].value;}}}imgPicto();";
mxRawJs($arrayRawJs);
/* Récuperation du radio sélectionné */
$optList=(( (isset($_POST["optList"])) && ($_POST["optList"]!="") )?$_POST["optList"]:((isset($_GET["optList"]) && ($_GET["optList"]!=""))?$_GET["optList"]:0));
/* On récupère la valeur postée de sélection du noeud */