From 4313982e02a04425ec1c14eac52ddfa65cd309d8 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 17 Jun 2016 14:27:33 +0200 Subject: [PATCH] frio - event - code clean up + docu --- include/datetime.php | 3 +- view/theme/frio/js/theme.js | 157 ----------------------- view/theme/frio/templates/event_form.tpl | 13 ++ view/theme/frio/templates/events-js.tpl | 8 ++ 4 files changed, 22 insertions(+), 159 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 4b0bbb576d..949f68dec5 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -298,8 +298,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $o .= replace_macros($tpl,array( '$field' => array($id, $label, $input_text, '', (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'), )); -// $o .= "
"; -// $o .= '
'; + $o .= ""; diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index 414df7c1a9..f3bd543c17 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -481,160 +481,3 @@ String.prototype.rtrim = function() { var trimmed = this.replace(/\s+$/g, ''); return trimmed; }; - - - -// $(document).ready(function() { -// $('#events-calendar').fullCalendar({ -// firstDay: {{$i18n.firstDay}}, -// monthNames: ['{{$i18n.January}}','{{$i18n.February}}','{{$i18n.March}}','{{$i18n.April}}','{{$i18n.May}}','{{$i18n.June}}','{{$i18n.July}}','{{$i18n.August}}','{{$i18n.September}}','{{$i18n.October}}','{{$i18n.November}}','{{$i18n.December}}'], -// monthNamesShort: ['{{$i18n.Jan}}','{{$i18n.Feb}}','{{$i18n.Mar}}','{{$i18n.Apr}}','{{$i18n.May}}','{{$i18n.Jun}}','{{$i18n.Jul}}','{{$i18n.Aug}}','{{$i18n.Sep}}','{{$i18n.Oct}}','{{$i18n.Nov}}','{{$i18n.Dec}}'], -// dayNames: ['{{$i18n.Sunday}}','{{$i18n.Monday}}','{{$i18n.Tuesday}}','{{$i18n.Wednesday}}','{{$i18n.Thursday}}','{{$i18n.Friday}}','{{$i18n.Saturday}}'], -// dayNamesShort: ['{{$i18n.Sun}}','{{$i18n.Mon}}','{{$i18n.Tue}}','{{$i18n.Wed}}','{{$i18n.Thu}}','{{$i18n.Fri}}','{{$i18n.Sat}}'], -// buttonText: { -// prev: "‹", -// next: "›", -// prevYear: "«", -// nextYear: "»", -// today: '{{$i18n.today}}', -// month: '{{$i18n.month}}', -// week: '{{$i18n.week}}', -// day: '{{$i18n.day}}' -// }, -// events: '{{$baseurl}}/events/json/', -// header: { -// left: '', -// // center: 'title', -// right: '' -// }, -// timeFormat: 'H(:mm)', -// eventClick: function(calEvent, jsEvent, view) { -// showEvent(calEvent.id); -// }, -// loading: function(isLoading, view) { -// if(!isLoading) { -// $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); }); -// } -// }, -// -// eventRender: function(event, element, view) { -// //console.log(view.name); -// if (event.item['author-name']==null) return; -// switch(view.name){ -// case "month": -// element.find(".fc-event-title").html( -// "{1} : {2}".format( -// event.item['author-avatar'], -// event.item['author-name'], -// event.title -// )); -// break; -// case "agendaWeek": -// element.find(".fc-event-title").html( -// "{1}

{2}

{3}

".format( -// event.item['author-avatar'], -// event.item['author-name'], -// event.item.desc, -// event.item.location -// )); -// break; -// case "agendaDay": -// element.find(".fc-event-title").html( -// "{1}

{2}

{3}

".format( -// event.item['author-avatar'], -// event.item['author-name'], -// event.item.desc, -// event.item.location -// )); -// break; -// } -// } -// -// }) -// -// // center on date -// var args=location.href.replace(baseurl,"").split("/"); -// if (args.length>=4) { -// $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1); -// } -// -// // echo the title -// var view = $('#events-calendar').fullCalendar('getView'); -// $('#fc-title').text(view.title); -// -// // show event popup -// var hash = location.hash.split("-") -// if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]); -// -// }); - -// $(document).ready(function() { -// $('#events-calendar').fullCalendar({ -// -// events: '{{$baseurl}}/events/json/', -// header: { -// left: '', -// // center: 'title', -// right: '' -// }, -// timeFormat: 'H(:mm)', -// eventClick: function(calEvent, jsEvent, view) { -// showEvent(calEvent.id); -// }, -// loading: function(isLoading, view) { -// if(!isLoading) { -// $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); }); -// } -// }, -// -// eventRender: function(event, element, view) { -// //console.log(view.name); -// if (event.item['author-name']==null) return; -// switch(view.name){ -// case "month": -// element.find(".fc-event-title").html( -// "{1} : {2}".format( -// event.item['author-avatar'], -// event.item['author-name'], -// event.title -// )); -// break; -// case "agendaWeek": -// element.find(".fc-event-title").html( -// "{1}

{2}

{3}

".format( -// event.item['author-avatar'], -// event.item['author-name'], -// event.item.desc, -// event.item.location -// )); -// break; -// case "agendaDay": -// element.find(".fc-event-title").html( -// "{1}

{2}

{3}

".format( -// event.item['author-avatar'], -// event.item['author-name'], -// event.item.desc, -// event.item.location -// )); -// break; -// } -// } -// -// }) -// -// // center on date -// var args=location.href.replace(baseurl,"").split("/"); -// if (args.length>=4) { -// $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1); -// } -// -// // echo the title -// var view = $('#events-calendar').fullCalendar('getView'); -// $('#fc-title').text(view.title); -// -// // show event popup -// var hash = location.hash.split("-") -// if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]); -// -// }); - \ No newline at end of file diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl index 6ccce703b2..97892d186b 100644 --- a/view/theme/frio/templates/event_form.tpl +++ b/view/theme/frio/templates/event_form.tpl @@ -24,32 +24,42 @@ + {{* The tab conten with the necessary basic settings *}}
+ {{* The event title *}} {{include file="field_input.tpl" field=$summary}}
+ {{* The field for event starting time *}} {{$s_dsel}} + {{* The field for event finish time *}} {{$f_dsel}} + {{* checkbox if the the event doesn't have a finish time *}} {{include file="field_checkbox.tpl" field=$nofinish}} + {{* checkbox for adjusting the event time to the timezone of the user *}} {{include file="field_checkbox.tpl" field=$adjust}}
+ {{* checkbox to enable event sharing and the permissions tab *}} {{if ! $eid}} {{include file="field_checkbox.tpl" field=$share}} {{/if}} + {{* The submit button - saves the event *}}
+ {{* The advanced tab *}} + {{* The tab for the permissions (if event sharing is enabled) *}} + {{* The tab for the event preview (content is inserted by js) *}}
diff --git a/view/theme/frio/templates/events-js.tpl b/view/theme/frio/templates/events-js.tpl index 8734d4ea83..9e46b5c48a 100644 --- a/view/theme/frio/templates/events-js.tpl +++ b/view/theme/frio/templates/events-js.tpl @@ -2,10 +2,13 @@ {{$tabs}} {{include file="section_title.tpl" title=$title}} + {{* The link to create a new event *}} + {{* We create our own fullcallendar header (with title & calendar view *}}
+ {{* The dropdown to change the callendar view *}}
+ + {{* The buttons to change the month/weeks/days *}}
+ {{* The title (e.g. name of the mont/week/day) *}}

+ + {{* This is the container where the fullCalendar is inserted through js *}}
-- 2.39.5