View | Details | Raw Unified | Return to bug 13464
Collapse All | Expand All

(-)a/admin/aqbudgetperiods.pl (-16 / +3 lines)
Lines 75-82 my $budget_period_hashref = { map { join(' ',@columns) =~ /$_/ ? ( $_ => $input- Link Here
75
$budget_period_hashref->{budget_period_startdate} = dt_from_string( $input->param('budget_period_startdate') );
75
$budget_period_hashref->{budget_period_startdate} = dt_from_string( $input->param('budget_period_startdate') );
76
$budget_period_hashref->{budget_period_enddate}   = dt_from_string( $input->param('budget_period_enddate') );
76
$budget_period_hashref->{budget_period_enddate}   = dt_from_string( $input->param('budget_period_enddate') );
77
77
78
my $activepagesize = 20;
79
my $inactivepagesize = 20;
80
$searchfield =~ s/\,//g;
78
$searchfield =~ s/\,//g;
81
79
82
my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
80
my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
Lines 261-278 my $results = GetBudgetPeriods( Link Here
261
    { budget_period_active => 1 },
259
    { budget_period_active => 1 },
262
    { -asc => 'budget_period_description' },
260
    { -asc => 'budget_period_description' },
263
);
261
);
264
my $first = ( $activepage - 1 ) * $activepagesize;
262
265
my $last = min( $first + $activepagesize - 1, scalar @{$results} - 1, );
266
my @period_active_loop;
263
my @period_active_loop;
267
264
268
foreach my $result ( @{$results}[ $first .. $last ] ) {
265
foreach my $result ( @{$results} ) {
269
    my $budgetperiod = $result;
266
    my $budgetperiod = $result;
270
    $budgetperiod->{budget_active} = 1;
267
    $budgetperiod->{budget_active} = 1;
271
    push( @period_active_loop, $budgetperiod );
268
    push( @period_active_loop, $budgetperiod );
272
}
269
}
273
my $url = "aqbudgetperiods.pl";
274
$url .=  "?ipage=$inactivepage" if($inactivepage != 1);
275
my $active_pagination_bar = pagination_bar ($url, getnbpages( scalar(@$results), $activepagesize), $activepage, "apage");
276
270
277
# Get inactive budget periods
271
# Get inactive budget periods
278
$results = GetBudgetPeriods(
272
$results = GetBudgetPeriods(
Lines 280-296 $results = GetBudgetPeriods( Link Here
280
    { -desc => 'budget_period_enddate' },
274
    { -desc => 'budget_period_enddate' },
281
);
275
);
282
276
283
$first = ( $inactivepage - 1 ) * $inactivepagesize;
284
$last = min( $first + $inactivepagesize - 1, scalar @{$results} - 1, );
285
my @period_inactive_loop;
277
my @period_inactive_loop;
286
foreach my $result ( @{$results}[ $first .. $last ] ) {
278
foreach my $result ( @{$results} ) {
287
    my $budgetperiod = $result;
279
    my $budgetperiod = $result;
288
    $budgetperiod->{budget_active} = 1;
280
    $budgetperiod->{budget_active} = 1;
289
    push( @period_inactive_loop, $budgetperiod );
281
    push( @period_inactive_loop, $budgetperiod );
290
}
282
}
291
$url = "aqbudgetperiods.pl?tab=2";
292
$url .= "&apage=$activepage" if($activepage != 1);
293
my $inactive_pagination_bar = pagination_bar ($url, getnbpages( scalar(@$results), $inactivepagesize), $inactivepage, "ipage");
294
283
295
my $branchloop = C4::Branch::GetBranchesLoop();
284
my $branchloop = C4::Branch::GetBranchesLoop();
296
285
Lines 298-305 my $tab = $input->param('tab') ? $input->param('tab') - 1 : 0; Link Here
298
$template->param(
287
$template->param(
299
    period_active_loop      => \@period_active_loop,
288
    period_active_loop      => \@period_active_loop,
300
    period_inactive_loop    => \@period_inactive_loop,
289
    period_inactive_loop    => \@period_inactive_loop,
301
    active_pagination_bar   => $active_pagination_bar,
302
    inactive_pagination_bar => $inactive_pagination_bar,
303
    tab                     => $tab,
290
    tab                     => $tab,
304
    branchloop              => $branchloop,
291
    branchloop              => $branchloop,
305
);
292
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-7 / +3 lines)
Lines 112-124 Link Here
112
            tabs.tabs("option", "active", [% tab %]);
112
            tabs.tabs("option", "active", [% tab %]);
113
        [% END %]
113
        [% END %]
114
        $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, {
114
        $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, {
115
            "sDom": 't',
116
            "aaSorting": [],
117
            "aoColumnDefs": [
115
            "aoColumnDefs": [
118
                { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
116
                { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
119
                { "sType": "title-string", "aTargets" : [ "title-string" ] }
117
                { "sType": "title-string", "aTargets" : [ "title-string" ] }
120
            ],
118
            ],
121
            "bPaginate": false,
119
            "sPaginationType": "four_button",
122
            'bAutoWidth': false
120
            'bAutoWidth': false
123
        } ) );
121
        } ) );
124
122
Lines 169-176 Link Here
169
            ],
