diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/acl_selector.tpl | 14 | ||||
| -rw-r--r-- | view/jot-header.tpl | 1 | ||||
| -rw-r--r-- | view/theme/slackr/birthdays_reminder.tpl.newlayout (renamed from view/theme/slackr/birthdays_reminder.tpl) | 0 | ||||
| -rw-r--r-- | view/theme/slackr/events_reminder.tpl | 39 |
4 files changed, 9 insertions, 45 deletions
diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl index 655ea8980..e5231b0f8 100644 --- a/view/acl_selector.tpl +++ b/view/acl_selector.tpl @@ -16,11 +16,13 @@ <script> $(document).ready(function() { - if(typeof acl=="undefined"){ - acl = new ACL( - baseurl+"/acl", - [ $allowcid,$allowgid,$denycid,$denygid ] - ); - } + setTimeout( function () { + if(typeof acl=="undefined"){ + acl = new ACL( + baseurl+"/acl", + [ $allowcid,$allowgid,$denycid,$denygid ] + ); + } + }, 5000 ); }); </script> diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 64bcf27ca..f777e997f 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -103,6 +103,7 @@ function initEditor(cb){ } }); + editor = true; // setup acl popup $("a#jot-perms-icon").fancybox({ diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl.newlayout index 1dc65295a..1dc65295a 100644 --- a/view/theme/slackr/birthdays_reminder.tpl +++ b/view/theme/slackr/birthdays_reminder.tpl.newlayout diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl deleted file mode 100644 index bd1a57d18..000000000 --- a/view/theme/slackr/events_reminder.tpl +++ /dev/null @@ -1,39 +0,0 @@ -<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' /> -<script language="javascript" type="text/javascript" - src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script> -<script> - // start calendar from yesterday - var yesterday= new Date() - yesterday.setDate(yesterday.getDate()-1) - - function showEvent(eventid) { - $.get( - '$baseurl/events/?id='+eventid, - function(data){ - $.fancybox(data); - } - ); - } - $(document).ready(function() { - $('#events-reminder').fullCalendar({ - firstDay: yesterday.getDay(), - year: yesterday.getFullYear(), - month: yesterday.getMonth(), - date: yesterday.getDate(), - events: '$baseurl/events/json/', - header: { - left: '', - center: '', - right: '' - }, - timeFormat: 'HH(:mm)', - defaultView: 'basicWeek', - height: 50, - eventClick: function(calEvent, jsEvent, view) { - showEvent(calEvent.id); - } - }); - }); -</script> -<div id="events-reminder" class="$classtoday"></div> -<br> |