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

(-)a/C4/Output.pm (-34 / +20 lines)
Lines 110-130 sub pagination_bar { Link Here
110
110
111
    # navigation bar useful only if more than one page to display !
111
    # navigation bar useful only if more than one page to display !
112
    if ( $nb_pages > 1 ) {
112
    if ( $nb_pages > 1 ) {
113
113
        $pagination_bar = '<ul class="pagination">';
114
        # link to first page?
114
        # link to first page?
115
        if ( $current_page > 1 ) {
115
        if ( $current_page > 1 ) {
116
            $pagination_bar .=
116
            $pagination_bar .=
117
                "\n" . '&nbsp;'
117
                "\n" . ''
118
              . '<a href="'
118
              . '<li class="page-item"><a class="page-link output first" href="'
119
              . $url
119
              . $url
120
              . '1'
120
              . '1'
121
              . $url_suffix
121
              . $url_suffix
122
              . '"rel="start">'
122
              . '"rel="start">'
123
              . '&lt;&lt;' . '</a>';
123
              . '<i class="fa fa-fw fa-angle-double-left"></i> First' . '</a></li>';
124
        }
125
        else {
126
            $pagination_bar .=
127
              "\n" . '&nbsp;<span class="inactive">&lt;&lt;</span>';
128
        }
124
        }
129
125
130
        # link on previous page ?
126
        # link on previous page ?
Lines 132-147 sub pagination_bar { Link Here
132
            my $previous = $current_page - 1;
128
            my $previous = $current_page - 1;
133
129
134
            $pagination_bar .=
130
            $pagination_bar .=
135
                "\n" . '&nbsp;'
131
                "\n" . ''
136
              . '<a href="'
132
              . '<li class="page-item"><a class="page-link output previous" href="'
137
              . $url
133
              . $url
138
              . $previous
134
              . $previous
139
              . $url_suffix
135
              . $url_suffix
140
              . '" rel="prev">' . '&lt;' . '</a>';
136
              . '" rel="prev">' . '<i class="fa fa-fw fa-angle-left"></i> Previous' . '</a></li>';
141
        }
142
        else {
143
            $pagination_bar .=
144
              "\n" . '&nbsp;<span class="inactive">&lt;</span>';
145
        }
137
        }
146
138
147
        my $min_to_display      = $current_page - $pages_around;
139
        my $min_to_display      = $current_page - $pages_around;
Lines 160-184 sub pagination_bar { Link Here
160
                    and $last_displayed_page != $page_number - 1 )
152
                    and $last_displayed_page != $page_number - 1 )
161
                {
153
                {
162
                    $pagination_bar .=
154
                    $pagination_bar .=
163
                      "\n" . '&nbsp;<span class="inactive">...</span>';
155
                      "\n" . '<li class="page-item disabled"><a class="page-link">...</a></li>';
164
                }
156
                }
165
157
166
                if ( $page_number == $current_page ) {
158
                if ( $page_number == $current_page ) {
167
                    $pagination_bar .=
159
                    $pagination_bar .=
168
                        "\n" . '&nbsp;'
160
                        "\n" . ''
169
                      . '<span class="currentPage">'
161
                      . '<li class="page-item active" aria-current="page"><a class="page-link" href="#">'
170
                      . $page_number
162
                      . $page_number
171
                      . '</span>';
163
                      . '</a></li>';
172
                }
164
                }
173
                else {
165
                else {
174
                    $pagination_bar .=
166
                    $pagination_bar .=
175
                        "\n" . '&nbsp;'
167
                        "\n" . ''
176
                      . '<a href="'
168
                      . '<li class="page-item"><a class="page-link" href="'
177
                      . $url
169
                      . $url
178
                      . $page_number
170
                      . $page_number
179
                      . $url_suffix
171
                      . $url_suffix
180
                      . '">'
172
                      . '">'
181
                      . $page_number . '</a>';
173
                      . $page_number . '</a></li>';
182
                }
174
                }
183
                $last_displayed_page = $page_number;
175
                $last_displayed_page = $page_number;
184
            }
176
            }
Lines 189-219 sub pagination_bar { Link Here
189
            my $next = $current_page + 1;
181
            my $next = $current_page + 1;
190
182
191
            $pagination_bar .= "\n"
183
            $pagination_bar .= "\n"
192
              . '&nbsp;<a href="'
184
              . '<li class="page-item"><a class="page-link output next" href="'
193
              . $url
185
              . $url
194
              . $next
186
              . $next
195
              . $url_suffix
187
              . $url_suffix
196
              . '" rel="next">' . '&gt;' . '</a>';
188
              . '" rel="next">' . 'Next <i class="fa fa-fw fa-angle-right"></i>' . '</a></li>';
197
        }
