From fe57e7059bc6ef1942a6b054a4da8edfb5a07578 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Nov 2015 15:05:21 +0100 Subject: events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted --- view/tpl/event_head.tpl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index d193696b7..7c252f446 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -97,7 +97,7 @@ } } - }) + }); // center on date var args=location.href.replace(baseurl,"").split("/"); @@ -113,6 +113,18 @@ var view = $('#events-calendar').fullCalendar('getView'); $('#title').text(view.title); + // shift the finish time date on start time date change automagically + var origsval = $('#id_start_text').val(); + $('#id_start_text').change(function() { + var origfval = $('#id_finish_text').val(); + var sval = $('#id_start_text').val(); + var diff = origsval > sval ? moment(origsval).diff(sval) : moment(sval).diff(origsval); + var fval = origsval > sval ? moment(origfval).subtract(diff, 'millisecond').format("YYYY-MM-DD HH:mm") : moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm"); + $('#id_finish_text').val(fval); + origsval = sval; + }); + + // ACL $('#id_share').change(function() { if ($('#id_share').is(':checked')) { @@ -123,7 +135,6 @@ } }).trigger('change'); - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { -- cgit v1.2.3 From ab71e33d832c9207a7244436e5f40c51c7164a44 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Nov 2015 17:28:26 +0100 Subject: note to self: do not make things more complicated than they need to be. --- view/tpl/event_head.tpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 7c252f446..a7a455d50 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -118,8 +118,9 @@ $('#id_start_text').change(function() { var origfval = $('#id_finish_text').val(); var sval = $('#id_start_text').val(); - var diff = origsval > sval ? moment(origsval).diff(sval) : moment(sval).diff(origsval); - var fval = origsval > sval ? moment(origfval).subtract(diff, 'millisecond').format("YYYY-MM-DD HH:mm") : moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm"); + var diff = moment(sval).diff(origsval); + var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm"); + $('#id_finish_text').val(fval); origsval = sval; }); -- cgit v1.2.3 From a80c45940e14d75ef91b39e62d8aab9e2efc01cc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Nov 2015 19:02:48 +0100 Subject: add a if clause for the case we do not have a finish date --- view/tpl/event_head.tpl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index a7a455d50..ec43d7ab7 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -117,12 +117,13 @@ var origsval = $('#id_start_text').val(); $('#id_start_text').change(function() { var origfval = $('#id_finish_text').val(); - var sval = $('#id_start_text').val(); - var diff = moment(sval).diff(origsval); - var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm"); - - $('#id_finish_text').val(fval); - origsval = sval; + if(origfval) { + var sval = $('#id_start_text').val(); + var diff = moment(sval).diff(origsval); + var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm"); + $('#id_finish_text').val(fval); + origsval = sval; + } }); // ACL -- cgit v1.2.3 From 3ea84d7eab20947ac52dc7e6c205252f0a76c047 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Nov 2015 22:55:07 +0100 Subject: some basic event styling --- view/css/conversation.css | 16 ++++++++++++ view/theme/redbasic/css/style.css | 51 ++------------------------------------- view/tpl/event.tpl | 2 +- 3 files changed, 19 insertions(+), 50 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 08b51d2fa..6a64e7cc2 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -245,3 +245,19 @@ a.wall-item-name-link { color: #FF0000; font-size: 1em !important; } + +/* event item */ + +.event-title h3 { + font-weight: bold; +} + +.event-title, +.event-end, +.event-description { + padding-bottom: 10px; +} + +.event-label { + font-weight: bold; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 959550dbd..4dd58dd4c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -857,41 +857,10 @@ nav .acpopup { border-color: #ccc !important; } -.eventcal { - float: left; - font-size: 20px; -} - #event-summary-text { margin-top: 15px; } -.event-wrapper { - width: 400px; - height: auto; - padding: 10px; -} - -.vevent { - max-width: 100%; - margin: 10px; - padding: 10px; - border: 1px solid #CCCCCC; -} - -.vevent .event-summary { - margin: 10px; - font-weight: bold; -} - -.vevent .event-description, .vevent .event-location { - margin-left: 10px; - margin-right: 10px; -} -.vevent .event-start { - margin-left: 10px; - margin-right: 10px; -} #new-event-link { margin-bottom: 10px; @@ -904,29 +873,13 @@ nav .acpopup { margin-bottom: 15px; } -.event-description:before { - content: url('../../../../images/calendar.png'); - margin-right: 15px; -} - -.event-start, .event-end { - margin-left: 10px; - width: 300px; - clear: both; -} - .event-owner img { - padding: 10px; + padding-bottom: 10px; + padding-right: 10px; } .event-buttons { margin-top: 10px; - margin-left: 10px; -} - -.event-start .dtstart, .event-end .dtend { - float: right; - margin-right: 10px; } .event-list-date { diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index c1793c3e7..3fc2063ef 100755 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -2,7 +2,7 @@
- {{if $event.item.author.xchan_name}}{{$event.item.author.xchan_name}}{{/if}} + {{if $event.item.author.xchan_name}}{{$event.item.author.xchan_name}}{{/if}}
{{$event.html}}
-- cgit v1.2.3