Commit de3699e9 authored by Raph El's avatar Raph El

Merge branch 'master' into inviteHotfix

parents 01960651 95ce88c4
......@@ -70,6 +70,7 @@ dynForm = {
afterSave : function(data,callB){
//alert("in save orga");
dyFObj.commonAfterSave(data, callB);
// toastr.success(trad.waitingValidation);
/*if( $(uploadObj.domTarget).fineUploader('getUploads').length > 0 ){
$(uploadObj.domTarget).fineUploader('uploadStoredFiles');
//principalement pour les surveys
......
......@@ -64,6 +64,10 @@ folder={
});
},
appendLevel: function(domTarget, inFolder, name, idFolder, contKey, docT){
if(docType=="")
$(".btn-add-folder").hide();
else
$(".btn-add-folder").show();
//mylog.log("folder.appendLevel", domTarget, inFolder, name, idFolder, contKey, docT);
className=(inFolder)? "btn btn-default": "bold text-dark";
foldKey=(notNull(idFolder)) ? idFolder : folderId;
......@@ -267,6 +271,7 @@ folder={
}
},
galleryGuide : function (domTarget, inFolder, level, name, docT, contentK, foldId){
$(".btn-add-folder").hide();
docType=(typeof docT != "undefined" ) ? docT : "";
contentKey=(typeof contentK != "undefined" ) ? contentK : "";
folderId=(typeof foldId != "undefined" ) ? foldId : "";
......
......@@ -122,7 +122,7 @@ if(isset($pageConfig["banner"]) && !empty($pageConfig["banner"])){
</a>
</div>
<?php } ?>
<?php if(!empty($element["preferences"]["isOpenData"])){?>
<?php if( Preference::isOpenData($element["preferences"]) ){?>
<?php //if( Badge::checkBadgeInListBadges("opendata", $element["badges"]) ){?>
<div class="badgePH pull-left" data-title="OPENDATA">
<?php if($edit){ ?><a href='javascript:;' class="openConfidentialSettings pull-left tooltips" data-toggle="tooltip" data-placement="left"
......@@ -138,7 +138,7 @@ if(isset($pageConfig["banner"]) && !empty($pageConfig["banner"])){
<?php //}
} ?>
<?php if (!empty($element["preferences"]["isOpenEdition"])) { ?>
<?php if (Preference::isOpenEdition($element["preferences"]) ) { ?>
<div class="badgePH pull-left" data-title="OPENEDITION">
<?php if($edit){ ?>
<a href="javascript:;" class="openConfidentialSettings btn-show-activity">
......@@ -163,8 +163,8 @@ if(isset($pageConfig["banner"]) && !empty($pageConfig["banner"])){
</span>
</a>
</div>
<?php } else {?>
<div class="badgePH pull-left" data-title="COSTUMIZE">
<?php } else { ?>
<div class="badgePH pull-left badgePHCOSTUMIZE" data-title="COSTUMIZE">
<a href="<?php echo Yii::app()->createUrl("/costum/co/index/slug/".$element["slug"]) ?>/test/costumBuilder">
<span class="pull-left tooltips" data-toggle="tooltip" data-placement="left"
title="<?php echo Yii::t("common","Customised Design") ?>"
......
......@@ -211,7 +211,7 @@ HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesModule, $this->module->
if (!$(e.target).hasClass("toolsFolder") && !$(e.target).hasClass("toolsFolderOptions")) {
newCollection = "";
if ($(this).data("folder-name") != "")
newCollection = $(this).data("folder-name");
newCollection = $(this).data("folder-name");
contentKey = $(this).data("key");
docType = $(this).data("doctype");
folderId = $(this).data("folder");
......@@ -258,8 +258,9 @@ HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesModule, $this->module->
});
selectedIds=[];
toastr.success(data.msg);
pageProfil.init();
}else{
toastr.error(data.error)
toastr.error(data.error);
}
}
);
......@@ -267,4 +268,4 @@ HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesModule, $this->module->
});
});
}
</script>
\ No newline at end of file
</script>
......@@ -2,7 +2,6 @@
var trad = {
"This data is not geolocated" : "<?php echo Yii::t("common", "This data is not geolocated") ?>",
"badge" : "<?php echo Yii::t("common", "Badge") ?>",
"badges" : "<?php echo Yii::t("common", "Badges") ?>",
"areyousuretodelete" : "<?php echo Yii::t("common", "Are you sure you want to delete") ?>",
......@@ -238,6 +237,7 @@ var trad = {
"testing" : "<?php echo Yii::t("project","testing")?>",
"concept" : "<?php echo Yii::t("project","concept")?>",
"mature" : "<?php echo Yii::t("project","mature")?>",
"abandoned" : "<?php echo Yii::t("project","abandoned")?>",
"notSpecified" : "<?php echo Yii::t("common","Not specified") ?>",
"UnknownLocality" : "<?php echo Yii::t("common","Unknown Locality") ?>",
......@@ -1297,6 +1297,15 @@ var tradCategory = {
"medicalstuff":"<?php echo Yii::t("category","Medical stuff") ?>",
"cibleDD":"<?php echo Yii::t("category","Dévelopement durable") ?>",
"domainAction":"<?php echo Yii::t("category","Domaine d'action") ?>",
<!-- avancement project -->
"idea" : "<?php echo Yii::t("project","idea")?>",
"started" : "<?php echo Yii::t("project","started")?>",
"development" : "<?php echo Yii::t("project","development")?>",
"testing" : "<?php echo Yii::t("project","testing")?>",
"concept" : "<?php echo Yii::t("project","concept")?>",
"mature" : "<?php echo Yii::t("project","mature")?>",
"abandoned" : "<?php echo Yii::t("project","abandoned")?>",
"Not specified" : "<?php echo Yii::t("common","Not specified") ?>"
};
......@@ -1330,7 +1339,8 @@ var tradTags = {
"computer" : "<?php echo Yii::t("tags","computer") ?>",
"web" : "<?php echo Yii::t("tags","web") ?>",
"internet" : "<?php echo Yii::t("tags","ict"),Yii::t("tags","internet") ?>",
"sport" : "<?php echo Yii::t("tags","sport") ?>"
"sport" : "<?php echo Yii::t("tags","sport") ?>",
"economy":"<?php echo Yii::t("category","Economy") ?>"
};
var tradSettings = {
"notificationsSettingsSuccess" : "<?php echo Yii::t("settings","Notifications settings well updated") ?>",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment