Commit e7f641ff authored by Clément Damiens's avatar Clément Damiens

Merge branch 'development' into qa

parents 33515b09 8c023e56
......@@ -587,11 +587,14 @@ var coInterface = {
}, 400);
},
setDomHtmlPosition: function(){
mylog.log("coInterface.setDomHtmlPosition", coInterface.menu.initTopPostion);
$("#mainNav").css("top",coInterface.menu.initTopPostion);
//heightNav=$("#mainNav").outerHeight();
heightTopMenu=$("#mainNav").outerHeight()+coInterface.menu.initTopPostion;
mylog.log("coInterface.setDomHtmlPosition", heightTopMenu, $("#mainNav").outerHeight());
$("#menuApp, #affix-sub-menu").css("top",heightTopMenu);
$("#notificationPanelSearch.vertical.arrow_box, #floopDrawerDirectory, #modal-preview-coop, .main-container .dropdown-main-menu, #mainNav .dropdown-result-global-search, .main-container.vertical .portfolio-modal.modal, .portfolio-modal.modal.vertical").css("top",heightTopMenu);
$("#notificationPanelSearch.horizontal.arrow_box, #notificationPanelSearch.vertical.arrow_box, #floopDrawerDirectory, #modal-preview-coop, .main-container .dropdown-main-menu, #mainNav .dropdown-result-global-search, .main-container.vertical .portfolio-modal.modal, .portfolio-modal.modal.vertical").css("top",heightTopMenu);
$(".dropdownApps-menuTop .dropdown-menu, #affix-sub-menu .dropdown-result-global-search").css("top", (heightTopMenu+$("#text-search-menu").height()));
coInterface.setTopPosition(false);
/*if(heightNav > 70){
......
......@@ -3723,6 +3723,7 @@ var directory = {
}*/
html+="</div>";
mylog.log("directory.getAdminToolBar html end", html);
return html;
},
getTypeObj: function(e){
......
......@@ -450,7 +450,7 @@ function bindButtonMenu(){
function getLabelTitleDir(dataName, dataIcon, countData, n){
mylog.log("getLabelTitleDir", dataName, dataIcon, countData, n, trad);
var elementName = "<span class='Montserrat' id='name-lbl-title'>"+$("#nameHeader .name-header").html()+"</span>";
var elementName = "<span class='Montserrat' id='name-lbl-title'>"+contextData.name+"</span>";
var s = (n>1) ? "s" : "";
......@@ -696,7 +696,7 @@ function displayInTheContainer(data, dataName, dataIcon, contextType, edit){
communityStr +='</div>';
}*/
mylog.log("communityStr", n, communityStr);
mylog.log("displayInTheContainer communityStr", n, communityStr);
if(n>0){
var thisTitle = getLabelTitleDir(dataName, dataIcon, parseInt(n), n);
......@@ -756,6 +756,7 @@ function displayInTheContainer(data, dataName, dataIcon, contextType, edit){
});
}
toogleNotif(false);
mylog.log("displayInTheContainer html",html);
$("#central-container").html(html);
//if(dataName != "collections" && directory.viewMode=="block")
// setTimeout(function(){ directory.checkImage(data);}, 300);
......@@ -788,7 +789,7 @@ function displayInTheContainer(data, dataName, dataIcon, contextType, edit){
});
});
}
mylog.log("displayInTheContainer here");
mylog.log("dataToMap", dataToMap);
$("#btn-show-links-onmap").off().click(function(){
//Sig.showMapElements(Sig.map, dataToMap, "", thisTitle);
......@@ -804,6 +805,7 @@ function displayInTheContainer(data, dataName, dataIcon, contextType, edit){
var html = communityStr+"<div class='col-md-12 col-sm-12 col-xs-12 labelTitleDir margin-bottom-15'>"+
getLabelTitleDir(dataName, dataIcon, parseInt(n), n)+
"</div>";
mylog.log("displayInTheContainer html2", html);
$("#central-container").html(html + "<span class='col-md-12 alert bold bg-white'>"+
"<i class='fa fa-ban'></i> "+trad.nodata+
"</span>");
......@@ -816,7 +818,9 @@ function displayInTheContainer(data, dataName, dataIcon, contextType, edit){
$(".load-coummunity").removeClass("active");
$(this).addClass("active");
pageProfil.params.dir = $(this).data("type-dir");
location.hash=hashUrlPage+".view.directory.dir."+pageProfil.params.dir;
//history.pushState remplace le location.hash car il recharge la page .
//location.hash=hashUrlPage+".view.directory.dir."+pageProfil.params.dir;
history.pushState(null, null, hashUrlPage+".view.directory.dir."+pageProfil.params.dir);
pageProfil.views.directory();
});
}
......
......@@ -10,6 +10,7 @@
"forum" : { "label": "Forum","key":"forum","icon":"comment"},
"cms" : { "label": "CMS","key":"cms","icon":"edit"},
"doc" : { "label": "Documentation","key":"doc","icon":"book"},
"faq" : { "label": "FAQ","key":"faq","icon":"info"},
"software" : { "label": "Software","key":"software","icon":"code"},
"rh" : { "label": "Human ressource","key":"rh","icon":"users"},
"financialRessource" : { "label": "Financial ressource","key":"RessourceFinanciere","icon":"money"},
......
......@@ -11,7 +11,32 @@ class DatamigrationController extends CommunecterController {
protected function beforeAction($action) {
return parent::beforeAction($action);
}
public function actionNASourceAllElts(){
if( Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]) )){
$colElts = array(Person::COLLECTION, Organization::COLLECTION, Poi::COLLECTION);
$res = array();
foreach ($colElts as $keyCol => $col) {
$elts=PHDB::find($col, array("source" => array('$exists' => 0)), array("name"));
$res[$col] = 0;
foreach ($elts as $id => $elt) {
$source = array(
'insertOrign' => "import",
'date'=> new MongoDate(time()),
"key" => "notragora",
"keys" => array("notragora") );
PHDB::update($col,
array("_id" => $elt["_id"]),
array('$set' => array("source" => $source))
);
$res[$col]++;
}
}
Rest::json($res); exit;
}
}
public function actionKnowsToFollows(){
if( Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]) )){
$persons=PHDB::find(Person::COLLECTION);
......@@ -4890,7 +4915,7 @@ if( Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]) )){
$parentType= Event::COLLECTION;
else
$parentType=$value["parentType"];
$set["parent"]=array($value["parentId"] => array("type"=>$parentType));
$set["parent"]=array($value["parentId"] => array("type"=>$parentType, "name"=>$value["name"]));
}
if(@$value["parentId"]){
......
......@@ -8,15 +8,7 @@
padding-bottom: 15px;
}
</style>
<?php
//var_dump($params);
if(!empty($params["files"])){ ?>
<h5 class="col-xs-12 title-files-list text-dark"> Voir le récapitulatif de la mesure :</h5>
<?php foreach($params["files"] as $k => $v){ ?>
<div class='col-xs-12 padding-5 shadow2 margin-top-5 margin-bottom-5'>
<a href='<?php echo $v["docPath"] ?>' target='_blank' class="link-files"><i class="fa fa-file-pdf-o text-red"></i> <?php echo $v["name"] ?></a>
</div>
<?php } } ?>
<div id="description" class="description-preview col-xs-12 no-padding activeMarkdown"><?php echo (!empty($params["description"]) ? $params["description"] : "" ); ?></div>
<?php
......
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