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/tpl') 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/tpl') 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/tpl') 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/tpl/event.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') 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 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/tpl/conv_item.tpl | 5 +++++ view/tpl/conv_list.tpl | 5 +++++ view/tpl/search_item.tpl | 5 +++++ 3 files changed, 15 insertions(+) (limited to 'view/tpl') 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 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/tpl') 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/tpl') 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/tpl') 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/tpl') 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/tpl') 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/tpl/conv_item.tpl | 2 +- view/tpl/event_head.tpl | 18 +++++++++--------- view/tpl/js_strings.tpl | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'view/tpl') 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 @@

{{$response.title}}

-
    {{foreach $response.list as $liker}}
  • {{$liker}}
    • {{/foreach}}
+
    {{foreach $response.list as $liker}}
  • {{$liker}}
    • {{/foreach}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index f587d69a0..6a38057fd 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -71,32 +71,32 @@ 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, - event.item.description, - event.item.location.replace(/(<([^>]+)>)/ig,"") + event.item.description ? event.item.description + "\r\n\r\n" : '', + event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' )); 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, - event.item.description, - event.item.location.replace(/(<([^>]+)>)/ig,"") + event.item.description ? event.item.description + "\r\n\r\n" : '', + event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' )); 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, - event.item.description, - event.item.location.replace(/(<([^>]+)>)/ig,"") + event.item.description ? event.item.description + "\r\n\r\n" : '', + event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' )); break; } diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 38cf8edbd..4243c2ea5 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -22,6 +22,7 @@ 'submit' : "{{$submit}}", 'linkurl' : "{{$linkurl}}", 'leavethispage' : "{{$leavethispage}}", + 'location' : "{{$location}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", -- cgit v1.2.3 From a73c3858318f0efe54dacd585d76e272041fba32 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Nov 2015 23:29:49 +0100 Subject: lost calendar icon --- view/tpl/event_item_header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl index de1899457..70ddfd808 100755 --- a/view/tpl/event_item_header.tpl +++ b/view/tpl/event_item_header.tpl @@ -1,5 +1,5 @@
-

{{$title}}

+

 {{$title}}

