From 6731ffbfc8eeeda4c60b1693e45ea0a708a4ebce Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 23 May 2015 19:23:32 +0200 Subject: [PATCH 1/2] event preview for frost theme --- view/templates/event_head.tpl | 10 +++++----- view/theme/frost/js/theme.js | 8 ++++++++ view/theme/frost/templates/event_form.tpl | 4 +++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl index 31f389d9e3..4b34ee182f 100644 --- a/view/templates/event_head.tpl +++ b/view/templates/event_head.tpl @@ -14,11 +14,11 @@ } function doEventPreview() { - $('#event-edit-preview').val(1); - $.post('events',$('#event-edit-form').serialize(), function(data) { - $.colorbox({ html: data }); - }); - $('#event-edit-preview').val(0); + $('#event-edit-preview').val(1); + $.post('events',$('#event-edit-form').serialize(), function(data) { + $.colorbox({ html: data }); + }); + $('#event-edit-preview').val(0); } diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js index 5d61d5ae89..1de9d3a96b 100644 --- a/view/theme/frost/js/theme.js +++ b/view/theme/frost/js/theme.js @@ -353,6 +353,14 @@ function showEvent(eventid) { ); } +function doEventPreview() { + $('#event-edit-preview').val(1); + $.post('events',$('#event-edit-form').serialize(), function(data) { + $.colorbox({ html: data }); + }); + $('#event-edit-preview').val(0); +} + function initCrop() { function onEndCrop( coords, dimensions ) { $PR( 'x1' ).value = coords.x1; diff --git a/view/theme/frost/templates/event_form.tpl b/view/theme/frost/templates/event_form.tpl index f8e1d65605..f348512b45 100644 --- a/view/theme/frost/templates/event_form.tpl +++ b/view/theme/frost/templates/event_form.tpl @@ -5,11 +5,12 @@ {{$desc}}

-
+ +
{{$s_text}}
{{$s_dsel}} {{$s_tsel}} @@ -45,6 +46,7 @@ {{$acl}}
+
From 5e6c140fc13755f63a87fc9ba25fb6cf14b300eb Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 23 May 2015 20:02:57 +0200 Subject: [PATCH 2/2] add double click on calendar day for frost theme --- view/theme/frost/js/theme.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js index 1de9d3a96b..a14a034bc1 100644 --- a/view/theme/frost/js/theme.js +++ b/view/theme/frost/js/theme.js @@ -159,6 +159,11 @@ $(document).ready(function() { 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);