167
            ],
170
            'bSort': true,
168
            'bSort': true,
171
            'aaSortingFixed': [[ 1, 'asc' ]],
169
            'aaSortingFixed': [[ 1, 'asc' ]],
172
            'bPaginate': false,
170
            "bAutoWidth": false,
173
            "bAutoWidth": false
171
            "sPaginationType": "full_numbers"
174
          }));
172
          }));
175
        [% END %]
173
        [% END %]
176
    });
174
    });
Lines 573-579 Link Here
573
      [% ELSE %]
571
      [% ELSE %]
574
        No active budgets
572
        No active budgets
575
      [% END %]
573
      [% END %]
576
      <div class="paginationBar">[% active_pagination_bar %]</div>
577
    </div>
574
    </div>
578
    <div id="inactive">
575
    <div id="inactive">
579
      [% IF ( period_inactive_loop ) %]
576
      [% IF ( period_inactive_loop ) %]
Lines 606-612 Link Here
606
      [% ELSE %]
603
      [% ELSE %]
607
        No inactive budgets
604
        No inactive budgets
608
      [% END %]
605
      [% END %]
609
      <div class="pages">[% inactive_pagination_bar %]</div>
610
    </div>
606
    </div>
611
  </div>
607
  </div>
612
[% END %]
608
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt (-3 lines)
Lines 265-272 function CheckRuleForm(f) { Link Here
265
  [% END %]
265
  [% END %]
266
</table>
266
</table>
267
267
268
<div class="pages">[% pagination_bar %]</div>
269
270
<h2>Classification filing rules</h2>
268
<h2>Classification filing rules</h2>
271
[% IF ( added_rule ) %]
269
[% IF ( added_rule ) %]
272
<div class="dialog message">Added filing rule [% added_rule %]</div>
270
<div class="dialog message">Added filing rule [% added_rule %]</div>
Lines 296-302 function CheckRuleForm(f) { Link Here
296
  </tr>
294
  </tr>
297
  [% END %]
295
  [% END %]
298
</table>
296
</table>
299
<div class="paginationBar">[% pagination_bar %]</div>
300
297
301
[% END %]
298
[% END %]
302
299
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt (-1 / +1 lines)
Lines 96-102 function searchauthority() { Link Here
96
  </table>
96
  </table>
97
</div>
97
</div>
98
98
99
<div class="paginationBar">[% pagination_bar %]</div>
99
<div class="pages">[% pagination_bar %]</div>
100
100
101
[% ELSE %]
101
[% ELSE %]
102
  No results found
102
  No results found
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt (-2 / +1 lines)
Lines 459-465 Link Here
459
            [% INCLUDE 'catalogue/itemsearch_items.inc' items = results %]
459
            [% INCLUDE 'catalogue/itemsearch_items.inc' items = results %]
460
          [% END %]
460
          [% END %]
461
461
462
          <div id="pagination-bar">
462
          <div class="pages">
463
            [% pagination_bar %]
463
            [% pagination_bar %]
464
          </div>
464
          </div>
465
465
466
- 

Return to bug 13464