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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt (-19 / +11 lines)
Lines 6-26 Link Here
6
[% USE Branches %]
6
[% USE Branches %]
7
<script type="text/javascript" language="JavaScript">
7
<script type="text/javascript" language="JavaScript">
8
// <![CDATA[
8
// <![CDATA[
9
    /**
9
    $(document).ready(function(){
10
     *  Function CheckForm
10
        $(".renew_subscription").on("click",function(e){
11
     *  This function checks the form before submit
11
            e.preventDefault();
12
     */
12
            var subscriptionid = $(this).data("subscriptionid");
13
     function CheckForm(form){
13
            popup( subscriptionid );
14
        if(form.date.value){
14
        });
15
            return true;
15
    });
16
        }
17
        else {
18
            alert(_("You must enter a date!"));
19
            document.f.date.focus();
20
            return false;
21
        }
22
     }
23
24
	function popup(subscriptionid) {
16
	function popup(subscriptionid) {
25
	   newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
17
	   newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
26
	}
18
	}
Lines 43-49 Link Here
43
35
44
<h1>Check expiration</h1>
36
<h1>Check expiration</h1>
45
37
46
    <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
38
    <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" class="validated">
47
<fieldset class="rows">
39
<fieldset class="rows">
48
    <legend>Filter results:</legend>
40
    <legend>Filter results:</legend>
49
    
41
    
Lines 70-77 Link Here
70
        </li>
62
        </li>
71
        [% END %]
63
        [% END %]
72
64
73
        <li><label for="date" class="required" title="Required field">Expiring before:</label>
65
        <li><label for="date" class="required">Expiring before:</label>
74
        <input id="date" type="text" name="date" size="10" value="[% date | $KohaDates %]" class="focus datepicker" />
66
            <input id="date" type="text" name="date" size="10" value="[% date | $KohaDates %]" class="required focus datepicker" required="required" />
75
        <span class="required">Required</span>
67
        <span class="required">Required</span>
76
			<div class="hint">[% INCLUDE 'date-format.inc' %]</div></li>
68
			<div class="hint">[% INCLUDE 'date-format.inc' %]</div></li>
77
			</ol>
69
			</ol>
Lines 128-134 Link Here
128
            </td>
120
            </td>
129
            <td class="actions">
121
            <td class="actions">
130
                <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptions_loo.subscriptionid %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a>
122
                <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptions_loo.subscriptionid %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a>
131
                <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid %]" onclick="popup([% subscriptions_loo.subscriptionid %]); return false;" class="btn btn-mini"><i class="fa fa-refresh"></i> Renew</a>
123
                <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid %]" data-subscriptionid="[% subscriptions_loo.subscriptionid %]" class="btn btn-mini renew_subscription"><i class="fa fa-refresh"></i> Renew</a>
132
            </td>
124
            </td>
133
        </tr>
125
        </tr>
134
    [% END %]
126
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-16 / +21 lines)
Lines 52-58 Link Here
52
        location.href = url;
52
        location.href = url;
53
        return false;
53
        return false;
54
        });
54
        });
55
55
        $("#filterByDate").on("click",function(e){
56
            e.preventDefault();
57
            filterByDate();
58
        });
59
        $("#clearfilter").on("click",function(e){
60
            e.preventDefault();
61
            $("table#claimst tbody tr").show();
62
        });
63
        $("#claims_form").on("submit",function(){
64
             return checkForm();
65
        });
66
        $("#filter_claims_form").on("submit",function(){
67
            return false;
68
        });
56
	 });
69
	 });
57
70
58
	// Checks if the form can be sent (at least one checkbox must be checked)
71
	// Checks if the form can be sent (at least one checkbox must be checked)
Lines 107-117 Link Here
107
	    });
120
	    });
108
	}
121
	}
109
122
110
	// Clears filters : shows everything
111
	function clearFilters() {
112
	    $("table#claimst tbody tr").show();
113
114
	}
115
123
116
//]]>
124
//]]>
117
</script>
125
</script>
Lines 132-142 Link Here
132
140
133
    [% IF error_claim %]
141
    [% IF error_claim %]
134
        [% IF error_claim == 'no_vendor_email' %]
142
        [% IF error_claim == 'no_vendor_email' %]
135
            <div class="error">This vendor has no email defined for late issues.</div>
143
            <div class="dialog alert">This vendor has no email defined for late issues.</div>
