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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-1 / +1 lines)
Lines 80-86 Link Here
80
                [% END %]
80
                [% END %]
81
                [% IF CAN_user_serials_edit_subscription %]
81
                [% IF CAN_user_serials_edit_subscription %]
82
                    [% IF closed %]
82
                    [% IF closed %]
83
                        <div class="btn-group"><a id="reopen" class="btn btn-small" href="#">Reopen</a></div>
83
                        <div class="btn-group"><a id="reopen" class="btn btn-small" href="#"><i class="icon-repeat"></i> Reopen</a></div>
84
                    [% ELSE %]
84
                    [% ELSE %]
85
                        <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="icon-remove-circle"></i> Close</a></div>
85
                        <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="icon-remove-circle"></i> Close</a></div>
86
                    [% END %]
86
                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-78 / +86 lines)
Lines 11-44 Link Here
11
//<![CDATA[
11
//<![CDATA[
12
 $(document).ready(function() {
12
 $(document).ready(function() {
13
    var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
13
    var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
14
        [% IF ( routing && CAN_user_serials_routing ) %]
14
        "sPaginationType": "four_button",
15
            "aoColumnDefs": [
15
        "aoColumnDefs": [
16
                { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
16
            { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
17
            ],
17
            { "sType": "title-string", "aTargets" : [ "title-string" ] },
18
        [% ELSE %]
18
            { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
19
            "aoColumnDefs": [
19
        ]
20
                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
21
            ],
22
        [% END %]
23
        "aoColumns": [
24
            null,{ "sType": "anti-the" },null,null,null,null,{ "sType": "title-string" }
25
            [% IF ( routing && CAN_user_serials_routing ) %],null[% END %],null,null
26
        ],
27
        "sPaginationType": "four_button"
28
    } ) );
20
    } ) );
29
21
30
    var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
22
    var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
23
        "sPaginationType": "four_button",
31
        "aoColumnDefs": [
24
        "aoColumnDefs": [
32
            { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
25
            { 'bSortable': false, 'aTargets': [ 'NoSort' ] },
33
        ],
26
            { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
34
        "aoColumns": [
27
        ]
35
            null,{ "sType": "anti-the" },null,null,null,null,null,null
36
        ],
37
        "sPaginationType": "four_button"
38
    } ) );
28
    } ) );
39
29
40
    osrlt.fnAddFilters("filter", 750);
30
    osrlt.fnAddFilters("dt-filter", 750);
41
    csrlt.fnAddFilters("filter", 750);
31
    csrlt.fnAddFilters("dt-filter", 750);
42
32
43
    $('#serialstabs').tabs();
33
    $('#serialstabs').tabs();
44
    $("#reopensub").click(function(){
34
    $("#reopensub").click(function(){
Lines 47-52 Link Here
47
 });
37
 });
48
 //]]>
38
 //]]>
49
</script>
39
</script>
40
<style type="text/css">input.dt-filter { width : 100%; font-size : 85%; }</style>
50
</head>
41
</head>
51
<body id="ser_serials-home" class="ser">
42
<body id="ser_serials-home" class="ser">
52
[% INCLUDE 'header.inc' %]
43
[% INCLUDE 'header.inc' %]
Lines 147-176 Link Here
147
                  <thead>
138
                  <thead>
148
                    <tr>
139
                    <tr>
149
                        <th>ISSN</th>
140
                        <th>ISSN</th>
150
                        <th>Title</th>
141
                        <th class="anti-the">Title</th>
151
                        <th> Notes </th>
142
                        <th>Notes</th>
152
                        <th>Library</th>
143
                        <th>Library</th>
153
                        <th>Location</th>
144
                        <th>Location</th>
154
                        <th>Call number</th>
145
                        <th>Call number</th>
155
                        <th>Expiration date</th>
146
                        <th class="title-string">Expiration date</th>
156
                        [% IF ( routing && CAN_user_serials_routing ) %]
147
                        <th class="NoSort">Actions</th>
157
                          <th>Routing list</th>
158
                        [% END %]
159
                        <th>&nbsp;</th>
160
                        <th>&nbsp;</th>
161
                    </tr>
148
                    </tr>
162
                  </thead>
149
                  </thead>
163
                  <tfoot>
150
                  <tfoot>
164
                    <tr>
151
                    <tr>
165
                      <td><input type="text" class="filter" data-column_num="0" placeholder="Search ISSN" /></td>
152
                      <td><input type="text" class="dt-filter" data-column_num="0" placeholder="Search ISSN" /></td>
166
                      <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
153
                      <td><input type="text" class="dt-filter" data-column_num="1" placeholder="Search title" /></td>
167
                      <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
154
                      <td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search notes" /></td>
168
                      <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
155
                      <td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search library" /></td>
169
                      <td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td>
156
                      <td><input type="text" class="dt-filter" data-column_num="4" placeholder="Search location" /></td>
170
                      <td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td>
157
                      <td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search callnumber" /></td>
171
                      <td><input type="text" class="filter" data-column_num="6" placeholder="Search expiration date" /></td>
158
                      <td><input type="text" class="dt-filter" data-column_num="6" placeholder="Search expiration date" /></td>
172
                      [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %]
173
                      <td></td>
174
                      <td></td>
159
                      <td></td>
175
                    </tr>
160
                    </tr>
176
                  </tfoot>
161
                  </tfoot>
Lines 203-229 Link Here
203
                                <span title="0000-00-00"></span>
188
                                <span title="0000-00-00"></span>
204
                            [% END %]
189
                            [% END %]
205
                        </td>
190
                        </td>
206
                        [% IF ( routing && CAN_user_serials_routing ) %]
191
207
                        <td>
