Merge pull request #7343 from MrPetovan/bug/notices

Various small fixes

diff --git a/view/theme/frio/img/none.png b/view/theme/frio/img/none.png
new file mode 100644 (file)
index 0000000..c8375db
Binary files /dev/null and b/view/theme/frio/img/none.png differ

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 6a8aaf2c2819fcd06e1e292573c4b1934b421be1..d6336ae3ddcada84ac6056ddf4d1e77dc4849285 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -101,7 +101,7 @@ $nav_icon_color   = (empty($nav_icon_color)   ? '#fff'         : $nav_icon_color
 $link_color       = (empty($link_color)       ? '#6fdbe8'      : $link_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.
-$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);
 
 

diff --git a/view/theme/frio/templates/admin/blocklist/contact.tpl b/view/theme/frio/templates/admin/blocklist/contact.tpl
index 1f43b412b786c613bdabea15cf880c136f262252..59f02dba56ebb34c5385990f0adf38493fee9ad0 100644 (file)
--- a/view/theme/frio/templates/admin/blocklist/contact.tpl
+++ b/view/theme/frio/templates/admin/blocklist/contact.tpl
@@ -37,7 +37,7 @@
                        <div class="section-subtitle-wrapper" role="tab" id="admin-settings-contactblock-blocked">
                                <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">
-                                               {{$h_contacts}} ({{count($contacts)}})
+                                               {{$h_contacts}} ({{$total_contacts}})
                                        </a>
                                </h4>
                        </div>