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

(-)a/C4/Output.pm (-34 / +20 lines)
Lines 107-127 sub pagination_bar { Link Here
107
107
108
    # navigation bar useful only if more than one page to display !
108
    # navigation bar useful only if more than one page to display !
109
    if ( $nb_pages > 1 ) {
109
    if ( $nb_pages > 1 ) {
110
110
        $pagination_bar = '<ul class="pagination">';
111
        # link to first page?
111
        # link to first page?
112
        if ( $current_page > 1 ) {
112
        if ( $current_page > 1 ) {
113
            $pagination_bar .=
113
            $pagination_bar .=
114
                "\n" . '&nbsp;'
114
                "\n" . ''
115
              . '<a href="'
115
              . '<li><a class="nav" href="'
116
              . $url
116
              . $url
117
              . '1'
117
              . '1'
118
              . $url_suffix
118
              . $url_suffix
119
              . '"rel="start">'
119
              . '"rel="start">'
120
              . '&lt;&lt;' . '</a>';
120
              . '<i class="fa fa-fw fa-angle-double-left"></i> First' . '</a></li>';
121
        }
122
        else {
123
            $pagination_bar .=
124
              "\n" . '&nbsp;<span class="inactive">&lt;&lt;</span>';
125
        }
121
        }
126
122
127
        # link on previous page ?
123
        # link on previous page ?
Lines 129-144 sub pagination_bar { Link Here
129
            my $previous = $current_page - 1;
125
            my $previous = $current_page - 1;
130
126
131
            $pagination_bar .=
127
            $pagination_bar .=
132
                "\n" . '&nbsp;'
128
                "\n" . ''
133
              . '<a href="'
129
              . '<li><a class="nav" href="'
134
              . $url
130
              . $url
135
              . $previous
131
              . $previous
136
              . $url_suffix
132
              . $url_suffix
137
              . '" rel="prev">' . '&lt;' . '</a>';
133
              . '" rel="prev">' . '<i class="fa fa-fw fa-angle-left"></i> Previous' . '</a></li>';
138
        }
139
        else {
140
            $pagination_bar .=
141
              "\n" . '&nbsp;<span class="inactive">&lt;</span>';
142
        }
134
        }
143
135
144
        my $min_to_display      = $current_page - $pages_around;
136
        my $min_to_display      = $current_page - $pages_around;
Lines 157-181 sub pagination_bar { Link Here
157
                    and $last_displayed_page != $page_number - 1 )
149
                    and $last_displayed_page != $page_number - 1 )
158
                {
150
                {
159
                    $pagination_bar .=
151
                    $pagination_bar .=
160
                      "\n" . '&nbsp;<span class="inactive">...</span>';
152
                      "\n" . '<li><span class="inactive">...</span></li>';
161
                }
153
                }
162
154
163
                if ( $page_number == $current_page ) {
155
                if ( $page_number == $current_page ) {
164
                    $pagination_bar .=
156
                    $pagination_bar .=
165
                        "\n" . '&nbsp;'
157
                        "\n" . ''
166
                      . '<span class="currentPage">'
158
                      . '<li class="active"><span>'
167
                      . $page_number
159
                      . $page_number
168
                      . '</span>';
160
                      . '</span></li>';
169
                }
161
                }
170
                else {
162
                else {
171
                    $pagination_bar .=
163
                    $pagination_bar .=
172
                        "\n" . '&nbsp;'
164
                        "\n" . ''
173
                      . '<a href="'
165
                      . '<li><a class="nav" href="'
174
                      . $url
166
                      . $url
175
                      . $page_number
167
                      . $page_number
176
                      . $url_suffix
168
                      . $url_suffix
177
                      . '">'
169
                      . '">'
178
                      . $page_number . '</a>';
170
                      . $page_number . '</a></li>';
179
                }
171
                }
180
                $last_displayed_page = $page_number;
172
                $last_displayed_page = $page_number;
181
            }
173
            }
Lines 186-216 sub pagination_bar { Link Here
186
            my $next = $current_page + 1;
178
            my $next = $current_page + 1;
187
179
188
            $pagination_bar .= "\n"
180
            $pagination_bar .= "\n"
189
              . '&nbsp;<a href="'
181
              . '<li><a class="nav" href="'
190
              . $url
182
              . $url
191
              . $next
183
              . $next
192
              . $url_suffix
184
              . $url_suffix
193
              . '" rel="next">' . '&gt;' . '</a>';
185
              . '" rel="next">' . 'Next <i class="fa fa-fw fa-angle-right"></i>' . '</a></li>';
194
        }