208
                          [% IF ( subscription.cannotedit ) %]
209
                            &nbsp;
210
                          [% ELSE %]
211
                            [% IF ( subscription.routingedit ) %]
212
                              <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
213
                              ([% subscription.routingedit %])
214
                            [% ELSE %]
215
                              <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
216
                            [% END %]
217
                          [% END %]
218
                        </td>
219
                        [% END %]
220
                        <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
221
                        </td>
222
                        <td>
192
                        <td>
223
                        [% IF ( CAN_user_serials_receive_serials ) %]
193
                            <div class="dropdown">
224
                          <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>
194
                                <a class="btn btn-mini dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#">
225
                        [% END %]
195
                                   Actions <b class="caret"></b>
196
                                </a>
197
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="subactions[% subscription.subscriptionid %]">
198
199
                                    [% IF ( routing && CAN_user_serials_routing ) %]
200
                                        [% IF ( subscription.cannotedit ) %]
201
                                        [% ELSE %]
202
                                            [% IF ( subscription.routingedit ) %]
203
                                                <li>
204
                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="icon-pencil"></i> Edit routing list ([% subscription.routingedit %])</a>
205
                                                </li>
206
                                            [% ELSE %]
207
                                                <li>
208
                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new"> <i class="icon-plus"></i> New routing list</a>
209
                                                </li>
210
                                            [% END %]
211
                                        [% END %]
212
                                    [% END # IF ( routing && CAN_user_serials_routing ) %]
213
214
                                    <li>
215
                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="icon-list-alt"></i> Issue history</a>
216
                                    </li>
217
                                    [% IF ( CAN_user_serials_receive_serials ) %]
218
                                        <li>
219
                                            <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7"> <i class="icon-inbox"></i> Serial receive</a>
220
                                        </li>
221
                                    [% END %]
222
                                </ul>
223
                            </div>
226
                        </td>
224
                        </td>
225
227
                      </tr>
226
                      </tr>
228
                      [% END %]
227
                      [% END %]
229
                    [% END %]
228
                    [% END %]
Lines 241-264 Link Here
241
                  <thead>
240
                  <thead>
242
                    <tr>
241
                    <tr>
243
                        <th>ISSN</th>
242
                        <th>ISSN</th>
244
                        <th>Title</th>
243
                        <th class="anti-the">Title</th>
245
                        <th> Notes </th>
244
                        <th>Notes</th>
246
                        <th>Library</th>
245
                        <th>Library</th>
247
                        <th>Location</th>
246
                        <th>Location</th>
248
                        <th>Call number</th>
247
                        <th>Call number</th>
249
                        <th>&nbsp;</th>
248
                        <th class="NoSort">Actions</th>
250
                        <th>&nbsp;</th>
251
                    </tr>
249
                    </tr>
252
                  </thead>
250
                  </thead>
253
                  <tfoot>
251
                  <tfoot>
254
                    <tr>
252
                    <tr>
255
                      <td><input type="text" class="filter" data-column_num="0" placeholder="Search ISSN" /></td>
253
                      <td><input type="text" class="dt-filter" data-column_num="0" placeholder="Search ISSN" /></td>
256
                      <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
254
                      <td><input type="text" class="dt-filter" data-column_num="1" placeholder="Search title" /></td>
257
                      <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
255
                      <td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search notes" /></td>
258
                      <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
256
                      <td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search library" /></td>
259
                      <td><input type="text" class="filter" data-column_num="4" placeholder="Search location" /></td>
257
                      <td><input type="text" class="dt-filter" data-column_num="4" placeholder="Search location" /></td>
260
                      <td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td>
258
                      <td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search callnumber" /></td>
261
                      <td></td>
262
                      <td></td>
259
                      <td></td>
263
                    </tr>
260
                    </tr>
264
                  </tfoot>
261
                  </tfoot>
Lines 288-301 Link Here
288
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
285
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
289
                        </td>
286
                        </td>
290
                        <td>
287
                        <td>
291
                          [% UNLESS subscription.cannotedit %]
288
                            <div class="dropdown">
292
                            <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter %]&amp;ISSN_filter=[% ISSN_filter %]&amp;EAN_filter=[% EAN_filter %]&amp;published_filter=[% publisher_filter %]&amp;bookseller_filter=[% bookseller_filter %]&amp;branch_filter=[% branch_filter %]" id="reopensub">Reopen</a>
289
                                <a class="btn btn-mini dropdown-toggle" id="closedsubactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#">
293
                          [% ELSE %]
290
                                   Actions <b class="caret"></b>
294
                            Cannot edit
291
                                </a>
295
                          [% END %]
292
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="closedsubactions[% subscription.subscriptionid %]">
296
                        </td>
293
297
                        <td>
294
                                    [% IF ( routing && CAN_user_serials_routing ) %]
298
                          <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
295
                                        [% UNLESS ( subscription.cannotedit ) %]
296
                                            <li>
297
                                                <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter %]&amp;ISSN_filter=[% ISSN_filter %]&amp;EAN_filter=[% EAN_filter %]&amp;published_filter=[% publisher_filter %]&amp;bookseller_filter=[% bookseller_filter %]&amp;branch_filter=[% branch_filter %]" id="reopensub"> <i class="icon-repeat"></i> Reopen</a>
298
                                            </li>
299
                                        [% END %]
300
                                    [% END # IF ( routing && CAN_user_serials_routing ) %]
301
302
                                    <li>
303
                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="icon-list-alt"></i> Issue history</a>
304
                                    </li>
305
306
                                </ul>
307
                            </div>
299
                        </td>
308
                        </td>
300
                      </tr>
309
                      </tr>
301
                    [% END %]
310
                    [% END %]
302
- 

Return to bug 11271