From f0e6294a0488d269ee43363e12885dd69a1a13be Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 1 Aug 2011 07:51:18 -0400 Subject: [PATCH] Fix for Bug 6652, Zip showing in funny place on libraries admin Content-Type: text/plain; charset="utf-8" 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. --- .../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 @@
[% branche.branchaddress2 |html %][% END %] [% IF ( branche.branchaddress3 ) %]
[% branche.branchaddress3 |html %][% END %] - [% IF ( branche.branchzip ) %] -
[% branche.branchzip |html %][% END %] [% IF ( branche.branchcity ) %] -
[% branche.branchcity |html %][% END %][% IF ( branche.branchstate ) %], +
[% branche.branchcity |html %][% END %][% IF ( branche.branchstate ) %], [% branche.branchstate |html %][% END %] + [% IF ( branche.branchzip ) %] + [% branche.branchzip |html %][% END %] [% IF ( branche.branchcountry ) %]
[% branche.branchcountry |html %][% END %] [% IF ( branche.branchphone ) %] @@ -221,9 +221,9 @@ [% IF ( branche.branchfax ) %]
Fax: [% branche.branchfax |html %][% END %] [% IF ( branche.branchemail ) %] -
Email: [% branche.branchemail |html %][% END %] +
[% branche.branchemail |html %][% END %] [% IF ( branche.branchurl ) %] -
url: [% branche.branchurl |html %][% END %] +
[% branche.branchurl |html %][% END %] [% IF ( branche.branchnotes ) %]
Notes: [% branche.branchnotes |html %][% END %] [% END %] -- 1.7.3