Bug 4041: (QA followup) fix issues raised by koha-qa.pl

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
index 0f526ee..0e3ec32 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
@@ -1,28 +1,28 @@
-               <fieldset class="rows" id="memberentry_address">
-               <legend id="alt_address_lgd">Alternate address</legend><ol>
+        <fieldset class="rows" id="memberentry_address">
+        <legend id="alt_address_lgd">Alternate address</legend><ol>
         [% UNLESS noB_address %]
-                       <li>
-                               [% IF ( mandatoryB_address ) %]
-                                       <label for="B_address" class="required">
-                               [% ELSE %]
-                                       <label for="B_address">
-                               [% END %]
-                               Address: </label>
+            <li>
+                [% IF ( mandatoryB_address ) %]
+                    <label for="B_address" class="required">
+                [% ELSE %]
+                    <label for="B_address">
+                [% END %]
+                Address: </label>
                     <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
-         [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_address2 %]
-                       <li>
-                               [% IF ( mandatoryB_address2 ) %]
-                                       <label for="B_address2" class="required">
-                               [% ELSE %]
-                                       <label for="B_address2">
-                               [% END %]
-                               Address 2: </label>
+            <li>
+                [% IF ( mandatoryB_address2 ) %]
+                    <label for="B_address2" class="required">
+                [% ELSE %]
+                    <label for="B_address2">
+                [% END %]
+                Address 2: </label>
                     <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
-         [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_zipcode %]
                         <li>
@@ -37,40 +37,40 @@
                         </li>
         [% END %]
         [% UNLESS noB_city %]
-                       <li>
-                               [% IF ( mandatoryB_city ) %]
-                                       <label for="B_city" class="required" >
-                               [% ELSE %]
-                                       <label for="B_city">
-                               [% END %]
-                               City: </label>
+            <li>
+                [% IF ( mandatoryB_city ) %]
+                    <label for="B_city" class="required" >
+                [% ELSE %]
+                    <label for="B_city">
+                [% END %]
+                City: </label>
                 <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
-         [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_state %]
-                       <li>
-                               [% IF ( mandatoryB_state ) %]
-                                       <label for="B_state" class="required" >
-                               [% ELSE %]
-                                       <label for="B_state">
-                               [% END %]
-                               State: </label>
+            <li>
+                [% IF ( mandatoryB_state ) %]
+                    <label for="B_state" class="required" >
+                [% ELSE %]
+                    <label for="B_state">
+                [% END %]
+                State: </label>
                 <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
-         [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_country %]
-                       <li>
-                               [% IF ( mandatoryB_country ) %]
-                                       <label for="B_country" class="required">
-                               [% ELSE %]
-                                       <label for="B_country">
-                               [% END %]
-                               Country: </label>
+            <li>
+                [% IF ( mandatoryB_country ) %]
+                    <label for="B_country" class="required">
+                [% ELSE %]
+                    <label for="B_country">
+                [% END %]
+                Country: </label>
                     <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
-         [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_phone %]
             <li>
@@ -85,7 +85,7 @@
             </li>
         [% END %]
         [% UNLESS noB_email %]
-                       <li>
+            <li>
         [% IF ( mandatoryB_email ) %]
           <label for="B_email" class="required">
         [% ELSE %]
@@ -93,7 +93,7 @@
         [% END %]
         Email: </label>
             <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
