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

(-)a/circ/branchoverdues.pl (-1 / +8 lines)
Lines 62-68 use Data::Dumper; Link Here
62
my $input       = new CGI;
62
my $input       = new CGI;
63
my $dbh = C4::Context->dbh;
63
my $dbh = C4::Context->dbh;
64
64
65
my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
65
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
66
        template_name   => "circ/branchoverdues.tt",
66
        template_name   => "circ/branchoverdues.tt",
67
        query           => $input,
67
        query           => $input,
68
        type            => "intranet",
68
        type            => "intranet",
Lines 156-159 $template->param( Link Here
156
    location     => $location,
156
    location     => $location,
157
);
157
);
158
158
159
# Checking if there is a Fast Cataloging Framework
160
my $fa = getframeworkinfo('FA');
161
$template->param( fast_cataloging => 1 ) if (defined $fa);
162
163
# Checking if the transfer page needs to be displayed
164
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
165
159
output_html_with_http_headers $input, $cookie, $template->output;
166
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/circ/branchtransfers.pl (-1 / +9 lines)
Lines 51-57 if (!C4::Context->userenv){ Link Here
51
51
52
#######################################################################################
52
#######################################################################################
53
# Make the page .....
53
# Make the page .....
54
my ($template, $user, $cookie) = get_template_and_user(
54
my ($template, $user, $cookie, $flags ) = get_template_and_user(
55
    {
55
    {
56
        template_name   => "circ/branchtransfers.tt",
56
        template_name   => "circ/branchtransfers.tt",
57
        query           => $query,
57
        query           => $query,
Lines 240-244 $template->param( Link Here
240
    errmsgloop              => \@errmsgloop,
240
    errmsgloop              => \@errmsgloop,
241
    CircAutocompl           => C4::Context->preference("CircAutocompl")
241
    CircAutocompl           => C4::Context->preference("CircAutocompl")
242
);
242
);
243
244
# Checking if there is a Fast Cataloging Framework
245
my $fa = getframeworkinfo('FA');
246
$template->param( fast_cataloging => 1 ) if (defined $fa);
247
248
# Checking if the transfer page needs to be displayed
249
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
250
243
output_html_with_http_headers $query, $cookie, $template->output;
251
output_html_with_http_headers $query, $cookie, $template->output;
244
252
(-)a/circ/renew.pl (-1 / +9 lines)
Lines 26-35 use C4::Output; Link Here
26
use C4::Circulation;
26
use C4::Circulation;
27
use Koha::DateUtils;
27
use Koha::DateUtils;
28
use Koha::Database;
28
use Koha::Database;
29
use C4::Koha;
29
30
30
my $cgi = new CGI;
31
my $cgi = new CGI;
31
32
32
my ( $template, $librarian, $cookie ) = get_template_and_user(
33
my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
33
    {
34
    {
34
        template_name   => "circ/renew.tt",
35
        template_name   => "circ/renew.tt",
35
        query           => $cgi,
36
        query           => $cgi,
Lines 109-112 if ($barcode) { Link Here
109
    );
110
    );
110
}
111
}
111
112
113
# Checking if there is a Fast Cataloging Framework
114
my $fa = getframeworkinfo('FA');
115
$template->param( fast_cataloging => 1 ) if (defined $fa);
116
117
# Checking if the transfer page needs to be displayed
118
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
119
112
output_html_with_http_headers( $cgi, $cookie, $template->output );
120
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/circ/returns.pl (-1 / +8 lines)
Lines 54-60 use Koha::Calendar; Link Here
54
my $query = new CGI;
54
my $query = new CGI;
55
55
56
#getting the template
56
#getting the template
57
my ( $template, $librarian, $cookie ) = get_template_and_user(
57
my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
58
    {
58
    {
59
        template_name   => "circ/returns.tt",
59
        template_name   => "circ/returns.tt",
60
        query           => $query,
60
        query           => $query,
Lines 657-661 if ( $itemnumber ) { Link Here
657
    }
657
    }
658
}
658
}
659
659
660
# Checking if there is a Fast Cataloging Framework
661
my $fa = getframeworkinfo('FA');
662
$template->param( fast_cataloging => 1 ) if (defined $fa);
663
664
# Checking if the transfer page needs to be displayed
665
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
666
660
# actually print the page!
667
# actually print the page!
661
output_html_with_http_headers $query, $cookie, $template->output;
668
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/selectbranchprinter.pl (-1 / +8 lines)
Lines 32-38 use C4::Branch; # GetBranches GetBranchesLoop Link Here
32
32
33
my $query = CGI->new();
33
my $query = CGI->new();
34
34
35
my ( $template, $borrowernumber, $cookie ) = get_template_and_user({
35
my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user({
36
    template_name   => "circ/selectbranchprinter.tt",
36
    template_name   => "circ/selectbranchprinter.tt",
37
    query           => $query,
37
    query           => $query,
38
    type            => "intranet",
38
    type            => "intranet",
Lines 138-141 $template->param( Link Here
138
    recycle_loop=> \@recycle_loop,
138
    recycle_loop=> \@recycle_loop,
139
);
139
);
140
140
141
# Checking if there is a Fast Cataloging Framework
142
my $fa = getframeworkinfo('FA');
143
$template->param( fast_cataloging => 1 ) if (defined $fa);
144
145
# Checking if the transfer page needs to be displayed
146
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
147
141
output_html_with_http_headers $query, $cookie, $template->output;
148
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/transferstoreceive.pl (-1 / +8 lines)
Lines 41-47 use C4::Reserves; Link Here
41
my $input = new CGI;
41
my $input = new CGI;
42
my $itemnumber = $input->param('itemnumber');
42
my $itemnumber = $input->param('itemnumber');
43
43
44
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
44
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
45
    {
45
    {
46
        template_name   => "circ/transferstoreceive.tt",
46
        template_name   => "circ/transferstoreceive.tt",
47
        query           => $input,
47
        query           => $input,
Lines 124-128 $template->param( Link Here
124
	latetransfers => $latetransfers ? 1 : 0,
124
	latetransfers => $latetransfers ? 1 : 0,
125
);
125
);
126
126
127
# Checking if there is a Fast Cataloging Framework
128
my $fa = getframeworkinfo('FA');
129
$template->param( fast_cataloging => 1 ) if (defined $fa);
130
131
# Checking if the transfer page needs to be displayed
132
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
133
127
output_html_with_http_headers $input, $cookie, $template->output;
134
output_html_with_http_headers $input, $cookie, $template->output;
128
135
(-)a/circ/view_holdsqueue.pl (-1 / +8 lines)
Lines 34-40 use C4::Branch; # GetBranches Link Here
34
use C4::HoldsQueue qw(GetHoldsQueueItems);
34
use C4::HoldsQueue qw(GetHoldsQueueItems);
35
35
36
my $query = new CGI;
36
my $query = new CGI;
37
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
37
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
38
    {
38
    {
39
        template_name   => "circ/view_holdsqueue.tt",
39
        template_name   => "circ/view_holdsqueue.tt",
40
        query           => $query,
40
        query           => $query,
Lines 76-80 $template->param( Link Here
76
   itemtypeloop => \@itemtypesloop,
76
   itemtypeloop => \@itemtypesloop,
77
);
77
);
78
78
79
# Checking if there is a Fast Cataloging Framework
80
my $fa = getframeworkinfo('FA');
81
$template->param( fast_cataloging => 1 ) if (defined $fa);
82
83
# Checking if the transfer page needs to be displayed
84
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
85
79
# writing the template
86
# writing the template
80
output_html_with_http_headers $query, $cookie, $template->output;
87
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/waitingreserves.pl (-1 / +8 lines)
Lines 48-54 my $all_branches = $input->param('allbranches') || ''; Link Here
48
my $cancelall      = $input->param('cancelall');
48
my $cancelall      = $input->param('cancelall');
49
my $tab            = $input->param('tab');
49
my $tab            = $input->param('tab');
50
50
51
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
51
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
52
    {
52
    {
53
        template_name   => "circ/waitingreserves.tt",
53
        template_name   => "circ/waitingreserves.tt",
54
        query           => $input,
54
        query           => $input,
Lines 164-169 $template->param( Link Here
164
    ReservesMaxPickUpDelay => $max_pickup_delay,
164
    ReservesMaxPickUpDelay => $max_pickup_delay,
165
);
165
);
166
166
167
# Checking if there is a Fast Cataloging Framework
168
my $fa = getframeworkinfo('FA');
169
$template->param( fast_cataloging => 1 ) if (defined $fa);
170
171
# Checking if the transfer page needs to be displayed
172
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
173
167
if ($item && $tab eq 'holdsover') {
174
if ($item && $tab eq 'holdsover') {
168
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
175
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
169
} elsif ($cancelall) {
176
} elsif ($cancelall) {
(-)a/installer/data/mysql/atomicupdate/bug_16530-add_circSidebar_syspref.sql (+1 lines)
Line 0 Link Here
1
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('circSidebar','0','','Activate or deactivate the navigation sidebar on all Circulation pages','YesNo');
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 94-99 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
94
('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),
94
('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),
95
('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),
95
('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),
96
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
96
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
97
('circSidebar','0',NULL,'Activate or deactivate the navigation sidebar on all Circulation pages','YesNo'),
97
('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
98
('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
98
('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),
99
('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),
99
('CoceHost', '', NULL, 'Coce server URL', 'Free'),
100
('CoceHost', '', NULL, 'Coce server URL', 'Free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (+54 lines)
Line 0 Link Here
1
<script type="text/javascript">//<![CDATA[
2
    $(document).ready(function() {
3
        var path = location.pathname.substring(1);
4
        var url = window.location.toString();
5
        var params = '';
6
        if ( url.match(/\?(.+)$/) ) {
7
            params = "?" + RegExp.$1;
8
        }
9
        $('#navmenulist a[href$="/' + path + params + '"]').css('font-weight','bold');
10
    });
11
//]]>
12
</script>
13
14
<div id="navmenu">
15
    <div id="navmenulist">
16
17
        <ul>
18
            <li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a></li>
19
        </ul>
20
21
        <h5>Circulation</h5>
22
        <ul>
23
            <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
24
            <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
25
            <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
26
            [% IF ( display_transfer ) %]
27
                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
28
            [% END %]
29
            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
30
                <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
31
            [% END %][% END %]
32
            [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
33
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
34
            [% END %][% END %]
35
        </ul>
36
37
        <h5>Circulation reports</h5>
38
        <ul>
39
            <li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li>
40
            <li><a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a></li>
41
            <li><a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a></li>
42
            <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
43
            <li><a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a></li>
44
            [% IF ( CAN_user_circulate_overdues_report ) %]
45
                <li><a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li>
46
            [% END %]
47
            <li><a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a></li>
48
            [% IF Koha.Preference('OnSiteCheckouts') %]
49
                <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
50
            [% END %]
51
        </ul>
52
53
    </div>
54
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
Lines 2-7 Circulation: Link Here
2
# FIXME: printcirculationslips is also omitted. It _technically_ could work, but C4::Print is HLT specific and needs a little bit of refactoring.
2
# FIXME: printcirculationslips is also omitted. It _technically_ could work, but C4::Print is HLT specific and needs a little bit of refactoring.
3
    Interface:
3
    Interface:
4
        -
4
        -
5
            - pref: circSidebar
6
              choices:
7
                  yes: Activate
8
                  no: Deactivate
9
            - the navigation sidebar on all Circulation pages.
10
        -
5
            - pref: CircAutocompl
11
            - pref: CircAutocompl
6
              choices:
12
              choices:
7
                  yes: Try
13
                  yes: Try
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt (-1 / +9 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname %]</title>
3
<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 8-17 Link Here
8
9
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues at [% LoginBranchname %]</div>
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues at [% LoginBranchname %]</div>
10
11
11
<div id="doc" class="yui-t7">
12
[% IF Koha.Preference('circSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
12
13
13
   <div id="bd">
14
   <div id="bd">
14
	<div id="yui-main">
15
	<div id="yui-main">
16
        [% IF Koha.Preference('circSidebar') %]<div class="yui-b">[% END %]
15
	<div class="yui-g">
17
	<div class="yui-g">
16
18
17
19
Lines 162-166 Link Here
162
164
163
</div>
165
</div>
164
</div>
166
</div>
167
[% IF Koha.Preference('circSidebar') %]
168
</div>
169
<div class="yui-b noprint">
170
    [% INCLUDE 'circ-nav.inc' %]
171
</div>
172
[% END %]
165
</div>
173
</div>
166
[% INCLUDE 'intranet-bottom.inc' %]
174
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-3 / +10 lines)
Lines 11-19 Link Here
11
11
12
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transfers</div>
12
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transfers</div>
13
13
14
<div id="doc" class="yui-t7">
14
[% IF Koha.Preference('circSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
15
   <div id="bd">
15
   <div id="bd">
16
16
<div id="yui-main">
17
[% IF Koha.Preference('circSidebar') %]<div class="yui-b">[% END %]
17
[% IF ( found ) %]
18
[% IF ( found ) %]
18
   <div class="yui-g"> <h3>Reserve found</h3>
19
   <div class="yui-g"> <h3>Reserve found</h3>
19
    <table>
20
    <table>
Lines 203-208 Link Here
203
	
204
	
204
	
205
	
205
[% END %]
206
[% END %]
206
207
</div>
208
[% IF Koha.Preference('circSidebar') %]
209
<div class="yui-b noprint">
210
[% INCLUDE 'circ-nav.inc' %]
211
</div>
212
[% END %]
213
</div>
207
</div>
214
</div>
208
[% INCLUDE 'intranet-bottom.inc' %]
215
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-4 / +16 lines)
Lines 962-973 No patron matched <span class="ex">[% message %]</span> Link Here
962
[% END %] <!-- borrowernumber and borrower-->
962
[% END %] <!-- borrowernumber and borrower-->
963
</div></div>
963
</div></div>
964
[% END %]
964
[% END %]
965
965
[% IF Koha.Preference('circSidebar') %]
966
[% UNLESS ( borrowers ) %]
967
    [% IF not( borrowernumber and borrower ) %]
968
        <div class="yui-b noprint">
969
            [% INCLUDE 'circ-nav.inc' %]
970
        </div>
971
    [% END %]
972
[% END %]
973
[% END %]
966
</div>
974
</div>
967
</div>
975
</div>
968
[% UNLESS ( borrowers ) %][% IF borrowernumber and borrower %]<div class="yui-b">
976
[% UNLESS ( borrowers ) %]
969
[% INCLUDE 'circ-menu.inc' %]
977
    [% IF borrowernumber and borrower %]
970
</div>[% END %][% END %]
978
        <div class="yui-b">
979
            [% INCLUDE 'circ-menu.inc' %]
980
        </div>
981
    [% END %]
982
[% END %]
971
</div>
983
</div>
972
<!-- Modal -->
984
<!-- Modal -->
973
<div id="barcodeSubmittedModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true">
985
<div id="barcodeSubmittedModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-4 / +10 lines)
Lines 26-34 Link Here
26
26
27
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Renew</div>
27
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Renew</div>
28
28
29
<div id="doc" class="yui-t7">
29
[% IF Koha.Preference('circSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
30
    <div id="bd">
30
    <div id="bd">
31
31
        <div id="yui-main">
32
            [% IF Koha.Preference('circSidebar') %]<div class="yui-b">[% END %]
32
                [% IF error %]
33
                [% IF error %]
33
                    <div class="dialog alert">
34
                    <div class="dialog alert">
34
                        <h3>Cannot renew:</h3>
35
                        <h3>Cannot renew:</h3>
Lines 128-134 Link Here
128
                        </p>
129
                        </p>
129
                    </div>
130
                    </div>
130
                [% END %]
131
                [% END %]
131
            </div>
132
132
133
            <div class="yui-g">
133
            <div class="yui-g">
134
134
Lines 151-159 Link Here
151
            [% END %]
151
            [% END %]
152
152
153
        </div>
153
        </div>
154
155
    </div>
154
    </div>
156
155
156
[% IF Koha.Preference('circSidebar') %]
157
</div>
158
159
<div class="yui-b noprint">
160
    [% INCLUDE 'circ-nav.inc' %]
161
</div>
162
[% END %]
157
<div>
163
<div>
158
164
159
[% INCLUDE 'intranet-bottom.inc' %]
165
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-63 / +68 lines)
Lines 140-150 $(document).ready(function () { Link Here
140
140
141
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
141
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
142
142
143
<div id="doc" class="yui-t7">
143
[% IF Koha.Preference('circSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
144
145
   <div id="bd">
146
	<div id="yui-main">
147
144
145
<div id="bd">
146
<div id="yui-main">
147
[% IF Koha.Preference('circSidebar') %]<div class="yui-b">[% END %]
148
<div class="yui-g">
148
<div class="yui-g">
149
149
150
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
150
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
Lines 461-526 $(document).ready(function () { Link Here
461
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
461
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
462
        [% END %]
462
        [% END %]
463
        [% FOREACH errmsgloo IN errmsgloop %]
463
        [% FOREACH errmsgloo IN errmsgloop %]
464
                    [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
464
            [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
465
                        <p class="problem">
465
                <p class="problem">
466
                            Not for loan status updated.
466
                    Not for loan status updated.
467
                            <br />Old value:
467
                    <br />Old value:
468
                            [% IF errmsgloo.NotForLoanStatusUpdated.from %]
468
                    [% IF errmsgloo.NotForLoanStatusUpdated.from %]
469
                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %].
469
                        [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %].
470
                            [% ELSE %]
470
                    [% ELSE %]
471
                                Available for loan.
471
                        Available for loan.
472
                            [% END %]
473
                            <br />New value:
474
                            [% IF errmsgloo.NotForLoanStatusUpdated.to %]
475
                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %].
476
                            [% ELSE %]
477
                                Available for loan.
478
                            [% END %]
479
                        </p>
480
                    [% END %]
481
                    [% IF ( errmsgloo.badbarcode ) %]
482
                        <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
483
                    [% END %]
484
                    [% IF ( errmsgloo.ispermanent ) %]
485
                        <p class="problem">Please return item to: [% errmsgloo.msg %]</p>
486
                    [% END %]
487
                    [% IF ( errmsgloo.notissued ) %]
488
                        <p class="problem">Not checked out.</p>
489
                    [% END %]
490
                    [% IF ( errmsgloo.localuse) %]
491
                        <p class="problem">Local use recorded</p>
492
                    [% END %]
493
                    [% IF ( errmsgloo.waslost ) %]
494
                        <p class="problem">Item was lost, now found.</p>
495
                        [% IF ( LostItemFeeRefunded ) %]
496
                            <p class="problem">A refund has been applied to the borrowing patron's account.</p>
497
                        [% ELSE %]
498
                            <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
499
                        [% END %]
500
                    [% END %]
501
                    [% IF ( errmsgloo.withdrawn ) %]
502
                        [% IF BlockReturnOfWithdrawnItems %]
503
                           <h5>Cannot check in</h5>
504
                           <p><strong>NOT CHECKED IN</strong></p>
505
                           <p class="problem">Item is withdrawn.</p>
506
                        [% ELSE %]
507
                           <p class="problem">Item is withdrawn.</p>
508
                        [% END %]
509
                    [% END %]
510
                    [% IF ( errmsgloo.debarred ) %]
511
                        <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p>
512
                    [% END %]
513
                    [% IF ( errmsgloo.prevdebarred ) %]
514
                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
515
                    [% END %]
472
                    [% END %]
516
                    [% IF ( errmsgloo.foreverdebarred ) %]
473
                    <br />New value:
517
                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
474
                    [% IF errmsgloo.NotForLoanStatusUpdated.to %]
475
                        [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %].
476
                    [% ELSE %]
477
                        Available for loan.
518
                    [% END %]
478
                    [% END %]
519
479
                </p>
480
            [% END %]
481
            [% IF ( errmsgloo.badbarcode ) %]
482
                <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
483
            [% END %]
484
            [% IF ( errmsgloo.ispermanent ) %]
485
                <p class="problem">Please return item to: [% errmsgloo.msg %]</p>
486
            [% END %]
487
            [% IF ( errmsgloo.notissued ) %]
488
                <p class="problem">Not checked out.</p>
489
            [% END %]
490
            [% IF ( errmsgloo.localuse) %]
491
                <p class="problem">Local use recorded</p>
492
            [% END %]
493
            [% IF ( errmsgloo.waslost ) %]
494
                <p class="problem">Item was lost, now found.</p>
495
                [% IF ( LostItemFeeRefunded ) %]
496
                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
497
                [% ELSE %]
498
                    <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
499
                [% END %]
500
            [% END %]
501
            [% IF ( errmsgloo.withdrawn ) %]
502
                [% IF BlockReturnOfWithdrawnItems %]
503
                    <h5>Cannot check in</h5>
504
                    <p><strong>NOT CHECKED IN</strong></p>
505
                    <p class="problem">Item is withdrawn.</p>
506
                [% ELSE %]
507
                    <p class="problem">Item is withdrawn.</p>
508
                [% END %]
509
            [% END %]
510
            [% IF ( errmsgloo.debarred ) %]
511
                <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p>
512
            [% END %]
513
            [% IF ( errmsgloo.prevdebarred ) %]
514
                <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
515
            [% END %]
516
            [% IF ( errmsgloo.foreverdebarred ) %]
517
                <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
520
            [% END %]
518
            [% END %]
521
        [% ELSE %]
522
        [% END %]
519
        [% END %]
523
    </div>
520
    </div>
521
[% END %]
524
522
525
[% IF ( checkinmsg ) %]
523
[% IF ( checkinmsg ) %]
526
    [% IF ( checkinmsgtype == 'alert' ) %]
524
    [% IF ( checkinmsgtype == 'alert' ) %]
Lines 542-548 $(document).ready(function () { Link Here
542
        <p>Book drop mode.  (Effective checkin date is [% dropboxdate %] ).</p>
540
        <p>Book drop mode.  (Effective checkin date is [% dropboxdate %] ).</p>
543
    </div>
541
    </div>
544
</div>
542
</div>
545
	<div class="yui-g">
543
<div class="yui-g">
546
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
544
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
547
    <div class="yui-u first">
545
    <div class="yui-u first">
548
            <fieldset>
546
            <fieldset>
Lines 655-663 $(document).ready(function () { Link Here
655
            </td>
653
            </td>
656
           </tr>
654
           </tr>
657
        [% END %]
655
        [% END %]
658
    </table></div>
656
    </table>
659
[% END %]
657
[% END %]
660
658
</div>
661
659
[% IF Koha.Preference('circSidebar') %]
660
</div>
661
<div class="yui-b noprint">
662
    [% INCLUDE 'circ-nav.inc' %]
663
</div>
664
[% END %]
665
</div>
666
</div>
662
</div>
667
</div>
663
[% INCLUDE 'intranet-bottom.inc' %]
668
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt (-2 / +8 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
3
<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 15-21 Link Here
15
&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
16
&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
16
</div>
17
</div>
17
18
18
<div id="doc" class="yui-t7">
19
[% IF Koha.Preference('circSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
19
  <div id="bd">
20
  <div id="bd">
20
    <div id="yui-main">
21
    <div id="yui-main">
21
      <div class="yui-b">
22
      <div class="yui-b">
Lines 94-98 Updated:<ul> Link Here
94
95
95
      </div>
96
      </div>
96
    </div>
97
    </div>
97
  </div>
98
[% IF Koha.Preference('circSidebar') %]
99
<div class="yui-b noprint">
100
    [% INCLUDE 'circ-nav.inc' %]
101
</div>
102
[% END %]
103
</div>
98
[% INCLUDE 'intranet-bottom.inc' %]
104
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-1 / +9 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% USE Branches %]
3
[% USE Branches %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
Lines 29-38 $(document).ready(function() { Link Here
29
30
30
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Transfers to your library</div>
31
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Transfers to your library</div>
31
32
32
<div id="doc" class="yui-t7">
33
[% IF Koha.Preference('circSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
33
34
34
   <div id="bd">
35
   <div id="bd">
35
	<div id="yui-main">
36
	<div id="yui-main">
37
        [% IF Koha.Preference('circSidebar') %]<div class="yui-b">[% END %]
36
	<div class="yui-g">
38
	<div class="yui-g">
37
39
38
	<h1>Transfers made to your library as of [% show_date %]</h1>
40
	<h1>Transfers made to your library as of [% show_date %]</h1>
Lines 95-99 $(document).ready(function() { Link Here
95
97
96
</div>
98
</div>
97
</div>
99
</div>
100
[% IF Koha.Preference('circSidebar') %]
101
</div>
102
<div class="yui-b noprint">
103
    [% INCLUDE 'circ-nav.inc' %]
104
</div>
105
[% END %]
98
</div>
106
</div>
99
[% INCLUDE 'intranet-bottom.inc' %]
107
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +9 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% USE ItemTypes %]
3
[% USE ItemTypes %]
3
[% USE Branches %]
4
[% USE Branches %]
Lines 52-61 $(document).ready(function() { Link Here
52
[% IF ( run_report ) %] &rsaquo; Results[% END %]
53
[% IF ( run_report ) %] &rsaquo; Results[% END %]
53
</div>
54
</div>
54
55
55
<div id="doc2" class="yui-t7">
56
[% IF Koha.Preference('circSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc2" class="yui-t7">[% END %]
56
57
57
   <div id="bd">
58
   <div id="bd">
58
	<div id="yui-main">
59
	<div id="yui-main">
60
        [% IF Koha.Preference('circSidebar') %]<div class="yui-b">[% END %]
59
	<div class="yui-g">
61
	<div class="yui-g">
60
62
61
<h1>Holds queue</h1>
63
<h1>Holds queue</h1>
Lines 220-224 $(document).ready(function() { Link Here
220
222
221
</div>
223
</div>
222
</div>
224
</div>
225
[% IF Koha.Preference('circSidebar') %]
226
</div>
227
<div class="yui-b noprint">
228
    [% INCLUDE 'circ-nav.inc' %]
229
</div>
230
[% END %]
223
</div>
231
</div>
224
[% INCLUDE 'intranet-bottom.inc' %]
232
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-1 / +9 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% USE Branches %]
3
[% USE Branches %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
Lines 31-40 Link Here
31
&rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
32
&rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
32
</div>
33
</div>
33
34
34
<div id="doc3" class="yui-t7">
35
[% IF Koha.Preference('circSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
35
36
36
   <div id="bd">
37
   <div id="bd">
37
    <div id="yui-main">
38
    <div id="yui-main">
39
    [% IF Koha.Preference('circSidebar') %]<div class="yui-b">[% END %]
38
    <div class="yui-g">
40
    <div class="yui-g">
39
41
40
        <h2>Holds awaiting pickup for your library on: [% show_date %]
42
        <h2>Holds awaiting pickup for your library on: [% show_date %]
Lines 193-197 Link Here
193
195
194
</div>
196
</div>
195
</div>
197
</div>
198
[% IF Koha.Preference('circSidebar') %]
199
</div>
200
<div class="yui-b noprint">
201
    [% INCLUDE 'circ-nav.inc' %]
202
</div>
203
[% END %]
196
</div>
204
</div>
197
[% INCLUDE 'intranet-bottom.inc' %]
205
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt (-2 / +2 lines)
Lines 61-67 Link Here
61
61
62
    <div id="doc" class="yui-t7">
62
    <div id="doc" class="yui-t7">
63
63
64
	    <div id="bd">
64
    <div id="bd">
65
65
66
        <h2>Offline circulation</h2>
66
        <h2>Offline circulation</h2>
67
67
Lines 132-137 Link Here
132
132
133
        [% END %]
133
        [% END %]
134
134
135
    </div>
135
</div>
136
136
137
    [% INCLUDE 'intranet-bottom.inc' %]
137
    [% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt (-3 lines)
Lines 127-133 function CheckForm(f) { Link Here
127
     <div id="jobfailed" style="display:none"></div>
127
     <div id="jobfailed" style="display:none"></div>
128
   </form>
128
   </form>
129
[% END %]
129
[% END %]
130
131
132
</div>
130
</div>
133
[% INCLUDE 'intranet-bottom.inc' %]
131
[% INCLUDE 'intranet-bottom.inc' %]
134
- 

Return to bug 16530