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

(-)a/C4/Output.pm (-19 / +47 lines)
Lines 109-121 sub pagination_bar { Link Here
109
109
110
    # navigation bar useful only if more than one page to display !
110
    # navigation bar useful only if more than one page to display !
111
    if ( $nb_pages > 1 ) {
111
    if ( $nb_pages > 1 ) {
112
        $pagination_bar = '<ul class="pagination">';
112
113
113
        # link to first page?
114
        # link to first page?
114
        if ( $current_page > 1 ) {
115
        if ( $current_page > 1 ) {
115
            $pagination_bar .=
116
            $pagination_bar .=
116
                "\n" . '&nbsp;' . '<a href="' . $url . '1' . $url_suffix . '"rel="start">' . '&lt;&lt;' . '</a>';
117
                  "\n"
117
        } else {
118
                . ''
118
            $pagination_bar .= "\n" . '&nbsp;<span class="inactive">&lt;&lt;</span>';
119
                . '<li class="page-item"><a class="page-link output first" href="'
120
                . $url . '1'
121
                . $url_suffix
122
                . '"rel="start">'
123
                . '<i class="fa fa-fw fa-angle-double-left"></i> First'
124
                . '</a></li>';
119
        }
125
        }
120
126
121
        # link on previous page ?
127
        # link on previous page ?
Lines 123-131 sub pagination_bar { Link Here
123
            my $previous = $current_page - 1;
129
            my $previous = $current_page - 1;
124
130
125
            $pagination_bar .=
131
            $pagination_bar .=
126
                "\n" . '&nbsp;' . '<a href="' . $url . $previous . $url_suffix . '" rel="prev">' . '&lt;' . '</a>';
132
                  "\n"
127
        } else {
133
                . ''
128
            $pagination_bar .= "\n" . '&nbsp;<span class="inactive">&lt;</span>';
134
                . '<li class="page-item"><a class="page-link output previous" href="'
135
                . $url
136
                . $previous
137
                . $url_suffix
138
                . '" rel="prev">'
139
                . '<i class="fa fa-fw fa-angle-left"></i> Previous'
140
                . '</a></li>';
129
        }
141
        }
130
142
131
        my $min_to_display      = $current_page - $pages_around;
143
        my $min_to_display      = $current_page - $pages_around;
Lines 143-162 sub pagination_bar { Link Here
143
                if ( defined $last_displayed_page
155
                if ( defined $last_displayed_page
144
                    and $last_displayed_page != $page_number - 1 )
156
                    and $last_displayed_page != $page_number - 1 )
145
                {
157
                {
146
                    $pagination_bar .= "\n" . '&nbsp;<span class="inactive">...</span>';
158
                    $pagination_bar .= "\n" . '<li class="page-item disabled"><a class="page-link">...</a></li>';
147
                }
159
                }
148
160
149
                if ( $page_number == $current_page ) {
161
                if ( $page_number == $current_page ) {
150
                    $pagination_bar .= "\n" . '&nbsp;' . '<span class="currentPage">' . $page_number . '</span>';
162
                    $pagination_bar .=
163
                          "\n"
164
                        . ''
165
                        . '<li class="page-item active" aria-current="page"><a class="page-link" href="#">'
166
                        . $page_number
167
                        . '</a></li>';
151
                } else {
168
                } else {
152
                    $pagination_bar .=
169
                    $pagination_bar .=
153
                          "\n"
170
                          "\n"
154
                        . '&nbsp;'
171
                        . ''
155
                        . '<a href="'
172
                        . '<li class="page-item"><a class="page-link" href="'
156
                        . $url
173
                        . $url
157
                        . $page_number
174
                        . $page_number
158
                        . $url_suffix . '">'
175
                        . $url_suffix . '">'
159
                        . $page_number . '</a>';
176
                        . $page_number
177
                        . '</a></li>';
160
                }
178
                }
161
                $last_displayed_page = $page_number;
179
                $last_displayed_page = $page_number;
162
            }
180
            }
Lines 166-184 sub pagination_bar { Link Here
166
        if ( $current_page < $nb_pages ) {
184
        if ( $current_page < $nb_pages ) {
167
            my $next = $current_page + 1;
185
            my $next = $current_page + 1;
168
186
169
            $pagination_bar .=
187
            $pagination_bar .= "\n"
170
                "\n" . '&nbsp;<a href="' . $url . $next . $url_suffix . '" rel="next">' . '&gt;' . '</a>';
188
                . '<li class="page-item"><a class="page-link output next" href="'
171
        } else {
189
                . $url
172
            $pagination_bar .= "\n" . '&nbsp;<span class="inactive">&gt;</span>';
190
                . $next
191
                . $url_suffix
192
                . '" rel="next">'
193
                . 'Next <i class="fa fa-fw fa-angle-right"></i>'
194
                . '</a></li>';
173
        }
195
        }
174
196
175
        # link to last page?
197
        # link to last page?
176
        if ( $current_page != $nb_pages ) {
198
        if ( $current_page != $nb_pages ) {
177
            $pagination_bar .=
199
            $pagination_bar .= "\n"
178
                "\n" . '&nbsp;<a href="' . $url . $nb_pages . $url_suffix . '" rel="last">' . '&gt;&gt;' . '</a>';
200
                . '<li class="page-item"><a class="page-link output last" href="'
179
        } else {
201
                . $url
180
            $pagination_bar .= "\n" . '&nbsp;<span class="inactive">&gt;&gt;</span>';
202
                . $nb_pages
203
                . $url_suffix
204
                . '" rel="last">'
205
                . 'Last <i class="fa fa-fw fa-angle-double-right"></i>'
206
                . '</a></li>';
181
        }
207
        }
208
209
        $pagination_bar .= "\n" . '</ul>';
182
    }
210
    }
