From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 7 Mar 2016 17:12:40 +0000 (-0500)
Subject: Bug 16001 - Use standard message dialog when there are no cities to list
X-Git-Tag: v16.11.00~1434
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=89b41ede653227c5b4f777d6a4b30422ab473153;hp=ca36a74c868f25217e0db0900f043b4403aa9e01;p=koha_ffzg

Bug 16001 - Use standard message dialog when there are no cities to list

If there are no existing cities in Administration -> Cities and Towns,
the message saying so should be in the standard message dialog.

Another minor change: Edit the message to say "There are no cities
defined," which I think reads better in English.

To test you must have no cities and towns defined.

Apply this patch and go to Administration -> Cities and Towns. You
should see a message displayed in a standard "message" style dialog.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Better view, no errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index f6a85ea136..a380a4557e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -146,7 +146,7 @@
         Searching: [% searchfield %]
     [% END %]
 
-    [% IF cities %]
+    [% IF cities.count %]
         <table id="table_cities">
             <thead>
                 <th>City ID</th>
@@ -172,7 +172,9 @@
             </tbody>
         </table>
     [% ELSE %]
-        There is no city defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">Create a new city</a>.
+        <div class="dialog message">
+            There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">Create a new city</a>.
+        </div>
     [% END %]
 [% END %]