198
        else {
199
            $pagination_bar .=
200
              "\n" . '&nbsp;<span class="inactive">&gt;</span>';
201
        }
189
        }
202
190
203
        # link to last page?
191
        # link to last page?
204
        if ( $current_page != $nb_pages ) {
192
        if ( $current_page != $nb_pages ) {
205
            $pagination_bar .= "\n"
193
            $pagination_bar .= "\n"
206
              . '&nbsp;<a href="'
194
              . '<li class="page-item"><a class="page-link output last" href="'
207
              . $url
195
              . $url
208
              . $nb_pages
196
              . $nb_pages
209
              . $url_suffix
197
              . $url_suffix
210
              . '" rel="last">'
198
              . '" rel="last">'
211
              . '&gt;&gt;' . '</a>';
199
              . 'Last <i class="fa fa-fw fa-angle-double-right"></i>' . '</a></li>';
212
        }
213
        else {
214
            $pagination_bar .=
215
              "\n" . '&nbsp;<span class="inactive">&gt;&gt;</span>';
216
        }
200
        }
201
202
        $pagination_bar .= "\n" . '</ul>';
217
    }
203
    }
218
204
219
    return $pagination_bar;
205
    return $pagination_bar;
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-36 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
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt (-2 lines)
Lines 483-490 Link Here
483
                    [% ELSE %]
483
                    [% ELSE %]
484
                        <p>There are no saved matching rules.</p>
484
                        <p>There are no saved matching rules.</p>
