Commit 8c023e56 authored by Clément Damiens's avatar Clément Damiens

Merge branch 'qa' into development

parents 2068bd97 33515b09
......@@ -540,14 +540,14 @@ var coInterface = {
if($("#headerBand").length > 0){
if($(this).scrollTop() > $("#headerBand").outerHeight() && infScroll){
coInterface.menu.initTopPostion=0;
coInterface.setDomHtmlPosition();
$("#affix-sub-menu, #mainNav, #menuApp, #filters-nav").removeClass("position-absolute");
$(".main-container.vertical .headerSearchContainer").addClass("affix");
coInterface.setDomHtmlPosition();
infScroll=false;
}else if($(this).scrollTop()<=$("#headerBand").outerHeight() && !infScroll){
coInterface.menu.initTopPostion=$("#headerBand").outerHeight();
coInterface.setDomHtmlPosition();
$("#affix-sub-menu, #mainNav, #filters-nav, #menuApp").addClass("position-absolute");
coInterface.setDomHtmlPosition();
infScroll=true;
}
......@@ -603,33 +603,35 @@ var coInterface = {
} */
},
setTopPosition: function(bool){
headerScaling=bool;
heightPos=$("#mainNav").outerHeight();
if(coInterface.menu.initTopPostion!=0)
heightPos=heightPos+coInterface.menu.initTopPostion;
if($("#affix-sub-menu").is(":visible"))
heightPos=heightPos+$("#affix-sub-menu").outerHeight();
$("#filter-scopes-menu").css("top",heightPos);
if($("#filter-scopes-menu").is(":visible"))
heightPos=heightPos+$("#filter-scopes-menu").outerHeight();
if($("#menuApp").hasClass("subMenuTop")){
$("#menuApp").css("top",heightPos);
heightPos=heightPos+$("#menuApp").outerHeight();
}
$("#filters-nav").css("top",heightPos);
if($("#filters-nav").is(":visible"))
heightPos=heightPos+$("#filters-nav").outerHeight();
$("#mapContent").css("top",heightPos);
if($(".main-container.vertical .headerSearchContainer").hasClass("affix")){
$(".main-container.vertical .headerSearchContainer").css("top",heightPos);
heightPos=heightPos+$(".main-container.vertical .headerSearchContainer").outerHeight();
}else{
$(".main-container.vertical .headerSearchContainer").css("top","inherit");
}
if($("#headerBand").length > 0 && coInterface.menu.initTopPostion==0)
heightPos=heightPos+$("#headerBand").outerHeight();
$(".main-container").css("padding-top",heightPos);
setTimeout(function(){headerScaling=false;},300);
mylog.log("coInterface.setTopPosition", bool);
headerScaling=bool;
heightPos=$("#mainNav").outerHeight();
if(coInterface.menu.initTopPostion!=0)
heightPos=heightPos+coInterface.menu.initTopPostion;
if($("#affix-sub-menu").is(":visible"))
heightPos=heightPos+$("#affix-sub-menu").outerHeight();
$("#filter-scopes-menu").css("top",heightPos);
if($("#filter-scopes-menu").is(":visible"))
heightPos=heightPos+$("#filter-scopes-menu").outerHeight();
if($("#menuApp").hasClass("subMenuTop")){
$("#menuApp").css("top",heightPos);
heightPos=heightPos+$("#menuApp").outerHeight();
}
$("#filters-nav").css("top",heightPos);
if($("#filters-nav").is(":visible"))
heightPos=heightPos+$("#filters-nav").outerHeight();
$("#mapContent").css("top",heightPos);
if($(".main-container.vertical .headerSearchContainer").hasClass("affix")){
mylog.log("coInterface.setTopPosition headerSearchContainer heightPos", heightPos);
$(".main-container.vertical .headerSearchContainer").css("top",heightPos);
heightPos=heightPos+$(".main-container.vertical .headerSearchContainer").outerHeight();
}else{
$(".main-container.vertical .headerSearchContainer").css("top","inherit");
}
if($("#headerBand").length > 0 && coInterface.menu.initTopPostion==0)
heightPos=heightPos+$("#headerBand").outerHeight();
$(".main-container").css("padding-top",heightPos);
setTimeout(function(){headerScaling=false;},300);
},
bindResizeEvent : function(){
$(window).resize(function(){
......
......@@ -79,10 +79,14 @@ function autoCompleteSearchGS(search, indexMin, indexMax, input, callB){
data.countType = [ "citoyens", "organizations", "projects", "events" ];
data.searchType = [ "citoyens", "organizations", "projects", "events" ];
}
if(typeof costum != "undefined" && notNull(costum) && typeof costum.filters != "undefined" && typeof costum.filters.searchTypeGS != "undefined"
&& (!notNull(input) || $.inArray(input, ["#filter-scopes-menu", "#scopes-news-form"]) < 0)){
data.countType = costum.filters.searchTypeGS;
data.searchType = costum.filters.searchTypeGS;
if(typeof costum != "undefined" && notNull(costum) && typeof costum.filters != "undefined" && (!notNull(input) || $.inArray(input, ["#filter-scopes-menu", "#scopes-news-form"]) < 0)){
if(typeof costum.filters.searchTypeGS != "undefined"){
data.countType = costum.filters.searchTypeGS;
data.searchType = costum.filters.searchTypeGS;
}
if(typeof costum.filters.sourceKey != "undefined"){
data.sourceKey=[costum.slug];
}
}
var domTarget = (notNull(input)) ? input+" .dropdown-result-global-search" : ".dropdown-result-global-search";
var dropDownVisibleDom=(notNull(input)) ? input+" .dropdown-result-global-search" : ".dropdown-result-global-search";
......@@ -148,7 +152,7 @@ function autoCompleteSearchGS(search, indexMin, indexMax, input, callB){
str += '</div>';
str += "<hr style='margin: 0px; float:left; width:100%;'/>";
}
//parcours la liste des résultats de la recherche
//parcours la liste des résultats de la recherche
$.each(data.results, function(i, o) {
mylog.log("globalsearch res : ", o);
var typeIco = i;
......
......@@ -7,6 +7,7 @@
"tool" : { "label": "Tool","key":"tool","icon":"wrench"},
"machine" : { "label": "Machine","key":"machine","icon":"cogs"},
"article" : { "label": "Article","key":"article","icon":"newspaper-o"},
"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"},
......
This diff is collapsed.
......@@ -40,7 +40,7 @@ co2/datamigration/UpdateBadgesCteNat
* mettre des slugs sur les elements qui ont le meme slug
db.costum.find().forEach( function(doc){
if(doc.slug != undefined){
if(doc.slug != undefined){
print("costum : "+doc.slug);
db.slugs.find({"name":doc.slug}).forEach(function(el){
print("el : "+el.type+" : "+el.id);
......
......@@ -172,8 +172,44 @@ updated 30/08/2018
* *****************************
* *****************************
*
* *****************************
* Présenatation
* *****************************
:PRESENTATION:
* Open Atlas
Presentation OPAL - CO [[https://docs.google.com/presentation/d/1hk2-RymfV2zeLA0hpzapgc3tl25xgu4n/edit#slide=id.g61500e7dd8_0_112]]
* SCIC CO
SCIC Reflexion stratégie et organisation CO
[[https://docs.google.com/presentation/d/1P_4ghDdCrHCJENmFPNDTYwD9qrUxH6yM/edit#slide=id.p8]]
doc status
[[https://docs.google.com/document/d/1ath12F-XPupfS1pd_A69pI-j5ZoBoU7B8q9JSz_Gp5o/edit]]
schema
[[https://docs.google.com/drawings/d/1BVoBnJAqFS9RAsZ0d0cib01hZViI7BLEorCke6Z7F9o/edit?usp=drive_web&ouid=111559540869540305126]]
[[https://docs.google.com/drawings/d/1kUVy3_7WkSon7DEkMgok5FwEh0x2D2Sd3sFG91dhUU8/edit]]
reflexion modele eco
[[https://docs.google.com/presentation/d/1UkF-VNAX6gPk8fErpagqB_apD6lHEiGdhdLDHYPRlcY/edit#slide=id.p]]
:PRODUITS:
* Usage de CO
[[https://docs.google.com/presentation/d/18coNLWOmUhcP2GN6GgWePXJ4vLqfATbRpvGs7sM__2Y/edit#slide=id.g46c50fb599_5_6]]
* Appels à Projets COnnecté
[[https://docs.google.com/presentation/d/17kT4wzcz0BEc4qwbCBXNsURu9IIxMs7IKLalSj2Fjzc/edit#slide=id.g60be068e42_0_26]]
* Smarterre
:PROJETS:
** Tiers Lieux Connecté
** CoPI Tiers Lieux Camp Tic
[[https://docs.google.com/presentation/d/1efQiAdOt54_XoxJaYZPazxCK0T83jdgdmer-le9NwDY/edit]]
** COPI ISLAND
[[https://docs.google.com/drawings/d/1hvDIRN3u4kvuo6-N7twFrjQ8uidEmXuSzm3dli_JTmg/edit]]
:COMMLUNAUTÉ:
** Metamaps
[[https://metamaps.cc/maps/900]]
* smarterre
* smarterreTCO
[[https://docs.google.com/document/d/1J7b3Qi3ZjR28A8mzqbkP21iwjyJOfd0AwHw9qQ3qiEc/edit]]
* *****************************
*
......
......@@ -269,15 +269,15 @@ jQuery(document).ready(function() {
}
});
searchObject.links = followers;
mylog.log("HERRRRE",followers);
// mylog.log("HERRRRE",followers);
// $.each(costum.app[appParamsKey].searchObject.links,function(k,v){
// if (costum.contextId != "undefinied") {
// if (costum.userId != "undefinied") {
// followers.push({type : v , id : userId});
// console.log(followers);
// }
// });
searchObject.links = followers;
// searchObject.links = followers;
}
if(typeof costum != "undefined" && notNull(costum) && typeof costum.app != "undefined" && typeof appParamsKey != "undefined" && typeof costum.app[appParamsKey] != "undefined" && typeof costum.app[appParamsKey].searchObject != "undefined" && typeof costum.app[appParamsKey].searchObject.sourceKey != "undefined"){
......
......@@ -28,6 +28,7 @@
border : 1px #e2e2e2 solid;
padding: 1%;
box-shadow: 0px 0px 20px -2px #e2e2e2;
margin-top: 2%;
}
.file{
border : 1px #e2e2e2 solid;
......@@ -76,79 +77,58 @@ span{
}
</style>
<!-- Espace photo -->
<div class="photo col-xs-12">
<div class="col-xs-12"><h2 style="margin-left: -2.37%; margin-right: -2.37%;"><i class="fa fa-camera"></i> Photos</h2></div>
<!-- AFFICHE 4 DERNIERE PHOTO -->
<div class="img-description"></div>
<div class="col-xs-12 no-padding" style="border-top: 2px #e2e2e2 dashed; margin-top: 1%; text-align:right;">
<div class="portfolio-item portfolio-item-album openFolder" data-folder="" data-folder-name="Photos" data-doctype="image" data-key="">
<a href="javascript:;" class="filter-folder-gallery btn btn-info ssmla" style="margin-top: 1%;"><i class="fa fa-plus"></i> Voir plus</a>
</div>
</div>
</div>
<!-- Espace document -->
<div class="file col-xs-12">
<h2><i class="fa fa-file"></i> Documents</h2>
<div class="col-xs-12"><ul class="file-description"></ul></div>
<div class="col-xs-12 no-padding" style="border-top: 2px #e2e2e2 dashed; margin-top: 1%; text-align:right;">
<a href="javascript:;" class="btn btn-warning ssmla" data-view="gallery" style="margin-top: 1%;"><i class="fa fa-plus"></i> Voir plus</a>
</div>
</div>
<!--Description rapido -->
<div class="description col-xs-12">
<h2><i class="fa fa-book"></i> <?php echo Yii::t("common","Descriptions") ?>
<h2><i class="fa fa-book"></i> Description
<?php if($edit==true || ( $openEdition==true && Yii::app()->session["userId"] != null ) ){?>
<button class="btn-update-descriptions btn btn-default letter-blue pull-right tooltips"
data-toggle="tooltip" data-placement="top" title="" alt="" data-original-title="<?php echo Yii::t("common","Update description") ?>">
<b><i class="fa fa-pencil"></i> <?php echo Yii::t("common", "Edit") ?></b>
</button>
<?php } ?>
<button class="btn-update-descriptions btn btn-default letter-blue pull-right tooltips"
data-toggle="tooltip" data-placement="top" title="" alt="" data-original-title="<?php echo Yii::t("common","Update description") ?>">
<b><i class="fa fa-pencil"></i> <?php echo Yii::t("common", "Edit") ?></b>
</button>
<?php } ?>
</h2>
<div id="ficheInfo" class="panel panel-white col-lg-12 col-md-12 col-sm-12 no-padding shadow2">
<div class="panel-body no-padding">
<div class="col-md-12 col-sm-12 col-xs-12 contentInformation no-padding">
<div class="col-md-3 col-sm-3 col-xs-3 hidden-xs labelAbout padding-10">
<span><i class="fa fa-quote-left"></i></span> <?php echo Yii::t("common", "Short description") ?>
</div>
<div id="shortDescriptionAbout" class="col-md-8 col-sm-8 col-xs-12 valueAbout padding-10">
<span class="visible-xs col-xs-12 no-padding"><i class="fa fa-quote-left"></i> <?php echo Yii::t("common", "Short description") ?>: </span><?php echo (@$element["shortDescription"]) ? $element["shortDescription"] : '<i>'.Yii::t("common","Not specified").'</i>'; ?>
</div>
<span id="shortDescriptionAboutEdit" name="shortDescriptionAboutEdit" class="hidden" ><?php echo (!empty($element["shortDescription"])) ? $element["shortDescription"] : ""; ?></span>
</div>
<div class="col-md-12 col-sm-12 col-xs-12 contentInformation no-padding">
<div class="col-md-3 col-sm-3 col-xs-3 hidden-xs labelAbout padding-10">
<span><i class="fa fa-paragraph"></i></span> <?php echo Yii::t("common", "Description") ?>
</div>
<div class="col-md-8 col-sm-8 col-xs-12 valueAbout padding-20"
style="word-wrap: break-word; overflow:hidden;">
<span class="visible-xs col-xs-12 no-padding">
<i class="fa fa-paragraph"></i> <?php echo Yii::t("common", "Description") ?>:
</span>
<div id="descriptionAbout"><?php echo (@$element["description"]) ? $element["description"] : '<i>'.Yii::t("common","Not specified").'</i>'; ?>
</div>
</div>
</div>
</div>
<div class="panel-body no-padding">
<div class="col-md-12 col-sm-12 col-xs-12 contentInformation no-padding">
<div class="col-md-3 col-sm-3 col-xs-3 hidden-xs labelAbout padding-10">
<span><i class="fa fa-quote-left"></i></span> Résumé
</div>
<div id="shortDescriptionAbout" class="col-md-8 col-sm-8 col-xs-12 valueAbout padding-10">
<span class="visible-xs col-xs-12 no-padding"><i class="fa fa-quote-left"></i> <?php echo Yii::t("common", "Short description") ?>: </span><?php echo (@$element["shortDescription"]) ? $element["shortDescription"] : '<i>'.Yii::t("common","Not specified").'</i>'; ?>
</div>
<span id="shortDescriptionAboutEdit" name="shortDescriptionAboutEdit" class="hidden" ><?php echo (!empty($element["shortDescription"])) ? $element["shortDescription"] : ""; ?></span>
</div>
<div class="col-md-12 col-sm-12 col-xs-12 contentInformation no-padding">
<div class="col-md-3 col-sm-3 col-xs-3 hidden-xs labelAbout padding-10">
<span><i class="fa fa-paragraph"></i></span> <?php echo Yii::t("common", "Description") ?>
</div>
<div class="col-md-8 col-sm-8 col-xs-12 valueAbout padding-20"
style="word-wrap: break-word; overflow:hidden;">
<span class="visible-xs col-xs-12 no-padding">
<i class="fa fa-paragraph"></i> <?php echo Yii::t("common", "Description") ?>:
</span>
<div id="descriptionAbout"><?php echo (@$element["description"]) ? $element["description"] : '<i>'.Yii::t("common","Not specified").'</i>'; ?>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Réseaux sociaux -->
<div class="reseaux col-xs-12">
<h2><i class="fa fa-connectdevelop"></i> <?php echo Yii::t("common","Socials"); ?>
<?php if($edit==true || ( $openEdition==true && Yii::app()->session["userId"] != null ) ) {?>
<button class="btn-update-network btn btn-default letter-blue pull-right tooltips"
data-toggle="tooltip" data-placement="top" title="" alt="" data-original-title="<?php echo Yii::t("common","Update network") ?>">
<b><i class="fa fa-pencil"></i></b>
</button>
<?php } ?>
<button class="btn-update-network btn btn-default letter-blue pull-right tooltips"
data-toggle="tooltip" data-placement="top" title="" alt="" data-original-title="<?php echo Yii::t("common","Update network") ?>">
<b><i class="fa fa-pencil"></i></b>
</button>
<?php } ?>
</h2>
<div class="col-xs-12" style="font-size: 1.25vw;">
......@@ -180,6 +160,32 @@ span{
</div>
<!-- Espace document -->
<div class="file col-xs-12">
<h2><i class="fa fa-file"></i> Documents</h2>
<div class="col-xs-12"><ul class="file-description"></ul></div>
<div class="col-xs-12 no-padding" style="border-top: 2px #e2e2e2 dashed; margin-top: 1%; text-align:right;">
<a href="javascript:;" class="btn btn-warning ssmla" data-view="gallery" style="margin-top: 1%;"><i class="fa fa-plus"></i> Voir plus</a>
</div>
</div>
<!-- Espace photo -->
<div class="photo col-xs-12">
<div class="col-xs-12"><h2 style="margin-left: -2.37%; margin-right: -2.37%;"><i class="fa fa-camera"></i> Photos</h2></div>
<!-- AFFICHE 4 DERNIERE PHOTO -->
<div class="img-description"></div>
<div class="col-xs-12 no-padding" style="border-top: 2px #e2e2e2 dashed; margin-top: 1%; text-align:right;">
<div class="portfolio-item portfolio-item-album openFolder" data-folder="" data-folder-name="Photos" data-doctype="image" data-key="">
<a href="javascript:;" class="filter-folder-gallery btn btn-info ssmla" style="margin-top: 1%;"><i class="fa fa-plus"></i> Voir plus</a>
</div>
</div>
</div>
<script>
......
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