From b1eab25a803c3177e5fccd3ca654e4aa54d57593 Mon Sep 17 00:00:00 2001
From: "tristan.champomier" <rooty@rooty.me>
Date: Sun, 13 Dec 2020 23:41:14 +0100
Subject: [PATCH] Fixed template lcube6 for tool configuration of adminobject
 object

---
 .../adminobject/configuration.mxt             | 224 ++++++++++--------
 .../adminobject/adminobject.php               |   2 +-
 2 files changed, 122 insertions(+), 104 deletions(-)

diff --git a/data/template/lcube6/object_coordination/adminobject/configuration.mxt b/data/template/lcube6/object_coordination/adminobject/configuration.mxt
index 12013ce..2ca6aa7 100755
--- a/data/template/lcube6/object_coordination/adminobject/configuration.mxt
+++ b/data/template/lcube6/object_coordination/adminobject/configuration.mxt
@@ -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">
@@ -8,106 +8,124 @@
 	</li>
     </mx:bloc id="TabeB">
 </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>
-				<li id="startTabe" class="WindowTabeData"></li>
-				<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>
-				</mx:bloc id="TabeSecond">
-				<li id="endTabe" class="WindowTabeData"></li>
-				</ul>
+<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>
+		</mx:bloc id="TabeSecond">
+	</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:urlActionReturn"/>
+			<input type="hidden" name="contentType" mXattribut="value:contentType"/>
+			<input type="hidden" name="objectId" mXattribut="value:objectId"/>
+			<div class="card w-100 mb-0">
+				<div class="card-header">
+					<h3><mx:text id="configurationObject"/> (<mx:text id="TxtContentType"/>)</h3>
+				</div>
+				<div class="card-body">
+					<div class="row mb-2">
+						<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 fa-lg fa-file-picture-o"></i></span>
+							</div>
+							<mx:select id="icone"/>
+							<div class="input-group-append">
+								<span class="input-group-text"><mx:image id="pictoObject"/></span>
+							</div>
+						</div>
+						<div class="input-group col-xs-12 col-sm-8 col-lg-6 p-0 m-0">
+							<mx:bloc id="blocName">
+							<div class="input-group-prepend">
+								<span class="input-group-text"><i class="fa"><mx:image id="pictoLanguage"/></i></span>
+							</div>
+							<mx:formField id="nameInput"/>
+							</mx:bloc id="blocName">
+						</div>
+					</div>
+					<div class="row mb-2">
+						<div class="input-group col-xs-12 col-sm-8 col-lg-6 p-0 m-0">
+							<mx:formField id="resumeValue"/>
+						</div>
+						<div class="input-group col-xs-12 col-sm-8 col-lg-6 p-0 m-0">
+							<mx:formField id="keyWordValue"/>
+						</div>
+					</div>
+					<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="TxtNode"/></i></span>
+							</div>
+							<mx:select id="NODE" id="node"/>
+						</div>
+					</div>
+				</div>
+				<div class="card-header">
+					<h3><mx:text id="TxtConfiguration"/></h3>
+				</div>
+				<div class="card-body">
+					<div class="row mb-2">
+						<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="TxtNodeAdmin"/></i></span>
+						</div>
+ 						<mx:select id="NODE_ADMIN" id="nodeadmin"/>
+					</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="TxtGroupAdmin"/></i></span>
+						</div>
+ 						<mx:select id="GROUP_ADMIN" id="group"/>
+					</div>
+				</div>
+				<div class="card-header">
+					<h3><mx:text id="TxtTemplateAdmin"/></h3>
+				</div>
+				<div class="card-body">
+					<div class="row mb-2">
+						<div class="form-inline col-xs-12 col-sm-8 col-lg-6 p-0 m-0">
+							<div class="input-group">
+								<div class="input-group-prepend">
+									<span class="input-group-text"><i class="fa fa-lg fa-picture-o"></i></span>
+								</div>
+								<mx:select id="TEMPLATE_ADMIN" onchange="javascript:imgTemplate();"/>
+							</div>
+						</div>
+						<div class="form-inline col-xs-12 col-sm-8 col-lg-6 p-0 m-0">
+							<div class="input-group">
+	<!-- 							<mx:image id="screenTemplate" id="screenTemplate"/> -->
+								<img name="screenTemplate" id="screenTemplate" src="data/template/lcube6/preview.png" class="preview" alt="preview"/></div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="card-header">
+					<h3><mx:text id="briquesList"/></h3>
+				</div>
+				<div class="card-body">
+					<div class="row mb-2">
+						<mx:bloc id="actionAdminClass">
+							<div class="input-group col-xs-12 col-sm-8 col-lg-3 p-0 m-0">
+								<div class="input-group-prepend w-75">
+									<mx:text id="className"/>
+								</div>
+								<div class="input-group-append w-25">
+									<mx:checker id="classId"/>
+								</div>
+							</div>
+						</mx:bloc id="actionAdminClass">
+					</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>
-			<div class="box">
-				<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>
-					<div class="field"><label for="iconeN" class="require"><mx:text id="TxtImage"/></label><img name="pictoObject" id="pictoObject" src="data/template/default/media/picto/object/DefaultObject.gif" alt="picto"/><mx:select id="icone" class="selectsmall"/></div>
-					<div class="field"><label for="nameInput" class="require"><mx:text id="nameObject"/></label>
-					<mx:bloc id="blocName">
-						<mx:image id="pictoLanguage"/><input type="text" mXattribut="value:namelanguagevalue" mXattribut="name:nameInput" id="nameInput"/>
-					</mx:bloc id="blocName">
-					</div>
-					<div class="field"><label for="resume"><mx:text id="resumeLanguage"/> :</label><textarea class="textareacomm" name="resume" id="resume"><mx:text id="resumeValue"/></textarea></div>
-					<div class="field"><label for="keyword"><mx:text id="keyword"/> :</label><textarea class="textareacomm" name="keyWord" id="keyword"><mx:text id="keyWordValue"/></textarea></div>
-					<div class="field"><label for="node" class="require"><mx:text id="TxtNode"/></label><mx:select id="NODE" id="node"/></div>
-					</div>
-				</div>
-				<div class="fieldset">
-					<legend><mx:text id="TxtConfiguration"/></legend>
-					<div>
-						<div class="require"><label class="labelverybig" for="nodeadmin"><mx:text id="TxtNodeAdmin"/></label><mx:select id="NODE_ADMIN" id="nodeadmin"/></div>
-						<br/>
-						<div class="require"><label class="labelverybig" for="group"><mx:text id="TxtGroupAdmin"/></label><mx:select id="GROUP_ADMIN" id="group"/></div>
-					</div>
-				</div>
-				<div class="fieldset">
-					<legend><mx:text id="TxtTemplateAdmin"/></legend>
-					<div>
-						<div class="field"><label for="TEMPLATE_ADMIN"><mx:text id="TxtTemplateAdmin"/></label><mx:select id="TEMPLATE_ADMIN" /></div>
-						<div class="field"><img name="pictoTemplate" id="pictoTemplate" src="data/template/default/preview.png" alt="Preview"/></div>
-					</div>
-				</div>
-				<div class="fieldset">
-					<legend><mx:text id="briquesList"/></legend>
-
-					<mx:bloc id="actionAdminClass">
-					<div class="boxcheck"><label><mx:text id="className"/></label><mx:checker id="classId"/></div>
-					</mx:bloc id="actionAdminClass">
-					<div class="action">
-							<input type="submit" name="BtnValid"  mXattribut="value:BtnValid" class="save"/>
-					</div>
-				</div>
-				<div class="info"><mx:text id="TxtField"/></div>
-				</div>
-		</div>
-	</fieldset>
-</form>
-<script type="text/javascript">
-//<![CDATA[
-function imgPicto()
-{
-	// cas ns6
-	if (document.getElementById)
-	{
-		if (document.getElementById("configObject"))
-		{
-			document.getElementById("pictoObject").src="data/template/default/media/picto/object/"+document.getElementById("configObject").iconeN.options[(document.getElementById("configObject").iconeN.selectedIndex)].value;
-		}
-	}
-	// cas ie 5.5
-	else if (document.all)
-	{
-		if (document.all["configObject"])
-		{
-			document.all["pictoObject"].src="data/template/default/media/picto/object/"+document.all["configObject"].iconeN.options[(document.all["configObject"].iconeN.selectedIndex)].value;
-		}
-	}
-}
-imgPicto();
-
-function imgTemplate()
-{
-	if (document.getElementById)
-	{
-		var obj=document.getElementById("TEMPLATE_ADMIN"); //configObject.template[]
-		document.getElementById("pictoTemplate").src="data/template/"+obj.options[(obj.selectedIndex)].value+"/preview.png";
-	}else{
-		var obj=document.all["TEMPLATE_ADMIN"]; //configObject.template[]	
-		document.all["pictoTemplate"].src="data/template/"+obj.options[(obj.selectedIndex)].value+"/preview.png";
-	}
-}
-imgTemplate();
-// ]]>
-</script>
+		</form>
+	</div>
+</div>
diff --git a/lib/object_coordination/adminobject/adminobject.php b/lib/object_coordination/adminobject/adminobject.php
index e593468..bfe8ef3 100755
--- a/lib/object_coordination/adminobject/adminobject.php
+++ b/lib/object_coordination/adminobject/adminobject.php
@@ -592,7 +592,7 @@ 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();";
+		$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();function imgTemplate(){if(document.getElementById){var obj=document.getElementById(\"TEMPLATE_ADMIN\");document.getElementById(\"screenTemplate\").src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/preview.png\";}else{var obj=document.all[\"TEMPLATE_ADMIN\"];document.all[\"screenTemplate\"].src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/preview.png\";}}imgTemplate();";
 		mxRawJs($arrayRawJs);
 
 		/* Récuperation du radio sélectionné */