diff options
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 6 | ||||
| -rw-r--r-- | include/conversation.php | 3 | ||||
| -rw-r--r-- | view/css/conversation.css | 5 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 16 |
4 files changed, 22 insertions, 8 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index a1e721dd7..2bab4a0ca 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -174,6 +174,11 @@ class ThreadItem { $responses = get_responses($conv_responses,$response_verbs,$this,$item); + $my_responses = []; + foreach($response_verbs as $v) { + $my_responses[$v] = (($conv_responses[$v][$item['mid'] . '-m']) ? 1 : 0); + } + $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) { @@ -381,6 +386,7 @@ class ThreadItem { 'list_unseen_txt' => $list_unseen_txt, 'markseen' => t('Mark all seen'), 'responses' => $responses, + 'my_responses' => $my_responses, 'like_count' => $like_count, 'like_list' => $like_list, 'like_list_part' => $like_list_part, diff --git a/include/conversation.php b/include/conversation.php index e515fb26a..c6eb7c589 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1053,6 +1053,9 @@ function builtin_activity_puller($item, &$conv_responses) { $conv_responses[$mode][$item['thr_parent']] ++; $conv_responses[$mode][$item['thr_parent'] . '-l'][] = $url; + if(get_observer_hash() && get_observer_hash() === $item['author_xchan']) { + $conv_responses[$mode][$item['thr_parent'] . '-m'] = true; + } // there can only be one activity verb per item so if we found anything, we can stop looking return; diff --git a/view/css/conversation.css b/view/css/conversation.css index e8b2f926b..7d4fdc746 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -340,3 +340,8 @@ img.smiley.emoji:hover { #filer_save { margin-left: 15px; } + +.ivoted { + font-weight: bold; + font-size: 120%; +}
\ No newline at end of file diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 7e42aa891..5bf4bc5b6 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -94,35 +94,35 @@ <div class="btn-group dropdown"> {{if $item.like}} <button type="button" title="{{$item.like.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false;"> - <i class="fa fa-thumbs-o-up" ></i> + <i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i> </button> {{/if}} {{if $item.dislike}} <button type="button" title="{{$item.dislike.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;"> - <i class="fa fa-thumbs-o-down" ></i> + <i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i> </button> {{/if}} {{if $item.isevent}} <button type="button" title="{{$item.attend.0}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;"> - <i class="fa fa-check" ></i> + <i class="fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> </button> <button type="button" title="{{$item.attend.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'attendno'); return false;"> - <i class="fa fa-times" ></i> + <i class="fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> </button> <button type="button" title="{{$item.attend.2}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;"> - <i class="fa fa-question" ></i> + <i class="fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> </button> {{/if}} {{if $item.canvote}} <button type="button" title="{{$item.conlabels.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'agree'); return false;"> - <i class="fa fa-check" ></i> + <i class="fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> </button> <button type="button" title="{{$item.conlabels.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'disagree'); return false;"> - <i class="fa fa-times" ></i> + <i class="fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> </button> <button type="button" title="{{$item.conlabels.2}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'abstain'); return false;"> - <i class="fa fa-question" ></i> + <i class="fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> </button> {{/if}} <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> |