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

(-)a/circ/branchoverdues.pl (-1 / +8 lines)
Lines 27-32 use C4::Biblio; Link Here
27
use C4::Koha;
27
use C4::Koha;
28
use C4::Debug;
28
use C4::Debug;
29
use Koha::DateUtils;
29
use Koha::DateUtils;
30
use Koha::BiblioFrameworks;
30
use Data::Dumper;
31
use Data::Dumper;
31
32
32
=head1 branchoverdues.pl
33
=head1 branchoverdues.pl
Lines 61-67 use Data::Dumper; Link Here
61
my $input       = new CGI;
62
my $input       = new CGI;
62
my $dbh = C4::Context->dbh;
63
my $dbh = C4::Context->dbh;
63
64
64
my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
65
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
65
        template_name   => "circ/branchoverdues.tt",
66
        template_name   => "circ/branchoverdues.tt",
66
        query           => $input,
67
        query           => $input,
67
        type            => "intranet",
68
        type            => "intranet",
Lines 155-158 $template->param( Link Here
155
    location     => $location,
156
    location     => $location,
156
);
157
);
157
158
159
# Checking if there is a Fast Cataloging Framework
160
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
161
162
# Checking if the transfer page needs to be displayed
163
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
164
158
output_html_with_http_headers $input, $cookie, $template->output;
165
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/circ/branchtransfers.pl (-2 / +9 lines)
Lines 31-37 use C4::Items; Link Here
31
use C4::Auth qw/:DEFAULT get_session/;
31
use C4::Auth qw/:DEFAULT get_session/;
32
use C4::Koha;
32
use C4::Koha;
33
use C4::Members;
33
use C4::Members;
34
34
use Koha::BiblioFrameworks;
35
use Koha::AuthorisedValues;
35
use Koha::AuthorisedValues;
36
36
37
###############################################
37
###############################################
Lines 52-58 if (!C4::Context->userenv){ Link Here
52
52
53
#######################################################################################
53
#######################################################################################
54
# Make the page .....
54
# Make the page .....
55
my ($template, $user, $cookie) = get_template_and_user(
55
my ($template, $user, $cookie, $flags ) = get_template_and_user(
56
    {
56
    {
57
        template_name   => "circ/branchtransfers.tt",
57
        template_name   => "circ/branchtransfers.tt",
58
        query           => $query,
58
        query           => $query,
Lines 236-240 $template->param( Link Here
236
    errmsgloop              => \@errmsgloop,
236
    errmsgloop              => \@errmsgloop,
237
    CircAutocompl           => C4::Context->preference("CircAutocompl")
237
    CircAutocompl           => C4::Context->preference("CircAutocompl")
238
);
238
);
239
240
# Checking if there is a Fast Cataloging Framework
241
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
242
243
# Checking if the transfer page needs to be displayed
244
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
245
239
output_html_with_http_headers $query, $cookie, $template->output;
246
output_html_with_http_headers $query, $cookie, $template->output;
240
247
(-)a/circ/on-site_checkouts.pl (-1 / +9 lines)
Lines 21-30 use Modern::Perl; Link Here
21
use C4::Auth;
21
use C4::Auth;
22
use C4::Circulation qw( GetPendingOnSiteCheckouts );
22
use C4::Circulation qw( GetPendingOnSiteCheckouts );
23
use C4::Output;
23
use C4::Output;
24
use C4::Koha;
25
use Koha::BiblioFrameworks;
24
26
25
my $cgi = new CGI;
27
my $cgi = new CGI;
26
28
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
29
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
28
    {
30
    {
29
        template_name   => "circ/on-site_checkouts.tt",
31
        template_name   => "circ/on-site_checkouts.tt",
30
        query           => $cgi,
32
        query           => $cgi,
Lines 34-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
34
    }
36
    }
35
);
37
);
36
38
39
# Checking if there is a Fast Cataloging Framework
40
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
41
42
# Checking if the transfer page needs to be displayed
43
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
44
37
my $pending_onsite_checkouts = C4::Circulation::GetPendingOnSiteCheckouts();
45
my $pending_onsite_checkouts = C4::Circulation::GetPendingOnSiteCheckouts();
38
46
39
$template->param(
47
$template->param(
(-)a/circ/renew.pl (-1 / +9 lines)
Lines 24-35 use C4::Context; Link Here
24
use C4::Auth qw/:DEFAULT get_session/;
24
use C4::Auth qw/:DEFAULT get_session/;
25
use C4::Output;
25
use C4::Output;
26
use C4::Circulation;
26
use C4::Circulation;
27
use C4::Koha;
27
use Koha::DateUtils;
28
use Koha::DateUtils;
28
use Koha::Database;
29
use Koha::Database;
30
use Koha::BiblioFrameworks;
29
31
30
my $cgi = new CGI;
32
my $cgi = new CGI;
31
33
32
my ( $template, $librarian, $cookie ) = get_template_and_user(
34
my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
33
    {
35
    {
34
        template_name   => "circ/renew.tt",
36
        template_name   => "circ/renew.tt",
35
        query           => $cgi,
37
        query           => $cgi,
Lines 116-119 if ($barcode) { Link Here
116
    );
118
    );
117
}
119
}
118
120
121
# Checking if there is a Fast Cataloging Framework
122
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
123
124
# Checking if the transfer page needs to be displayed
125
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
126
119
output_html_with_http_headers( $cgi, $cookie, $template->output );
127
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/circ/returns.pl (-1 / +8 lines)
Lines 50-60 use C4::RotatingCollections; Link Here
50
use Koha::AuthorisedValues;
50
use Koha::AuthorisedValues;
51
use Koha::DateUtils;
51
use Koha::DateUtils;
52
use Koha::Calendar;
52
use Koha::Calendar;
53
use Koha::BiblioFrameworks;
53
54
54
my $query = new CGI;
55
my $query = new CGI;
55
56
56
#getting the template
57
#getting the template
57
my ( $template, $librarian, $cookie ) = get_template_and_user(
58
my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
58
    {
59
    {
59
        template_name   => "circ/returns.tt",
60
        template_name   => "circ/returns.tt",
60
        query           => $query,
61
        query           => $query,
Lines 643-647 if ( $itemnumber ) { Link Here
643
    }
644
    }
644
}
645
}
645
646
647
# Checking if there is a Fast Cataloging Framework
648
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
649
650
# Checking if the transfer page needs to be displayed
651
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
652
646
# actually print the page!
653
# actually print the page!
647
output_html_with_http_headers $query, $cookie, $template->output;
654
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/selectbranchprinter.pl (-2 / +8 lines)
Lines 26-39 use C4::Output; Link Here
26
use C4::Auth qw/:DEFAULT get_session/;
26
use C4::Auth qw/:DEFAULT get_session/;
27
use C4::Print;  # GetPrinters
27
use C4::Print;  # GetPrinters
28
use C4::Koha;
28
use C4::Koha;
29
29
use Koha::BiblioFrameworks;
30
use Koha::Libraries;
30
use Koha::Libraries;
31
31
32
# this will be the script that chooses branch and printer settings....
32
# this will be the script that chooses branch and printer settings....
33
33
34
my $query = CGI->new();
34
my $query = CGI->new();
35
35
36
my ( $template, $borrowernumber, $cookie ) = get_template_and_user({
36
my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user({
37
    template_name   => "circ/selectbranchprinter.tt",
37
    template_name   => "circ/selectbranchprinter.tt",
38
    query           => $query,
38
    query           => $query,
39
    type            => "intranet",
39
    type            => "intranet",
Lines 134-137 $template->param( Link Here
134
    recycle_loop=> \@recycle_loop,
134
    recycle_loop=> \@recycle_loop,
135
);
135
);
136
136
137
# Checking if there is a Fast Cataloging Framework
138
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
139
140
# Checking if the transfer page needs to be displayed
141
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
142
137
output_html_with_http_headers $query, $cookie, $template->output;
143
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/transferstoreceive.pl (-2 / +9 lines)
Lines 24-30 use CGI qw ( -utf8 ); Link Here
24
use C4::Context;
24
use C4::Context;
25
use C4::Output;
25
use C4::Output;
26
use C4::Auth;
26
use C4::Auth;
27
use Koha::DateUtils;
28
use C4::Biblio;
27
use C4::Biblio;
29
use C4::Circulation;
28
use C4::Circulation;
30
use C4::Members;
29
use C4::Members;
Lines 37-47 use Date::Calc qw( Link Here
37
use C4::Koha;
36
use C4::Koha;
38
use C4::Reserves;
37
use C4::Reserves;
39
use Koha::Libraries;
38
use Koha::Libraries;
39
use Koha::DateUtils;
40
use Koha::BiblioFrameworks;
40
41
41
my $input = new CGI;
42
my $input = new CGI;
42
my $itemnumber = $input->param('itemnumber');
43
my $itemnumber = $input->param('itemnumber');
43
44
44
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
45
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
45
    {
46
    {
46
        template_name   => "circ/transferstoreceive.tt",
47
        template_name   => "circ/transferstoreceive.tt",
47
        query           => $input,
48
        query           => $input,
Lines 124-128 $template->param( Link Here
124
	latetransfers => $latetransfers ? 1 : 0,
125
	latetransfers => $latetransfers ? 1 : 0,
125
);
126
);
126
127
128
# Checking if there is a Fast Cataloging Framework
129
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( '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 31-39 use C4::Biblio; Link Here
31
use C4::Items;
31
use C4::Items;
32
use C4::Koha;   # GetItemTypes
32
use C4::Koha;   # GetItemTypes
33
use C4::HoldsQueue qw(GetHoldsQueueItems);
33
use C4::HoldsQueue qw(GetHoldsQueueItems);
34
use Koha::BiblioFrameworks;
34
35
35
my $query = new CGI;
36
my $query = new CGI;
36
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
37
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
37
    {
38
    {
38
        template_name   => "circ/view_holdsqueue.tt",
39
        template_name   => "circ/view_holdsqueue.tt",
39
        query           => $query,
40
        query           => $query,
Lines 74-78 $template->param( Link Here
74
   itemtypeloop => \@itemtypesloop,
75
   itemtypeloop => \@itemtypesloop,
75
);
76
);
76
77
78
# Checking if there is a Fast Cataloging Framework
79
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
80
81
# Checking if the transfer page needs to be displayed
82
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
83
77
# writing the template
84
# writing the template
78
output_html_with_http_headers $query, $cookie, $template->output;
85
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/waitingreserves.pl (-2 / +9 lines)
Lines 28-34 use C4::Circulation; Link Here
28
use C4::Members;
28
use C4::Members;
29
use C4::Biblio;
29
use C4::Biblio;
30
use C4::Items;
30
use C4::Items;
31
use Koha::DateUtils;
32
use Date::Calc qw(
31
use Date::Calc qw(
33
  Today
32
  Today
34
  Add_Delta_Days
33
  Add_Delta_Days
Lines 36-41 use Date::Calc qw( Link Here
36
);
35
);
37
use C4::Reserves;
36
use C4::Reserves;
38
use C4::Koha;
37
use C4::Koha;
38
use Koha::DateUtils;
39
use Koha::BiblioFrameworks;
39
40
40
my $input = new CGI;
41
my $input = new CGI;
41
42
Lines 47-53 my $all_branches = $input->param('allbranches') || ''; Link Here
47
my $cancelall      = $input->param('cancelall');
48
my $cancelall      = $input->param('cancelall');
48
my $tab            = $input->param('tab');
49
my $tab            = $input->param('tab');
49
50
50
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
51
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
51
    {
52
    {
52
        template_name   => "circ/waitingreserves.tt",
53
        template_name   => "circ/waitingreserves.tt",
53
        query           => $input,
54
        query           => $input,
Lines 163-168 $template->param( Link Here
163
    tab => $tab,
164
    tab => $tab,
164
);
165
);
165
166
167
# Checking if there is a Fast Cataloging Framework
168
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
169
170
# Checking if the transfer page needs to be displayed
171
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
172
166
if ($item && $tab eq 'holdsover' && !@cancel_result) {
173
if ($item && $tab eq 'holdsover' && !@cancel_result) {
167
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
174
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
168
} elsif ($cancelall) {
175
} 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 101-106 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
101
('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),
101
('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),
102
('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'),
102
('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'),
103
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
103
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
104
('CircSidebar','0',NULL,'Activate or deactivate the navigation sidebar on all Circulation pages','YesNo'),
104
('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
105
('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
105
('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),
106
('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),
106
('CoceHost', '', NULL, 'Coce server URL', 'Free'),
107
('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-4 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% USE Koha %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname %]</title>
4
<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
Lines 9-18 Link Here
9
10
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>
11
<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>
11
12
12
<div id="doc" class="yui-t7">
13
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
13
14
14
   <div id="bd">
15
   <div id="bd">
15
	<div id="yui-main">
16
	<div id="yui-main">
17
        [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
16
	<div class="yui-g">
18
	<div class="yui-g">
17
19
18
20
Lines 163-167 Link Here
163
165
164
</div>
166
</div>
165
</div>
167
</div>
168
[% IF Koha.Preference('CircSidebar') %]
169
</div>
170
<div class="yui-b noprint">
171
    [% INCLUDE 'circ-nav.inc' %]
172
</div>
173
[% END %]
166
</div>
174
</div>
167
[% INCLUDE 'intranet-bottom.inc' %]
175
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-3 / +10 lines)
Lines 12-20 Link Here
12
12
13
<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
<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>
14
14
15
<div id="doc" class="yui-t7">
15
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
16
   <div id="bd">
16
   <div id="bd">
17
17
<div id="yui-main">
18
[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
18
[% IF ( found ) %]
19
[% IF ( found ) %]
19
   <div class="yui-g"> <h3>Reserve found</h3>
20
   <div class="yui-g"> <h3>Reserve found</h3>
20
    <table>
21
    <table>
Lines 196-201 Link Here
196
	
197
	
197
	
198
	
198
[% END %]
199
[% END %]
199
200
</div>
201
[% IF Koha.Preference('CircSidebar') %]
202
<div class="yui-b noprint">
203
[% INCLUDE 'circ-nav.inc' %]
204
</div>
205
[% END %]
206
</div>
200
</div>
207
</div>
201
[% INCLUDE 'intranet-bottom.inc' %]
208
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-4 / +16 lines)
Lines 1001-1012 No patron matched <span class="ex">[% message | html %]</span> Link Here
1001
[% END %] <!-- borrowernumber and borrower-->
1001
[% END %] <!-- borrowernumber and borrower-->
1002
</div></div>
1002
</div></div>
1003
[% END %]
1003
[% END %]
1004
1004
[% IF Koha.Preference('CircSidebar') %]
1005
[% UNLESS ( borrowers ) %]
1006
    [% IF not( borrowernumber and borrower ) %]
1007
        <div class="yui-b noprint">
1008
            [% INCLUDE 'circ-nav.inc' %]
1009
        </div>
1010
    [% END %]
1011
[% END %]
1012
[% END %]
1005
</div>
1013
</div>
1006
</div>
1014
</div>
1007
[% UNLESS ( borrowers ) %][% IF borrowernumber and borrower %]<div class="yui-b">
1015
[% UNLESS ( borrowers ) %]
1008
[% INCLUDE 'circ-menu.inc' %]
1016
    [% IF borrowernumber and borrower %]
1009
</div>[% END %][% END %]
1017
        <div class="yui-b">
1018
            [% INCLUDE 'circ-menu.inc' %]
1019
        </div>
1020
    [% END %]
1021
[% END %]
1010
</div>
1022
</div>
1011
<!-- Modal -->
1023
<!-- Modal -->
1012
<div id="barcodeSubmittedModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true">
1024
<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/on-site_checkouts.tt (-1 / +2 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% USE Branches %]
2
[% USE Branches %]
2
[% USE KohaDates %]
3
[% USE KohaDates %]
3
[% USE AuthorisedValues %]
4
[% USE AuthorisedValues %]
Lines 79-85 $(document).ready(function(){ Link Here
79
      </div>
80
      </div>
80
    </div>
81
    </div>
81
    <div class="yui-b">
82
    <div class="yui-b">
82
      [% INCLUDE 'circ-menu.inc' %]
83
      [% IF Koha.Preference('CircSidebar') %][% INCLUDE 'circ-nav.inc' %][% END %]
83
    </div>
84
    </div>
84
  </div>
85
  </div>
85
[% INCLUDE 'intranet-bottom.inc' %]
86
[% INCLUDE 'intranet-bottom.inc' %]
(-)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 140-146 Link Here
140
                        </p>
141
                        </p>
141
                    </div>
142
                    </div>
142
                [% END %]
143
                [% END %]
143
            </div>
144
144
145
            <div class="yui-g">
145
            <div class="yui-g">
146
146
Lines 163-171 Link Here
163
            [% END %]
163
            [% END %]
164
164
165
        </div>
165
        </div>
166
167
    </div>
166
    </div>
168
167
168
[% IF Koha.Preference('CircSidebar') %]
169
</div>
170
171
<div class="yui-b noprint">
172
    [% INCLUDE 'circ-nav.inc' %]
173
</div>
174
[% END %]
169
<div>
175
<div>
170
176
171
[% INCLUDE 'intranet-bottom.inc' %]
177
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-14 / +54 lines)
Lines 155-165 $(document).ready(function () { Link Here
155
155
156
<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>
156
<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>
157
157
158
<div id="doc" class="yui-t7">
158
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
159
160
   <div id="bd">
161
	<div id="yui-main">
162
159
160
<div id="bd">
161
<div id="yui-main">
162
[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
163
<div class="yui-g">
163
<div class="yui-g">
164
164
165
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
165
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
Lines 626-640 $(document).ready(function () { Link Here
626
                    [% END %]
626
                    [% END %]
627
                    [% IF ( errmsgloo.prevdebarred ) %]
627
                    [% IF ( errmsgloo.prevdebarred ) %]
628
                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
628
                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
629
                    [% END %]
630
                    [% IF ( errmsgloo.foreverdebarred ) %]
631
                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
632
                    [% END %]
633
634
            [% END %]
629
            [% END %]
635
        [% ELSE %]
630
            [% IF ( errmsgloo.badbarcode ) %]
631
                <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
632
            [% END %]
633
            [% IF ( errmsgloo.ispermanent ) %]
634
                <p class="problem">Please return item to: [% errmsgloo.msg %]</p>
635
            [% END %]
636
            [% IF ( errmsgloo.notissued ) %]
637
                <p class="problem">Not checked out.</p>
638
            [% END %]
639
            [% IF ( errmsgloo.localuse) %]
640
                <p class="problem">Local use recorded</p>
641
            [% END %]
642
            [% IF ( errmsgloo.waslost ) %]
643
                <p class="problem">Item was lost, now found.</p>
644
                [% IF ( LostItemFeeRefunded ) %]
645
                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
646
                [% ELSE %]
647
                    <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
648
                [% END %]
649
            [% END %]
650
            [% IF ( errmsgloo.withdrawn ) %]
651
                [% IF BlockReturnOfWithdrawnItems %]
652
                    <h5>Cannot check in</h5>
653
                    <p><strong>NOT CHECKED IN</strong></p>
654
                    <p class="problem">Item is withdrawn.</p>
655
                [% ELSE %]
656
                    <p class="problem">Item is withdrawn.</p>
657
                [% END %]
658
            [% END %]
659
            [% IF ( errmsgloo.debarred ) %]
660
                <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>
661
            [% END %]
662
            [% IF ( errmsgloo.prevdebarred ) %]
663
                <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
664
            [% END %]
665
            [% IF ( errmsgloo.foreverdebarred ) %]
666
                <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
667
            [% END %]
636
        [% END %]
668
        [% END %]
637
    </div>
669
    </div>
670
[% END %]
638
671
639
[% IF ( checkinmsg ) %]
672
[% IF ( checkinmsg ) %]
640
    [% IF ( checkinmsgtype == 'alert' ) %]
673
    [% IF ( checkinmsgtype == 'alert' ) %]
Lines 656-662 $(document).ready(function () { Link Here
656
        <p>Book drop mode.  (Effective checkin date is [% dropboxdate %] ).</p>
689
        <p>Book drop mode.  (Effective checkin date is [% dropboxdate %] ).</p>
657
    </div>
690
    </div>
658
</div>
691
</div>
659
	<div class="yui-g">
692
<div class="yui-g">
660
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
693
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
661
    <div class="yui-u first">
694
    <div class="yui-u first">
662
            <fieldset>
695
            <fieldset>
Lines 775-783 $(document).ready(function () { Link Here
775
            </td>
808
            </td>
776
           </tr>
809
           </tr>
777
        [% END %]
810
        [% END %]
778
    </table></div>
811
    </table>
779
[% END %]
812
[% END %]
780
813
</div>
781
814
[% IF Koha.Preference('CircSidebar') %]
815
</div>
816
<div class="yui-b noprint">
817
    [% INCLUDE 'circ-nav.inc' %]
818
</div>
819
[% END %]
820
</div>
821
</div>
782
</div>
822
</div>
783
[% INCLUDE 'intranet-bottom.inc' %]
823
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt (-2 / +8 lines)
Lines 1-4 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% USE Koha %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
4
<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
Lines 16-22 Link Here
16
&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
17
&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
17
</div>
18
</div>
18
19
19
<div id="doc" class="yui-t7">
20
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
20
  <div id="bd">
21
  <div id="bd">
21
    <div id="yui-main">
22
    <div id="yui-main">
22
      <div class="yui-b">
23
      <div class="yui-b">
Lines 89-93 Updated:<ul> Link Here
89
90
90
      </div>
91
      </div>
91
    </div>
92
    </div>
92
  </div>
93
[% IF Koha.Preference('CircSidebar') %]
94
<div class="yui-b noprint">
95
    [% INCLUDE 'circ-nav.inc' %]
96
</div>
97
[% END %]
98
</div>
93
[% INCLUDE 'intranet-bottom.inc' %]
99
[% 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 receive</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 receive</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 | $KohaDates %]</h1>
40
        <h1>Transfers made to your library as of [% show_date | $KohaDates %]</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 53-62 $(document).ready(function() { Link Here
53
[% IF ( run_report ) %] &rsaquo; Results[% END %]
54
[% IF ( run_report ) %] &rsaquo; Results[% END %]
54
</div>
55
</div>
55
56
56
<div id="doc2" class="yui-t7">
57
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc2" class="yui-t7">[% END %]
57
58
58
   <div id="bd">
59
   <div id="bd">
59
	<div id="yui-main">
60
	<div id="yui-main">
61
        [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
60
	<div class="yui-g">
62
	<div class="yui-g">
61
63
62
<h1>Holds queue</h1>
64
<h1>Holds queue</h1>
Lines 226-230 $(document).ready(function() { Link Here
226
228
227
</div>
229
</div>
228
</div>
230
</div>
231
[% IF Koha.Preference('CircSidebar') %]
232
</div>
233
<div class="yui-b noprint">
234
    [% INCLUDE 'circ-nav.inc' %]
235
</div>
236
[% END %]
229
</div>
237
</div>
230
[% INCLUDE 'intranet-bottom.inc' %]
238
[% 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 | $KohaDates %]
42
        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
Lines 201-205 Link Here
201
203
202
</div>
204
</div>
203
</div>
205
</div>
206
[% IF Koha.Preference('CircSidebar') %]
207
</div>
208
<div class="yui-b noprint">
209
    [% INCLUDE 'circ-nav.inc' %]
210
</div>
211
[% END %]
204
</div>
212
</div>
205
[% INCLUDE 'intranet-bottom.inc' %]
213
[% 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 123-129 function CheckForm(f) { Link Here
123
     <div id="jobfailed" style="display:none"></div>
123
     <div id="jobfailed" style="display:none"></div>
124
   </form>
124
   </form>
125
[% END %]
125
[% END %]
126
127
128
</div>
126
</div>
129
[% INCLUDE 'intranet-bottom.inc' %]
127
[% INCLUDE 'intranet-bottom.inc' %]
130
- 

Return to bug 16530