-               [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
+        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
         [% END %]
         [% UNLESS nocontactnote %]
             <li>
@@ -107,5 +107,5 @@
         [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
-                       </ol>
-               </fieldset>
+            </ol>
+        </fieldset>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
index 1d2d8b2..34e8ccc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
@@ -1,76 +1,76 @@
-               <fieldset class="rows" id="memberentry_address">
-               <legend id="alt_address_lgd">Alternate address</legend><ol>
+        <fieldset class="rows" id="memberentry_address">
+        <legend id="alt_address_lgd">Alternate address</legend><ol>
         [% UNLESS noB_address %]
-                       <li>
-                               [% IF ( mandatoryB_address ) %]
-                                       <label for="B_address" class="required">
-                               [% ELSE %]
-                                       <label for="B_address">
-                               [% END %]
-                               Address: </label>
+            <li>
+                [% IF ( mandatoryB_address ) %]
+                    <label for="B_address" class="required">
+                [% ELSE %]
+                    <label for="B_address">
+                [% END %]
+                Address: </label>
                     <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
-         [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_address2 %]
-                       <li>
-                               [% IF ( mandatoryB_address2 ) %]
-                                       <label for="B_address2" class="required">
-                               [% ELSE %]
-                                       <label for="B_address2">
-                               [% END %]
-                               Address 2: </label>
+            <li>
+                [% IF ( mandatoryB_address2 ) %]
+                    <label for="B_address2" class="required">
+                [% ELSE %]
+                    <label for="B_address2">
+                [% END %]
+                Address 2: </label>
                     <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
-         [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_city %]
-                       <li>
-                               [% IF ( mandatoryB_city ) %]
-                                       <label for="B_city" class="required" >
-                               [% ELSE %]
-                                       <label for="B_city">
-                               [% END %]
-                               City: </label>
+            <li>
+                [% IF ( mandatoryB_city ) %]
+                    <label for="B_city" class="required" >
+                [% ELSE %]
+                    <label for="B_city">
+                [% END %]
+                City: </label>
                 <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
-         [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_state %]
-                       <li>
-                               [% IF ( mandatoryB_state ) %]
-                                       <label for="B_state" class="required" >
-                               [% ELSE %]
-                                       <label for="B_state">
-                               [% END %]
-                               State: </label>
+            <li>
+                [% IF ( mandatoryB_state ) %]
+                    <label for="B_state" class="required" >
+                [% ELSE %]
+                    <label for="B_state">
+                [% END %]
+                State: </label>
                 <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
-         [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_zipcode %]
-                       <li>
-                               [% IF ( mandatoryB_zipcode ) %]
-                                       <label for="B_zipcode" class="required">
-                               [% ELSE %]
-                                       <label for="B_zipcode">
-                               [% END %]
-                               Zip/Postal code: </label>
+            <li>
+                [% IF ( mandatoryB_zipcode ) %]
+                    <label for="B_zipcode" class="required">
+                [% ELSE %]
+                    <label for="B_zipcode">
+                [% END %]
+                Zip/Postal code: </label>
                     <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
-         [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_country %]
-                       <li>
-                               [% IF ( mandatoryB_country ) %]
-                                       <label for="B_country" class="required">
-                               [% ELSE %]
-                                       <label for="B_country">
-                               [% END %]
-                               Country: </label>
+            <li>
+                [% IF ( mandatoryB_country ) %]
+                    <label for="B_country" class="required">
+                [% ELSE %]
+                    <label for="B_country">
+                [% END %]
+                Country: </label>
                     <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
-         [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
-                       </li>
+      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noB_phone %]
             <li>
@@ -85,7 +85,7 @@
             </li>
         [% END %]
         [% UNLESS noB_email %]
-                       <li>
+            <li>
         [% IF ( mandatoryB_email ) %]
           <label for="B_email" class="required">
         [% ELSE %]
@@ -93,7 +93,7 @@
         [% END %]
         Email: </label>
             <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
-               [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
+        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
         [% END %]
         [% UNLESS nocontactnote %]
             <li>
@@ -107,5 +107,5 @@
         [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
-                       </ol>
-               </fieldset>
+            </ol>
+        </fieldset>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
index 2f47ce7..31bc204 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
@@ -1,52 +1,52 @@
-               <fieldset class="rows" id="memberentry_altaddress">
+        <fieldset class="rows" id="memberentry_altaddress">
             <legend id="alt_contact_lgd">Alternate contact</legend><ol>
         [% UNLESS noaltcontactsurname %]
-                       <li>
-                           [% IF ( mandatoryaltcontactsurname ) %]
-                               <label for="altcontactsurname" class="required">
-                               [% ELSE %]
-                               <label for="altcontactsurname">
-                               [% END %]
-                               Surname:</label>
+            <li>
+                [% IF ( mandatoryaltcontactsurname ) %]
+                <label for="altcontactsurname" class="required">
+                [% ELSE %]
+                <label for="altcontactsurname">
+                [% END %]
+                Surname:</label>
                     <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
-                               [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactfirstname %]
-                       <li>
-                           [% IF ( mandatoryaltcontactfirstname ) %]
-                               <label for="altcontactfirstname" class="required">
-                               [% ELSE %]
-                               <label for="altcontactfirstname">
-                               [% END %]
-                               First name:</label>
+            <li>
+                [% IF ( mandatoryaltcontactfirstname ) %]
+                <label for="altcontactfirstname" class="required">
+                [% ELSE %]
+                <label for="altcontactfirstname">
+                [% END %]
+                First name:</label>
                     <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
-                               [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactaddress1 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress1 ) %]
-                               <label for="altcontactaddress1" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress1">
-                               [% END %]
-                               Address:</label>
+            <li>
+                [% IF ( mandatoryaltcontactaddress1 ) %]
+                <label for="altcontactaddress1" class="required">
+                [% ELSE %]
+                <label for="altcontactaddress1">
+                [% END %]
+                Address:</label>
                     <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
-                               [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactaddress2 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress2 ) %]
-                               <label for="altcontactaddress2" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress2">
-                               [% END %]
-                               Address 2:</label>
+            <li>
+                [% IF ( mandatoryaltcontactaddress2 ) %]
+                <label for="altcontactaddress2" class="required">
+                [% ELSE %]
+                <label for="altcontactaddress2">
+                [% END %]
+                Address 2:</label>
                 <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
-                               [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactzipcode %]
                         <li>
@@ -61,52 +61,52 @@
                         </li>
         [% END %]
         [% UNLESS noaltcontactaddress3 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress3 ) %]
-                               <label for="altcontactaddress3" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress3">
-                               [% END %]
-                               City:</label>
+            <li>
+                [% IF ( mandatoryaltcontactaddress3 ) %]
+                <label for="altcontactaddress3" class="required">
+                [% ELSE %]
+                <label for="altcontactaddress3">
+                [% END %]
+                City:</label>
                 <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
-                               [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactstate %]
-                       <li>
-                           [% IF ( mandatoryaltcontactstate ) %]
-                               <label for="altcontactstate" class="required">
-                               [% ELSE %]
-                               <label for="altcontactstate">
-                               [% END %]
-                               State:</label>
+            <li>
+                [% IF ( mandatoryaltcontactstate ) %]
+                <label for="altcontactstate" class="required">
+                [% ELSE %]
+                <label for="altcontactstate">
+                [% END %]
+                State:</label>
                 <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
-                               [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactcountry %]
-                       <li>
-                           [% IF ( mandatoryaltcontactcountry ) %]
-                               <label for="altcontactcountry" class="required">
-                               [% ELSE %]
-                               <label for="altcontactcountry">
-                               [% END %]
-                               Country:</label>
+            <li>
+                [% IF ( mandatoryaltcontactcountry ) %]
+                <label for="altcontactcountry" class="required">
+                [% ELSE %]
+                <label for="altcontactcountry">
+                [% END %]
+                Country:</label>
                     <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
-                               [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactphone %]
-                       <li>
-                           [% IF ( mandatoryaltcontactphone ) %]
-                               <label for="altcontactphone" class="required">
-                               [% ELSE %]
-                               <label for="altcontactphone">
-                               [% END %]
-                               Phone:</label>
+            <li>
+                [% IF ( mandatoryaltcontactphone ) %]
+                <label for="altcontactphone" class="required">
+                [% ELSE %]
+                <label for="altcontactphone">
+                [% END %]
+                Phone:</label>
                     <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
-                               [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
             </ol>
         </fieldset>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
index ff0f99b..ec0d83f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
@@ -1,112 +1,112 @@
-               <fieldset class="rows" id="memberentry_altaddress">
+        <fieldset class="rows" id="memberentry_altaddress">
             <legend id="alt_contact_lgd">Alternate contact</legend><ol>
         [% UNLESS noaltcontactsurname %]
-                       <li>
-                           [% IF ( mandatoryaltcontactsurname ) %]
-                               <label for="altcontactsurname" class="required">
-                               [% ELSE %]
-                               <label for="altcontactsurname">
-                               [% END %]
-                               Surname:</label>
+            <li>
+                [% IF ( mandatoryaltcontactsurname ) %]
+                <label for="altcontactsurname" class="required">
+                [% ELSE %]
+                <label for="altcontactsurname">
+                [% END %]
+                Surname:</label>
                     <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
-                               [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactfirstname %]
-                       <li>
-                           [% IF ( mandatoryaltcontactfirstname ) %]
-                               <label for="altcontactfirstname" class="required">
-                               [% ELSE %]
-                               <label for="altcontactfirstname">
-                               [% END %]
-                               First name:</label>
+            <li>
+                [% IF ( mandatoryaltcontactfirstname ) %]
+                <label for="altcontactfirstname" class="required">
+                [% ELSE %]
+                <label for="altcontactfirstname">
+                [% END %]
+                First name:</label>
                     <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
-                               [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactaddress1 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress1 ) %]
-                               <label for="altcontactaddress1" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress1">
-                               [% END %]
-                               Address:</label>
+            <li>
+                [% IF ( mandatoryaltcontactaddress1 ) %]
+                <label for="altcontactaddress1" class="required">
+                [% ELSE %]
+                <label for="altcontactaddress1">
+                [% END %]
+                Address:</label>
                     <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
-                               [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactaddress2 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress2 ) %]
-                               <label for="altcontactaddress2" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress2">
-                               [% END %]
-                               Address 2:</label>
+            <li>
+                [% IF ( mandatoryaltcontactaddress2 ) %]
+                <label for="altcontactaddress2" class="required">
+                [% ELSE %]
+                <label for="altcontactaddress2">
+                [% END %]
+                Address 2:</label>
                 <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