195
        else {
196
            $pagination_bar .=
197
              "\n" . '&nbsp;<span class="inactive">&gt;</span>';
198
        }
186
        }
199
187
200
        # link to last page?
188
        # link to last page?
201
        if ( $current_page != $nb_pages ) {
189
        if ( $current_page != $nb_pages ) {
202
            $pagination_bar .= "\n"
190
            $pagination_bar .= "\n"
203
              . '&nbsp;<a href="'
191
              . '<li><a class="nav" href="'
204
              . $url
192
              . $url
205
              . $nb_pages
193
              . $nb_pages
206
              . $url_suffix
194
              . $url_suffix
207
              . '" rel="last">'
195
              . '" rel="last">'
208
              . '&gt;&gt;' . '</a>';
196
              . 'Last <i class="fa fa-fw fa-angle-double-right"></i>' . '</a></li>';
209
        }
210
        else {
211
            $pagination_bar .=
212
              "\n" . '&nbsp;<span class="inactive">&gt;&gt;</span>';
213
        }
197
        }
198
199
        $pagination_bar .= "\n" . '</ul>';
214
    }
200
    }
215
201
216
    return $pagination_bar;
202
    return $pagination_bar;
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-36 / +4 lines)
Lines 1251-1292 div { Link Here
1251
        }
1251
        }
1252
    }
1252
    }
1253
1253
1254
    &.pages {
1255
        margin: .5em 0;
1256
1257
        a {
1258
            font-weight: bold;
1259
            padding: 1px 5px;
1260
            text-decoration: none;
1261
1262
            &:link,
1263
            &:visited {
1264
                background-color: #EEEEEE;
1265
                color: #3366CC;
1266
            }
1267
1268
            &:hover,
1269
            &:active {
1270
                background-color: #FFC;
1271
            }
1272
        }
1273
1274
        .current,
1275
        .currentPage {
1276
            background-color: #E6FCB7;
1277
            color: #666;
1278
            font-weight: bold;
1279
            padding: 1px 5px;
1280
        }
1281
1282
        .inactive {
1283
            background-color: #F3F3F3;
1284
            color: #BCBCBC;
1285
            font-weight: bold;
1286
            padding: 1px 5px;
1287
        }
1288
    }
1289
1290
    .browse {
1254
    .browse {
1291
        margin: .5em 0;
1255
        margin: .5em 0;
1292
    }
1256
    }
Lines 3206-3211 nav { Link Here
3206
        }
3170
        }
3207
    }
3171
    }
3208
3172
3173
    &.pages {
3174
        font-size: 90%;
3175
    }
3176
3209
3177
3210
}
3178
}
3211
3179
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt (-1 lines)
Lines 478-484 Link Here
478
                        <p>There are no saved matching rules.</p>
478
                        <p>There are no saved matching rules.</p>
