Merge commit 'kc/master'

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / members / moremember.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index e064b9c..dfad6ee 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -37,7 +37,6 @@ $(document).ready(function() {
         return confirm(_('Are you sure you want to replace the current patron image? This cannot be undone.'));
        });<!-- /TMPL_IF -->
        $("#renew_all"      ).click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=items]"   ); $(".checkboxed").unCheckCheckboxes(":input[name*=barcodes]"); });
-       $("#return_all"     ).click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=barcodes]"); $(".checkboxed").unCheckCheckboxes(":input[name*=items]"   ); });
        $("#CheckAllitems"  ).click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=items]"   ); $(".checkboxed").unCheckCheckboxes(":input[name*=barcodes]"); return false; });
     $("#CheckNoitems"   ).click(function(){ $(".checkboxed").unCheckCheckboxes(":input[name*=items]"); return false; });
        $("#CheckAllreturns").click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=barcodes]"); $(".checkboxed").unCheckCheckboxes(":input[name*=items]"); return false; });
@@ -163,10 +162,10 @@ if (nodename =="barcodes[]"){
      <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->&ldquo;<!-- TMPL_VAR NAME="othernames" -->&rdquo;<!-- /TMPL_IF -->
 
 <p class="address"><!-- TMPL_VAR NAME="streetnumber" -->
-        <!-- TMPL_VAR NAME="address" -->         
         <!--TMPL_IF NAME="roaddetails"-->
-         <!-- TMPL_VAR NAME="roaddetails" -->
-        <!-- /TMPL_IF --><br />
+         <!-- TMPL_VAR NAME="roaddetails" -->,
+        <!-- /TMPL_IF -->
+        <!-- TMPL_VAR NAME="address" --><br />
         <!-- TMPL_IF NAME="address2" --><!-- TMPL_VAR NAME="address2"--><br /><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="city" --><!-- TMPL_VAR NAME="city" --><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="zipcode" --><!-- TMPL_VAR NAME="zipcode" --><br /><!-- /TMPL_IF -->
@@ -338,7 +337,9 @@ if (nodename =="barcodes[]"){
       <li><span class="label">Address 2: </span><!-- TMPL_VAR NAME="B_address2" --></li>
       <li><span class="label">City, State: </span><!-- TMPL_VAR NAME="B_city" --></li>
       <li><span class="label">Zip/Postal Code: </span><!-- TMPL_VAR NAME="B_zipcode" --></li>
-      <li><span class="label">Country: </span><!-- TMPL_VAR NAME="B_country" --></li></ol></div>
+      <li><span class="label">Country: </span><!-- TMPL_VAR NAME="B_country" --></li>
+      <!-- TMPL_IF NAME="B_phone"--><li><span class="label">Phone: </span><!-- TMPL_VAR NAME="B_phone" --></li><!-- /TMPL_IF -->
+      <!-- TMPL_IF NAME="B_email"--><li><span class="label">Email: </span><!-- TMPL_VAR NAME="B_email" --></li><!-- /TMPL_IF --></ol></div>
     <!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
      <!-- TMPL_IF NAME="C" -->
    <div class="rows"> <ol><li><span class="label">Surname: </span><!-- TMPL_VAR NAME="contactname" --></li>
@@ -421,6 +422,7 @@ if (nodename =="barcodes[]"){
                         });
                         //]]>
                     </script>
+                               <span style="display:block;color:#666;font-weight:normal;font-size:90%;"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
                 </p>
                 <p>
                     <label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label>
@@ -504,7 +506,6 @@ if (nodename =="barcodes[]"){
         <!-- /TMPL_IF -->
         <input type="submit" name="renew_checked" value="Renew or Return checked items" />
         <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
-        <input type="submit" id="return_all" name="return_all" value="Return all" />
         </fieldset>
     </form><!-- TMPL_ELSE --><p>Patron has nothing checked out.</p><!-- /TMPL_IF -->
        </div>