Merge remote-tracking branch 'kc/new/enh/bug_5917' into kcmaster

diff --combined koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index a1b6fa2,b839529..cf7ada3
--- 1/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
--- 2/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@@ -101,11 -101,11 +101,11 @@@
        
        <span id="pager[% codes_loo.code %]table" class="pager">
        <form class="formpager">&nbsp;<strong>page(s)</strong>&nbsp;:
 -              <img src="[% codes_loo.interface %]/prog/img/first.png" class="first"/>
 -              <img src="[% codes_loo.interface %]/prog/img/prev.png" class="prev"/>
 +              <img src="[% interface %]/[% theme %]/img/first.png" class="first"/>
 +              <img src="[% interface %]/[% theme %]/img/prev.png" class="prev"/>
                <input type="text" size="5" class="pagedisplay"/>
 -              <img src="[% codes_loo.interface %]/prog/img/next.png" class="next"/>
 -              <img src="[% codes_loo.interface %]/prog/img/last.png" class="last"/>
 +              <img src="[% interface %]/[% theme %]/img/next.png" class="next"/>
 +              <img src="[% interface %]/[% theme %]/img/last.png" class="last"/>
                , entries/page : 
                <select class="pagesize">
                <option selected="selected" value="10">10</option>
@@@ -127,8 -127,7 +127,7 @@@
  
                        <tbody>
                                        [% FOREACH to_branch_loo IN codes_loo.to_branch_loop %]
-                                               [% UNLESS ( loop.odd ) %]<tr class="highlight"><!-- TMPL_ELSE
- --><tr>[% END %]
+                                               [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
                                                        <td><label style="min-width:400px;" for="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row">[% to_branch_loo.toBranch %] - [% to_branch_loo.toBranchname %]</label></td>
                                                        <td><input type="checkbox" id="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row" name="[% to_branch_loo.code %]_[% to_branch_loo.toBranch %]" [% IF ( to_branch_loo.isChecked ) %]checked="checked" [% END %] /></td>
                                                </tr>