From c29483b88cda69beb51f00ee8f2d262bc6784a24 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 2 Feb 2015 15:18:44 +0100 Subject: respect parent dir permissions --- view/tpl/attach_edit.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 5a8743919..4a438e8fd 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -22,11 +22,13 @@ {{/if}} + {{if !$isadir}}
+ {{/if}}
{{/if}} +
- -
- {{*/if*}} {{if $entry.public_forum}}
diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl index 49dea7d72..924bea252 100644 --- a/view/tpl/prep.tpl +++ b/view/tpl/prep.tpl @@ -12,9 +12,10 @@
{{$r.xchan_name}}
 -{{$rating_lbl}} {{$r.xlink_rating}} +
{{$rating_lbl}} {{$r.xlink_rating}}
{{if $r.xlink_rating_text}} -{{$rating_text_label}} {{$r.xlink_rating_text}} +
{{$rating_text_label}} {{$r.xlink_rating_text}} +
{{/if}}
-- cgit v1.2.3 From 5cb2f55dbbe715219dd18c60345e341ed478a753 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Feb 2015 16:52:09 -0800 Subject: rating form work --- view/tpl/direntry.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 1761ed12d..461c5dcde 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -17,7 +17,7 @@ {{*if $entry.rateme*}}
{{if $entry.total_ratings}}{{/if}} - +
{{*/if*}} {{if $entry.public_forum}} -- cgit v1.2.3 From 17ffe122b309610208d769f0e2b41f53fcf9d254 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Feb 2015 18:10:55 -0800 Subject: ratings - mopping up, most everything but directory sync implemented --- view/tpl/direntry.tpl | 6 +++--- view/tpl/js_strings.tpl | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 461c5dcde..1b84bca56 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -15,11 +15,11 @@
{{$entry.name}}{{if $entry.online}} {{/if}}
-{{*if $entry.rateme*}} +{{if $entry.viewrate}}
{{if $entry.total_ratings}}{{/if}} - +{{if $entry.canrate}}{{/if}}
-{{*/if*}} +{{/if}} {{if $entry.public_forum}}
{{$entry.forum_label}} @{{$entry.nickname}}+ diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index eb78c669f..9cfd84cf8 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -16,6 +16,9 @@ 'permschange' : "{{$permschange}}", 'closeAll' : "{{$closeAll}}", 'nothingnew' : "{{$nothingnew}}", + 'rating_desc' : "{{$rating_desc}}", + 'rating_val' : "{{$rating_val}}", + 'rating_text' : "{{$rating_text}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", -- cgit v1.2.3 From 4ead2cd79d3c7e5c29a11785a3ceefef6d3ba93f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Feb 2015 21:19:29 -0800 Subject: final cleanup on ratings feature --- view/tpl/direntry.tpl | 2 +- view/tpl/js_strings.tpl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 1b84bca56..b0a1084e8 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -17,7 +17,7 @@ {{if $entry.viewrate}}
{{if $entry.total_ratings}}{{/if}} -{{if $entry.canrate}}{{/if}} +{{if $entry.canrate}}{{/if}}
{{/if}} {{if $entry.public_forum}} diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 9cfd84cf8..4eb9ae844 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -19,6 +19,7 @@ 'rating_desc' : "{{$rating_desc}}", 'rating_val' : "{{$rating_val}}", 'rating_text' : "{{$rating_text}}", + 'submit' : "{{$submit}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", -- cgit v1.2.3 From 127bf82187c266c2202fd33003e60b5061778cd7 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Feb 2015 23:30:07 -0800 Subject: probably enough for now - couldn't get the censorship filter in today, I think that's the only bit missing. --- view/tpl/direntry.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index b0a1084e8..db098baa1 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,8 +1,8 @@ -
+
-
-
-{{$entry.alttext}} +
+
+{{$entry.alttext}} {{if $entry.connect}}
{{$entry.conn_label}}
{{/if}} @@ -13,10 +13,10 @@
-
{{$entry.name}}{{if $entry.online}} {{/if}}
+
{{$entry.name}}{{if $entry.online}} {{/if}}
{{if $entry.viewrate}} -
{{if $entry.total_ratings}}{{/if}} +
{{if $entry.total_ratings}}{{/if}} {{if $entry.canrate}}{{/if}}
{{/if}} -- cgit v1.2.3 From 398894851628ccb99090e9d70b92a9a909ef7015 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Feb 2015 15:48:39 -0800 Subject: first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories. --- view/tpl/profile_vcard.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index bff3148f3..bc093ebb5 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -50,10 +50,11 @@ {{if $connect}} {{$connect}} {{/if}} - +
+ {{$chanmenu}} {{$contact_block}} -- cgit v1.2.3 From 561bab4ece9fa5844a0cb00f3cbd75e0855b2796 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Feb 2015 17:32:29 -0800 Subject: remote rating and addition of rate-me to channel profile sidebar --- view/tpl/profile_vcard.tpl | 2 ++ view/tpl/rating_form.tpl | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 view/tpl/rating_form.tpl (limited to 'view/tpl') diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index bc093ebb5..cae920c5d 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -51,6 +51,8 @@ {{$connect}} {{/if}} +{{$rating}} +
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl new file mode 100644 index 000000000..216bf6ede --- /dev/null +++ b/view/tpl/rating_form.tpl @@ -0,0 +1,22 @@ +

{{$header}}

+ +
{{$tgt_name}}
+ +

{{$lbl_rating}}

+ +
+ +{{$rating}} + + + + + +

{{$lbl_rating_txt}}

+ + +
+ + + +
\ No newline at end of file -- cgit v1.2.3 From 1b5bd1d808637696b31f197c2b2194f00b903952 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Feb 2015 15:11:51 -0800 Subject: increase size of rating value to make it stand out a bit. --- view/tpl/prep.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl index 924bea252..9ebe3ac54 100644 --- a/view/tpl/prep.tpl +++ b/view/tpl/prep.tpl @@ -12,7 +12,7 @@
{{$r.xchan_name}}
 -
{{$rating_lbl}} {{$r.xlink_rating}}
+
{{$rating_lbl}} {{$r.xlink_rating}}
{{if $r.xlink_rating_text}}
{{$rating_text_label}} {{$r.xlink_rating_text}}
-- cgit v1.2.3 From 68978ad1c08daeb55581b95b4328905df42c847b Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Feb 2015 15:28:46 -0800 Subject: collapse overly-verbose ratings --- view/tpl/prep.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl index 9ebe3ac54..83a86372c 100644 --- a/view/tpl/prep.tpl +++ b/view/tpl/prep.tpl @@ -10,7 +10,7 @@ {{$r.xchan_addr}}
-
+
{{$r.xchan_name}}
{{$rating_lbl}} {{$r.xlink_rating}}
{{if $r.xlink_rating_text}} -- cgit v1.2.3