Hotfix pixelhumain#231

Author: RaphaelRIVIERE

assets/js/default/editInPlace.js

@@ -193,7 +193,8 @@ function bindAboutPodElement() {
 							if(data.result && data.resultGoods.result){
 								if(typeof data.resultGoods.values.allDay != "undefined"){
 									contextData.allDay = data.resultGoods.values.allDay;
-									$("#allDayAbout").html(contextData.allDay);
+
+									$("#allDayAbout").html((contextData.allDay ? trad["yes"] : trad["no"]));
 								}  
 								if(typeof data.resultGoods.values.startDate != "undefined"){
 									contextData.startDate = data.resultGoods.values.startDate;
@@ -209,7 +210,6 @@ function bindAboutPodElement() {
 								initDate();
 								updateCalendar();
 							}
-
 							//urlCtrl.loadByHash(location.hash);
 							dyFObj.closeForm();
 						},
@@ -625,7 +625,7 @@ function bindAboutPodElement() {
 			if(notEmpty(contextData.socialNetwork) && notEmpty(contextData.socialNetwork.facebook))
 				dataUpdate.facebook = contextData.socialNetwork.facebook;
 
-			dyFObj.openForm(form, null, dataUpdate);
+			dyFObj.openForm(form, "sub", dataUpdate);
 
 
 		});

views/element/about.php

@@ -462,10 +462,10 @@
 
 	var formatDateView = "DD MMMM YYYY à HH:mm" ;
 	var formatDatedynForm = "DD/MM/YYYY HH:mm" ;
-	if( (typeof contextData.allDay != "undefined" && contextData.allDay == true) || contextData.type == "<?php echo Project::COLLECTION; ?>" ) {
+	/*if( (typeof contextData.allDay != "undefined" && contextData.allDay == true) || contextData.type == "<?php //echo Project::COLLECTION; ?>" ) {
 		formatDateView = "DD MMMM YYYY" ;
 		formatDatedynForm = "DD/MM/YYYY" ;
-	}
+	}*/
 
 	jQuery(document).ready(function() {
 		bindDynFormEditable();
@@ -569,6 +569,14 @@ className: 'btn-danger'
 
 	function initDate() {//DD/mm/YYYY hh:mm
 		//moment.locale('fr');
+		if( (typeof contextData.allDay != "undefined" && contextData.allDay == true) || contextData.type == "<?php echo Project::COLLECTION; ?>" ) {
+			formatDateView = "DD MMMM YYYY" ;
+			formatDatedynForm = "DD/MM/YYYY" ;
+		}else{
+			formatDateView = "DD MMMM YYYY à HH:mm" ;
+			formatDatedynForm = "DD/MM/YYYY HH:mm" ;
+		}
+
 		if( typeof contextData.startDate != "undefined" && contextData.startDate != "" ){
 			$("#divStartDate").removeClass("hidden");
 			$("#divNoDate").addClass("hidden");
@@ -582,7 +590,7 @@ function initDate() {//DD/mm/YYYY hh:mm
 			$("#divEndDate").removeClass("hidden");
 		else
 			$("#divEndDate").addClass("hidden");
-
+		mylog.log("formatDateView", formatDateView);
 		if($("#startDateAbout").html() != "")
 	    	$("#startDateAbout").html(moment(contextData.startDateDB).local().locale("fr").format(formatDateView));
 	    if($("#endDateAbout").html() != "")

views/pod/activityList.php

@@ -33,7 +33,8 @@
 	"isOpenEdition" => Yii::t("common", "open edition"),
 	"state" => Yii::t("common", "state"),
 	"organizer" => Yii::t("common", "organizer"),
-	"contacts" => Yii::t("common", "un contact")
+	"contacts" => Yii::t("common", "un contact"),
+	"descriptionHTML" => Yii::t("common", "la descripton"),
 );
 if ($contextType == Organization::COLLECTION)
 	$contextTypeLabel=Yii::t("common","of the organization");
@@ -128,6 +129,8 @@
 
 						} else if(@$value["object"]["displayValue"] && !empty($value["object"]["displayValue"]) )
 							echo Yii::t("common",$value["object"]["displayValue"]);
+						else if($value["object"]["displayName"] == "descriptionHTML")
+							echo "transformer la description en format Markdown";
 						else
 							echo "supprimé";