From 533f39debe494dc826570ff030fcda35041d9038 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Feb 2015 17:01:13 -0800 Subject: [PATCH] bring back like/dislike summaries on photos --- include/ItemObject.php | 4 -- include/conversation.php | 2 +- mod/photos.php | 24 +++++++++-- view/tpl/photo_view.tpl | 89 ++++++++++++++-------------------------- 4 files changed, 52 insertions(+), 67 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index 136e08eb7..1785d55e7 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -168,10 +168,6 @@ class Item extends BaseObject { $responses = get_responses($conv_responses,$response_verbs,$this,$item); - - - $like_button_label = tt('Like','Likes',$like_count,'noun'); - $like_count = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid']] : ''); $like_list = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid'] . '-l'] : ''); if (count($like_list) > MAX_LIKERS) { diff --git a/include/conversation.php b/include/conversation.php index 17822d0d5..8bc42b34b 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1664,7 +1664,7 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) { if(count($ret[$v]['list']) > MAX_LIKERS) { $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); array_push($ret[$v]['list_part'], '' . t('View all') . ''); + . (($ob) ? $ob->get_id() : $item['id']) . '">' . t('View all') . ''); } else { $ret[$v]['list_part'] = ''; diff --git a/mod/photos.php b/mod/photos.php index 8ac6ed3d7..297790f6e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -974,13 +974,21 @@ function photos_content(&$a) { $like = ''; $dislike = ''; + $conv_responses = array( + 'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')), + 'agree' => array('title' => t('Agree','title')),'disagree' => array('title' => t('Disagree','title')), 'abstain' => array('title' => t('Abstain','title')), + 'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title')) + ); + + + if($r) { -// foreach($r as $item) { -// like_puller($a,$item,$alike,'like'); -// like_puller($a,$item,$dlike,'dislike'); -// } + foreach($r as $item) { + builtin_activity_puller($item, $conv_responses); + } + $like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : ''); $like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : ''); @@ -1084,6 +1092,13 @@ function photos_content(&$a) { $dislike_e = $dislike; + $response_verbs = array('like'); + if(feature_enabled($owner_uid,'dislike')) + $response_verbs[] = 'dislike'; + + + $responses = get_responses($conv_responses,$response_verbs,'',$link_item); + $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( '$id' => $link_item['id'], //$ph[0]['id'], @@ -1098,6 +1113,7 @@ function photos_content(&$a) { '$unknown' => t('Unknown'), '$tag_hdr' => t('In This Photo:'), '$tags' => $tags, + 'responses' => $responses, '$edit' => $edit, '$likebuttons' => $likebuttons, '$like' => $like_e, diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 45a7cd7e5..3ece68876 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -95,70 +95,43 @@ {{/if}}
- {{if $like_count || $dislike_count}} -
-
- {{if $like_count}} -
- - {{if $like_list_part}} - - {{else}} - - {{/if}} -
+ + {{if $responses.count }} +
+
+ {{foreach $responses as $verb=>$response}} + {{if $response.count}} +
+ + {{if $response.list_part}} + + {{else}} + {{/if}} - {{if $dislike_count}} -
- - {{if $dislike_list_part}} - - {{else}} - - {{/if}} -
+ {{if $response.list_part}} + {{/if}}
- {{if $like_list_part}} - {{/if}} - {{if $dislike_list_part}} - - {{/if}} -
+ {{/foreach}}
{{/if}} - +
{{if $likebuttons}}