Skip to content
GitLab
Commit 202003ca authored by Tibor Katelbach's avatar Tibor Katelbach
Browse files

Merge remote-tracking branch 'origin/master'

parents 4d8beeac dd88b3a7
Hide whitespace changes
Inline Side-by-side
assets/js/dataHelpers.js
View file @ 202003ca
......@@ -3,6 +3,7 @@
//for select input : {"value":"FR", "text":"France"}
//for select2 input : {"id":"FR", "text":"France"}
function getCountries(selectType) {
mylog.log("getCountries");
var result = new Array();
$.ajax({
url: baseUrl+'/'+moduleId+"/opendata/getcountries",
......
assets/js/scopes/scopes.js
View file @ 202003ca
......@@ -395,7 +395,7 @@ function scopeObject(values){
}
mylog.log("scopeObject cp", typeof values.postalCode, typeof values.uniqueCp, values.uniqueCp);
if(typeof values.postalCode != "undefined" && typeof values.uniqueCp != "undefined" && values.uniqueCp == false){
mylog.log("communexionObj cp values", values);
mylog.log("scopeObject communexionObj cp values", values);
objToPush={
id:values.postalCode+values.country+objToPush.type,
......@@ -405,7 +405,7 @@ function scopeObject(values){
countryCode:values.country
}
communexionObj[objToPush.id] = objToPush;
mylog.log("communexionObj cp", communexionObj);
mylog.log("scopeObject communexionObj cp", communexionObj);
}
if(notNull(values.level) && typeof values.level != "undefined"){
......@@ -431,7 +431,7 @@ function scopeObject(values){
// objToPush["postalCode"] = values.postalCode ;
}
communexionObj[objToPush.id+objToPush.type] = objToPush;
mylog.log("communexionObj", communexionObj);
mylog.log("scopeObject communexionObj", communexionObj);
if(notNull(values.allCP) && values.allCP == false){
objToPush={
......
views/element/addMembersFromMyContacts.php
View file @ 202003ca
......@@ -676,6 +676,7 @@ function showMyContactInModalAddMembers(fieldObj, jqElement){
var fieldHTML = "";
$.each(fieldObj.contactTypes, function(key, type){
mylog.log("fieldObj.contactTypes", key, type, typeof type);
fieldHTML += '<div class="panel panel-default" id="scroll-type-'+type.name+'"> '+
'<div class="panel-heading">'+
......@@ -686,6 +687,8 @@ function showMyContactInModalAddMembers(fieldObj, jqElement){
'<ul>';
if(typeof fieldObj.values[type.name] != "undefined")
$.each(fieldObj.values[type.name], function(key2, value){
mylog.log("TESTTEST", key2, value);
if(typeof value != "undefined"){
var cp = (typeof value.address != "undefined" && notNull(value.address) && typeof value.address.postalCode != "undefined") ? value.address.postalCode : typeof value.cp != "undefined" ? value.cp : "";
var city = (typeof value.address != "undefined" && notNull(value.address) && typeof value.address.addressLocality != "undefined") ? value.address.addressLocality : "";
......@@ -703,7 +706,7 @@ function showMyContactInModalAddMembers(fieldObj, jqElement){
'<a href="javascript:">admin <i class="fa fa-user-secret"></i></a>'+
'</small>';
}
fieldHTML += '<div class="btn btn-default btn-scroll-type btn-select-contact" id="contact'+thisKey+'">' +
fieldHTML += '<div class="btn btn-default btn-scroll-type btn-select-contact" id="contact'+getObjectId(value)+'">' +
'<div class="col-md-1 no-padding"><input type="checkbox" name="scope-'+type.name+'" class="chk-scope-'+type.name+' chk-contact" id="chk-scope-'+thisKey+'" idcontact="'+thisKey+'" value="'+thisValue+'" data-type="'+type.name+'"></div> '+
'<div class="btn-chk-contact col-md-11 no-padding" idcontact="'+thisKey+'" typecontact="'+type.name+'">' +
'<img src="'+ profilThumbImageUrl+'" class="thumb-send-to" height="35" width="35">'+
......@@ -743,9 +746,11 @@ function filterContact(searchVal){
if(searchVal != "") $(".btn-select-contact").hide();
else $(".btn-select-contact").show();
//recherche la valeur recherché dans les 3 champs "name", "cp", et "city"
$.each($(".name-contact"), function() { checkSearch($(this), searchVal); });
$.each($(".cp-contact"), function() { checkSearch($(this), searchVal); });
$.each($(".city-contact"), function() { checkSearch($(this), searchVal); });
$.each($(".name-contact"), function() {
checkSearch($(this), searchVal);
});
//$.each($(".cp-contact"), function() { checkSearch($(this), searchVal); });
//$.each($(".city-contact"), function() { checkSearch($(this), searchVal); });
}else if(addLinkSearchMode == "all"){
if(searchVal.length>2){
clearTimeout(timeout);
......@@ -815,10 +820,14 @@ function autoCompleteEmailAddMember(searchValue){
//si l'élément contient la searchVal, on l'affiche
function checkSearch(thisElement, searchVal, type){
mylog.log("checkSearch", thisElement, searchVal, type);
var content = thisElement.html();
mylog.log("checkSearch content", content);
var found = content.search(new RegExp(searchVal, "i"));
mylog.log("checkSearch found", found);
if(found >= 0){
var id = thisElement.attr("idcontact");
mylog.log("checkSearch id", id);
$("#contact"+id).show();
}
}
......
views/news/formCreateNewsCO2.php
View file @ 202003ca
......@@ -172,8 +172,102 @@
.updateMention .mentions-input-box .mentions{
padding:10px !important;
}
</style>
<?php
$contextScopeNews=array(
Organization::COLLECTION => array(
"public"=>array(
"icon"=>"globe",
"label"=>ucfirst(Yii::t("common", "public")),
"explain"=>Yii::t("news","Write a public message visible in live on selected places")
),
"restricted"=>array(
"icon"=>"rss",
"label"=>ucfirst(Yii::t("common", "followers")),
"explain"=>Yii::t("news", "Posted on followers and members wall and visible to all on this wall")//Visible to all on this wall and published on community's network",
),
"private"=>array(
"icon"=>"users",
"label"=>ucfirst(Yii::t("common", "members")),
"explain"=>Yii::t("news", "Posted on members wall and visible only for them")
),
"init"=>array(
"admin"=>"restricted",
"noadmin"=>"private"
)
),
Project::COLLECTION => array(
"public"=>array(
"icon"=>"globe",
"label"=>ucfirst(Yii::t("common", "public")),
"explain"=>Yii::t("news","Write a public message visible in live on selected places")
),
"restricted"=>array(
"icon"=>"rss",
"label"=>ucfirst(Yii::t("common", "followers")),
"explain"=>Yii::t("news", "Posted on followers and contributors wall and visible to all on this wall")
),
"private"=>array(
"icon"=>"users",
"label"=>ucfirst(Yii::t("common", "contributors")),
"explain"=>Yii::t("news", "Posted on contributors wall and visible only for them")
),
"init"=>array(
"admin"=>"restricted",
"noadmin"=>"private"
)
),
Event::COLLECTION => array(
"public"=>array(
"icon"=>"globe",
"label"=>ucfirst(Yii::t("common", "public")),
"explain"=>Yii::t("news","Write a public message visible in live on selected places")
),
"restricted"=>array(
"icon"=>"rss",
"label"=>ucfirst(Yii::t("common", "attendees")),
"explain"=>Yii::t("news", "Posted on attendees wall and visible to all on this wall"),
),
"private"=>array(
"icon"=>"users",
"label"=>ucfirst(Yii::t("common", "admins")),
"explain"=>Yii::t("news","Posted on administrators wall and visible only for them"),
),
"init"=>array(
"admin"=>"restricted",
"noadmin"=>"private"
)
),
Person::COLLECTION => array(
"public"=>array(
"icon"=>"globe",
"label"=>ucfirst(Yii::t("common", "public")),
"explain"=>Yii::t("news","Write a public message visible in live on selected places")
),
"restricted"=>array(
"icon"=>"rss",
"label"=>ucfirst(Yii::t("common", "followers")),
"explain"=>Yii::t("news", "Posted on followers wall and visible to all on this wall"),
),
"private"=>array(
"icon"=>"lock",
"label"=>ucfirst(Yii::t("common", "private")),
"explain"=>Yii::t("news","Visible only to me"),
),
"init"=>array(
"admin"=>"restricted",
"noadmin"=>"private"
)
),
"city" => array(
"public"=>array(
"icon"=>"globe",
"label"=>ucfirst(Yii::t("common", "public")),
"explain"=>Yii::t("news","Write a public message visible in live on selected places"),
)
)
);
$isLive = isset($_GET["isLive"]) ? true : false;
$contextName = "";
$contextIcon = "bookmark fa-rotate-270";
......@@ -184,13 +278,13 @@
$contextName = $parent["name"];
$contextIcon = "users";
$contextTitle = Yii::t("common","Participants");
$restricted = Yii::t("common","Visible to all on this wall and published on community's network");
$titleRestricted = "Restreint";
$private = Yii::t("common","Visible only to the members");
$titlePrivate = "Privé";
$scopeBegin= ucfirst(Yii::t("common", "followers"));
$public = true;
$iconBegin= "connectdevelop";
//$restricted = Yii::t("common","Visible to all on this wall and published on community's network");
//$titleRestricted = "Restreint";
//$private = Yii::t("common","Visible only to the members");
//$titlePrivate = "Privé";
//$scopeBegin= ucfirst(Yii::t("common", "followers"));
//$public = true;
//$iconBegin= "connectdevelop";
$headerName= "Journal de l'organisation";//.$contextName;
$topTitle= "Journal de l'organisation";//.$contextName;
if(@$canManageNews && $canManageNews==true)
......@@ -208,10 +302,10 @@
$contextIcon = "<i class='fa fa-circle text-yellow'></i> <i class='fa fa-user text-dark'></i> ";
$contextTitle = Yii::t("common", "DIRECTORY of")." ".$contextName;
if(@Yii::app()->session["userId"] && $contextParentId==Yii::app()->session["userId"]){
$restricted = Yii::t("common","Visible to all on my wall and published on my network");
$private = Yii::t("common","Visible only to me");
// $restricted = Yii::t("common","Visible to all on my wall and published on my network");
// $private = Yii::t("common","Visible only to me");
$textForm = Yii::t("common","Published a message in your wall for your network");
$public = true;
// $public = true;
}
if(Yii::app()->session["userId"] ==$contextParentId){
$headerName= "Mon journal";
......@@ -226,22 +320,22 @@
$shortName=explode(" ", $parent["name"]);
//$headerName= "Bonjour <span class='text-red'>".addslashes($shortName[0])."</span>, l'actu de votre réseau";
$headerName= "L'actu de votre réseau";
$restricted = Yii::t("common","Visible to all on my wall and published on my network");
$private = Yii::t("common","Visible only to me");
//$restricted = Yii::t("common","Visible to all on my wall and published on my network");
//$private = Yii::t("common","Visible only to me");
$textForm = Yii::t("common","Published a message in your wall for your network");
}
$scopeBegin= ucfirst(Yii::t("common", "followers"));
$iconBegin= "connectdevelop";
//$scopeBegin= ucfirst(Yii::t("common", "followers"));
//$iconBegin= "connectdevelop";
}
else if( isset($type) && $type == Project::COLLECTION && isset($parent) ){
$contextName = $parent["name"];
$contextIcon = "lightbulb-o";
$contextTitle = Yii::t("common", "Contributors of project");
$restricted = Yii::t("common","Visible to all on this wall and published on community's network");
$private = Yii::t("common","Visible only to the project's contributors");
$scopeBegin= ucfirst(Yii::t("common", "followers"));
$iconBegin= "connectdevelop";
$public = true;
//$restricted = Yii::t("common","Visible to all on this wall and published on community's network");
//$private = Yii::t("common","Visible only to the project's contributors");
//$scopeBegin= ucfirst(Yii::t("common", "followers"));
//$iconBegin= "connectdevelop";
//$public = true;
$headerName= "Journal du projet";//.$contextName;
$topTitle = "Journal du projet";//.$contextName;
if(@$canManageNews && $canManageNews==true)
......@@ -253,12 +347,12 @@
$contextName = $parent["name"];
$contextIcon = "calendar";
$contextTitle = Yii::t("common", "Contributors of event");
$restricted = Yii::t("common","Visible to all on this wall and published on community's network");
$scopeBegin= ucfirst(Yii::t("common", "followers"));
$iconBegin= "connectdevelop";
//$restricted = Yii::t("common","Visible to all on this wall and published on community's network");
//$scopeBegin= ucfirst(Yii::t("common", "followers"));
//$iconBegin= "connectdevelop";
$headerName= "Journal de l'événement";//.$contextName;
$topTitle = "Journal de l'événement";//.$contextName;
$public = true;
//$public = true;
//if(@$canManageNews && $canManageNews==true)
$textForm = Yii::t("common","Post a message in the wall of").
" <b>".$contextName."</b>";
......@@ -271,20 +365,20 @@
$contextName = Yii::t("common","City")." : ".$city["name"];
$contextIcon = "university";
$contextTitle = Yii::t("common", "DIRECTORY Local network of")." ".$city["name"];
$scopeBegin= "Public";
$iconBegin= "globe";
//$scopeBegin= "Public";
//$iconBegin= "globe";
$headerName= "Actualités de ".$city["name"];
$topTitle = ""; //$headerName;
$textForm = Yii::t("common","Write a idea, a message in the city wall of")." ".$contextName;
}
else if( isset($type) && $type == "pixels"){
/*else if( isset($type) && $type == "pixels"){
//$contextName = "<i class='fa fa-rss'></i> Signaler un bug";
//$contextTitle = Yii::t("common", "Contributors of project");
$headerName= " La foire aux bugs";
$topTitle = " La foire aux bugs";
$textForm = Yii::t("common","Write a bug or an idea to improve the development of communecter");
}
}*/
$imgProfil = "";
if($contextParentType != "city"){
......@@ -366,9 +460,20 @@
<input type="hidden" name="scope" value="public"/>-->
<div class="dropdown col-md-6 no-padding">
<a data-toggle="dropdown" class="btn btn-default" id="btn-toogle-dropdown-scope" href="#"><i class="fa fa-<?php echo $iconBegin ?>"></i> <?php echo $scopeBegin ?> <i class="fa fa-caret-down" style="font-size:inherit;"></i></a>
<a data-toggle="dropdown" class="btn btn-default" id="btn-toogle-dropdown-scope" href="#"><i class="fa fa-<?php echo @$contextScopeNews[$contextParentType][$contextScopeNews[$contextParentType]["init"]["admin"]]["icon"] ?>"></i> <?php echo @$contextScopeNews[$contextParentType][$contextScopeNews[$contextParentType]["init"]["admin"]]["label"] ?> <i class="fa fa-caret-down" style="font-size:inherit;"></i></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<?php if (@$private && ($contextParentType==Project::COLLECTION || $contextParentType==Organization::COLLECTION)){ ?>
<?php if(@$contextScopeNews && @$contextScopeNews[$contextParentType]){
foreach($contextScopeNews[$contextParentType] as $key => $v){
if($key != "init"){ ?>
<li>
<a href="javascript:;" class="scopeShare" data-value="<?php echo $key ?>"><h4 class="list-group-item-heading"><i class="fa fa-<?php echo $v["icon"] ?>"></i> <?php echo $v["label"] ?></h4>
<p class="list-group-item-text small"><?php echo $v["explain"] ?></p>
</a>
</li>
<?php }
}
} ?>
<?php /*if (@$private && ($contextParentType==Project::COLLECTION || $contextParentType==Organization::COLLECTION)){ ?>
<li>
<a href="javascript:;" id="scope-my-network" class="scopeShare" data-value="private"><h4 class="list-group-item-heading"><i class="fa fa-lock"></i> <?php echo ucfirst(Yii::t("common", "private")) ?></h4>
<p class="list-group-item-text small"><?php echo $private ?></p>
......@@ -396,7 +501,7 @@
<p class="list-group-item-text small"><?php echo $private ?></p>
</a>
</li>
<?php } ?>
<?php } */ ?>
<!--<li>
<a href="#" id="scope-select" data-toggle="modal" data-target="#modal-scope"><i class="fa fa-plus"></i> Selectionner</a>
</li>-->
......
views/translation/trad.php
View file @ 202003ca
......@@ -110,6 +110,7 @@ var trad = {
"addevents" : "<?php echo Yii::t("common","Add a new event") ?>",
"addprojects" : "<?php echo Yii::t("common","Add a new project") ?>",
"addressources":"<?php echo Yii::t("common","Add a new ressource") ?>",
"addressource":"<?php echo Yii::t("common","Add a new ressource") ?>",
"addclassified":"<?php echo Yii::t("common","Add a new classified") ?>",
"addclassifieds":"<?php echo Yii::t("common","Add a new classified") ?>",
"addplace":"<?php echo Yii::t("common","Add a new place") ?>",
......@@ -148,6 +149,8 @@ var trad = {
"createevent":"<?php echo Yii::t("common","Create an event") ?>",
"createpoi":"<?php echo Yii::t("common","Create a point of interest") ?>",
"createclassified":"<?php echo Yii::t("common","Create a classified ad") ?>",
"createressource":"<?php echo Yii::t("common","Create a ressource") ?>",
"createressources":"<?php echo Yii::t("common","Create a ressource") ?>",
"createcollection":"<?php echo Yii::t("common","Create a new collection") ?>",
"createpage":"<?php echo Yii::t("common","Create a page") ?>",
"organizations":"<?php echo Yii::t("common","organizations"); ?>",
......
Supports Markdown
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