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 From b33420179712c0ba5dce484e63e7a9a0201daab1 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 25 Nov 2015 15:12:54 -0800 Subject: removed block style on dropdown contact name and details, added dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable --- view/js/autocomplete.js | 2 +- view/theme/redbasic/css/style.css | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 0af27c61b..511a7f815 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -60,7 +60,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick); if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return "
{2}{3}
".format(item.taggable, item.photo, item.name, desc, item.link); + return "
{2}{3}
".format(item.taggable, item.photo, item.name, desc, item.link); } else return "
" + item.text + "
"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 959550dbd..2fde8fde9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1289,14 +1289,14 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - display: block; +/* display: block; */ } .dropdown-sub-text { line-height: 1em; overflow: hidden; text-overflow: ellipsis; - display: block; +/* display: block; */ } .notify-seen a { @@ -2291,3 +2291,4 @@ nav .badge.mail-update:hover { .response-list ul { list-style-type: none; } + -- cgit v1.2.3 From 41542e68864373c336ae3da8ffe0ed03d3e107a8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 25 Nov 2015 17:34:03 -0800 Subject: document that you probably shouldn't set a primary directory server in somebody else's realm. --- view/en/htconfig.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index c6357b3a7..17ee7bfeb 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -81,7 +81,7 @@ $a->config['system']['php_path'] = '{{$phpath}}'; // Configure how we communicate with directory servers. // DIRECTORY_MODE_NORMAL = directory client, we will find a directory // DIRECTORY_MODE_SECONDARY = caching directory or mirror -// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_PRIMARY = master directory server - one per realm // DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services $a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; -- cgit v1.2.3 From c7cbd41c16e36a6244ada6d4317dcd390e8dde0d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 12:26:27 +0100 Subject: first iteration on the event item --- view/css/conversation.css | 3 +-- view/theme/redbasic/css/style.css | 13 +++++++++++-- view/tpl/conv_item.tpl | 5 +++++ view/tpl/conv_list.tpl | 5 +++++ view/tpl/search_item.tpl | 5 +++++ 5 files changed, 27 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 6a64e7cc2..24a22defb 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -249,11 +249,10 @@ a.wall-item-name-link { /* event item */ .event-title h3 { + margin: 0px 0px 10px 0px; font-weight: bold; } -.event-title, -.event-end, .event-description { padding-bottom: 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 357bb5093..f9aca1f59 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -857,6 +857,15 @@ nav .acpopup { border-color: #ccc !important; } +.wall-event-item { + padding: 10px; + color: #fff; + background-color: #3A87AD; /* should reflect calendar color */ + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; +} + + #event-summary-text { margin-top: 15px; } @@ -1242,14 +1251,14 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; -/* display: block; */ + display: block; } .dropdown-sub-text { line-height: 1em; overflow: hidden; text-overflow: ellipsis; -/* display: block; */ + display: block; } .notify-seen a { diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 5257b3ed6..206ee245e 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -13,6 +13,11 @@ {{$item.photo}}
{{/if}} + {{if $item.event}} +
+ {{$item.event}} +
+ {{/if}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 53f65bc78..cf1310ea6 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -13,6 +13,11 @@ {{$item.photo}}
{{/if}} + {{if $item.event}} +
+ {{$item.event}} +
+ {{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index b44e1c39e..b2689c7ba 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -7,6 +7,11 @@ {{$item.photo}}
{{/if}} + {{if $item.event}} +
+ {{$item.event}} +
+ {{/if}}
-- cgit v1.2.3 From 306ce3819ebdf761085b9a1247f62e01bf4c5adf Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 14:16:35 +0100 Subject: css fixes --- view/css/conversation.css | 1 + view/theme/redbasic/css/style.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 24a22defb..26478aa9c 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -253,6 +253,7 @@ a.wall-item-name-link { font-weight: bold; } +.event-end, .event-description { padding-bottom: 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f9aca1f59..91e684aaa 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -858,7 +858,7 @@ nav .acpopup { } .wall-event-item { - padding: 10px; + padding: 10px 10px 0px 10px; color: #fff; background-color: #3A87AD; /* should reflect calendar color */ border-top-left-radius: $radiuspx; -- cgit v1.2.3 From 17e7b276f6c647bc65cb34dfcb1c395e528ef8a3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 14:45:22 +0100 Subject: we also need nofinish in the object. css fices --- view/css/conversation.css | 1 - view/theme/redbasic/css/style.css | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 26478aa9c..24a22defb 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -253,7 +253,6 @@ a.wall-item-name-link { font-weight: bold; } -.event-end, .event-description { padding-bottom: 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 91e684aaa..fe6f10365 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -858,13 +858,16 @@ nav .acpopup { } .wall-event-item { - padding: 10px 10px 0px 10px; + padding: 10px; color: #fff; background-color: #3A87AD; /* should reflect calendar color */ border-top-left-radius: $radiuspx; border-top-right-radius: $radiuspx; } +.vevent .event-end { + padding-bottom: 10px; +} #event-summary-text { margin-top: 15px; -- cgit v1.2.3 From 8e3b796a2ff28d1c46fbae9d2b029e9f7252c0dc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 16:38:14 +0100 Subject: fix event rendering --- view/tpl/event_head.tpl | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'view') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index ec43d7ab7..05d58aba2 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -64,34 +64,35 @@ }, eventRender: function(event, element, view) { + //console.log(view.name); if (event.item['author']['xchan_name']==null) return; switch(view.name){ case "month": - element.find(".fc-event-title").html( - "{1} : {2}".format( + element.find(".fc-title").html( + " {1}: {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title )); break; case "agendaWeek": - element.find(".fc-event-title").html( - "{1}

{2}

{3}

".format( + element.find(".fc-title").html( + " {1}: {2}

{3}

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

{2}

{3}

".format( + element.find(".fc-title").html( + " {1}: {2}

{3}

".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], - event.item.desc, - event.item.location + event.title, + event.item.description )); break; } -- cgit v1.2.3 From c407e72dcc4d4f892e88e8260e662104586695f2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 16:40:40 +0100 Subject: add location --- view/tpl/event_head.tpl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 05d58aba2..4362360d3 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -79,20 +79,22 @@ break; case "agendaWeek": element.find(".fc-title").html( - " {1}: {2}

{3}

".format( + " {1}: {2}

{3}

{4}

".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, - event.item.description + event.item.description, + event.item.location )); break; case "agendaDay": element.find(".fc-title").html( - " {1}: {2}

{3}

".format( + " {1}: {2}

{3}

{4}

".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, - event.item.description + event.item.description, + event.item.location )); break; } -- cgit v1.2.3 From 8a269823d2fb0b8b8d39840042216e364c2567c7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 20:53:42 +0100 Subject: improve event rendering --- view/tpl/event_head.tpl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 4362360d3..fcd0f0df1 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -71,30 +71,32 @@ switch(view.name){ case "month": element.find(".fc-title").html( - " {1}: {2}".format( + " {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], - event.title + event.title, + event.item.description, + event.item.location.replace(/(<([^>]+)>)/ig,"") )); break; case "agendaWeek": element.find(".fc-title").html( - " {1}: {2}

{3}

{4}

".format( + " {1}: {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, event.item.description, - event.item.location + event.item.location.replace(/(<([^>]+)>)/ig,"") )); break; case "agendaDay": element.find(".fc-title").html( - " {1}: {2}

{3}

{4}

".format( + " {1}: {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, event.item.description, - event.item.location + event.item.location.replace(/(<([^>]+)>)/ig,"") )); break; } -- cgit v1.2.3 From 5cb71fa5da219e97a4c105c6025ff9b79553a38c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 21:00:04 +0100 Subject: default timepicker to 15 min steps. abbr -> span --- view/tpl/event_head.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index fcd0f0df1..f587d69a0 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -71,7 +71,7 @@ switch(view.name){ case "month": element.find(".fc-title").html( - " {2}".format( + " {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, @@ -81,7 +81,7 @@ break; case "agendaWeek": element.find(".fc-title").html( - " {1}: {2}".format( + " {1}: {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, @@ -91,7 +91,7 @@ break; case "agendaDay": element.find(".fc-title").html( - " {1}: {2}".format( + " {1}: {2}".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, -- cgit v1.2.3 From 056db37c662864954181fea9c1af48d69866340f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 22:14:20 +0100 Subject: beautify event item code --- view/tpl/event_item_content.tpl | 10 ++++++++++ view/tpl/event_item_header.tpl | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 view/tpl/event_item_content.tpl create mode 100755 view/tpl/event_item_header.tpl (limited to 'view') diff --git a/view/tpl/event_item_content.tpl b/view/tpl/event_item_content.tpl new file mode 100644 index 000000000..868e5ad27 --- /dev/null +++ b/view/tpl/event_item_content.tpl @@ -0,0 +1,10 @@ +{{if $description}} +
+ {{$description}} +
+{{/if}} +{{if $location}} +
+ {{$location_label}} {{$location}} +
+{{/if}} diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl new file mode 100755 index 000000000..de1899457 --- /dev/null +++ b/view/tpl/event_item_header.tpl @@ -0,0 +1,11 @@ +
+

{{$title}}

+
+
+ {{$dtstart_label}} {{$dtstart_dt}} +
+{{if $finish}} +
+ {{$dtend_label}} {{$dtend_dt}} +
+{{/if}} -- cgit v1.2.3 From 91b35c53494f0ab4b53430dd39bbbc21f019912a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 23:19:06 +0100 Subject: various css fixes --- view/css/mod_events.css | 6 ++++++ view/tpl/conv_item.tpl | 2 +- view/tpl/event_head.tpl | 18 +++++++++--------- view/tpl/js_strings.tpl | 1 + 4 files changed, 17 insertions(+), 10 deletions(-) (limited to 'view') diff --git a/view/css/mod_events.css b/view/css/mod_events.css index 00dcc40f8..5e0fc2bce 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -8,3 +8,9 @@ width: 100%; padding: 6px 12px; } + +.event-wrapper { + max-width: 700px; + height: auto; + padding: 10px; +} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 206ee245e..08f0d4fbe 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -183,7 +183,7 @@