479
                    [% END # /IF ( available_matching_rules ) %]
479
                    [% END # /IF ( available_matching_rules ) %]
480
480
481
                    <div class="pages">[% pagination_bar | $raw %]</div>
482
                [% END # /IF ( display_list ) %]
481
                [% END # /IF ( display_list ) %]
483
482
484
                [% IF ( matching_rule_form ) %]
483
                [% IF ( matching_rule_form ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt (-2 lines)
Lines 352-359 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here
352
  <p>There are no saved patron attribute types.</p>
352
  <p>There are no saved patron attribute types.</p>
353
[% END %]
353
[% END %]
354
354
355
<div class="pages">[% pagination_bar | $raw %]</div>
356
357
[% END %]
355
[% END %]
358
356
359
            </main>
357
            </main>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt (-2 / +7 lines)
Lines 35-41 Link Here
35
35
36
<div id="merge_in_progress"></div>
36
<div id="merge_in_progress"></div>
37
[% IF ( total ) %]
37
[% IF ( total ) %]
38
<div class="pages">[% pagination_bar | $raw %]</div>
38
39
    <nav class="pages" id="pagination_top">
40
        [% pagination_bar | $raw %]
41
    </nav>
39
42
40
<p id="authorities_searchresultlist_current_page_info">
43
<p id="authorities_searchresultlist_current_page_info">
41
  Results [% from | html %] to [% to | html %] of [% total | html %]
44
  Results [% from | html %] to [% to | html %] of [% total | html %]
Lines 86-92 Link Here
86
  </table>
89
  </table>
87
</div>
90
</div>
88
91
89
<div class="pages">[% pagination_bar | $raw %]</div>
92
    <nav class="pages" id="pagination_bottom">
93
        [% pagination_bar | $raw %]
94
    </nav>
90
95
91
[% ELSE %]
96
[% ELSE %]
92
  No results found
97
  No results found
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-2 / +10 lines)
Lines 93-99 Link Here
93
                        [% total | html %] result(s) found in catalog,
93
                        [% total | html %] result(s) found in catalog,
94
                        <a href="#searchresult-breeding">[% breeding_count | html %] result(s) found in reservoir</a>
94
                        <a href="#searchresult-breeding">[% breeding_count | html %] result(s) found in reservoir</a>
95
                    </div>
95
                    </div>
96
                    <div class="pages">[% pagination_bar | $raw %]</div>
96
97
                    <nav class="pages" id="pagination_top">
98
                        [% pagination_bar | $raw %]
99
                    </nav>
100
97
                    <div class="searchresults">
101
                    <div class="searchresults">
98
                        <table>
102
                        <table>
99
                            <tr>
103
                            <tr>
Lines 180-186 Link Here
180
                                </tr>
184
                                </tr>
181
                            [% END # /FOREACH resultsloo %]
185
                            [% END # /FOREACH resultsloo %]
182
                        </table>
186
                        </table>
183
                        <div class="pages">[% pagination_bar | $raw %]</div>
187
188
                        <nav class="pages" id="pagination_bottom">
189
                            [% pagination_bar | $raw %]
190
                        </nav>
191
184
                    </div> <!-- /.searchresults -->
192
                    </div> <!-- /.searchresults -->
185
                [% ELSE # IF total %]
193
                [% ELSE # IF total %]
186
                    [% IF ( query ) %]
194
                    [% IF ( query ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt (-10 / +12 lines)
Lines 16-22 Link Here
16
            <input type="hidden" name="type" value="intranet" />
16
            <input type="hidden" name="type" value="intranet" />
17
            <input type="hidden" name="nbstatements" value="[% nbstatements | html %]" />
17
            <input type="hidden" name="nbstatements" value="[% nbstatements | html %]" />
18
            <input type="hidden" name="index" value="[% index | html %]" />
18
            <input type="hidden" name="index" value="[% index | html %]" />
19
            <input type="hidden" name="authtypecode" value="EDITORS" />
19
            <input type="hidden" name="authtypecode" value="PERSO_NAME" />
20
            <input type="hidden" name="q" value="[% index | html %]" />
20
            <input type="hidden" name="q" value="[% index | html %]" />
21
            <input type="hidden" name="marclist" value="all" />
21
            <input type="hidden" name="marclist" value="all" />
22
            <input type="hidden" name="and_or" value="and" />
22
            <input type="hidden" name="and_or" value="and" />
Lines 42-51 Link Here
42
                </fieldset>
42
                </fieldset>
43
        </form>
43
        </form>
44
            [% IF ( total ) %]
44
            [% IF ( total ) %]
45
            <h3>Authority search results</h3>
45
                <h3>Authority search results</h3>
46
            <div class="pages">
46
                <nav class="pages" id="pagination_top">
47
                          [% pagination_bar | $raw %]
47
                    [% pagination_bar | $raw %]
48
                        </div>[% END %]
48
                </nav>
49
            [% END %]
49
            <p>
50
            <p>
50
                [% IF ( total ) %]
51
                [% IF ( total ) %]
51
                    &nbsp;<strong>Results [% from | html %] to [% to | html %] of [% total | html %]</strong><br /><br />
52
                    &nbsp;<strong>Results [% from | html %] to [% to | html %] of [% total | html %]</strong><br /><br />
Lines 68-77 Link Here
68
                        <td>[% resul.summary.label | html %]</td>
69
                        <td>[% resul.summary.label | html %]</td>
69
                        <td>[% resul.used | html %] times</td>
70
                        <td>[% resul.used | html %] times</td>
70
                        <td>
71
                        <td>
71
                        [% IF ( resul.to_report ) %]
72
                        [% #IF ( resul.to_report ) %]
72
                            <button class="choosebt">Choose</button>
73
                            <button class="choosebt">Choose</button>
73
                            <p class="toreport" style="display:none">[% resul.to_report |replace('\n', '\\n') |replace('\r', '\\r') |html %]</p>
74
                            <p class="toreport" style="display:none">[% resul.to_report |replace('\n', '\\n') |replace('\r', '\\r') |html %]</p>
74
                        [% END %]
75
                        [% #END %]
75
                        </td>
76
                        </td>
76
                    </tr>
77
                    </tr>
77
                [% END %]
78
                [% END %]
Lines 79-87 Link Here
79
        </div>
80
        </div>
80
[% END %]
81
[% END %]
81
82
82
            [% IF ( total ) %]<div class="pages">
83
            [% IF ( total ) %]
83
                          [% pagination_bar | $raw %]
84
                <nav class="pages" id="pagination_bottom">
84
                        </div>
85
                    [% pagination_bar | $raw %]
86
                </nav>
85
            [% END %]
87
            [% END %]
86
88
87
<!-- Authority details modal -->
89
<!-- Authority details modal -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-2 / +8 lines)
Lines 1076-1082 Link Here
1076
                        </select>
1076
                        </select>
1077
                    </form> <!-- /#limitselect -->
1077
                    </form> <!-- /#limitselect -->
1078
1078
1079
                    <div class="pages">[% pagination_bar | $raw %]</div>
1079
                    <nav class="pages" id="pagination_top">
1080
                        [% pagination_bar | $raw %]
1081
                    </nav>
1082
1080
                    [% UNLESS ( errors ) %]
1083
                    [% UNLESS ( errors ) %]
1081
                        <table>
1084
                        <table>
1082
                            <tr>
1085
                            <tr>
Lines 1093-1099 Link Here
1093
                            [% END %]
1096
                            [% END %]
1094
                        </table>
1097
                        </table>
1095
                    [% END %]
1098
                    [% END %]
1096
                    <div class="pages">[% pagination_bar | $raw %]</div>
1099
1100
                    <nav class="pages" id="pagination_bottom">
1101
                        [% pagination_bar | $raw %]
1102
                    </nav>
1097
1103
1098
                    [% INCLUDE 'chart.inc' %]
1104
                    [% INCLUDE 'chart.inc' %]
1099
1105
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-1 / +5 lines)
Lines 81-87 Link Here
81
    </tr>
81
    </tr>
82
    [% END %]</tbody>
82
    [% END %]</tbody>
83
</table>
83
</table>
84
 <div class="pages">[% pagination_bar | $raw %]</div>
84
85
    <nav class="pages" id="pagination_bottom">
86
        [% pagination_bar | $raw %]
87
    </nav>
88
85
[% ELSE %]
89
[% ELSE %]
86
[% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
90
[% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
87
[% END %]
91
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt (-5 / +1 lines)
Lines 80-90 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
80
        [% END %]
80
        [% END %]
81
  </div>
81
  </div>
82
  [% END %]
82
  [% END %]
83
  [% IF ( pagination_bar ) %]
83
84
  <div class="pages" id="pagination_top">
85
    [% pagination_bar | $raw %]
86
  </div>
87
  [% END %]
88
  [% IF ( tagloop ) %]
84
  [% IF ( tagloop ) %]
89
  <p class="check"></p>
85
  <p class="check"></p>
90
  <table id="tagst">
86
  <table id="tagst">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-3 / +10 lines)
Lines 186-192 Link Here
186
    [% IF itemsloop %]
186
    [% IF itemsloop %]
187
187
188
    <h3>Contents of <em>[% shelf.shelfname | html %]</em></h3>
188
    <h3>Contents of <em>[% shelf.shelfname | html %]</em></h3>
189
    <div class="pages">[% pagination_bar | $raw %]</div>
189
190
    <nav class="pages" id="pagination_top">
191
        [% pagination_bar | $raw %]
192
    </nav>
193
190
    <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
194
    <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
191
        <input type="hidden" name="op" value="remove_biblios" />
195
        <input type="hidden" name="op" value="remove_biblios" />
192
        <input type="hidden" name="referer" value="view" />
196
        <input type="hidden" name="referer" value="view" />
Lines 307-313 Link Here
307
			</tr>
311
			</tr>
308
		[% END %]<!-- /itemsloop -->
312
		[% END %]<!-- /itemsloop -->
309
    </table>
313
    </table>
310
    <div class="pages">[% pagination_bar | $raw %]</div>
314
315
    <nav class="pages" id="pagination_bottom">
316
        [% pagination_bar | $raw %]
317
    </nav>
318
311
</form>
319
</form>
312
320
313
	[% END %]
321
	[% END %]
314
- 

Return to bug 28453