Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7343 from MrPetovan/bug/notices

Browse source 
Various small fixes
This commit is contained in:
Michael Vogel 2019-07-06 08:19:42 +02:00 committed by GitHub
commit 0d27d410b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
view/theme/frio/img/none.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 156 B

2
view/theme/frio/style.php
View file

@ -101,7 +101,7 @@ $nav_icon_color = (empty($nav_icon_color) ? '#fff' : $nav_icon_color
$link_color = (empty($link_color) ? '#6fdbe8' : $link_color); $link_color = (empty($link_color) ? '#6fdbe8' : $link_color);
$background_color = (empty($background_color) ? '#ededed' : $background_color); $background_color = (empty($background_color) ? '#ededed' : $background_color);
// The background image can not be empty. So we use a dummy jpg if no image was set. // The background image can not be empty. So we use a dummy jpg if no image was set.
$background_image = (empty($background_image) ? 'img/none.jpg' : $background_image); $background_image = (empty($background_image) ? 'img/none.png' : $background_image);
$modified = (empty($modified) ? time() : $modified); $modified = (empty($modified) ? time() : $modified);

2
view/theme/frio/templates/admin/blocklist/contact.tpl
View file

@ -37,7 +37,7 @@
<div class="section-subtitle-wrapper" role="tab" id="admin-settings-contactblock-blocked"> <div class="section-subtitle-wrapper" role="tab" id="admin-settings-contactblock-blocked">
<h4> <h4>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-contactblock-blocked-collapse" aria-expanded="{{if count($contacts) > 0}}true{{else}}false{{/if}}" aria-controls="admin-settings-contactblock-blocked-collapse"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-contactblock-blocked-collapse" aria-expanded="{{if count($contacts) > 0}}true{{else}}false{{/if}}" aria-controls="admin-settings-contactblock-blocked-collapse">
{{$h_contacts}} ({{count($contacts)}}) {{$h_contacts}} ({{$total_contacts}})
</a> </a>
</h4> </h4>
</div> </div>