From e0ab1e24e43e60cec955f82b1d4618050efebeac Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Tue, 18 Nov 2014 19:42:13 +0100 Subject: Directory shows channel suggestions by default --- view/tpl/direntry.tpl | 3 +++ view/tpl/peoplefind.tpl | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 2da920ab1..cdc6f1f97 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -6,6 +6,9 @@ {{if $entry.connect}}
{{$entry.conn_label}}
{{/if}} +{{if $entry.ignlink}} +
{{$entry.ignore_label}}
+{{/if}} diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 2f23948c8..16af5d8ed 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -12,7 +12,6 @@ -- cgit v1.2.3 From bfde28f28eae1f4b00aac03b2714254d14ab7464 Mon Sep 17 00:00:00 2001 From: RedMatrix Date: Wed, 19 Nov 2014 09:15:24 +1100 Subject: Revert "Directory shows channel suggestions by default" --- view/tpl/direntry.tpl | 3 --- view/tpl/peoplefind.tpl | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index cdc6f1f97..2da920ab1 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -6,9 +6,6 @@ {{if $entry.connect}}
{{$entry.conn_label}}
{{/if}} -{{if $entry.ignlink}} -
{{$entry.ignore_label}}
-{{/if}} diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 16af5d8ed..2f23948c8 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -12,6 +12,7 @@ -- cgit v1.2.3 From 38d50cabd4b3db859c5ac33f02760b1b00a993e5 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Nov 2014 15:13:37 -0800 Subject: private mail buttons --- view/tpl/msg-header.tpl | 28 ++++++++++++++-------------- view/tpl/prv_message.tpl | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'view') diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 503e4c8cc..85fa51b0a 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -52,10 +52,10 @@ else 'prvmail-upload-wrapper', { action: 'wall_upload/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, onComplete: function(file,response) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(response); + $('#prvmail-rotator').spin(false); } } ); @@ -64,23 +64,23 @@ else 'prvmail-attach-wrapper', { action: 'wall_attach/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, onComplete: function(file,response) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(response); + $('#prvmail-rotator').spin(false); } } ); }); - function jotGetLink() { + function prvmailJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#profile-rotator').spin('tiny'); + $('#prvmail-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(data); + $('#prvmail-rotator').spin(false); }); } } @@ -103,15 +103,15 @@ else event.target.textContent = reply; event.preventDefault(); if(reply && reply.length) { - $('#profile-rotator').spin('tiny'); + $('#prvmail-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(data); + $('#prvmail-rotator').spin(false); }); } } - function addeditortext(data) { + function addmailtext(data) { if(plaintext == 'none') { var currentText = $("#prvmail-text").val(); $("#prvmail-text").val(currentText + data); diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 709943541..c6f393aa4 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -34,21 +34,21 @@ - {{if $feature_expire}} - {{/if}} {{if $feature_encrypt}} - {{/if}}
- +
-- cgit v1.2.3 From 11f0b45a9015a717e6e0da1bfd5a1c61381d64ed Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Nov 2014 16:58:36 -0800 Subject: blog mode - turn the comment link into a button and group with the likes/dislikes --- view/tpl/conv_list.tpl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index b9a966e93..444734f48 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -104,7 +104,12 @@ -
+
+ + +
{{if $item.unseen_comments}}
{{/if}} + {{if $item.like_count}}
@@ -164,8 +169,6 @@ {{/if}}
-
{{$item.comment_count_txt}}{{if $item.unseen_comments}} -, {{$item.list_unseen_txt}}{{/if}}{{if $item.unseen_comments}}   
-- cgit v1.2.3 From 3224848bad07fefec7ab830e70634740329ccae6 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Nov 2014 19:02:28 -0800 Subject: turn the "adult photo flagging" (which prevents a particularly flagged photo from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. --- view/tpl/photo_view.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view') diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index a741a5ce7..45a7cd7e5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -59,9 +59,12 @@
+ {{if $edit.adult_enabled}}
{{include file="field_checkbox.tpl" field=$edit.adult}}
+ {{/if}} + {{$edit.aclselect}}
-- cgit v1.2.3 From 7fec939c23f2a23c8ac123d8a416cb2bde9ffbd9 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 19 Nov 2014 14:41:24 -0800 Subject: couple of fixes: - significantly increase the content availability on the discover channel - fix the button group on the blog/list mode which made the border on a single comment button a bit wonky --- view/tpl/conv_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 444734f48..aec1a78ab 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -104,7 +104,7 @@
-
+