Commit 4a3af882 authored by Tibor Katelbach's avatar Tibor Katelbach
Browse files

doc changes, #33 done

parent bcf782cd
......@@ -3100,7 +3100,7 @@ var dyFInputs = {
//mylog.log("get", type);
var obj = null;
$.each( typeObj,function(k,o) {
if( o.types && ( $.inArray( type, o.types )>=0 ) ){
if( o.subTypes && ( $.inArray( type, o.subTypes )>=0 ) ){
obj = o;
return false;
}
......@@ -3177,7 +3177,7 @@ var typeObj = {
"citoyens" : { sameAs:"person" },
"poi":{ col:"poi",ctrl:"poi",color:"green", titleClass : "bg-green", icon:"info-circle",
types:["link" ,"tool","machine","software","rh","RessourceMaterielle","RessourceFinanciere",
subTypes:["link" ,"tool","machine","software","rh","RessourceMaterielle","RessourceFinanciere",
"ficheBlanche","geoJson","compostPickup","video","sharedLibrary","artPiece","recoveryCenter",
"trash","history","something2See","funPlace","place","streetArts","openScene","stand","parking","other" ] },
......
......@@ -213,12 +213,17 @@ function autoCompleteSearch(name, locality, indexMin, indexMax, callBack){
"<i class='fa fa-"+params.icon+" hidden-sm hidden-md hidden-lg padding-5'></i> <span class='hidden-xs'>"+params.name+"</span>"+
"</span> ";
});//console.log("myMultiTags", myMultiTags);
$.each(myMultiTags, function(key, val){
var params = headerParams[val];
str += "<span class='text-dark hidden-xs pull-right'>"+
"#"+key+
"</span> ";
});
if( Object.keys(myMultiTags).length > 0 )
str += "<a href='javascript:;' class='pull-right' onClick='resetMyTags()'><i class='fa fa-times-circle text-red '></i></a> ";
}
str += "</small>";
str += "</h4>";
......@@ -584,7 +589,7 @@ var directory = {
colPos: "left",
dirLog : false,
defaultPanelHtml : function(params){
if(directory.dirLog) mylog.log("----------- defaultPanelHtml",params.type,params.name);
mylog.log("----------- defaultPanelHtml",params.type,params.name);
str = "";
str += "<div class='col-lg-4 col-md-6 col-sm-6 col-xs-12 searchEntityContainer "+params.type+" "+params.elTagsList+" '>";
str += "<div class='searchEntity' id='entity"+params.id+"'>";
......@@ -606,12 +611,11 @@ var directory = {
}
}
if(params.updated != null && !params.useMinSize)
str += "<div class='dateUpdated'><i class='fa fa-flash'></i> <span class='hidden-xs'>actif </span>" + params.updated + "</div>";
if(params.itemType!="city" && (typeof params.size == "undefined" || params.size == "max"))
str += "<a href='"+params.hash+"' class='container-img-profil lbh add2fav'>" + params.imgProfil + "</a>";
str += "<a href='"+params.hash+"' class='container-img-profil lbhp add2fav' data-modalshow='"+params.id+"'>" + params.imgProfil + "</a>";
str += "<div class='padding-10 informations'>";
......@@ -624,7 +628,7 @@ var directory = {
if(typeof params.size == "undefined" || params.size == "max"){
str += "<div class='entityCenter no-padding'>";
str += "<a href='"+params.hash+"' class='lbh add2fav'>" + params.htmlIco + "</a>";
str += "<a href='"+params.hash+"' class='lbhp add2fav' data-modalshow='"+params.id+"'>" + params.htmlIco + "</a>";
str += "</div>";
}
}
......@@ -633,19 +637,19 @@ var directory = {
if(notEmpty(params.parent) && notEmpty(params.parent.name))
str += "<a href='"+urlParent+"' class='entityName text-"+params.parentColor+" lbh add2fav text-light-weight margin-bottom-5'>" +
str += "<a href='"+urlParent+"' class='entityName text-"+params.parentColor+" lbhp add2fav data-modalshow='"+params.id+"'text-light-weight margin-bottom-5'>" +
"<i class='fa "+params.parentIcon+"'></i> "
+ params.parent.name +
"</a>";
var iconFaReply = notEmpty(params.parent) ? "<i class='fa fa-reply fa-rotate-180'></i> " : "";
str += "<a href='"+params.hash+"' class='"+params.size+" entityName text-dark lbh add2fav'>"+
str += "<a href='"+params.hash+"' class='"+params.size+" entityName text-dark lbhp add2fav' data-modalshow='"+params.id+"'>"+
iconFaReply + params.name +
"</a>";
var thisLocality = "";
if(params.fullLocality != "" && params.fullLocality != " ")
thisLocality = "<a href='"+params.hash+"' data-id='" + params.dataId + "' class='entityLocality lbh add2fav'>"+
thisLocality = "<a href='"+params.hash+"' data-id='" + params.dataId + "' class='entityLocality lbhp add2fav' data-modalshow='"+params.id+"'>"+
"<i class='fa fa-home'></i> " + params.fullLocality +
"</a>";
else thisLocality = "<br>";
......@@ -676,7 +680,7 @@ var directory = {
params.parentIco = "";
if(type == "surveys"){ params.parentUrl = "#survey.entries.id."+params.survey; params.parentIco = "archive"; }
else if(type == "actions") {params.parentUrl = "#rooms.actions.id."+params.room;params.parentIco = "cogs";}
str += "<div class='entityDescription text-dark'><i class='fa fa-" + params.parentIco + "'></i><a href='" + params.parentUrl + "' class='lbh add2fav'> " + params.parentRoom.name + "</a></div>";
str += "<div class='entityDescription text-dark'><i class='fa fa-" + params.parentIco + "'></i><a href='" + params.parentUrl + "' class='lbhp add2fav' data-modalshow='"+params.id+"'> " + params.parentRoom.name + "</a></div>";
if(notEmpty(params.parentRoom.parentObj)){
var typeIcoParent = params.parentRoom.parentObj.typeSig;
//mylog.log("typeIcoParent", params.parentRoom);
......@@ -732,7 +736,7 @@ var directory = {
if(typeof params.size == "undefined" || params.size == "max"){
str += "<div class='entityCenter no-padding'>";
str += "<a href='"+params.hash+"' class='lbh add2fav'>" + params.htmlIco + "</a>";
str += "<a href='"+params.hash+"' class='lbhp add2fav' data-modalshow='"+params.id+"'>" + params.htmlIco + "</a>";
str += "</div>";
}
}
......
......@@ -243,4 +243,11 @@ function showTagSuggestion(tagValue, tagSpec){ //mylog.log("showTagSuggestion()"
}
}
function resetMyTags(){
myMultiTags = {};
saveMultiTag();
startSearch(0, indexStepInit);
$('#sub-menu-filliaire').addClass('hidden');
}
\ No newline at end of file
......@@ -529,8 +529,10 @@ jQuery(document).ready(function() {
$(".btn-open-filliaire").click(function(){
if($("#sub-menu-filliaire").hasClass("hidden"))
$("#sub-menu-filliaire").removeClass("hidden");
else
else{
$("#sub-menu-filliaire").addClass("hidden");
resetMyTags();
}
});
$(".btn-select-filliaire").click(function(){
......
......@@ -96,3 +96,10 @@
<br/> Open source
</div>
</div>
<div class="space20"></div>
<div class="panel-heading border-light center text-dark partition-white radius-10">
<span class="panel-title homestead "> <i class='text-red fa fa-search faa-pulse animated fa-3x '></i> <span style="font-size: 48px"><span class="text-red">CO</span>.R.D</span> </span>
</div>
......@@ -289,6 +289,13 @@ var keywords = [
"avatar":"https://www.communecter.org/upload/communecter/citoyens/586793ff40bb4ee620947c30/medium/IMG20170221133431.jpg?_=1492717390",
"class" : "builder"
},
{
"icon" : "fa-user",
"title": "Tom Baumert",
"co" : "57e5256640bb4eff07c4c9d6",
"avatar":"https://www.communecter.org/upload/communecter/citoyens/57e5256640bb4eff07c4c9d6/medium/profil.jpg?_=1496302667",
"class" : "builder"
},
/* **************************************
*
* Devs
......@@ -426,6 +433,13 @@ var keywords = [
"link" : "https://openagenda.com",
"class" : "interoperate"
},
{
"icon" : "fa-usb",
"title": "smart Citizen",
"link" : "https://smartcitizen.me",
"class" : "interoperate",
"img" : "http://2012.cities.io/wp-content/uploads/2014/06/SmartCitizen_logo.png",
},
/* **************************************
*
......
......@@ -120,13 +120,6 @@ var keywords = [
"comment" : "Communecter c’est l’espoir! l’espoir de voir naître une communauté tournée vers le vivre ensemble créatif et ouvert. ",
"image" : "<?php echo $this->module->assetsUrl; ?>/images/testamonials/hafid.png"
},
{
"name" : "Julien Cantoni",
"project" : "P2P Foundation",
"url" : "http://p2pfoundation.net/",
"comment" : "Communecter peut faire partie des alternatives aux plateformes propriétaires qui se sont développées ces dernières années. Inclusive, équitable, interopérable, efficace, soutenable, glocale, voilà les promesses de communecter ! Nous attendons son déploiement avec impatience !",
"image" : "<?php echo $this->module->assetsUrl; ?>/images/testamonials/julien.png"
},
{
"name" : "Francis Morel",
"project" : "Practishare",
......
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