136
        [% ELSIF error_claim == 'no_loggedin_user_email' %]
144
        [% ELSIF error_claim == 'no_loggedin_user_email' %]
137
            <div class="error">No email is configured for your user.</div>
145
            <div class="dialog alert">No email is configured for your user.</div>
138
        [% ELSE %]
146
        [% ELSE %]
139
            <div class="error">[% error_claim %]</div>
147
            <div class="dialog alert">[% error_claim %]</div>
140
        [% END %]
148
        [% END %]
141
    [% END %]
149
    [% END %]
142
    [% IF info_claim %]
150
    [% IF info_claim %]
Lines 170-176 Link Here
170
178
171
   [% IF ( missingissues ) %]	
179
   [% IF ( missingissues ) %]	
172
    <h3>Missing issues</h3>
180
    <h3>Missing issues</h3>
173
    <form action="claims.pl" onsubmit="return false;">
181
    <form action="claims.pl" id="filter_claims_form">
174
	<fieldset class="rows">
182
	<fieldset class="rows">
175
	<legend>Filters :</legend>
183
	<legend>Filters :</legend>
176
	
184
	
Lines 181-198 Link Here
181
        <label for="to" style="float:none;">To:</label>
189
        <label for="to" style="float:none;">To:</label>
182
        <input type="text" name="enddate" id="to" value="[% enddate %]" size="10" maxlength="10" class="datepickerto" />
190
        <input type="text" name="enddate" id="to" value="[% enddate %]" size="10" maxlength="10" class="datepickerto" />
183
        <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
191
        <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
184
	    <input type="button" value="OK" onclick="filterByDate();" />
192
        <input id="filterByDate" type="button" value="OK" />
193
        <a href="#" id="clearfilter"><i class="fa fa-remove"></i> Clear filter</a>
185
    </li>
194
    </li>
186
187
	<li>
188
        <input type="reset" value="Clear filters" onclick="clearFilters();" />
189
	</li>
190
	</ol>
195
	</ol>
191
	</fieldset>
196
	</fieldset>
192
    </form>
197
    </form>
193
198
194
    <fieldset>
199
    <fieldset>
195
        <form action="claims.pl" method="post" class="checkboxed" onsubmit="return checkForm()">
200
        <form action="claims.pl" method="post" id="claims_form">
196
            <table id="claimst">
201
            <table id="claimst">
197
                <thead>
202
                <thead>
198
                    <tr>
203
                    <tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt (-17 / +32 lines)
Lines 3-15 Link Here
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
4
<script type="text/javascript">
5
//<![CDATA[
5
//<![CDATA[
6
function GetIt(bibno,title)
6
    $(document).ready(function(){
7
{
7
        $(".select_title").on("click",function(e){
8
    title = title.parents('tr').find('.title').text();
8
            e.preventDefault();
9
    opener.document.f.biblionumber.value = bibno;
9
            var biblionumber = $(this).data("biblionumber");
10
    opener.document.f.title.value = title;
10
            GetIt( biblionumber, $(this) );
11
    window.close();
11
        });
12
}
12
    });
13
    function GetIt(bibno,title) {
14
        title = title.parents('tr').find('.title').text();
15
        opener.document.f.biblionumber.value = bibno;
16
        opener.document.f.title.value = title;
17
        window.close();
18
    }
13
//]]>
19
//]]>
14
</script>
20
</script>
15
</head>
21
</head>
Lines 46-67 function GetIt(bibno,title) Link Here
46
            <td>
52
            <td>
47
                [% resultsloo.issn |html %]
53
                [% resultsloo.issn |html %]
48
            </td>
54
            </td>
49
55
            <td><a class="btn btn-mini select_title" data-biblionumber="[% resultsloo.biblionumber %]" href="#" title="Choose this record">Choose</a></td>
50
			<td><a href="#" onclick="GetIt('[% resultsloo.biblionumber %]',$(this));" title="Choose this record">Choose</a></td>
51
        </tr>
56
        </tr>
52
    [% END %]
57
    [% END %]
53
    </table>
58
    </table>
54
[% ELSE %]
59
[% ELSE %]
55
<h2>No results found for <b>[% query %]</b></h2>
60
56
[% END %]
61
    <div class="dialog message">
57
[% IF ( displayprev ) %]
62
        <p>No results found for <b>[% query %]</b></p>
