Commit c4fb9531 authored by Raph El's avatar Raph El
Browse files

Merge branch 'cressRE' into qa

parents 89517a27 1f14d148
......@@ -177,8 +177,8 @@ var calendar = {
date : dateToShow.getDate(),
//gotoDate:moment(initDate),
editable : false,
eventBackgroundColor: '#FFA200',
textColor: '#fff',
eventBackgroundColor: '#FFA200 !important',
textColor: '#fff !important',
defaultView: calendar.viewMode,
events : [],
eventLimit: 3,
......@@ -301,10 +301,11 @@ var calendar = {
mylog.log("calendar.php globalautocomplete error", data);
},
success: function(data){
mylog.log("calendar.php globalautocomplete success", data);
//mylog.log("calendar.php globalautocomplete success", data);
if(!data){
toastr.error(data.content);
} else {
//mylog.log("calendar.php globalautocomplete success searchObject", searchObject.initType, searchObject.text);
if(typeof calendar != "undefined" && searchObject.initType == "events" && searchObject.text=="")
calendar.addEvents(data.events);
}
......
......@@ -2685,9 +2685,8 @@ var directory = {
&& typeof costum.app[directory.appKeyParam].map != 'undefined'
&& typeof costum.app[directory.appKeyParam].map.hash != 'undefined'){
mylog.log('headerStr if');
headerStr+= '<button class="lbh-menu-app hidden-xs" data-hash="'+costum.app[directory.appKeyParam].directory.map.hash+'" style="" title="'+trad.showmap+'" alt="'+trad.showmap+'">'+
'<i class="fa fa-map-marker"></i> '+trad.map;
'</button>';
headerStr+= '<a class="lbh-menu-app btn btn-hash-map" href="'+costum.app[directory.appKeyParam].map.hash+'" style="" title="'+trad.showmap+'" alt="'+trad.showmap+'">'+
'<i class="fa fa-map-marker"></i> '+trad.map+'</a>';
} else if( !notNull(directory.costum)
|| typeof directory.costum.header == 'undefined'
|| typeof directory.costum.header.map== 'undefined'
......
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