Bug 6842 Alternate fix, Branch transfer limits broken

The patch which moved the table pager markup into an
include undid the fix which was previously pushed for
this problem. Re-implementing the fix in the pager
include is a simpler fix which doesn't depend on
the Datatables plugin.

The markup change in table-pager.inc fixes the problem
in branch transfer limits and does not affect functionality
on other pages.

The changes in this patch to branch_transfer_limits.tt and
staff-global.css are for cosmetic reasons only.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Saving changes works now correctly. I tried:
- uncheck all for a branch
- check all for a branch
- making changes for different itemtypes on different tabs

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 17305d2..fec66d6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2137,9 +2137,11 @@ div.pager input.pagedisplay {
        font-weight: bold;
        text-align : center;
 }
-
 a.localimage img {
        border : 1px solid #0000CC;
        margin : 0 .5em;
        padding : .3em;
-}
\ No newline at end of file
+}
+div.pager p {
+       margin: 0;
+}

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc
index 961c07b..17d43d4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc
@@ -1,4 +1,4 @@
-<div class="pager"><form class="formpager" action=""><label>Page(s):
+<div class="pager"><p class="formpager" action=""><label>Page(s):
        <img src="[% interface %]/prog/img/first.png" alt="" class="first"/>
        <img src="[% interface %]/prog/img/prev.png" alt="" class="prev"/>
        <input type="text" size="5" class="pagedisplay"/></label>
@@ -14,4 +14,4 @@
        [% IF ( perpage == 100) %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
        [% IF ( perpage == 200) %]<option value="200" selected="selected">200</option>[% ELSE %]<option value="200">200</option>[% END %]
        </select></label>
-</form></div>
\ No newline at end of file
+</p></div>
\ No newline at end of file

diff --git a/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
index 5e4e58f..0e8805e 100644 (file)
--- a/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
@@ -102,7 +102,7 @@
                <h4>Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]</h4>
        <p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#">Check All</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#">Uncheck All</a></p>
        
-       <div id="pager[% codes_loo.code %]table" class="pager">
+       <div id="pager[% codes_loo.code %]table">
        [% INCLUDE 'table-pager.inc' perpage='20' %]
        </div>
                <table id="[% codes_loo.code %]table" class="sorted">