58
<a href="/cgi-bin/koha/serials/subscription-bib-search.pl?op=do_search&amp;type=intranet&amp;startfrom=[% startfromprev |url %]&amp;q=[% query |url %]">&lt;&lt;</a>
63
    </div>
59
[% END %]
64
60
[% IF ( displaynext ) %]
61
<a href="/cgi-bin/koha/serials/subscription-bib-search.pl?op=do_search&amp;type=intranet&amp;startfrom=[% startfromnext |url %]&amp;q=[% query |url %]">&gt;&gt;</a>
62
[% END %]
65
[% END %]
66
67
<div class="pages">
68
    [% IF ( displayprev ) %]
69
        <a class="nav" href="/cgi-bin/koha/serials/subscription-bib-search.pl?op=do_search&amp;type=intranet&amp;startfrom=[% startfromprev |url %]&amp;q=[% query |url %]">&lt;&lt; Previous</a>
70
    [% END %]
71
    [% IF ( displaynext ) %]
72
        <a class="nav" href="/cgi-bin/koha/serials/subscription-bib-search.pl?op=do_search&amp;type=intranet&amp;startfrom=[% startfromnext |url %]&amp;q=[% query |url %]">Next  &gt;&gt;</a>
73
    [% END %]
74
</div>
75
63
<p><a href="subscription-bib-search.pl">Search for another record</a></p>
76
<p><a href="subscription-bib-search.pl">Search for another record</a></p>
64
<fieldset class="action"><a class="button close" href="#">Close</a></fieldset>
77
78
<div id="closewindow"><a class="btn btn-default close" href="#">Close</a></div>
79
65
</div>
80
</div>
66
81
67
[% INCLUDE 'intranet-bottom.inc' %]
82
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt (-4 / +10 lines)
Lines 1-7 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Serials  &rsaquo; Routing slip preview</title>
2
<title>Koha &rsaquo; Serials  &rsaquo; Routing slip preview</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
4
<script type="text/javascript">
5
    $(document).ready(function(){
6
        $("#print_slip").on("click",function(e){
7
            e.preventDefault();
8
            window.print();
9
            self.close();
10
        });
11
    });
12
</script>
5
<style type="text/css">
13
<style type="text/css">
6
   #custom-doc { width:38.46em;*width:37.53em;min-width:500px; margin:auto; text-align:left; }
14
   #custom-doc { width:38.46em;*width:37.53em;min-width:500px; margin:auto; text-align:left; }
7
</style>
15
</style>
Lines 38-46 Link Here
38
    <p id="routingnote">[% routingnotes %]</p>
46
    <p id="routingnote">[% routingnotes %]</p>
39
</div>
47
</div>
40
48
41
   <div id="slip-block-links" class="noprint">
49
    <div id="closewindow" class="noprint"><a class="btn btn-default" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a> <a class="btn btn-default close" href="#">Close</a></div>
42
   <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
43
   </div>
44
50
45
   </div>
51
   </div>
46
52
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt (-4 / +9 lines)
Lines 2-9 Link Here
2
<title>Koha &rsaquo; Serials &rsaquo; Preview routing list</title>
2
<title>Koha &rsaquo; Serials &rsaquo; Preview routing list</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
4
<script type="text/javascript">
5
<!--
5
    $(document).ready(function(){
6
6
        $("#save_and_preview").on("click",function(e){
7
            e.preventDefault();
8
            print_slip( $("#subscriptionid").val(), $("#issue_escaped").val() );
9
        });
10
    });