183
211
184
    return $pagination_bar;
212
    return $pagination_bar;
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-37 / +1 lines)
Lines 694-735 div { Link Here
694
        }
694
        }
695
    }
695
    }
696
696
697
    &.pages {
698
        margin: .5em 0;
699
700
        a {
701
            font-weight: bold;
702
            padding: 1px 5px;
703
            text-decoration: none;
704
705
            &:link,
706
            &:visited {
707
                background-color: #EEEEEE;
708
                color: #3366CC;
709
            }
710
711
            &:hover,
712
            &:active {
713
                background-color: #FFC;
714
            }
715
        }
716
717
        .current,
718
        .currentPage {
719
            background-color: #E6FCB7;
720
            color: #666;
721
            font-weight: bold;
722
            padding: 1px 5px;
723
        }
724
725
        .inactive {
726
            background-color: #F3F3F3;
727
            color: #BCBCBC;
728
            font-weight: bold;
729
            padding: 1px 5px;
730
        }
731
    }
732
733
    .browse {
697
    .browse {
734
        margin: .5em 0;
698
        margin: .5em 0;
735
    }
699
    }
Lines 4895-4898 div .suggestion_note { Link Here
4895
            display: block;
4859
            display: block;
4896
        }
4860
        }
4897
    }
4861
    }
4898
}
4862
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt (-2 lines)
Lines 611-618 Link Here
611
        [% ELSE %]
611
        [% ELSE %]
612
            <p>There are no saved matching rules.</p>
612
            <p>There are no saved matching rules.</p>
