From 93e5449c0843494c49ae799fa044299ca5cdeb6d Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 12 Nov 2015 20:22:36 -0800 Subject: really basic photo album widget for content regions --- view/tpl/photo_album.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index d22f82f8e..bbcdcefc1 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,7 +1,9 @@
+ {{if $order}} + {{/if}}
{{if $album_edit.1}} -- cgit v1.2.3 From def5edf93ced1527155053b64d666bf1812cbbca Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sat, 14 Nov 2015 20:43:34 +0100 Subject: nl+es and some other bits --- view/tpl/pwdreset.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl index a9106343f..dc17ed57a 100755 --- a/view/tpl/pwdreset.tpl +++ b/view/tpl/pwdreset.tpl @@ -1,3 +1,4 @@ +

{{$lbl1}}

@@ -13,3 +14,4 @@

{{$lbl6}}

+
-- cgit v1.2.3 From b531486dabfa66256b5809a6d7eac93a830be1f6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 17 Nov 2015 10:46:38 +0100 Subject: show jotnets toggle button only if there are jotnets and whitespace fixes --- view/tpl/acl_selector.tpl | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index a873457fe..013f3f296 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -8,11 +8,11 @@
{{if $jotnets}} + +
- {{$jotnets}} -
+ {{$jotnets}} +
{{/if}} @@ -41,14 +41,10 @@
-- cgit v1.2.3 From 6fa0807550f4e7a3da307afe9398e54c3d036228 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 17 Nov 2015 23:01:24 +0100 Subject: more css fixes --- view/tpl/hdr.tpl | 2 +- view/tpl/profile_vcard.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index c3f0700f0..3770cb9a6 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index bea0d894f..c52c2cd81 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -6,7 +6,7 @@
+
+
+
+
+
diff --git a/view/tpl/events_side.tpl b/view/tpl/events_side.tpl new file mode 100755 index 000000000..4659063c3 --- /dev/null +++ b/view/tpl/events_side.tpl @@ -0,0 +1,9 @@ +
+

{{$title}}

