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

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / branches.tt

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 0b1a914..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
@@ -91,7 +91,7 @@
         </li>
         <li>
             <label for="branchname">Name</label>
-            <input type="text" name="branchname" id="branchname" size="40" maxlength="80" value="[% branch_name |html %]" />&nbsp;
+            <input type="text" name="branchname" id="branchname" size="80" value="[% branch_name |html %]" />&nbsp;
         </li>
        </ol>
        </fieldset>
@@ -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 %]
@@ -301,16 +301,16 @@
                     [% categorycode %]
                 [% ELSE %]
                 <label for="categorycode">Category code:</label>
-                    <input type="text" name="categorycode" id="categorycode" size="11" maxlength="10" value="[% categorycode |html %]" />
+                    <input type="text" name="categorycode" id="categorycode" size="10" maxlength="10" value="[% categorycode |html %]" />
                 [% END %]
             </li>
         <li>
             <label for="categoryname">Name: </label>
-            <input type="text" name="categoryname" id="categoryname" size="40" maxlength="80" value="[% categoryname |html %]" />
+            <input type="text" name="categoryname" id="categoryname" size="32" maxlength="32" value="[% categoryname |html %]" />
         </li>
         <li>
             <label for="codedescription">Description: </label>
-            <input type="text" name="codedescription" id="codedescription" size="70" maxlength="80" value="[% codedescription |html %]" />
+            <input type="text" name="codedescription" id="codedescription" size="70" value="[% codedescription |html %]" />
         </li>
                <li>
                <label for="categorytype">Category Type: </label>