485
                    [% END # /IF ( available_matching_rules ) %]
485
                    [% END # /IF ( available_matching_rules ) %]
486
487
                    <div class="pages">[% pagination_bar | $raw %]</div>
488
                [% END # /IF ( display_list ) %]
486
                [% END # /IF ( display_list ) %]
489
487
490
                [% IF ( matching_rule_form ) %]
488
                [% IF ( matching_rule_form ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt (-2 lines)
Lines 390-397 Link Here
390
  <p>There are no saved patron attribute types.</p>
390
  <p>There are no saved patron attribute types.</p>
391
[% END %]
391
[% END %]
392
392
393
<div class="pages">[% pagination_bar | $raw %]</div>
394
395
[% END %]
393
[% END %]
396
394
397
            </main>
395
            </main>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt (-2 / +6 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">
58
        [% pagination_bar | $raw %]
59
    </nav>
58
60
59
    <p id="authorities_searchresultlist_current_page_info">
61
    <p id="authorities_searchresultlist_current_page_info">
60
      Results [% from | html %] to [% to | html %] of [% total | html %]
62
      Results [% from | html %] to [% to | html %] of [% total | html %]
Lines 141-147 Link Here
141
143
142
    [% INCLUDE 'authority-detail-modal.inc' %]
144
    [% INCLUDE 'authority-detail-modal.inc' %]
143
145
144
    <div class="pages">[% pagination_bar | $raw %]</div>
146
    <nav class="pages" id="pagination_bottom">
147
        [% pagination_bar | $raw %]
148
    </nav>
145
149
146
    [% ELSE %]
150
    [% ELSE %]
147
      No results found
151
      No results found
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-6 / +10 lines)
Lines 94-104 Link Here
94
                [% IF ( total ) %]
94
                [% IF ( total ) %]
95
                    <h2>Records found in the catalog</h2>
95
                    <h2>Records found in the catalog</h2>
96
                    <div class="page-section">
96
                    <div class="page-section">
97
                    <div>
97
                        <div>
98
                        [% total | html %] result(s) found in catalog,
98
                            [% total | html %] result(s) found in catalog,
99
                        <a href="#searchresult-breeding">[% breeding_count | html %] result(s) found in reservoir</a>
99
                            <a href="#searchresult-breeding">[% breeding_count | html %] result(s) found in reservoir</a>
100
                    </div>
100
                        </div>
101
                    <div class="pages">[% pagination_bar | $raw %]</div>
101
                        <nav class="pages" id="pagination_top">
102
                            [% pagination_bar | $raw %]
103
                        </nav>
102
                        <div class="searchresults">
104
                        <div class="searchresults">
103
                            <table>
105
                            <table>
104
                                <tr>
106
                                <tr>
Lines 186-192 Link Here
186
                                    </tr>
188
                                    </tr>
187
                                [% END # /FOREACH resultsloo %]
189
                                [% END # /FOREACH resultsloo %]
188
                            </table>
190
                            </table>
189
                            <div class="pages">[% pagination_bar | $raw %]</div>
191
                            <nav class="pages" id="pagination_bottom">
192
                                [% pagination_bar | $raw %]
193
                            </nav>
190
                        </div> <!-- /.searchresults -->
194
                        </div> <!-- /.searchresults -->
191
                    </div> <!-- /.page-section -->
195
                    </div> <!-- /.page-section -->
192
                [% ELSE # IF total %]
196
                [% ELSE # IF total %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt (-7 / +9 lines)
Lines 48-57 Link Here
48
                </fieldset>
48
                </fieldset>
49
        </form>
49
        </form>
50
            [% IF ( total ) %]
50
            [% IF ( total ) %]
51
            <h3>Authority search results</h3>
51
                <h3>Authority search results</h3>
52
            <div class="pages">
52
                <nav class="pages" id="pagination_top">
53
                          [% pagination_bar | $raw %]
53
                    [% pagination_bar | $raw %]
54
                        </div>[% END %]
54
                </nav>
55
            [% END %]
55
            <p>
56
            <p>
56
                [% IF ( total ) %]
57
                [% IF ( total ) %]
57
                    &nbsp;<strong>Results [% from | html %] to [% to | html %] of [% total | html %]</strong><br /><br />
58
                    &nbsp;<strong>Results [% from | html %] to [% to | html %] of [% total | html %]</strong><br /><br />
Lines 85-93 Link Here
85
        </div>
86
        </div>
86
[% END %]
87
[% END %]
87
88
88
            [% IF ( total ) %]<div class="pages">
89
            [% IF ( total ) %]
89
                          [% pagination_bar | $raw %]
90
                <nav class="pages" id="pagination_bottom">
90
                        </div>
91
                    [% pagination_bar | $raw %]
92
                </nav>
91
            [% END %]
93
            [% END %]
92
94
93
<!-- Authority details modal -->
95
<!-- Authority details modal -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-3 / +5 lines)
Lines 1155-1163 Link Here
1155
                                    </div> <!-- /#toolbar.btn-toolbar -->
1155
                                    </div> <!-- /#toolbar.btn-toolbar -->
1156
                                [% END # /IF batch operations || ( unlimited_total > 10 && limit <= 1000 ) %]
1156
                                [% END # /IF batch operations || ( unlimited_total > 10 && limit <= 1000 ) %]
1157
1157
1158
                                <div class="pages">
1158
                                <nav id="pagination_top" class="pages">
1159
                                    [% pagination_bar | $raw %]
1159
                                    [% pagination_bar | $raw %]
1160
                                </div>
1160
                                </nav>
1161
1161
1162
                            [% END # UNLESS ( errors ) %]
1162
                            [% END # UNLESS ( errors ) %]
1163
                        [% END # IF ( execute ) %]
1163
                        [% END # IF ( execute ) %]
Lines 1237-1243 Link Here
1237
                                </tbody>
1237
                                </tbody>
1238
                            </table>
1238
                            </table>
1239
                        [% END %]
1239
                        [% END %]
1240
                        <div class="pages">[% pagination_bar | $raw %]</div>
1240
                        <nav class="pages" id="pagination_bottom">
1241
                            [% pagination_bar | $raw %]
1242
                        </nav>
1241
                    </div>
1243
                    </div>
1242
                    [% INCLUDE 'chart.inc' %]
1244
                    [% INCLUDE 'chart.inc' %]
1243
1245
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-1 / +5 lines)
Lines 123-129 Link Here
123
    </tr>
123
    </tr>
124
    [% END %]</tbody>
124
    [% END %]</tbody>
125
</table>
125
</table>
126
 <div class="pages">[% pagination_bar | $raw %]</div>
126
127
    <nav class="pages" id="pagination_bottom">
128
        [% pagination_bar | $raw %]
129
    </nav>
130
127
[% ELSE %]
131
[% ELSE %]
128
[% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
132
[% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
129
[% END %]
133
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-3 / +8 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">
247
                        [% pagination_bar | $raw %]
248
                    </nav>
249
246
                    <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
250
                    <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
247
                        [% INCLUDE 'csrf-token.inc' %]
251
                        [% INCLUDE 'csrf-token.inc' %]
248
                        <input type="hidden" name="op" value="cud-remove_biblios" />
252
                        <input type="hidden" name="op" value="cud-remove_biblios" />
Lines 388-394 Link Here
388
                            </table> <!-- /#searchresults -->
392
                            </table> <!-- /#searchresults -->
389
                        </div> <!-- /.page-section -->
393
                        </div> <!-- /.page-section -->
390
394
391
                        <div class="pages">[% pagination_bar | $raw %]</div>
395
                        <nav class="pages" id="pagination_bottom">
396
                            [% pagination_bar | $raw %]
397
                        </nav>
392
                    </form>
398
                    </form>
393
                [% END # /IF itemsloop %]
399
                [% END # /IF itemsloop %]
394
            [% END # /IF op == 'view' %]
400
            [% END # /IF op == 'view' %]
395
- 

Return to bug 28453