{{$dtstart_label}} {{$dtstart_dt}} -- cgit v1.2.3 From ee153f64d459406f429a8951e95ec0d50fa66956 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 27 Nov 2015 13:32:20 +0100 Subject: add spinner to events --- view/tpl/event_head.tpl | 4 ++++ view/tpl/events-js.tpl | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 6a38057fd..745cdc0e6 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -55,7 +55,11 @@ showEvent(calEvent.id); }, loading: function(isLoading, view) { + $('#events-spinner').spin('tiny'); + $('#events-spinner > i').css('color', 'transparent'); if(!isLoading) { + $('#events-spinner').spin(false); + $('#events-spinner > i').css('color', 'unset'); $('td.fc-day').dblclick(function() { openMenu('form'); //window.location.href='/events/new?start='+$(this).data('date'); diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index b2de90da1..2b6170ff4 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,12 +1,13 @@
+
- +
-- cgit v1.2.3 From e569f5d6ebc44b8bd6011e8ec2db757188b51c48 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 27 Nov 2015 14:00:37 +0100 Subject: unset does not work in webkit browsers --- view/tpl/event_head.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 745cdc0e6..dc98d14b3 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -59,7 +59,7 @@ $('#events-spinner > i').css('color', 'transparent'); if(!isLoading) { $('#events-spinner').spin(false); - $('#events-spinner > i').css('color', 'unset'); + $('#events-spinner > i').css('color', ''); $('td.fc-day').dblclick(function() { openMenu('form'); //window.location.href='/events/new?start='+$(this).data('date'); -- cgit v1.2.3 From bcfa72ed310f05dc9a5fca9e724c07b7216aa7fd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 27 Nov 2015 22:45:28 +0100 Subject: move events tools to aside widget --- view/tpl/events-js.tpl | 16 ---------------- view/tpl/events_side.tpl | 8 -------- 2 files changed, 24 deletions(-) delete mode 100755 view/tpl/events_side.tpl (limited to 'view/tpl') diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 2b6170ff4..08c8aa64a 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,10 +1,7 @@
- - -
@@ -17,19 +14,6 @@ -
diff --git a/view/tpl/events_side.tpl b/view/tpl/events_side.tpl deleted file mode 100755 index b9a9062b1..000000000 --- a/view/tpl/events_side.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
-

{{$title}}

- -
-- cgit v1.2.3 From fce1dc083b0d6d8294463b9e698924f6f53593cd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 27 Nov 2015 22:53:36 +0100 Subject: add templates --- view/tpl/events_menu_side.tpl | 8 ++++++++ view/tpl/events_tools_side.tpl | 15 +++++++++++++++ 2 files changed, 23 insertions(+) create mode 100755 view/tpl/events_menu_side.tpl create mode 100755 view/tpl/events_tools_side.tpl (limited to 'view/tpl') diff --git a/view/tpl/events_menu_side.tpl b/view/tpl/events_menu_side.tpl new file mode 100755 index 000000000..b9a9062b1 --- /dev/null +++ b/view/tpl/events_menu_side.tpl @@ -0,0 +1,8 @@ +
+

{{$title}}

+ +
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl new file mode 100755 index 000000000..5e20511fc --- /dev/null +++ b/view/tpl/events_tools_side.tpl @@ -0,0 +1,15 @@ +
+

{{$title}}

+ + +
-- cgit v1.2.3 From 122d7281f7d4b55ef8adf8791bdab51b4b797ba8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 28 Nov 2015 11:04:33 +0100 Subject: fix tpl if clause --- view/tpl/settings.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 2c71c64fb..af5f222fe 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -159,12 +159,12 @@ {{/foreach}}
+ {{/if}} {{include file="field_checkbox.tpl" field=$cal_first_day}}
- {{/if}}
-- cgit v1.2.3 From 7db86a4e0505235b154a1121835861b0b6a76581 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 28 Nov 2015 14:47:17 +0100 Subject: css fixes --- view/tpl/event_item_content.tpl | 6 +++--- view/tpl/event_item_header.tpl | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/event_item_content.tpl b/view/tpl/event_item_content.tpl index 868e5ad27..76e0f4616 100644 --- a/view/tpl/event_item_content.tpl +++ b/view/tpl/event_item_content.tpl @@ -1,10 +1,10 @@ {{if $description}} -
+
{{$description}}
{{/if}} {{if $location}} -
- {{$location_label}} {{$location}} +
+ {{$location_label}} {{$location}}
{{/if}} diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl index 70ddfd808..9547676e9 100755 --- a/view/tpl/event_item_header.tpl +++ b/view/tpl/event_item_header.tpl @@ -1,11 +1,11 @@ -
+

 {{$title}}

-
- {{$dtstart_label}} {{$dtstart_dt}} +
+ {{$dtstart_label}} {{$dtstart_dt}}
{{if $finish}} -
- {{$dtend_label}} {{$dtend_dt}} +
+ {{$dtend_label}} {{$dtend_dt}}
{{/if}} -- cgit v1.2.3 From 593423434c0c0e8d1ebb43d97b2dda7e6b4d67bd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 2 Dec 2015 09:44:25 +0100 Subject: fix attachment rendering for mail --- view/tpl/mail_conv.tpl | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 4f54f1a6a..5e5d9808d 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -13,6 +13,12 @@ {{$mail.body}}
+ {{if $mail.attachments}} +
+ + +
+ {{/if}}

{{if $entry.public_forum}} {{/if}}{{$entry.name}}{{if $entry.online}} {{/if}}

-
+
-- cgit v1.2.3 From 69c9f4588c57a1159ab18c5987f99ea5471579d5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 7 Dec 2015 12:13:51 +0100 Subject: make justify gallery work with more than one albums per page (eg album widget) --- view/tpl/photo_album.tpl | 4 ++-- view/tpl/photos_recent.tpl | 4 ++-- view/tpl/photosajax.tpl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index bbcdcefc1..95169164a 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -21,7 +21,7 @@ {{$upload_form}} {{$album_edit.1}}
-
+
{{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} @@ -30,5 +30,5 @@
- +
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 46ac65e87..f3131117c 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -8,7 +8,7 @@
{{$upload_form}}
-
+
{{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} @@ -17,5 +17,5 @@
- +
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index 705cb6c75..45191db85 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,4 +1,4 @@ {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} - + -- cgit v1.2.3 From b9f5076cfc254fffe708d32aa2752adbc1857675 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 7 Dec 2015 19:17:40 -0800 Subject: move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time) --- view/tpl/diaspora_comment.tpl | 11 ----------- view/tpl/diaspora_comment_relay.tpl | 12 ------------ view/tpl/diaspora_consensus.tpl | 17 ----------------- view/tpl/diaspora_conversation.tpl | 29 ----------------------------- view/tpl/diaspora_like.tpl | 12 ------------ view/tpl/diaspora_like_relay.tpl | 13 ------------- view/tpl/diaspora_message.tpl | 13 ------------- view/tpl/diaspora_photo.tpl | 13 ------------- view/tpl/diaspora_post.tpl | 13 ------------- view/tpl/diaspora_relay_retraction.tpl | 10 ---------- view/tpl/diaspora_relayable_retraction.tpl | 11 ----------- view/tpl/diaspora_reshare.tpl | 13 ------------- view/tpl/diaspora_retract.tpl | 9 --------- view/tpl/diaspora_share.tpl | 8 -------- view/tpl/diaspora_signed_retract.tpl | 10 ---------- 15 files changed, 194 deletions(-) delete mode 100644 view/tpl/diaspora_comment.tpl delete mode 100644 view/tpl/diaspora_comment_relay.tpl delete mode 100644 view/tpl/diaspora_consensus.tpl delete mode 100644 view/tpl/diaspora_conversation.tpl delete mode 100644 view/tpl/diaspora_like.tpl delete mode 100644 view/tpl/diaspora_like_relay.tpl delete mode 100644 view/tpl/diaspora_message.tpl delete mode 100644 view/tpl/diaspora_photo.tpl delete mode 100644 view/tpl/diaspora_post.tpl delete mode 100644 view/tpl/diaspora_relay_retraction.tpl delete mode 100644 view/tpl/diaspora_relayable_retraction.tpl delete mode 100644 view/tpl/diaspora_reshare.tpl delete mode 100644 view/tpl/diaspora_retract.tpl delete mode 100644 view/tpl/diaspora_share.tpl delete mode 100644 view/tpl/diaspora_signed_retract.tpl (limited to 'view/tpl') diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl deleted file mode 100644 index 27ec3dffc..000000000 --- a/view/tpl/diaspora_comment.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - {{$guid}} - {{$parent_guid}} - {{$authorsig}} - {{$body}} - {{$handle}} - - - \ No newline at end of file diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl deleted file mode 100644 index 37a9e88b3..000000000 --- a/view/tpl/diaspora_comment_relay.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - {{$guid}} - {{$parent_guid}} - {{$parentsig}} - {{$authorsig}} - {{$body}} - {{$handle}} - - - \ No newline at end of file diff --git a/view/tpl/diaspora_consensus.tpl b/view/tpl/diaspora_consensus.tpl deleted file mode 100644 index b6b7cf13d..000000000 --- a/view/tpl/diaspora_consensus.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -{{$guid_q}} -{{$question}} - - {{$guid_y}} - {{$agree}} - - - {{$guid_n}} - {{$disagree}} - - - {{$guid_a}} - {{$abstain}} - - - diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl deleted file mode 100644 index dc4482e4b..000000000 --- a/view/tpl/diaspora_conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - {{$conv.guid}} - {{$conv.subject}} - {{$conv.created_at}} - - {{foreach $conv.messages as $msg}} - - - {{$msg.guid}} - {{$msg.parent_guid}} - {{if $msg.parent_author_signature}} - {{$msg.parent_author_signature}} - {{/if}} - {{$msg.author_signature}} - {{$msg.text}} - {{$msg.created_at}} - {{$msg.diaspora_handle}} - {{$msg.conversation_guid}} - - - {{/foreach}} - - {{$conv.diaspora_handle}} - {{$conv.participant_handles}} - - - diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl deleted file mode 100644 index a27e92240..000000000 --- a/view/tpl/diaspora_like.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - {{$positive}} - {{$guid}} - {{$target_type}} - {{$parent_guid}} - {{$authorsig}} - {{$handle}} - - - diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl deleted file mode 100644 index 8209540c5..000000000 --- a/view/tpl/diaspora_like_relay.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - {{$positive}} - {{$guid}} - {{$target_type}} - {{$parent_guid}} - {{$parentsig}} - {{$authorsig}} - {{$handle}} - - - diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl deleted file mode 100644 index 3413d79b0..000000000 --- a/view/tpl/diaspora_message.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - {{$msg.guid}} - {{$msg.parent_guid}} - {{$msg.author_signature}} - {{$msg.text}} - {{$msg.created_at}} - {{$msg.diaspora_handle}} - {{$msg.conversation_guid}} - - - diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl deleted file mode 100644 index 256459d8d..000000000 --- a/view/tpl/diaspora_photo.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - {{$guid}} - {{$handle}} - {{$public}} - {{$created_at}} - {{$path}} - {{$filename}} - {{$msg_guid}} - - - diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl deleted file mode 100644 index ebfe9e5b7..000000000 --- a/view/tpl/diaspora_post.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - {{$body}} - {{$guid}} - {{$handle}} - {{$poll}} - {{$public}} - {{$created}} - {{$provider}} - - - diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl deleted file mode 100644 index 5e7aed41f..000000000 --- a/view/tpl/diaspora_relay_retraction.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - {{$type}} - {{$guid}} - {{$signature}} - {{$handle}} - - - diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl deleted file mode 100644 index 4e3ff3243..000000000 --- a/view/tpl/diaspora_relayable_retraction.tpl +++ /dev/null @@ -1,11 +0,0 @@ - - - - {{$parentsig}} - {{$guid}} - {{$target_type}} - {{$handle}} - {{$authorsig}} - - - diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl deleted file mode 100644 index 963bb9e12..000000000 --- a/view/tpl/diaspora_reshare.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - {{$root_handle}} - {{$root_guid}} - {{$guid}} - {{$handle}} - {{$public}} - {{$created}} - {{$provider}} - - - diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl deleted file mode 100644 index 9df066d38..000000000 --- a/view/tpl/diaspora_retract.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - - - {{$guid}} - {{$handle}} - {{$type}} - - - diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl deleted file mode 100644 index 59eb06124..000000000 --- a/view/tpl/diaspora_share.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - {{$sender}} - {{$recipient}} - - - \ No newline at end of file diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl deleted file mode 100644 index f0f346da8..000000000 --- a/view/tpl/diaspora_signed_retract.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - {{$guid}} - {{$type}} - {{$handle}} - {{$signature}} - - - -- cgit v1.2.3 From 29ac533cc908a57115d52a8659bce348b36ae6fa Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 8 Dec 2015 16:32:06 -0800 Subject: remove some unused stuff --- view/tpl/jot.tpl | 2 -- 1 file changed, 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index e7edb7e64..32a08a9b3 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -118,8 +118,6 @@
  • {{if $writefiles}}
  •  {{$attach}}
    • {{/if}}
  •  {{$weblink}}
    • - - {{/if}}
  •  {{$setloc}}
    • -- cgit v1.2.3 From 5a59cd9b8cd6e0c00260f47c50e5433b070155d1 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Tue, 15 Dec 2015 21:00:40 +0100 Subject: Invitation only added to the admin site page. Plus css wrapper class to docu search. --- view/tpl/admin_site.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 4add59a0d..0e65dfa69 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -58,6 +58,7 @@

    {{$registration}}

    {{include file="field_input.tpl" field=$register_text}} {{include file="field_select.tpl" field=$register_policy}} + {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_select.tpl" field=$access_policy}} {{include file="field_textarea.tpl" field=$allowed_email}} {{include file="field_textarea.tpl" field=$not_allowed_email}} -- cgit v1.2.3 From f78e9001f3d1b15b91787e956aa3555574dc2371 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 17 Dec 2015 19:39:26 +0100 Subject: fix search item attachment rendering --- view/tpl/search_item.tpl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index b2689c7ba..24e1b97d5 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -65,11 +65,6 @@ {{$item.folders}}
    {{/if}} - {{if $item.attachments}} -
    - {{$item.attachments}} -
    - {{/if}}
    {{/if}} @@ -88,6 +83,12 @@ {{/if}}
    + {{if $item.attachments}} +
    + + +
    + {{/if}}
    -- cgit v1.2.3