-                               [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactaddress3 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress3 ) %]
-                               <label for="altcontactaddress3" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress3">
-                               [% END %]
-                               City:</label>
+            <li>
+                [% IF ( mandatoryaltcontactaddress3 ) %]
+                <label for="altcontactaddress3" class="required">
+                [% ELSE %]
+                <label for="altcontactaddress3">
+                [% END %]
+                City:</label>
                 <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
-                               [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactstate %]
-                       <li>
-                           [% IF ( mandatoryaltcontactstate ) %]
-                               <label for="altcontactstate" class="required">
-                               [% ELSE %]
-                               <label for="altcontactstate">
-                               [% END %]
-                               State:</label>
+            <li>
+                [% IF ( mandatoryaltcontactstate ) %]
+                <label for="altcontactstate" class="required">
+                [% ELSE %]
+                <label for="altcontactstate">
+                [% END %]
+                State:</label>
                 <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
-                               [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactzipcode %]
-                       <li>
-                           [% IF ( mandatoryaltcontactzipcode ) %]
-                               <label for="altcontactzipcode" class="required">
-                               [% ELSE %]
-                               <label for="altcontactzipcode">
-                               [% END %]
-                               Zip/Postal code:</label>
+            <li>
+                [% IF ( mandatoryaltcontactzipcode ) %]
+                <label for="altcontactzipcode" class="required">
+                [% ELSE %]
+                <label for="altcontactzipcode">
+                [% END %]
+                Zip/Postal code:</label>
                     <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
