[Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 6652, Zip showing in funny place on libraries admin

[Nicole C. Engard]

From: Owen Leonard <oleonard at myacpl.org>

This fixes display of Zip code relative to the city and state if
you're in the USA and you like to do it this way. At the very
least this matches how we display addresses elsewhere in Koha.

It should be noted that this makes it incorrect for anyone who
wants to see addresses like this:

[name]
[street address]
[postal code + city]

...or any other variation of course.

While I'm in there, also making branch URLs and emails clickable.

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/admin/branches.tt              |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index b92ad52..42ddb52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -209,11 +209,11 @@
                             <br />[% branche.branchaddress2 |html %][% END %]
                         [% IF ( branche.branchaddress3 ) %]
                             <br />[% branche.branchaddress3 |html %][% END %]
-                        [% IF ( branche.branchzip ) %]
-                            <br />[% branche.branchzip |html %][% END %]
                         [% IF ( branche.branchcity ) %]
-                            <br />[% branche.branchcity |html %][% END %][% IF ( branche.branchstate ) %], 
+                            <br />[% branche.branchcity |html %][% END %][% IF ( branche.branchstate ) %],
                             [% branche.branchstate |html %][% END %]
+                        [% IF ( branche.branchzip ) %]
+                            [% branche.branchzip |html %][% END %]
                         [% IF ( branche.branchcountry ) %]
                             <br />[% branche.branchcountry |html %][% END %]
                         [% IF ( branche.branchphone ) %]
@@ -221,9 +221,9 @@
                         [% IF ( branche.branchfax ) %]
                             <br />Fax: [% branche.branchfax |html %][% END %]
                         [% IF ( branche.branchemail ) %]
-                            <br />Email: [% branche.branchemail |html %][% END %]
+                            <br /><a href="mailto:[% branche.branchemail %]">[% branche.branchemail |html %]</a>[% END %]
                         [% IF ( branche.branchurl ) %]
-                            <br />url: [% branche.branchurl |html %][% END %]
+                            <br /><a href="[% branche.branchurl %]">[% branche.branchurl |html %]</a>[% END %]
                         [% IF ( branche.branchnotes ) %]
                             <br />Notes: [% branche.branchnotes |html %][% END %]
                     [% END %]
-- 
1.7.2.3