+ +
-- cgit v1.2.3 From b23284cba28335f61595f2264685b1bbafc19183 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 18 Nov 2015 23:56:25 +0100 Subject: move moment.min.js and remove unneeded files --- 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 5d87caa7c..d7734af3c 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -1,5 +1,5 @@ - + -- cgit v1.2.3 From ba52af786e0e2f27c36e82df9086dfb8d33d9062 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Nov 2015 11:38:34 +0100 Subject: move today button from aside to section title --- view/tpl/events-js.tpl | 1 + view/tpl/events_side.tpl | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 03c6a5fb6..d481af2e9 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -6,6 +6,7 @@
+
diff --git a/view/tpl/events_side.tpl b/view/tpl/events_side.tpl index 4659063c3..b9a9062b1 100755 --- a/view/tpl/events_side.tpl +++ b/view/tpl/events_side.tpl @@ -4,6 +4,5 @@
  • {{$month}}
  • {{$week}}
  • {{$day}}
    • -
  • {{$today}}
    • -- cgit v1.2.3 From c7652fc29ce2d69a6d71d6d8a928709cbf6ebbb0 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 20 Nov 2015 00:50:54 +0100 Subject: Had to switch these 2. Sorry. --- view/tpl/invite.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl index 2b7ab9cfb..c39e044bc 100755 --- a/view/tpl/invite.tpl +++ b/view/tpl/invite.tpl @@ -1,3 +1,4 @@ +
    @@ -28,3 +29,4 @@
    + -- cgit v1.2.3 From a3e47d26f617f06b3f9c8221a5240b3387131ddd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 20 Nov 2015 16:39:55 +0100 Subject: make calendar language aware --- 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 d7734af3c..346dfb154 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -38,7 +38,7 @@ $('#events-calendar').fullCalendar({ events: '{{$baseurl}}/events/json', header: false, - //lang: 'de', + lang: '{{$lang}}', eventLimit: 3, height: 'auto', -- cgit v1.2.3 From 6083cd255990c82380a85029b3951160eb558ac9 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 20 Nov 2015 21:55:13 -0500 Subject: If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs. --- view/tpl/jot-header.tpl | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index b405e4ac8..84fccc105 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -190,15 +190,27 @@ function enableOnUser(){ } function jotGetLink() { - reply = prompt("{{$linkurl}}"); - if(reply && reply.length) { - reply = bin2hex(reply); - $('#profile-rotator').spin('tiny'); - $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { - addeditortext(data); - $('#profile-rotator').spin(false); - }); - } + textarea = document.getElementById('profile-jot-text'); + if (textarea.selectionStart || textarea.selectionStart == "0") { + var start = textarea.selectionStart; + var end = textarea.selectionEnd; + if (end > start) { + reply = prompt("{{$linkurl}}"); + if(reply && reply.length) { + textarea.value = textarea.value.substring(0, start) + "[url=" + reply + "]" + textarea.value.substring(start, end) + "[/url]" + textarea.value.substring(end, textarea.value.length); + } + } else { + reply = prompt("{{$linkurl}}"); + if(reply && reply.length) { + reply = bin2hex(reply); + $('#profile-rotator').spin('tiny'); + $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { + addeditortext(data); + $('#profile-rotator').spin(false); + }); + } + } + } } function jotVideoURL() { -- cgit v1.2.3 From d726c921eb5902483dfeb82383829e9309f6b65c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 21 Nov 2015 15:33:57 +0100 Subject: make calendar week start (sun or mon) configurable --- view/tpl/event_head.tpl | 2 ++ view/tpl/settings.tpl | 1 + 2 files changed, 3 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 346dfb154..ae5f21234 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -39,6 +39,8 @@ events: '{{$baseurl}}/events/json', header: false, lang: '{{$lang}}', + firstDay: {{$first_day}}, + eventLimit: 3, height: 'auto', diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 7c1f4578d..2c71c64fb 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -159,6 +159,7 @@ {{/foreach}} + {{include file="field_checkbox.tpl" field=$cal_first_day}}
    -- cgit v1.2.3 From a7e4553ea75854e9ab5d94566d0f8d0550e4205b Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 22 Nov 2015 17:12:30 -0800 Subject: delivery report tweaks --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 0d375400c..5257b3ed6 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -143,7 +143,7 @@ {{$item.item_photo_menu}} - {{if $item.edpost}} + {{if $item.edpost && $item.dreport}}
  • {{$item.dreport}}
    • {{/if}} -- cgit v1.2.3 From 987619130b99bf4548d5d31ac453cdf48c818eff Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 24 Nov 2015 14:15:28 +0100 Subject: some event heavy lifting - please test and report issues --- view/tpl/event.tpl | 24 ++-- view/tpl/event_form.tpl | 291 ++++++++++++++++++++---------------------------- view/tpl/event_head.tpl | 13 +-- view/tpl/events-js.tpl | 7 +- view/tpl/jot.tpl | 10 +- 5 files changed, 146 insertions(+), 199 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index 5dfc91ebe..c1793c3e7 100755 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -1,16 +1,16 @@ {{foreach $events as $event}}
    -
    -
    - {{if $event.item.author.xchan_name}}{{$event.item.author.xchan_name}}{{/if}} -
    - {{$event.html}} -
    - {{if $event.item.plink}}{{/if}} - {{if $event.edit}}{{/if}} - {{if $event.drop}}{{/if}} -
    -
    -
    +
    +
    + {{if $event.item.author.xchan_name}}{{$event.item.author.xchan_name}}{{/if}} +
    + {{$event.html}} +
    + {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} + {{if $event.drop}}{{/if}} +
    +
    +
    {{/foreach}} diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 15505397b..e74aabc68 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,177 +1,130 @@ -
    - -

    {{$title}}

    - -

    -{{$desc}} -

    -
    - - - - - - - -
    {{$t_text}}
    -{{$required}} - -
    - -
    {{$s_text}}
    - -{{$s_dsel}} - -

    - -
    - -
    -
    -
    - -
    - -
    -
    {{$f_text}}
    -{{$f_dsel}} -
    - -
    - -{{include file="field_checkbox.tpl" field=$adjust}} - -
    - - - -{{if $catsenabled}} -
    - -
    -{{/if}} - - - -
    {{$d_text}}
    - - -
    -
    -
    -
    - - - - - -
    - -
    - - - -
    - -
    -
    - -
    - -
    {{$l_text}}
    - - - -
    -
    -
    -
    - - - - - -
    - -
    - - - - + + + + + + + + + {{include file="field_input.tpl" field=$summary}} + + {{$s_dsel}} + + {{$f_dsel}} + + {{include file="field_checkbox.tpl" field=$nofinish}} + + - -
    - - -
    - - - -
    -
    +
    -{{if ! $eid}} + {{if ! $eid}} + {{include file="field_checkbox.tpl" field=$share}} + {{$acl}} + {{/if}} -
    - -
    -
    -
    +
    - -
    - - - - -{{$acl}} - -{{/if}} - -
    - - - - + +
    + + {{if ! $eid}} + + {{/if}} + +
    - -
    diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index ae5f21234..0fc3da5bc 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -110,22 +110,13 @@ var view = $('#events-calendar').fullCalendar('getView'); $('#title').text(view.title); - - - }); - - - -