diff --git a/data/template/qware/object_coordination/community/actionlecture.mxt b/data/template/qware/object_coordination/community/actionlecture.mxt index b6cc5fd..85d8837 100755 --- a/data/template/qware/object_coordination/community/actionlecture.mxt +++ b/data/template/qware/object_coordination/community/actionlecture.mxt @@ -13,30 +13,32 @@ -

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

+
+
+ + + +
+ +
+
+ +
+
+
-
-
- + +
diff --git a/lib/object_coordination/community/community.php b/lib/object_coordination/community/community.php index 77a8aac..e4654b3 100755 --- a/lib/object_coordination/community/community.php +++ b/lib/object_coordination/community/community.php @@ -55,11 +55,19 @@ Class Community extends CoordinationObj if(isset($_REQUEST['param'])) { - $title=getMessage("titlPagePresentation")." ".recupCommunity($_REQUEST['param'], "lib", $currentCode); + $currentCommunityName=recupCommunity($_REQUEST['param'], "lib", $currentCode); + + if( $currentCommunityName == "Anonyme" ) + $currentCommunityName = "Qware"; + + $title=getMessage("titlPagePresentation")." ".$currentCommunityName; mxPageTitle($title); } else mxPageTitle("titlPageSelectCommunities"); + mxCallCss(''); + mxCallJs(''); + $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); @@ -95,14 +103,17 @@ Class Community extends CoordinationObj //Si aucune valeur, on demande à l'utilisateur de choisir une communauté if(!$_REQUEST['param']) { - $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ComText", getMessage("selectCom")); + $GLOBALS["SYSTEM_TEMPLATE"]->MxText("blocComContent".".ComText", getMessage("selectCom")); $GLOBALS["SYSTEM_CONTROL"]->messageSystem = "selectCom"; $msg= "selectCom"; + $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocComContent", "delete"); } else //Sinon on récupère la valeur { $idNode = $_REQUEST['param']; } + } else { + $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocComContent", "delete"); } $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("urlReturn", htmlentitiesconv($GLOBALS['CONF_PAGE_EXECUTION']."?id=".$GLOBALS['SYSTEM_USER_SESSION']->id."&system=navigationNode&navigationNodeId=".$GLOBALS["SYSTEM_USER_SESSION"]->entryNodeId)); @@ -168,25 +179,27 @@ Class Community extends CoordinationObj { $list = $GLOBALS['SYSTEM_DATABASE_CONN']->sql_fetchrow(); $textResume = $list['textentrynode_resume']; - $textText = $list['textentrynode_resume']; + $textText = $list['textentrynode_text']; //On masque le texte d'intro affiché par défaut à partir de message $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ComTextdefault", ""); - $GLOBALS["SYSTEM_TEMPLATE"]->MxText("blocTextResume".".text_resume", $textResume); - $GLOBALS["SYSTEM_TEMPLATE"]->MxText("blocTextText".".text_text", $textText); + $GLOBALS["SYSTEM_TEMPLATE"]->MxText("blocComContent".".blocTextResume".".text_resume", $textResume); + $GLOBALS["SYSTEM_TEMPLATE"]->MxText("blocComContent".".blocTextText".".text_text", $textText); + } else { + $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocComContent", "delete"); } # Destruction des éléments $GLOBALS['SYSTEM_DATABASE_CONN']->sql_freeresult(); #Affichage des contenus - $GLOBALS["SYSTEM_TEMPLATE"]->MxText("ComText",$tabNode[$i][1]); + $GLOBALS["SYSTEM_TEMPLATE"]->MxText("blocComContent".".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( !isset($textResume) || $textResume == "" ) $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocComContent".".blocTextResume", "delete"); + if( !isset($textText) || $textText == "" ) $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocComContent".".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); + $GLOBALS['SYSTEM_TEMPLATE']->MxImage("blocComContent".".blocImgLogo".".logo", "data/image/communities/".$idNode."_logo.svg", $tabNode[$i][1], "", 32); else - $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocImgLogo", "delete"); + $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocComContent".".blocImgLogo", "delete"); $GLOBALS["SYSTEM_TEMPLATE"]->MxAttribut("bloc1.entrynodeid",$tabNode[$i][0]); $GLOBALS["SYSTEM_TEMPLATE"]->MxText("bloc1.entrynodeselected"," selected='selected' "); @@ -194,9 +207,9 @@ Class Community extends CoordinationObj if( $tabNode[$i][3] == "on" ) { $url_inscrire = Navigation::formatUrl($this->GetId(),"Community","formlecture","",$tabNode[$i][0]); - $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("blocRegisterCom".".inscrire", "button", "ok", getMessage("registerCom"), " onclick=\"javascript:window.location.href='$url_inscrire';\" class=\"btn btn-outline-secondary btn-lg btn-sm\""); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("blocComContent".".blocRegisterCom".".inscrire", "button", "ok", getMessage("registerCom"), " onclick=\"javascript:window.location.href='$url_inscrire';\" class=\"btn btn-outline-secondary btn-lg btn-sm\""); } else { - $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("blocRegisterCom".".inscrire", "button", "ok", getMessage("registerComClosed"), "class=\"btn btn-secondary btn-lg btn-sm\" disabled"); + $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("blocComContent".".blocRegisterCom".".inscrire", "button", "ok", getMessage("registerComClosed"), "class=\"btn btn-secondary btn-lg btn-sm\" disabled"); } } else