613
        [% END # /IF ( available_matching_rules ) %]
613
        [% END # /IF ( available_matching_rules ) %]
614
615
        <div class="pages">[% pagination_bar | $raw %]</div>
616
    [% END # /IF ( display_list ) %]
614
    [% END # /IF ( display_list ) %]
617
615
618
    [% IF ( matching_rule_form ) %]
616
    [% IF ( matching_rule_form ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt (-2 lines)
Lines 384-391 Link Here
384
        [% ELSE %]
384
        [% ELSE %]
385
            <p>There are no saved patron attribute types.</p>
385
            <p>There are no saved patron attribute types.</p>
386
        [% END %]
386
        [% END %]
387
388
        <div class="pages">[% pagination_bar | $raw %]</div>
389
    [% END %]
387
    [% END %]
390
[% END %]
388
[% END %]
391
[% MACRO jsinclude BLOCK %]
389
[% MACRO jsinclude BLOCK %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt (-2 / +2 lines)
Lines 54-60 Link Here
54
        [% END %]
54
        [% END %]
55
55
56
        [% IF ( total ) %]
56
        [% IF ( total ) %]
57
            <div class="pages">[% pagination_bar | $raw %]</div>
57
            <nav class="pages" id="pagination_top"> [% pagination_bar | $raw %] </nav>
58
58
59
            <p id="authorities_searchresultlist_current_page_info"> Results [% from | html %] to [% to | html %] of [% total | html %] </p>
59
            <p id="authorities_searchresultlist_current_page_info"> Results [% from | html %] to [% to | html %] of [% total | html %] </p>
60
60
Lines 146-152 Link Here
146
146
147
            [% INCLUDE 'authority-detail-modal.inc' %]
147
            [% INCLUDE 'authority-detail-modal.inc' %]
148
148
149
            <div class="pages">[% pagination_bar | $raw %]</div>
149
            <nav class="pages" id="pagination_bottom"> [% pagination_bar | $raw %] </nav>
150
        [% ELSE %]
150
        [% ELSE %]
151
            No results found
151
            No results found
152
        [% END %]
152
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-2 / +2 lines)
Lines 102-108 Link Here
102
                [% total | html %] result(s) found in catalog,
102
                [% total | html %] result(s) found in catalog,
103
                <a href="#searchresult-breeding">[% breeding_count | html %] result(s) found in reservoir</a>
103
                <a href="#searchresult-breeding">[% breeding_count | html %] result(s) found in reservoir</a>
104
            </div>
104
            </div>
105
            <div class="pages">[% pagination_bar | $raw %]</div>
105
            <nav class="pages" id="pagination_top"> [% pagination_bar | $raw %] </nav>
106
            <div class="searchresults">
106
            <div class="searchresults">
107
                <table>
107
                <table>
108
                    <tr>
108
                    <tr>
Lines 196-202 Link Here
196
                        </tr>
196
                        </tr>
197
                    [% END # /FOREACH resultsloo %]
197
                    [% END # /FOREACH resultsloo %]
198
                </table>
198
                </table>
199
                <div class="pages">[% pagination_bar | $raw %]</div>
199
                <nav class="pages" id="pagination_bottom"> [% pagination_bar | $raw %] </nav>
200
            </div>
200
            </div>
201
            <!-- /.searchresults -->
201
            <!-- /.searchresults -->
202
        </div>
202
        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt (-2 / +2 lines)
Lines 50-56 Link Here
50
</form>
50
</form>
51
[% IF ( total ) %]
51
[% IF ( total ) %]
52
    <h3>Authority search results</h3>
52
    <h3>Authority search results</h3>
53
    <div class="pages"> [% pagination_bar | $raw %] </div>
53
    <nav class="pages" id="pagination_top"> [% pagination_bar | $raw %] </nav>
54
[% END %]
54
[% END %]
55
<p>
55
<p>
56
    [% IF ( total ) %]
56
    [% IF ( total ) %]
Lines 86-92 Link Here
86
[% END %]
86
[% END %]
87
87
88
[% IF ( total ) %]
88
[% IF ( total ) %]
89
    <div class="pages"> [% pagination_bar | $raw %] </div>
89
    <nav class="pages" id="pagination_bottom"> [% pagination_bar | $raw %] </nav>
90
[% END %]
90
[% END %]
91
91
92
<!-- Authority details modal -->
92
<!-- Authority details modal -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-2 / +2 lines)
Lines 1246-1252 Link Here
1246
                                    <!-- /#toolbar.btn-toolbar -->
1246
                                    <!-- /#toolbar.btn-toolbar -->
1247
                                [% END # /IF batch operations || ( unlimited_total > 10 && limit <= 1000 ) %]
1247
                                [% END # /IF batch operations || ( unlimited_total > 10 && limit <= 1000 ) %]
1248
1248
1249
                                <div class="pages"> [% pagination_bar | $raw %] </div>
1249
                                <nav id="pagination_top" class="pages"> [% pagination_bar | $raw %] </nav>
1250
                            [% END # UNLESS ( errors ) %]
1250
                            [% END # UNLESS ( errors ) %]
1251
                        [% END # IF ( execute ) %]
1251
                        [% END # IF ( execute ) %]
1252
1252
Lines 1357-1363 Link Here
1357
                                </tbody>
1357
                                </tbody>
1358
                            </table>
1358
                            </table>
1359
                        [% END %]
1359
                        [% END %]
1360
                        <div class="pages">[% pagination_bar | $raw %]</div>
1360
                        <nav class="pages" id="pagination_bottom"> [% pagination_bar | $raw %] </nav>
1361
                    </div>
1361
                    </div>
1362
                    [% INCLUDE 'chart.inc' %]
1362
                    [% INCLUDE 'chart.inc' %]
1363
                [% END #/IF ( execute ) %]
1363
                [% END #/IF ( execute ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-1 / +2 lines)
Lines 116-122 Link Here
116
                            [% END %]</tbody
116
                            [% END %]</tbody
117
                        >
117
                        >
118
                    </table>
118
                    </table>
119
                    <div class="pages">[% pagination_bar | $raw %]</div>
119
120
                    <nav class="pages" id="pagination_bottom"> [% pagination_bar | $raw %] </nav>
120
                [% ELSE %]
121
                [% ELSE %]
121
                    [% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
122
                    [% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
122
                [% END %]
123
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-3 / +4 lines)
Lines 242-248 Link Here
242
        [% IF itemsloop %]
242
        [% IF itemsloop %]
243
            [% SET contents = shelf.get_contents %]
243
            [% SET contents = shelf.get_contents %]
244
            [% IF ( contents.count ) %]<p>This list contains [% contents.count | html %] titles</p>[% END %]
244
            [% IF ( contents.count ) %]<p>This list contains [% contents.count | html %] titles</p>[% END %]
245
            <div class="pages">[% pagination_bar | $raw %]</div>
245
246
            <nav class="pages" id="pagination_top"> [% pagination_bar | $raw %] </nav>
247
246
            <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
248
            <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
247
                [% INCLUDE 'csrf-token.inc' %]
249
                [% INCLUDE 'csrf-token.inc' %]
248
                <input type="hidden" name="op" value="cud-remove_biblios" />
250
                <input type="hidden" name="op" value="cud-remove_biblios" />
Lines 410-416 Link Here
410
                </div>
412
                </div>
411
                <!-- /.page-section -->
413
                <!-- /.page-section -->
412
414
413
                <div class="pages">[% pagination_bar | $raw %]</div>
415
                <nav class="pages" id="pagination_bottom"> [% pagination_bar | $raw %] </nav>
414
            </form>
416
            </form>
415
        [% END # /IF itemsloop %]
417
        [% END # /IF itemsloop %]
416
    [% END # /IF op == 'view' %]
418
    [% END # /IF op == 'view' %]
417
- 

Return to bug 28453