From 5afbe3b7b7fef493b9406a9cc4959f0a09b013ba Mon Sep 17 00:00:00 2001
From: "tristan.champomier" <rooty@rooty.me>
Date: Tue, 4 May 2021 09:51:45 +0200
Subject: [PATCH] Fixed community object styles for qware template and updated
 community class

---
 .../community/actionlecture.mxt               | 54 +++++++++----------
 data/template/qware/qware.css                 | 11 ++--
 .../community/community.php                   | 20 +++++--
 3 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/data/template/qware/object_coordination/community/actionlecture.mxt b/data/template/qware/object_coordination/community/actionlecture.mxt
index e774045..1d91010 100755
--- a/data/template/qware/object_coordination/community/actionlecture.mxt
+++ b/data/template/qware/object_coordination/community/actionlecture.mxt
@@ -1,6 +1,6 @@
-<div class="tab-content container px-0 py-2 border">
-	<form id="FselectCom" role="form" class="form container-fluid" method="post" mXattribut="action:urlAction">
-		<div class="card text-center">
+<form id="FselectCom" role="form" class="form-inline px-0" method="post" mXattribut="action:urlAction">
+	<div class="tab-content container-fluid py-2 w-75 px-0">
+		<div class="card w-100 text-center">
 			<div class="card-header"><mx:text id="allCom"/></div>
 			<div class="card-body">
 					<label class="hidden" for="com"></label>
@@ -11,38 +11,34 @@
 						</mx:bloc id="bloc1">
 					</select>
 			</div>
-		</div>
-	</form>
-	<div class="container container-fluid">
-		<div class="card border-0 bg-white text-center">
-			<div class="card-header border-0 bg-white"><mx:text id="ComText"/></div>
-			<div class="card-body">
+			<div class="card-header border-0 text-center"><mx:text id="ComText"/></div>
+			<div class="card-body p-0 m-0 border-0">
+				<div class="row justify-content-center">
+					<mx:bloc id="blocImgLogo">
+						<div class="col-xs-12 col-sm-8 col-lg-2">
+							<mx:image id="logo"/>
+						</div>
+					</mx:bloc id="blocImgLogo">
+					<mx:bloc id="blocTextResume">
+						<div class="col-xs-12 col-sm-8 col-lg-4">
+							<mx:text id="text_resume"/>
+						</div>
+					</mx:bloc id="blocTextResume">
+				</div>
+				<mx:bloc id="blocTextText">
 				<div class="row">
-					<mx:bloc id="linkImageComm">
-					<div class="col-xs-12 col-sm-8 col-lg-4">
-						<img src="data/image/communities/<mx:text id="ComText"/>.png" alt="<mx:text id="ComText"/>" title="<mx:text id="ComText"/>" />
-					</div>
-					</mx:bloc id="linkImageComm">
-					<div class="col-xs-12 col-sm-8 col-lg-8">
-						<mx:text id="text_resume"/>
+					<div class="col-xs-12 col-sm-8 col-lg-12">
+						<mx:text id="text_text"/>
 					</div>
 				</div>
+				</mx:bloc id="blocTextText">
 			</div>
-			<div class="card-footer border-0 bg-white">
+		</div>
+		<div class="card w-100">
+			<div class="card-footer border-0 bg-white text-center">
 				<mx:formField id="inscrire" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true"/>
 				<input type="button" name="return" class="btn btn-outline-secondary btn-lg btn-sm" aria-pressed="true" title="<mx:text id="tipReturnButton"/>" value="<mx:text id="BtnReturn"/>" onclick="history.back(); return false;"/>
 			</div>
 		</div>
 	</div>
-</div> 
-<script type="text/javascript">
-//<![CDATA[
-function FselectCom()
-{
-	// cas ns6
-	if (document.getElementById){if (document.getElementById("FselectCom")){document.getElementById("FselectCom").submit();}}
-	// cas ie 5.5
-	else if (document.all){if (document.all["FselectCom"]){document.all["FselectCom"].submit();}}
-}
-// ]]>
-</script>
+</form>
diff --git a/data/template/qware/qware.css b/data/template/qware/qware.css
index 8fa1540..faa9a6a 100755
--- a/data/template/qware/qware.css
+++ b/data/template/qware/qware.css
@@ -67,17 +67,22 @@
 	padding-top:		0 !important;
 	padding-bottom:		0 !important;
 	border:				0 !important;