7
function print_slip(subscriptionid,issue){
11
function print_slip(subscriptionid,issue){
8
    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
12
    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
9
    window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
13
    window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
Lines 27-33 function print_slip(subscriptionid,issue){ Link Here
27
<h2>Preview routing list for <i>[% title |html %]</i></h2>
31
<h2>Preview routing list for <i>[% title |html %]</i></h2>
28
32
29
<form method="post" action="routing-preview.pl">
33
<form method="post" action="routing-preview.pl">
30
<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
34
<input type="hidden" id="subscriptionid" name="subscriptionid" value="[% subscriptionid %]" />
35
    <input type="hidden" id="issue_escaped" name="issue_escaped" value="[% issue_escaped %]" />
31
<fieldset class="rows">
36
<fieldset class="rows">
32
	<ol>
37
	<ol>
33
		<li><span class="label">Issue:</span>[% issue %]</li>
38
		<li><span class="label">Issue:</span>[% issue %]</li>
Lines 42-48 function print_slip(subscriptionid,issue){ Link Here
42
</fieldset>
47
</fieldset>
43
48
44
<fieldset class="action">
49
<fieldset class="action">
45
<input type="submit" name="ok" class="button" value="Save and preview routing slip" onclick="print_slip([% subscriptionid %],'[% issue_escaped %]'); return false" />
50
    <input type="submit" name="ok" id="save_and_preview" class="button" value="Save and preview routing slip" />
46
<input type="submit" name="edit" class="button" value="Edit" />
51
<input type="submit" name="edit" class="button" value="Edit" />
47
<input type="submit" name="delete" class="button" value="Delete" /></fieldset>
52
<input type="submit" name="delete" class="button" value="Delete" /></fieldset>
48
</form>
53
</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt (-7 / +15 lines)
Lines 2-9 Link Here
2
<title>Koha &rsaquo; Serials &rsaquo; [% title |html %] &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</title>
2
<title>Koha &rsaquo; Serials &rsaquo; [% title |html %] &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
4
<script type="text/javascript">
5
<!--
5
    $(document).ready(function(){
6
6
        $("#add_recipients").on("click",function(e){
7
            e.preventDefault();
8
            userPopup();
9
        });
10
        $(".itemrank").on("change",function(){
11
            var subscriptionid = $(this).data("subscriptionid");
12
            var routingid = $(this).data("routingid");
13
            reorder_item( subscriptionid, routingid, $(this).val());
14
        });
15
    });
7
function reorder_item(sid,rid,rank){
16
function reorder_item(sid,rid,rank){
8
    var mylocation = 'reorder_members.pl?subscriptionid='+sid+'&routingid='+rid+'&rank='+rank;
17
    var mylocation = 'reorder_members.pl?subscriptionid='+sid+'&routingid='+rid+'&rank='+rank;
9
    window.location.href=mylocation; 
18
    window.location.href=mylocation; 
Lines 68-74 function reorder_item(sid,rid,rank){ Link Here
68
            [% FOREACH member IN m_loop %]
77
            [% FOREACH member IN m_loop %]
69
            <tr><td>[% member.name %]</td>
78
            <tr><td>[% member.name %]</td>
70
                <td>
79
                <td>
71
                    <select name="itemrank" onchange="reorder_item([%- subscriptionid -%], [%- member.routingid -%], this.value)">
80
                    <select name="itemrank" class="itemrank" data-subscriptionid="[% subscriptionid %]" data-routingid="[% member.routingid %]">
72
                    [% rankings = [1 .. m_loop.size] %]
81
                    [% rankings = [1 .. m_loop.size] %]
73
                    [% FOREACH r IN rankings %]
82
                    [% FOREACH r IN rankings %]
74
                        [% IF r == member.ranking %]
83
                        [% IF r == member.ranking %]
Lines 79-94 function reorder_item(sid,rid,rank){ Link Here
79
                    [% END %]
88
                    [% END %]
80
                    </select>
89
                    </select>
81
                </td>
90
                </td>
82
                <td><a href="/cgi-bin/koha/serials/routing.pl?routingid=[% member.routingid %]&amp;subscriptionid=[% subscriptionid %]&amp;op=delete">Delete</a></td>
91
                <td><a class="btn btn-mini" href="/cgi-bin/koha/serials/routing.pl?routingid=[% member.routingid %]&amp;subscriptionid=[% subscriptionid %]&amp;op=delete"><i class="fa fa-trash"></i> Delete</a></td>
83
            </tr>
92
            </tr>
84
            [% END %]
93
            [% END %]
85
        </table>
94
        </table>
86
    [% END %]
95
    [% END %]
87
96
88
    <p style="margin-left:10em;">
97
    <p style="margin-left:10em;">
89
        <input type="button" onclick="userPopup()" value="Add recipients" />
98
        <a href="#" id="add_recipients"><i class="fa fa-plus"></i> Add recipients</a>
90
        [% IF memberloop %]
99
        [% IF memberloop %]
91
            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=delete" class="button">Delete all</a>
100
            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=delete"><i class="fa fa-trash"></i> Delete all</a>
92
        [% END %]
101
        [% END %]
93
    </p>
102
    </p>
94
</li>
103
</li>
95
- 

Return to bug 16946