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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc (-7 / +7 lines)
Lines 1-13 Link Here
1
[% IF ( subscriptionid ) %]
1
[% IF ( subscriptionid ) %]
2
<ul>
2
<ul>
3
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial Collection</a></li>
3
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial collection</a></li>
4
	[% IF ( CAN_user_serials_routing ) %]
4
    [% IF ( routing && CAN_user_serials_routing ) %]
5
        [% IF ( hasRouting ) %]
5
        [% IF ( hasRouting ) %]
6
             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]">Edit Routing List</a></li>
6
             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]">Edit routing list</a></li>
7
        [% ELSE %]
7
        [% ELSE %]
8
			<li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create Routing List</a></li>
8
            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
9
		[% END %]
9
        [% END %]
10
	[% END %]
10
    [% END %]
11
</ul>
11
</ul>
12
[% END %]
12
[% END %]
13
13
Lines 16-21 Link Here
16
	<li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
16
	<li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
17
    [% END %]
17
    [% END %]
18
    [% IF ( CAN_user_serials_check_expiration ) %]
18
    [% IF ( CAN_user_serials_check_expiration ) %]
19
	<li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a></li>
19
	<li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Check expiration</a></li>
20
    [% END %]
20
    [% END %]
21
</ul>
21
</ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt (-2 / +2 lines)
Lines 24-37 function print_slip(subscriptionid,issue){ Link Here
24
	<div id="yui-main">
24
	<div id="yui-main">
25
	<div class="yui-b">
25
	<div class="yui-b">
26
26
27
<h2>Preview Routing List for <i>[% title |html %]</i></h2>
27
<h2>Preview routing list for <i>[% title |html %]</i></h2>
28
28
29
<form method="post" action="routing-preview.pl">
29
<form method="post" action="routing-preview.pl">
30
<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
30
<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
31
<fieldset class="rows">
31
<fieldset class="rows">
32
	<ol>
32
	<ol>
33
		<li><span class="label">Issue:</span>[% issue %]</li>
33
		<li><span class="label">Issue:</span>[% issue %]</li>
34
		<li><span class="label">List Member:</span><table style="clear:none;margin:0;">
34
		<li><span class="label">List member:</span><table style="clear:none;margin:0;">
35
        <tr><th>Name</th></tr>
35
        <tr><th>Name</th></tr>
36
[% FOREACH memberloo IN memberloop %]
36
[% FOREACH memberloo IN memberloop %]
37
        <tr><td>[% memberloo.surname %], [% memberloo.firstname %]</td></tr>
37
        <tr><td>[% memberloo.surname %], [% memberloo.firstname %]</td></tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-13 / +17 lines)
