Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster

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 (file)
--- 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 %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
index 6f3489d..b50012f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
@@ -273,6 +273,7 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
 [% IF ( searchfield ) %]
                You Searched for [% searchfield %]</span>
        [% END %]
+[% IF ( loop ) %]
 <span id="pagertable_categorie" class="pager">
        <form class="formpager">&nbsp;<strong>page(s)</strong>&nbsp;:
                <img src="[% interface %]/prog/img/first.png" class="first"/>
@@ -364,6 +365,9 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
                </tr>
                [% END %]
        </table>
+[% ELSE %]
+       <div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categorie.pl?op=add_form">Create a new category</a>.</div>
+[% END %]
 [% END %]
 
 </div>