clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13628 from annando/icons 

Don't show dislike if unwanted / views use the correct icon now / colours adjusted
This commit is contained in:
Hypolite Petovan 2023-11-09 12:13:07 -08:00 committed by GitHub
parent c261bf8759 00395118f9
commit 2f1ec8e144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Object/Post.php
View File

@ -458,7 +458,8 @@ class Post
$title = ''; $title = '';
} }
if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'hide_dislike')) { $hide_dislike = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'hide_dislike');
if ($hide_dislike) {
$buttons['dislike'] = false; $buttons['dislike'] = false;
} }
@ -593,6 +594,7 @@ class Post
'vote' => $buttons, 'vote' => $buttons,
'like_html' => $responses['like']['output'], 'like_html' => $responses['like']['output'],
'dislike_html' => $responses['dislike']['output'], 'dislike_html' => $responses['dislike']['output'],
'hide_dislike' => $hide_dislike,
'emojis' => $emojis, 'emojis' => $emojis,
'quoteshares' => $this->getQuoteShares($item['quoteshares']), 'quoteshares' => $this->getQuoteShares($item['quoteshares']),
'reactions' => $reactions, 'reactions' => $reactions,

2
view/theme/frio/scheme/black.php
View File

@ -19,5 +19,5 @@ $background_color = '#000000';
$contentbg_transp = '0'; $contentbg_transp = '0';
$font_color = '#cccccc'; $font_color = '#cccccc';
$font_color_darker = '#acacac'; $font_color_darker = '#acacac';
$font_color_lighter = '#cdcdcd'; $font_color_lighter = '#444444';
$background_image = ''; $background_image = '';

2
view/theme/frio/scheme/dark.php
View File

@ -33,5 +33,5 @@ switch ($scheme_accent) {
$contentbg_transp = 4; $contentbg_transp = 4;
$font_color = '#e4e4e4'; $font_color = '#e4e4e4';
$font_color_darker = '#dcdcdc'; $font_color_darker = '#dcdcdc';
$font_color_lighter = '#ababab'; $font_color_lighter = '#555555';
$background_image = ''; $background_image = '';

9
view/theme/frio/templates/wall_thread.tpl
View File

@ -352,13 +352,17 @@ as the value of $top_child_total (this is done at the end of this file)
{{if $item.vote.dislike}} {{if $item.vote.dislike}}
<button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" ><i class="fa fa-thumbs-down" aria-hidden="true"></i></button> <button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" ><i class="fa fa-thumbs-down" aria-hidden="true"></i></button>
<span title="{{$item.responses.dislike.title}}">{{$item.responses.dislike.total}}</span> <span title="{{$item.responses.dislike.title}}">{{$item.responses.dislike.total}}</span>
{{else}} {{elseif !$item.hide_dislike}}
<button type="button" class="btn-link button-likes" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" disabled><i class="fa fa-thumbs-o-down" aria-hidden="true"></i></button> <button type="button" class="btn-link button-likes" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" disabled><i class="fa fa-thumbs-o-down" aria-hidden="true"></i></button>
{{/if}} {{/if}}
</span> </span>
{{foreach $item.reactions as $emoji}} {{foreach $item.reactions as $emoji}}
<span class="wall-item-emoji" title="{{$emoji.title}}">{{$emoji.emoji}} {{$emoji.total}}</span> {{if $emoji.icon.fa}}
<span class="wall-item-emoji" title="{{$emoji.title}}"><i class="fa {{$emoji.icon.fa}}" aria-hidden="true"></i> {{$emoji.total}}</span>
{{else}}
<span class="wall-item-emoji" title="{{$emoji.title}}">{{$emoji.emoji}} {{$emoji.total}}</span>
{{/if}}
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
@ -495,7 +499,6 @@ as the value of $top_child_total (this is done at the end of this file)
</span> </span>
{{/if}} {{/if}}
</span> </span>
<div class="wall-item-actions-items btn-toolbar btn-group visible-xs" role="group"> <div class="wall-item-actions-items btn-toolbar btn-group visible-xs" role="group">
<div class="wall-item-actions-row"> <div class="wall-item-actions-row">
{{* Button to open the comment text field *}} {{* Button to open the comment text field *}}