-	border-radius:		12px !important;
+	border-radius:		0 !important;
 /* 	opacity:			.90; */
-	background-color:	#fff;
+/* 	background-color:	#fff; */
 }
 
-#data div.tab-content.container-fluid div.card.w-100{
+#data div.tab-content.container-fluid div.card.w-100,
+#data-guest div.tab-content.container-fluid div.card.w-100{
 /* 	background-color:		transparent; */
 /* 	opacity:				.90; */
 	margin-bottom:			20px;
 }
 
+#data-guest div#contentTextInfos.tab-content.container-fluid.w-75{
+	border-radius:		6px !important;
+}
+
 #data div.tab-content.container-fluid div.card.w-100.start{
 /* 	border-radius:		0 .50em ; */
 }
diff --git a/lib/object_coordination/community/community.php b/lib/object_coordination/community/community.php
index 782f525..1966f39 100755
--- a/lib/object_coordination/community/community.php
+++ b/lib/object_coordination/community/community.php
@@ -55,6 +55,9 @@ Class Community extends CoordinationObj
 		
 		mxPageTitle("titlPageSelectCommunities");
 		
+		$arrayRawJs[] = "function FselectCom(){if(document.getElementById){if(document.getElementById(\"FselectCom\")){document.getElementById(\"FselectCom\").submit();}}else if(document.all){if(document.all[\"FselectCom\"]){document.all[\"FselectCom\"].submit();}}}";
+		mxRawJs($arrayRawJs);
+		
 		/* On inclus la template (voir package.template.php) */
 		WithBlocPath("Community", "actionLecture");
 
@@ -145,7 +148,6 @@ Class Community extends CoordinationObj
 				if($tabNode[$i][0] == $idNode) //si le noeud de la boucle égale celui sélectionné
 				{
 					//On récupère le texte du noeud choisi par l'internaute
-// 					$sql="SELECT * FROM ".DATA_ACCES_TABLE_PREFIX.DATA_ACCES_OBJECT_PREFIX."textentrynode WHERE node_id=".$idNode;
 					$sql="SELECT * FROM ".DATA_ACCES_TABLE_PREFIX.DATA_ACCES_OBJECT_PREFIX."textentrynode WHERE node_id=".$idNode." AND langue_id=".$GLOBALS["SYSTEM_USER_SESSION"]->langue->getId();
 					# Exécution de Requete
 					$result=$GLOBALS['SYSTEM_DATABASE_CONN']->sql_query($sql);
@@ -154,17 +156,27 @@ Class Community extends CoordinationObj
 					if ($GLOBALS['SYSTEM_DATABASE_CONN']->sql_numrows()>0)
 					{
 							$list = $GLOBALS['SYSTEM_DATABASE_CONN']->sql_fetchrow();
-// 							$text = $list['text_resume'];
-							$text = $list['textentrynode_resume'];
+							$textResume = $list['textentrynode_resume'];
+							$textText = $list['textentrynode_resume'];
 							//On masque le texte d'intro affiché par défaut à partir de message
 							$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ComTextdefault", "");
-							$GLOBALS["SYSTEM_TEMPLATE"]->MxText("text_resume", $text);
+							$GLOBALS["SYSTEM_TEMPLATE"]->MxText("blocTextResume".".text_resume", $textResume);
+							$GLOBALS["SYSTEM_TEMPLATE"]->MxText("blocTextText".".text_text", $textText);
 					}
 
 					# Destruction des éléments
 					$GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult();
 					#Affichage des contenus
 					$GLOBALS["SYSTEM_TEMPLATE"]->MxText("ComText",$tabNode[$i][1]);
+
+					if( !isset($textResume) || $textResume == "" ) $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocTextResume", "delete");
+					if( !isset($textText) || $textText == "" ) $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocTextText", "delete");
+					
+					if( is_file("data/image/communities/".$idNode."_logo.svg" ) )
+						$GLOBALS['SYSTEM_TEMPLATE']->MxImage("blocImgLogo".".logo", "data/image/communities/".$idNode."_logo.svg", $tabNode[$i][1], "", 32);
+					else
+						$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocImgLogo", "delete");
+
 					$GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("bloc1.entrynodeid",$tabNode[$i][0]);
 					$GLOBALS["SYSTEM_TEMPLATE"]->MxText("bloc1.entrynodeselected"," selected='selected' ");
 					$url_inscrire = formatUrl($this->GetId(),"Community","formlecture","",$tabNode[$i][0]);