Lines 64-70 $(document).ready(function() { Link Here
64
[% UNLESS ( popup ) %]
64
[% UNLESS ( popup ) %]
65
	[% INCLUDE 'serials-toolbar.inc' %]
65
	[% INCLUDE 'serials-toolbar.inc' %]
66
66
67
	<h1>Serial Collection information for  <i>[% bibliotitle %]</i>
67
	<h1>Serial collection information for  <i>[% bibliotitle %]</i>
68
        [% IF location %] ([% location %] ) [% END %]
68
        [% IF location %] ([% location %] ) [% END %]
69
		[% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]</h1>
69
		[% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]</h1>
70
[% END %]
70
[% END %]
Lines 72-89 $(document).ready(function() { Link Here
72
[% IF ( subscriptions ) %]
72
[% IF ( subscriptions ) %]
73
<table>
73
<table>
74
[% IF ( subscriptions.size == 1 ) %]
74
[% IF ( subscriptions.size == 1 ) %]
75
<caption> Subscription Summary</caption>
75
<caption> Subscription summary</caption>
76
[% ELSE %]
76
[% ELSE %]
77
<caption> Subscription Summaries</caption>
77
<caption> Subscription summaries</caption>
78
[% END %]
78
[% END %]
79
<tr>
79
<tr>
80
  <th>Subscription Num. </th>
80
  <th>Subscription num. </th>
81
  <th>Frequency</th>
81
  <th>Frequency</th>
82
  <th>Numbering pattern</th>
82
  <th>Numbering pattern</th>
83
  <th>Library</th>
83
  <th>Library</th>
84
  <th>Call number</th>
84
  <th>Call number</th>
85
  <th>Notes</th>
85
  <th>Notes</th>
86
  <th>Routing</th>
86
  [% IF ( routing && CAN_user_serials_routing ) %]<th>Routing</th>[% END %]
87
  <th>Renew</th>
87
  <th>Renew</th>
88
</tr>
88
</tr>
89
[% FOREACH subscription IN subscriptions %]
89
[% FOREACH subscription IN subscriptions %]
Lines 146-155 $(document).ready(function() { Link Here
146
                [% END %]</td>
146
                [% END %]</td>
147
            <td> [% subscription.branchcode %]</td>
147
            <td> [% subscription.branchcode %]</td>
148
            <td> [% subscription.callnumber %]</td>
148
            <td> [% subscription.callnumber %]</td>
149
        <td> [% subscription.notes %]        [% IF ( subscription.subscriptionexpired ) %]<br /><span class="problem"> Subscription Expired</span>
149
        <td> [% subscription.notes %]        [% IF ( subscription.subscriptionexpired ) %]<br /><span class="problem"> Subscription expired</span>
150
        [% END %]
150
        [% END %]
151
        </td>
151
        </td>
152
			<td><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit Routing List</a></td>
152
        [% IF ( routing && CAN_user_serials_routing ) %]
153
        <td>
154
            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
155
        </td>
156
        [% END %]
153
        [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
157
        [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
154
        [% ELSE %]
158
        [% ELSE %]
155
        [% IF ( subscription.subscriptionexpired ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
159
        [% IF ( subscription.subscriptionexpired ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
Lines 199-207 $(document).ready(function() { Link Here
199
                </th>
203
                </th>
200
                <th>Branch
204
                <th>Branch
201
                </th>
205
                </th>
202
		<th>Routing
206
                [% IF ( routing ) %]<th>Routing</th>[% END %]
203
		</th>
204
205
                [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
207
                [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
206
            </tr>
208
            </tr>
207
      [% FOREACH serial IN year.serials %]
209
      [% FOREACH serial IN year.serials %]
Lines 227-235 $(document).ready(function() { Link Here
227
                <td>
229
                <td>
228
                    [% serial.branchcode %]
230
                    [% serial.branchcode %]
229
                </td>
231
                </td>
230
		<td>
232
                [% IF ( routing ) %]
231
		   <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %]'); return false" >Print list</a>
233
                <td>
232
		</td>
234
                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %]'); return false" >Print list</a>
235
                </td>
236
                [% END %]
233
            [% IF ( CAN_user_serials_receive_serials ) %]
237
            [% IF ( CAN_user_serials_receive_serials ) %]
234
                <td>
238
                <td>
235
                  [% IF ( serial.cannotedit ) %]
239
                  [% IF ( serial.cannotedit ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-5 / +5 lines)
Lines 431-442 $(document).ready(function() { Link Here
431
[% INCLUDE 'serials-menu.inc' %]
431
[% INCLUDE 'serials-menu.inc' %]
432
<ul>
432
<ul>
433
    [% FOREACH subscription IN subscriptions %]
433
    [% FOREACH subscription IN subscriptions %]
434
    
434
        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]" title="serial collection for [% subscription.bibliotitle %]">Serial collection #[% subscription.subscriptionid %]</a></li>
435
	<li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]" title="serial collection for [% subscription.bibliotitle %]">Serial collection</a></li>
435
        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid %]</a></li>
436
	<li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid %]</a></li>
436
        [% IF ( subscription.abouttoexpire ) %]
437
        [% IF ( subscription.abouttoexpire ) %]<a href="#" onclick="javascript:popup([% subscription.subscriptionid %])">Renew [% subscription.subscriptionid %]</a>
437
            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid %])">Renew #[% subscription.subscriptionid %]</a></li>
438
        [% END %]
438
        [% END %]
439
      [% END %]
439
    [% END %]
440
    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% biblionumber %]" title="go to [% bibliotitle %]">Show Biblio</a></li></ul>
440
    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% biblionumber %]" title="go to [% bibliotitle %]">Show Biblio</a></li></ul>
441
</div>
441
</div>
442
</div>
442
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt (-14 / +14 lines)
Lines 84-92 Serials updated : Link Here
84
            <th>Title</th>
84
            <th>Title</th>
85
            <th> Notes </th>
85
            <th> Notes </th>
86
            <th>
86
            <th>
87
                Library (Callnumber)
87
                Library (callnumber)
88
            </th>
88
            </th>
89
            [% IF ( routing ) %]
89
            [% IF ( routing && CAN_user_serials_routing ) %]
90
              <th>Routing list</th>
90
              <th>Routing list</th>
91
            [% END %]        
91
            [% END %]        
92
            <th>&nbsp;</th>
92
            <th>&nbsp;</th>
Lines 99-105 Serials updated : Link Here
99
            <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
99
            <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
100
            <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
100
            <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
101
            <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
101
            <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
102
            <td></td>
102
            [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %]
103
            <td></td>
103
            <td></td>
104
            <td></td>
104
            <td></td>
105
        </tr>
105
        </tr>
Lines 120-139 Serials updated : Link Here
120
                [% IF ( subscription.branchcode ) %][% subscription.branchcode %][% END %]
120
                [% IF ( subscription.branchcode ) %][% subscription.branchcode %][% END %]
121
                [% IF ( subscription.callnumber ) %]([% subscription.callnumber %])[% END %]
121
                [% IF ( subscription.callnumber ) %]([% subscription.callnumber %])[% END %]
122
                </td>
122
                </td>
123
                [% IF ( routing ) %]
123
                [% IF ( routing && CAN_user_serials_routing ) %]
124
                <td>
124
                <td>
125
                [% IF ( subscription.cannotedit ) %]
125
                    [% IF ( subscription.cannotedit ) %]
126
                  &nbsp;        
126
                        &nbsp;        
127
                [% ELSE %]
127
                    [% ELSE %]
128
                    [% IF ( subscription.routingedit ) %]
128
                        [% IF ( subscription.routingedit ) %]
129
                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
129
                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
130
                	[% ELSE %]
130
                        [% ELSE %]
131
						<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
131
                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
132
					[% END %]
132
                        [% END %]
133
                [% END %]
133
                    [% END %]
134
                </td>
134
                </td>
135
                [% END %]
135
                [% END %]
136
                <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue History</a>
136
                <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
137
                </td>
137
                </td>
138
                <td>
138
                <td>
139
                [% IF ( subscription.cannotedit ) %]
139
                [% IF ( subscription.cannotedit ) %]
(-)a/serials/routing-preview.pl (-2 / +2 lines)
Lines 99-105 if($ok){ Link Here
99
				query => $query,
99
				query => $query,
100
				type => "intranet",
100
				type => "intranet",
101
				authnotrequired => 0,
101
				authnotrequired => 0,
102
				flagsrequired => {serials => 'routing'},
102
				flagsrequired => {serials => '*'},
103
				debug => 1,
103
				debug => 1,
104
				});
104
				});
105
    $template->param("libraryname"=>$branchname);
105
    $template->param("libraryname"=>$branchname);
Lines 109-115 if($ok){ Link Here
109
				query => $query,
109
				query => $query,
110
				type => "intranet",
110
				type => "intranet",
111
				authnotrequired => 0,
111
				authnotrequired => 0,
112
				flagsrequired => {serials => 'routing'},
112
				flagsrequired => {serials => '*'},
113
				debug => 1,
113
				debug => 1,
114
				});
114
				});
115
}
115
}
(-)a/serials/serials-collection.pl (+1 lines)
Lines 158-163 $template->param( Link Here
158
          bibliotitle => $title,
158
          bibliotitle => $title,
159
          suggestion => C4::Context->preference("suggestion"),
159
          suggestion => C4::Context->preference("suggestion"),
160
          virtualshelves => C4::Context->preference("virtualshelves"),
160
          virtualshelves => C4::Context->preference("virtualshelves"),
161
          routing => C4::Context->preference("RoutingSerials"),
161
          subscr=>$query->param('subscriptionid'),
162
          subscr=>$query->param('subscriptionid'),
162
          subscriptioncount => $subscriptioncount,
163
          subscriptioncount => $subscriptioncount,
163
    location	       => $locationlib,
164
    location	       => $locationlib,
(-)a/serials/subscription-detail.pl (-1 / +1 lines)
Lines 124-129 $template->param( Link Here
124
	subscriptionid => $subscriptionid,
124
	subscriptionid => $subscriptionid,
125
    serialslist => \@serialslist,
125
    serialslist => \@serialslist,
126
    hasRouting  => $hasRouting,
126
    hasRouting  => $hasRouting,
127
    routing => C4::Context->preference("RoutingSerials"),
127
    totalissues => $totalissues,
128
    totalissues => $totalissues,
128
    hemisphere => $hemisphere,
129
    hemisphere => $hemisphere,
129
    cannotedit =>(C4::Context->preference('IndependantBranches') &&
130
    cannotedit =>(C4::Context->preference('IndependantBranches') &&
130
- 

Return to bug 7523