-                               [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactcountry %]
-                       <li>
-                           [% IF ( mandatoryaltcontactcountry ) %]
-                               <label for="altcontactcountry" class="required">
-                               [% ELSE %]
-                               <label for="altcontactcountry">
-                               [% END %]
-                               Country:</label>
+            <li>
+                [% IF ( mandatoryaltcontactcountry ) %]
+                <label for="altcontactcountry" class="required">
+                [% ELSE %]
+                <label for="altcontactcountry">
+                [% END %]
+                Country:</label>
                     <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
-                               [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
         [% UNLESS noaltcontactphone %]
-                       <li>
-                           [% IF ( mandatoryaltcontactphone ) %]
-                               <label for="altcontactphone" class="required">
-                               [% ELSE %]
-                               <label for="altcontactphone">
-                               [% END %]
-                               Phone:</label>
+            <li>
+                [% IF ( mandatoryaltcontactphone ) %]
+                <label for="altcontactphone" class="required">
+                [% ELSE %]
+                <label for="altcontactphone">
+                [% END %]
+                Phone:</label>
                     <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
-                               [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
-                       </li>
+                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
+            </li>
         [% END %]
             </ol>
         </fieldset>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
index 254e2b9..96dbdde 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
@@ -19,7 +19,7 @@
           [% END %]
         [% END %]
       </select>
-         [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
       </li>
     [% END %]
         [% END %]
@@ -32,7 +32,7 @@
       [% END %]
       Address: </label>
             <input type="text" id="address" name="address" size="35" value="[% address %]" />
-         [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nostreetnumber %]
@@ -56,7 +56,7 @@
       [% END %]
       Address 2: </label>
             <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
-         [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nozipcode %]
@@ -93,7 +93,7 @@
         [% END %]
         </select>
         [% END %]
-         [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nostate %]
@@ -105,7 +105,7 @@
       [% END %]
       State: </label>
       <input type="text" name="state" id="state" size="20" value="[% state %]" />
-         [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nocountry %]
@@ -117,8 +117,8 @@
       [% END %]
       Country: </label>
         <input type="text" name="country" id="country" size="20" value="[% country %]" />
-         [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
-       </ol>
+    </ol>
 </fieldset>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
index 60c44b4..3b9a079 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
@@ -31,7 +31,7 @@
           [% END %]
         [% END %]
       </select>
-         [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
       </li>
     [% END %]
         [% END %]
@@ -44,7 +44,7 @@
       [% END %]
       Address: </label>
             <input type="text" id="address" name="address" size="35" value="[% address %]" />
-         [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS noaddress2 %]
@@ -56,7 +56,7 @@
       [% END %]
       Address 2: </label>
             <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
-         [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nocity %]
@@ -81,7 +81,7 @@
         [% END %]
         </select>
         [% END %]
-         [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nostate %]
@@ -93,7 +93,7 @@
       [% END %]
       State: </label>
       <input type="text" name="state" id="state" size="20" value="[% state %]" />
-         [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nozipcode %]
@@ -105,7 +105,7 @@
       [% END %]
       Zip/Postal code: </label>
             <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
-         [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nocountry %]
@@ -117,8 +117,8 @@
       [% END %]
       Country: </label>
         <input type="text" name="country" id="country" size="20" value="[% country %]" />
-         [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
+      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
-       </ol>
+    </ol>
 </fieldset>

diff --git a/members/boraccount.pl b/members/boraccount.pl
index 37e0adb..8b1b7bd 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -113,7 +113,7 @@ $template->param(
     finesview           => 1,
     borrowernumber      => $borrowernumber,
     roadtype            => $roadtype,
-    branchname         => GetBranchName($data->{'branchcode'}),
+    branchname          => GetBranchName($data->{'branchcode'}),
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
     is_child            => ($data->{'category_type'} eq 'C'),