Attachment #136885 for bug #30952

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

Lines 129-135 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (-1 lines)
129		129
130	<body id="circ_article-requests" class="circ">	130	<body id="circ_article-requests" class="circ">
131	[% INCLUDE 'header.inc' %]	131	[% INCLUDE 'header.inc' %]
132	[% INCLUDE 'cat-search.inc' %]
133		132
134		133
135	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	134	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt (-1 lines)
9		9
10	<body id="circ_bookcount" class="circ">	10	<body id="circ_bookcount" class="circ">
11	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' %]
12	[% INCLUDE 'circ-search.inc' %]
13		12
14	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
15	<ol>	14	<ol>

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt (-4 / +12 lines)
1	[% USE Branches %]	1	[% USE Branches %]
2	[% USE Koha %]	2	[% USE Koha %]
		3	[% formulaire = BLOCK %]
		4	[% INCLUDE 'circ-search.inc' %]
		5	[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Overdues at [% Branches.GetLoggedInBranchname \| html %] &rsaquo; Circulation &rsaquo; Koha</title>	7	<title>Overdues at [% Branches.GetLoggedInBranchname \| html %] &rsaquo; Circulation &rsaquo; Koha</title>
5	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
6	</head>	9	</head>
7	<body id="circ_branchoverdues" class="circ">	10	<body id="circ_branchoverdues" class="circ">
8	[% INCLUDE 'header.inc' %]	11	[% INCLUDE 'header.inc' form=formulaire %]
9	[% INCLUDE 'circ-search.inc' %]
10		12
11	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
12	<ol>	14	<ol>
Lines 22-27 Link Here
22	</a>	24	</a>
23	</li>	25	</li>
24	</ol>	26	</ol>
		27	<ol>
		28	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		29	</ol>
		30	<ol>
		31	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		32	</ol>
25	</nav>	33	</nav>
26		34
27	<div class="main container-fluid">	35	<div class="main container-fluid">
Lines 33-39 Link Here
33	[% END %]	41	[% END %]
34	<main>	42	<main>
35		43
36	<h1>Circulation: Overdues at [% Branches.GetLoggedInBranchname \| html %]</h1>	44	<h2>Circulation: Overdues at [% Branches.GetLoggedInBranchname \| html %]</h2>
37		45
38	<form name="selectlocation" action="branchoverdues.pl" method="post">	46	<form name="selectlocation" action="branchoverdues.pl" method="post">
39	<label for="location">Shelving location selected: </label><select id="location" name="location">	47	<label for="location">Shelving location selected: </label><select id="location" name="location">
Lines 42-48 Link Here
42	[% IF ( locationsloo.selected ) %]<option value="[% locationsloo.authorised_value \| html %]" selected="selected">[% locationsloo.lib \| html %]</option>[% ELSE %]<option value="[% locationsloo.authorised_value \| html %]">[% locationsloo.lib \| html %]</option>[% END %]	50	[% IF ( locationsloo.selected ) %]<option value="[% locationsloo.authorised_value \| html %]" selected="selected">[% locationsloo.lib \| html %]</option>[% ELSE %]<option value="[% locationsloo.authorised_value \| html %]">[% locationsloo.lib \| html %]</option>[% END %]
43	[% END %]	51	[% END %]
44	</select>	52	</select>
45	<input type="submit" name="location" class="submit" value="OK" />	53	<button type="submit" class="submit" id="principal">OK</button>
46	</form>	54	</form>
47		55
48	[% IF ( overduesloop ) %]	56	[% IF ( overduesloop ) %]

Lines 2-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-11 / +17 lines)
2	[% USE Branches %]	2	[% USE Branches %]
3	[% USE ItemTypes %]	3	[% USE ItemTypes %]
4	[% USE AuthorisedValues %]	4	[% USE AuthorisedValues %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'circ-search.inc' %]
		7	[% END %]
5	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Transfers &rsaquo; Circulation &rsaquo; Koha</title>	9	<title>Transfers &rsaquo; Circulation &rsaquo; Koha</title>
7	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	11	</head>
9	<body id="circ_branchtransfers" class="circ">	12	<body id="circ_branchtransfers" class="circ">
10	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form=formulaire %]
11	[% INCLUDE 'circ-search.inc' %]
12		14
13	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
14	<ol>	16	<ol>
Lines 24-29 Link Here
24	</a>	26	</a>
25	</li>	27	</li>
26	</ol>	28	</ol>
		29	<ol>
		30	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		31	</ol>
		32	<ol>
		33	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		34	</ol>
27	</nav>	35	</nav>
28		36
29	<div class="main container-fluid">	37	<div class="main container-fluid">
Lines 171-189 Link Here
171	<div id="branchtransfers">	179	<div id="branchtransfers">
172	<form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">	180	<form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
173	<fieldset class="brief">	181	<fieldset class="brief">
174	<legend>Transfer</legend>	182	<h3>Transfer</h3>
175	<ol>	183	<ol><li>
176	<li>	184	<p>Destination library:
177	<label for="tobranchcd">Destination library: </label>
178	<select name="tobranchcd" id="tobranchcd">	185	<select name="tobranchcd" id="tobranchcd">
179	[% PROCESS options_for_libraries libraries => Branches.all( selected => tobranchcd, unfiltered => 1) %]	186	[% PROCESS options_for_libraries libraries => Branches.all( selected => tobranchcd, unfiltered => 1) %]
180	</select>	187	</select></p>
181	</li>	188	</li>
182	<li>	189	<li>
183	<label for="barcode">Enter barcode: </label>	190	<input name="barcode" size="15" class="petit-barcode" type="text" placeholder="Enter barcode" /><button type="submit" class="submit" id="principal">Submit</button>
184	<input name="barcode" id="barcode" size="15" class="focus" type="text" /> <input type="submit" value="Submit" />	191	</li></ol>
185	</li>	192
186	</ol>
187	</fieldset>	193	</fieldset>
188	[% FOREACH trsfitemloo IN trsfitemloop %]	194	[% FOREACH trsfitemloo IN trsfitemloop %]
189	<input type="hidden" name="bc-[% trsfitemloo.counter \| html %]" value="[% trsfitemloo.item.barcode \| html %]" />	195	<input type="hidden" name="bc-[% trsfitemloo.counter \| html %]" value="[% trsfitemloo.item.barcode \| html %]" />

Lines 12-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt (-1 / +1 lines)
12	<body id="circ_checkout-notes" class="circ">	12	<body id="circ_checkout-notes" class="circ">
13		13
14	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' %]
15	[% INCLUDE 'circ-search.inc' %]	15
16		16
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	18	<ol>

Lines 1-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-54 / +39 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE Branches %]	3	[% USE Branches %]
		4	[% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'circ-search.inc' %]
		7	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Circulation &rsaquo; Koha</title>	9	<title>Circulation &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
7	</head>	11	</head>
8	<body id="circ_circulation-home" class="circ">	12	<body id="circ_circulation-home" class="circ">
9	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' form = formulaire %]
10	[% INCLUDE 'circ-search.inc' %]
11		14
12	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	15	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
13	<ol>	16	<ol>
Lines 20-25 Link Here
20	</a>	23	</a>
21	</li>	24	</li>
22	</ol>	25	</ol>
		26
		27	<ol>
		28	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		29	</ol>
		30
		31	<ol>
		32	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		33	</ol>
23	</nav>	34	</nav>
24		35
25	<div class="main container-fluid">	36	<div class="main container-fluid">
Lines 27-71 Link Here
27	<h1>Circulation</h1>	38	<h1>Circulation</h1>
28		39
29	<div class="row">	40	<div class="row">
30
31	<div class="col-sm-5 col-md-4">	41	<div class="col-sm-5 col-md-4">
32	<h3>Circulation</h3>	42	<h3>Circulation</h3>
33		43
34	<ul class="buttons-list">	44	<ul class="buttons-list">
35	<li>	45	<li><a class="circ-button" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload"></i></a> Check out</li>
36	<a class="circ-button" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload"></i> Check out</a>	46	<li><a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i></a> Check in</li>
37	</li>	47	<li><a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i></a> Renew</li>
38	<li>
39	<a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i> Check in</a>
40	</li>
41	<li>
42	<a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i> Renew</a>
43	</li>
44	[% UNLESS IndependentBranches %]	48	[% UNLESS IndependentBranches %]
45	<li>	49	<li>
46	[% IF Koha.Preference('UseCirculationDesks') %]	50	[% IF Koha.Preference('UseCirculationDesks') %]
47	<a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library and desk</a>	51	<a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i></a> Set library and desk
48	[% ELSE %]	52	[% ELSE %]
49	<a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a>	53	<a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i></a> Set library
50	[% END %]	54	[% END %]
51	</li>	55	</li>
52	[% END %]	56	[% END %]
53	[% IF ( fast_cataloging ) %]	57	[% IF ( fast_cataloging ) %]
54	[% IF ( CAN_user_editcatalogue_fast_cataloging ) %]	58	[% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
55	<li>	59	<li><a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"><i class="fa fa-plus"></i></a> Fast cataloging</li>
56	<a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"><i class="fa fa-plus"></i> Fast cataloging</a>
57	</li>
58	[% END %]	60	[% END %]
59	[% END %]	61	[% END %]
60	[% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]	62	[% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]
61	<li>	63	<li><a class="circ-button" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note"></i></a> Checkout notes</li>
62	<a class="circ-button" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note"></i> Checkout notes</a>
63	</li>
64	[% END %]	64	[% END %]
65	[% IF Koha.Preference('OnSiteCheckouts') %]	65	[% IF Koha.Preference('OnSiteCheckouts') %]
66	<li>	66	<li><a class="circ-button" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa fa-map-marker"></i></a> Pending on-site checkouts</li>
67	<a class="circ-button" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa fa-map-marker"></i> Pending on-site checkouts</a>
68	</li>
69	[% END %]	67	[% END %]
70	</ul>	68	</ul>
71	</div>	69	</div>
Lines 74-91 Link Here
74	<h3>Holds</h3>	72	<h3>Holds</h3>
75		73
76	<ul class="buttons-list">	74	<ul class="buttons-list">
77	<li>	75	<li><a class="circ-button" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks"></i></a> Holds queue</li>
78	<a class="circ-button" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks"></i> Holds queue</a>	76	<li><a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o"></i></a> Holds to pull</li>
79	</li>	77	<li><a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i></a> Holds awaiting pickup</li>
80	<li>	78	<li><a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i></a> Hold ratios</li>
81	<a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o"></i> Holds to pull</a>
82	</li>
83	<li>
84	<a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i> Holds awaiting pickup</a>
85	</li>
86	<li>
87	<a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
88	</li>
89	</ul>	79	</ul>
90		80
91	[% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]	81	[% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
Lines 108-116 Link Here
108	[% IF Koha.Preference('ArticleRequests') %]	98	[% IF Koha.Preference('ArticleRequests') %]
109	<h3>Patron request</h3>	99	<h3>Patron request</h3>
110	<ul class="buttons-list">	100	<ul class="buttons-list">
111	<li>	101	<li><a class="circ-button" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa fa-newspaper-o"></i</a>> Article requests</li>
112	<a class="circ-button" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa fa-newspaper-o"></i> Article requests</a>
113	</li>
114	</ul>	102	</ul>
115	[% END %]	103	[% END %]
116		104
Lines 118-133 Link Here
118		106
119	<ul class="buttons-list">	107	<ul class="buttons-list">
120	[% IF !Koha.Preference('IndependentBranchesTransfers') \|\| CAN_user_superlibrarian %]	108	[% IF !Koha.Preference('IndependentBranchesTransfers') \|\| CAN_user_superlibrarian %]
121	<li>	109	<li><a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange"></i></a> Transfer</li>
122	<a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange"></i> Transfer</a>
123	</li>
124	[% END %]	110	[% END %]
125	<li>	111	<li><a class="circ-button" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa fa-sign-out"></i></a> Transfers to send</li>
126	<a class="circ-button" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa fa-sign-out"></i> Transfers to send</a>	112	<li><a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i></a> Transfers to receive</li>
127	</li>
128	<li>
129	<a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i> Transfers to receive</a>
130	</li>
131	</ul>	113	</ul>
132		114
133	<h3>Overdues</h3>	115	<h3>Overdues</h3>
Lines 138-175 Link Here
138	<a class="circ-button"	120	<a class="circ-button"
139	href="/cgi-bin/koha/circ/overdue.pl"	121	href="/cgi-bin/koha/circ/overdue.pl"
140	title="Warning: This report is very resource intensive on systems with large numbers of overdue items."	122	title="Warning: This report is very resource intensive on systems with large numbers of overdue items."
141	><i class="fa fa-clock-o"></i> Overdues</a>	123	><i class="fa fa-clock-o"></i></a> Overdues
142	</li>	124	</li>
143	[% END %]	125	[% END %]
144	<li>	126	<li>
145	<a class="circ-button"	127	<a class="circ-button"
146	href="/cgi-bin/koha/circ/branchoverdues.pl"	128	href="/cgi-bin/koha/circ/branchoverdues.pl"
147	title="Limited to your library. See report help for other details."	129	title="Limited to your library. See report help for other details."
148	><i class="fa fa-clock-o"></i> Overdues with fines</a>	130	><i class="fa fa-clock-o"></i></a> Overdues with fines
149	</li>	131	</li>
150	</ul>	132	</ul>
151	</div>	133	</div>
152	</div>	134	</div>
		135
153	<div class="row" id="intranet-circulation-home-html">	136	<div class="row" id="intranet-circulation-home-html">
154	<div class="col-md-12">	137	<div class="col-md-12">
155	[% Koha.Preference('IntranetCirculationHomeHTML') \| $raw %]	138	[% Koha.Preference('IntranetCirculationHomeHTML') \| $raw %]
156	</div>	139	</div>
157	</div>	140	</div>
		141
158	<div class="row" id="offline-circulation">	142	<div class="row" id="offline-circulation">
159	<div class="col-md-12">	143	<div class="col-md-12">
160	<h4>Offline circulation</h4>	144	<h4>Offline circulation</h4>
161	<div class="col-sm-5 col-md-3">	145	<div class="col-sm-5 col-md-3">
162	[% IF (AllowOfflineCirculation) %]	146	[% IF (AllowOfflineCirculation) %]
163	<a href="/cgi-bin/koha/circ/offline.pl">Built-in offline circulation interface</a>	147	<a class="noir" href="/cgi-bin/koha/circ/offline.pl">Built-in offline circulation interface</a>
164	[% END %]	148	[% END %]
165	<p><a href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></p>	149	<p><a class="noir" href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></p>
166	<p><a href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a></p>	150	<p><a class="noir" href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a></p>
167	</div>	151	</div>
168	<div class="col-sm-5 col-md-3">	152	<div class="col-sm-5 col-md-3">
169	<p><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p>	153	<p><a class="noir" href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p>
170	<p><a href="https://addons.mozilla.org/[% lang \| uri %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p>	154	<p><a class="noir" href="https://addons.mozilla.org/[% lang \| uri %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p>
171	</div>	155	</div>
172	</div>	156	</div>
173	</div>	157	</div>
		158	</div>
174		159
175	[% INCLUDE 'intranet-bottom.inc' %]	160	[% INCLUDE 'intranet-bottom.inc' %]

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-9 / +11 lines)
9	[% USE ItemTypes %]	9	[% USE ItemTypes %]
10	[% USE Price %]	10	[% USE Price %]
11	[% USE AuthorisedValues %]	11	[% USE AuthorisedValues %]
12	[% SET footerjs = 1 %]	12	[% formulaire = BLOCK %]
		13	[% INCLUDE 'circ-search.inc' %]
		14	[% END %]
13	[% INCLUDE 'doc-head-open.inc' %]	15	[% INCLUDE 'doc-head-open.inc' %]
14	[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") \| $raw %]	16	[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") \| $raw %]
15	[% SET destination = "circ" %]	17	[% SET destination = "circ" %]
Lines 24-31 Link Here
24		26
25	<body id="circ_circulation" class="circ">	27	<body id="circ_circulation" class="circ">
26		28
27	[% INCLUDE 'header.inc' %]	29	[% INCLUDE 'header.inc' form=formulaire %]
28	[% INCLUDE 'circ-search.inc' %]
29		30
30	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	31	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
31	<ol>	32	<ol>
Lines 640-649 Link Here
640	<input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />	641	<input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
641	[% END %]	642	[% END %]
642		643
643	<button type="submit" class="btn btn-default">Check out</button>	644	<button class="submit" id="principal" type="submit">Check out</button>
644		645
645	<div id="show-circ-settings">	646	<div id="show-circ-settings">
646	<a href="#"><i class="fa fa-caret-right circ-settings-icon"></i> Checkout settings</a>	647	<a href="#"><i class="fa fa-caret-right circ-settings-icon"></i></a>
647	</div>	648	</div>
648		649
649	<div class="circ-settings">	650	<div class="circ-settings">
Lines 765-774 Link Here
765		766
766	[% IF ( noissues ) %]	767	[% IF ( noissues ) %]
767	[% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]	768	[% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
768	<div id="circmessages" class="circmessage attention">	769	<fieldset>
769	[% ELSE %]	770	[% ELSE %]
770	<h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>	771	<h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
771	<div id="circmessages" class="circmessage warning">	772	<fieldset>
772	[% END %]	773	[% END %]
773	<h3>	774	<h3>
774	Cannot check out!	775	Cannot check out!
Lines 777-788 Link Here
777	[% END %]	778	[% END %]
778	</h3>	779	</h3>
779	[% ELSE %]	780	[% ELSE %]
780	<div id="circmessages" class="circmessage attention">	781	<fieldset>
781	[% END %]	782	[% END %]
782		783
783	[% INCLUDE 'patron_messages.inc' %]	784	[% INCLUDE 'patron_messages.inc' %]
784		785
785	</div> <!-- /#circmessages -->	786
		787	</fieldset> <!-- /#circmessages -->
786	</div> <!-- /div or div.col-sm-6 -->	788	</div> <!-- /div or div.col-sm-6 -->
787	</div> <!-- /.row -->	789	</div> <!-- /.row -->
788		790

Lines 21-27 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-1 lines)
21	<body id="circ_circulation_batch_checkouts" class="circ">	21	<body id="circ_circulation_batch_checkouts" class="circ">
22		22
23	[% INCLUDE 'header.inc' %]	23	[% INCLUDE 'header.inc' %]
24	[% INCLUDE 'circ-search.inc' %]
25		24
26	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
27	<ol>	26	<ol>

Lines 17-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt (-1 lines)
17		17
18	<body id="circ_offline" class="circ">	18	<body id="circ_offline" class="circ">
19	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' %]
20	[% INCLUDE 'circ-search.inc' %]
21	<div class="loading-overlay" style="display: none;">	20	<div class="loading-overlay" style="display: none;">
22	<div>Downloading records, please wait...</div>	21	<div>Downloading records, please wait...</div>
23	</div>	22	</div>

Lines 12-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt (-1 lines)
12		12
13	<body id="circ_stats" class="circ">	13	<body id="circ_stats" class="circ">
14	[% INCLUDE 'header.inc' %]	14	[% INCLUDE 'header.inc' %]
15	[% INCLUDE 'circ-search.inc' %]
16		15
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	17	<ol>

Lines 8-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-110 / +105 lines)
8	[%- USE Categories -%]	8	[%- USE Categories -%]
9	[%- USE TablesSettings -%]	9	[%- USE TablesSettings -%]
10	[% SET footerjs = 1 %]	10	[% SET footerjs = 1 %]
		11	[% formulaire = BLOCK %]
		12	[% INCLUDE 'circ-search.inc' %]
		13	[% END %]
11	[% INCLUDE 'doc-head-open.inc' %]	14	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Items overdue as of [% todaysdate \| html %] &rsaquo; Circulation &rsaquo; Koha</title>	15	<title>Items overdue as of [% todaysdate \| html %] &rsaquo; Circulation &rsaquo; Koha</title>
13	[% INCLUDE 'doc-head-close.inc' %]	16	[% INCLUDE 'doc-head-close.inc' %]
Lines 29-36 Link Here
29	</head>	32	</head>
30		33
31	<body id="circ_overdue" class="circ">	34	<body id="circ_overdue" class="circ">
32	[% INCLUDE 'header.inc' %]	35	[% INCLUDE 'header.inc' form=formulaire %]
33	[% INCLUDE 'circ-search.inc' %]
34		36
35	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	37	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
36	<ol>	38	<ol>
Lines 46-51 Link Here
46	</a>	48	</a>
47	</li>	49	</li>
48	</ol>	50	</ol>
		51	<ol>
		52	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		53	</ol>
		54	<ol>
		55	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		56	</ol>
49	</nav>	57	</nav>
50		58
51	<div class="main container-fluid">	59	<div class="main container-fluid">
Lines 140-262 Link Here
140		148
141	<div class="col-sm-2 col-sm-pull-10">	149	<div class="col-sm-2 col-sm-pull-10">
142	<aside>	150	<aside>
		151	<div id="filters">
		152	<form method="post" action="/cgi-bin/koha/circ/overdue.pl">
		153	<fieldset class="brief">
		154	<h4>Filter on</h4>
143		155
144	<form method="post" action="/cgi-bin/koha/circ/overdue.pl">	156	<fieldset><legend>Date due:</legend>
145	<fieldset class="brief">	157	<li class="radio">
146	<h4>Filter on:</h4>	158	<p for="showall">Show any items currently checked out:
147	<fieldset><legend>Date due:</legend>	159	[% IF ( showall ) %]
148	<ol>	160	<input type="checkbox" id="showall" name="showall" value="show" checked="checked" />
149	<li class="radio">	161	[% ELSE %]
150	<label for="showall">Show any items currently checked out:</label>	162	<input type="checkbox" id="showall" name="showall" value="show" />
151	[% IF ( showall ) %]	163	[% END %]
152	<input type="checkbox" id="showall" name="showall" value="show" checked="checked" />	164	</p>
153	[% ELSE %]
154	<input type="checkbox" id="showall" name="showall" value="show" />
155	[% END %]
156	</li>
157		165
158	<li class="date_due_filter">	166	<p>From: <input type="text" id="from" name="dateduefrom" size="10" value="[% filters.dateduefrom \| $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
159	<label for="from">From:</label>	167	<p>To:<input type="text" id="to" name="datedueto" size="10" value="[% filters.datedueto \| $KohaDates %]" class="flatpickr" /></p>
160	<input type="text" id="from" name="dateduefrom" size="10" value="[% filters.dateduefrom \| $KohaDates %]" class="flatpickr" data-date_to="to" />	168	</li>
161	</li>
162	<li class="date_due_filter">
163	<label for="to">To:</label>
164	<input type="text" id="to" name="datedueto" size="10" value="[% filters.datedueto \| $KohaDates %]" class="flatpickr" />
165	</li>
166	</ol>
167	</fieldset>
168	<ol>
169	<li><label>Name or cardnumber:</label><input type="text" name="borname" value="[% filters.borname \| html %]" /></li>
170	<li><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option>
171	[% FOREACH borcatloo IN borcatloop %]
172	[% IF ( borcatloo.selected ) %]<option value="[% borcatloo.value \| html %]" selected="selected">[% borcatloo.catname \| html %]</option>[% ELSE %]<option value="[% borcatloo.value \| html %]">[% borcatloo.catname \| html %]</option>[% END %]
173	[% END %]
174	</select>
175	</li>
176		169
177	<li><label>Patron flags:</label>	170	<li><p>Name or cardnumber:<input type="text" name="borname" value="[% filters.borname \| html %]" /></p>
178	<select name="borflag" id="borflag">	171	<p>Patron category:<select name="borcat" id="borcat"><option value="">Any</option>
179	<option value="">None</option>	172	[% FOREACH borcatloo IN borcatloop %]
180	[% IF ( borflag_gonenoaddress ) %]<option value="gonenoaddress" selected="selected">Address in question</option>	173	[% IF ( borcatloo.selected ) %]<option value="[% borcatloo.value \| html %]" selected="selected">[% borcatloo.catname \| html %]</option>[% ELSE %]<option value="[% borcatloo.value \| html %]">[% borcatloo.catname \| html %]</option>[% END %]
181	[% ELSE %]<option value="gonenoaddress">Address in question</option>[% END %]	174	[% END %]
182	[% IF ( borflag_debarred ) %]<option value="debarred" selected="selected">Restricted</option>	175	</select></p>
183	[% ELSE %]<option value="debarred">Restricted</option>[% END %]	176	<p>Patron flags:
184	[% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost card</option>	177	<select name="borflag" id="borflag">
185	[% ELSE %]<option value="lost">Lost card</option>[% END %]	178	<option value="">None</option>
186	</select>	179	[% IF ( borflag_gonenoaddress ) %]<option value="gonenoaddress" selected="selected">Address in question</option>
187	</li>	180	[% ELSE %]<option value="gonenoaddress">Address in question</option>[% END %]
188	[% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %]	181	[% IF ( borflag_debarred ) %]<option value="debarred" selected="selected">Restricted</option>
189	<!-- domid cgivalue ismany isclone ordinal code description repeatable authorised_value_category -->	182	[% ELSE %]<option value="debarred">Restricted</option>[% END %]
190	<li>	183	[% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost card</option>
191	<label>[% patron_attr_filter_loo.description \| html %]:</label>	184	[% ELSE %]<option value="lost">Lost card</option>[% END %]
192	[% IF ( patron_attr_filter_loo.authorised_value_category ) %]	185	</select>
193	[% SET authvals = AuthorisedValues.GetAuthValueDropbox( patron_attr_filter_loo.authorised_value_category ) %]	186	</p>
194	<select id="pattrodue-input-[% patron_attr_filter_loo.domid \| html %]" name="patron_attr_filter_[% patron_attr_filter_loo.code \| html %]" class="pattrodue-input">
195	<option></option>
196	[% FOREACH authval IN authvals %]
197	[% IF ( patron_attr_filter_loo.cgivalue == authval.authorised_value ) -%]
198	<option value="[% authval.authorised_value \| html %]" selected="selected">[% authval.lib \| html %]</option>
199	[% ELSE -%]
200	<option value="[% authval.authorised_value \| html %]">[% authval.lib \| html %]</option>
201	[% END %]
202	[% END %]
203	</select>
204	[% ELSE %]
205	<input type="text" name="patron_attr_filter_[% patron_attr_filter_loo.code \| html %]" value="[% patron_attr_filter_loo.cgivalue \| html %]"/>
206	[% END %]
207	[% IF ( patron_attr_filter_loo.repeatable ) %]
208	<a href="#" class="btn btn-link clone-attribute" data-original-id="pattrodue-input-[% patron_attr_filter_loo.domid \| html %]"><i class="fa fa-plus"></i> Add</a>
209	[% IF ( patron_attr_filter_loo.isclone ) %]
210	<a href="#" class="btn btn-link delete_clone"><i class="fa fa-remove"></i> Delete</a>
211	[% ELSIF ( patron_attr_filter_loo.ismany ) %]
212	<a href="#" class="btn btn-link delete_clone"><i class="fa fa-remove"></i> Delete</a>
213	[% ELSE %]
214	<a href="#" class="btn btn-link delete_clone" style="display:none"><i class="fa fa-remove"></i> Delete</a>
215	[% END %]
216	[% END %]
217	</li>
218	[% END %]
219		187
220	<li><label>Item type:</label><select name="itemtype" id="itemtype"><option value="">Any</option>	188	[% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %]
221	[% FOREACH itemtypeloo IN itemtypeloop %][% IF ( itemtypeloo.selected ) %]	189	<!-- domid cgivalue ismany isclone ordinal code description repeatable authorised_value_category -->
222	<option value="[% itemtypeloo.value \| html %]" selected="selected">[% itemtypeloo.itemtypename \| html %]</option>[% ELSE %]	190	<p>[% patron_attr_filter_loo.description \| html %]:
223	<option value="[% itemtypeloo.value \| html %]">[% itemtypeloo.itemtypename \| html %]</option>[% END %]	191	[% IF ( patron_attr_filter_loo.authorised_value_category ) %]
224	[% END %]	192	[% SET authvals = AuthorisedValues.GetAuthValueDropbox( patron_attr_filter_loo.authorised_value_category ) %]
225	</select>	193	<select id="pattrodue-input-[% patron_attr_filter_loo.domid \| html %]" name="patron_attr_filter_[% patron_attr_filter_loo.code \| html %]" class="pattrodue-input">
226	</li>	194	<option></option>
		195	[% FOREACH authval IN authvals %]
		196	[% IF ( patron_attr_filter_loo.cgivalue == authval.authorised_value ) -%]
		197	<option value="[% authval.authorised_value \| html %]" selected="selected">[% authval.lib \| html %]</option>
		198	[% ELSE -%]
		199	<option value="[% authval.authorised_value \| html %]">[% authval.lib \| html %]</option>
		200	[% END %]
		201	[% END %]
		202	</select>
		203	[% ELSE %]
		204	<input type="text" name="patron_attr_filter_[% patron_attr_filter_loo.code \| html %]" value="[% patron_attr_filter_loo.cgivalue \| html %]"/>
		205	[% END %]
		206	[% IF ( patron_attr_filter_loo.repeatable ) %]
		207	<a href="#" class="btn btn-link clone-attribute" data-original-id="pattrodue-input-[% patron_attr_filter_loo.domid \| html %]"><i class="fa fa-plus"></i> Add</a>
		208	[% IF ( patron_attr_filter_loo.isclone ) %]
		209	<a href="#" class="btn btn-link delete_clone"><i class="fa fa-remove"></i> Delete</a>
		210	[% ELSIF ( patron_attr_filter_loo.ismany ) %]
		211	<a href="#" class="btn btn-link delete_clone"><i class="fa fa-remove"></i> Delete</a>
		212	[% ELSE %]
		213	<a href="#" class="btn btn-link delete_clone" style="display:none"><i class="fa fa-remove"></i> Delete</a>
		214	[% END %]
		215	[% END %]</p>
		216	[% END %]
227		217
228	<li>	218	<p>
229	<label>Item home library:</label>	219	Item type:<select name="itemtype" id="itemtype"><option value="">Any</option>
230	<select name="homebranch" id="homebranch">	220	[% FOREACH itemtypeloo IN itemtypeloop %][% IF ( itemtypeloo.selected ) %]
231	<option value="">Any</option>	221	<option value="[% itemtypeloo.value \| html %]" selected="selected">[% itemtypeloo.itemtypename \| html %]</option>[% ELSE %]
232	[% PROCESS options_for_libraries libraries => Branches.all( selected => filters.homebranch ) %]	222	<option value="[% itemtypeloo.value \| html %]">[% itemtypeloo.itemtypename \| html %]</option>[% END %]
233	</select>	223	[% END %]
234	</li>	224	</select>
		225	</p>
235		226
236	<li>	227	<p>Item home library:
237	<label>Item holding library:</label>	228	<select name="homebranch" id="homebranch">
238	<select name="holdingbranch" id="holdingbranch">	229	<option value="">Any</option>
239	<option value="">Any</option>	230	[% PROCESS options_for_libraries libraries => Branches.all( selected => filters.homebranch ) %]
240	[% PROCESS options_for_libraries libraries => Branches.all( selected => filters.holdingbranch ) %]	231	</select></p>
241	</select>
242	</li>
243		232
244	<li>	233	<p>Item holding library:
245	<label>Library of the patron:</label>	234	<select name="holdingbranch" id="holdingbranch">
246	<select name="branch" id="branch">	235	<option value="">Any</option>
247	<option value="">Any</option>	236	[% PROCESS options_for_libraries libraries => Branches.all( selected => filters.holdingbranch ) %]
248	[% PROCESS options_for_libraries libraries => Branches.all( selected => filters.branch, only_from_group => 1 ) %]	237	</select></p>
249	</select>
250	</li>
251		238
252	</ol>	239	<p>Library of the patron:
253	<fieldset class="action">	240	<select name="branch" id="branch">
254	<input type="submit" value="Apply filter" class="submit" />	241	<option value="">Any</option>
255	<input type="hidden" name="op" value="apply filter" />	242	[% PROCESS options_for_libraries libraries => Branches.all( selected => filters.branch, only_from_group => 1 ) %]
256	</fieldset>	243	</select></p>
257	</fieldset>	244	</li>
258	</form>	245	</ol>
		246	<fieldset class="action">
		247	<button type="submit" class="submit" id="principal">Apply filter</button>
		248	<input type="hidden" name="op" value="apply filter" />
		249	</fieldset>
259		250
		251	</fieldset>
		252	</fieldset>
		253	</form>
		254	</div>
260	</aside>	255	</aside>
261	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	256	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
262	</div> <!-- /.row -->	257	</div> <!-- /.row -->

Lines 7-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-32 / +36 lines)
7	[%- USE Branches -%]	7	[%- USE Branches -%]
8	[%- USE ItemTypes -%]	8	[%- USE ItemTypes -%]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
		10	[% formulaire = BLOCK %]
		11	[% INCLUDE 'circ-search.inc' %]
		12	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	13	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Holds to pull &rsaquo; Circulation &rsaquo; Koha</title>	14	<title>Holds to pull &rsaquo; Circulation &rsaquo; Koha</title>
12	[% INCLUDE 'doc-head-close.inc' %]	15	[% INCLUDE 'doc-head-close.inc' %]
13	</head>	16	</head>
14		17
15	<body id="circ_pendingreserves" class="circ">	18	<body id="circ_pendingreserves" class="circ">
16	[% INCLUDE 'header.inc' %]	19	[% INCLUDE 'header.inc' form=formulaire %]
17	[% INCLUDE 'circ-search.inc' %]
18		20
19		21
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	22	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
Lines 31-36 Link Here
31	</a>	33	</a>
32	</li>	34	</li>
33	</ol>	35	</ol>
		36	<ol>
		37	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		38	</ol>
		39	<ol>
		40	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		41	</ol>
34	</nav>	42	</nav>
35		43
36	<div class="main container-fluid">	44	<div class="main container-fluid">
Lines 250-256 Link Here
250	</tfoot>	258	</tfoot>
251	</table>	259	</table>
252	[% ELSE %]	260	[% ELSE %]
253	<strong>No items found.</strong>	261	<fieldset><strong>No items found.</strong></fieldset>
254	[% END %]	262	[% END %]
255	</div>	263	</div>
256		264
Lines 260-296 Link Here
260		268
261	<div class="col-sm-2 col-sm-pull-10">	269	<div class="col-sm-2 col-sm-pull-10">
262	<aside>	270	<aside>
		271	<div id="filters">
		272	<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
		273	<fieldset class="brief">
		274	<h4>Refine results</h4>
		275	<fieldset>
		276	<ol>
		277	<li>
		278	<p>Start date:
		279	<input type="text" size="10" id="from" name="from" value="[% from \| $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
		280	</li>
		281	<li>
		282	<p>End date:
		283	<input type="text" size="10" id="to" name="to" value="[% to \| $KohaDates %]" class="flatpickr" /></p>
		284	</li>
		285	</ol>
263		286
264	<div id="filters">	287	[% IF ( HoldsToPullEndDate ) %]
		288	<p><em>(Inclusive, default is [% HoldsToPullStartDate \| html %] days ago to [% HoldsToPullEndDate \| html %] days ahead. Set other date ranges as needed.)</em></p>
		289	[% ELSE %]
		290	<p><em>(Inclusive, default is [% HoldsToPullStartDate \| html %] days ago to today. Set other date ranges as needed.)</em></p>
		291	[% END %]
265		292
266	<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >	293	<button type="submit" class="submit" id="principal">Submit</button>
267	<fieldset class="brief">	294	</fieldset>
268	<h4>Refine results</h4>	295	</fieldset>
269	<ol>	296	</form>
270	<li>	297	</div>
271	<label for="from">
272	Start date:
273	</label>
274	<input type="text" size="10" id="from" name="from" value="[% from \| $KohaDates %]" class="flatpickr" data-date_to="to" />
275	</li>
276	<li><label for="to">
277	End date:
278	</label>
279	<input type="text" size="10" id="to" name="to" value="[% to \| $KohaDates %]" class="flatpickr" />
280	</li>
281	</ol>
282
283	[% IF ( HoldsToPullEndDate ) %]
284	<p><em>(Inclusive, default is [% HoldsToPullStartDate \| html %] days ago to [% HoldsToPullEndDate \| html %] days ahead. Set other date ranges as needed.)</em></p>
285	[% ELSE %]
286	<p><em>(Inclusive, default is [% HoldsToPullStartDate \| html %] days ago to today. Set other date ranges as needed.)</em></p>
287	[% END %]
288
289	<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
290	</fieldset>
291	</form>
292
293	</div>
294	</aside>	298	</aside>
295	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	299	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
296	</div> <!-- /.row -->	300	</div> <!-- /.row -->

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-25 / +27 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
		6	[% formulaire = BLOCK %]
		7	[% INCLUDE 'circ-search.inc' %]
		8	[% END %]
6	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
7		10
8	<title>Renew [% title \| html %] &rsaquo; Circulation &rsaquo; Koha</title>	11	<title>Renew [% title \| html %] &rsaquo; Circulation &rsaquo; Koha</title>
Lines 11-18 Link Here
11		14
12	<body id="circ_renew" class="circ">	15	<body id="circ_renew" class="circ">
13		16
14	[% INCLUDE 'header.inc' %]	17	[% INCLUDE 'header.inc' form=formulaire %]
15	[% INCLUDE 'circ-search.inc' %]
16		18
17	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	19	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
18	<ol>	20	<ol>
Lines 28-33 Link Here
28	</a>	30	</a>
29	</li>	31	</li>
30	</ol>	32	</ol>
		33	<ol>
		34	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		35	</ol>
		36	<ol>
		37	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		38	</ol>
31	</nav>	39	</nav>
32		40
33	<div class="main container-fluid">	41	<div class="main container-fluid">
Lines 196-246 Link Here
196	[% UNLESS error %]	204	[% UNLESS error %]
197	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >	205	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >
198		206
199	<fieldset>	207	<fieldset class="brief">
200	<h1>Renew</h1>	208	<h3>Renew</h3>
		209	<ol>
201		210
202	[% IF Koha.Preference('UnseenRenewals') %]	211	[% IF Koha.Preference('UnseenRenewals') %]
203	<div class="renew_formfield">	212	<div class="renew_formfield">
204	<div>	213	<input name="barcode" id="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" />
205	<label for="barcode" class="hint">Enter item barcode: </label>
206	</div>
207	<input name="barcode" id="barcode" size="14" class="barcode focus" type="text" />
208	</div>	214	</div>
209	<div class="renew_formfield">	215	<div class="renew_formfield">
210	<label for="unseen" class="hint">Record renewal as unseen if appropriate: </label>	216	<label for="unseen" class="hint">Record renewal as unseen if appropriate: </label>
211	<input value="1" name="unseen" id="unseen" type="checkbox" />	217	<input value="1" name="unseen" id="unseen" type="checkbox" />
212	</div>	218	</div>
213	[% ELSE %]	219	[% ELSE %]
214	<div>	220	<input name="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" />
215	<label for="barcode" class="hint">Enter item barcode: </label>
216	</div>
217
218	<input name="barcode" id="barcode" size="14" class="barcode focus" type="text" />
219		221
220	[% END %]	222	[% END %]
221	<button type="submit" class="btn btn-default">Submit</button>	223	<button type="submit" class="submit" id="principal">Submit</button>
222		224
223	<div class="circ-settings show">	225	<div class="circ-settings show">
224	<div class="date-select" id="renew_date_override_fields">	226	<div class="date-select" id="renew_date_override_fields">
225	<div><label for="hard_due_date" class="hint">Renewal due date [% INCLUDE 'date-format.inc' %]:</label></div>	227	<input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date \| $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" placeholder="Renewal due date [% INCLUDE 'date-format.inc' %]" />
226	<input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date \| $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" />
227	</div> <!-- /.date-select -->	228	</div> <!-- /.date-select -->
228	</div>	229	</div>
		230	</ol>
229	</fieldset>	231	</fieldset>
230		232
231		233
232	</form>	234	</form>
233	[% END %]	235	[% END %]
234		236
235	[% IF Koha.Preference('CircSidebar') %]	237	[% IF Koha.Preference('CircSidebar') %]
236	</div> <!-- /.col-sm-10.col-sm-push-2 -->	238	</div> <!-- /.col-sm-10.col-sm-push-2 -->
237	<div class="col-sm-2 col-sm-pull-10">	239	<div class="col-sm-2 col-sm-pull-10">
238	<aside>	240	<aside>
239	[% INCLUDE 'circ-nav.inc' %]	241	[% INCLUDE 'circ-nav.inc' %]
240	</aside>	242	</aside>
241	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	243	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
242	</div> <!-- /.row -->	244	</div> <!-- /.row -->
243	[% END %]	245	[% END %]
244		246
245	</main>	247	</main>
246	</div> <!-- /.col-sm-12 -->	248	</div> <!-- /.col-sm-12 -->

Lines 60-66 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (-1 lines)
60		60
61	<body id="circ_request-article" class="circ">	61	<body id="circ_request-article" class="circ">
62	[% INCLUDE 'header.inc' %]	62	[% INCLUDE 'header.inc' %]
63	[% INCLUDE 'circ-search.inc' %]
64		63
65	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	64	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
66	<ol>	65	<ol>

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-59 / +68 lines)
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
7	[% USE TablesSettings %]	7	[% USE TablesSettings %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'circ-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Hold ratios &rsaquo; Circulation &rsaquo; Koha</title>	13	<title>Hold ratios &rsaquo; Circulation &rsaquo; Koha</title>
11	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
Lines 17-24 Link Here
17	</head>	20	</head>
18		21
19	<body id="circ_reserveratios" class="circ">	22	<body id="circ_reserveratios" class="circ">
20	[% INCLUDE 'header.inc' %]	23	[% INCLUDE 'header.inc'form=formulaire %]
21	[% INCLUDE 'circ-search.inc' %]
22		24
23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
24	<ol>	26	<ol>
Lines 34-39 Link Here
34	</a>	36	</a>
35	</li>	37	</li>
36	</ol>	38	</ol>
		39	<ol>
		40	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		41	</ol>
		42	<ol>
		43	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		44	</ol>
37	</nav>	45	</nav>
38		46
39	<div class="main container-fluid">	47	<div class="main container-fluid">
Lines 119-187 Link Here
119	[% ELSE %]	127	[% ELSE %]
120	<span>0 to order</span>	128	<span>0 to order</span>
121	[% END %]	129	[% END %]
122	</p>	130	</tbody>
123	</td>	131	</table>
124	</tr>	132	[% ELSE %]
125	[% END %]	133	<strong>No items found.</strong>
126	</tbody>	134	[% END %]
127	</table>
128	[% ELSE %]
129	<strong>No items found.</strong>
130	[% END %]
131		135
132	</main>	136	</main>
133	</div> <!-- /.col-sm-10.col-sm-push-2 -->	137	</div> <!-- /.col-sm-10.col-sm-push-2 -->
134		138
135	<div class="col-sm-2 col-sm-pull-10">	139	<div class="col-sm-2 col-sm-pull-10">
136	<aside>	140	<aside>
137		141	<div id="filters">
138	<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >	142	<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
139	<fieldset class="brief">	143	<fieldset class="brief">
140	<h4>Refine results:</h4>	144	<h4>Refine results</h4>
141	<ol>	145
142	<li>	146	<fieldset>
143	<label for="ratio">Hold ratio (greater than or equal to):</label>	147	<ol>
144	<input type="text" size="5" id="ratio" name="ratio" value="[% ratio \| html %]" />	148	<li>
145	</li>	149	<p>Hold ratio (greater than or equal to):
146		150	<input type="text" size="5" id="ratio" name="ratio" value="[% ratio \| html %]" /></p>
147	<li class="checkbox">	151	</li>
148	[% IF include_ordered %]	152
149	<input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>	153	<li class="checkbox">
150	[% ELSE %]	154	<p>
151	<input id="include_ordered" name="include_ordered" type="checkbox"/>	155	[% IF include_ordered %]
152	[% END %]	156	<input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
153	<label for="include_ordered">Include ordered</label>	157	[% ELSE %]
154	</li>	158	<input id="include_ordered" name="include_ordered" type="checkbox"/>
155		159	[% END %]
156	<li class="checkbox">	160	Include ordered</p>
157	[% IF include_suspended %]	161	</li>
158	<input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>	162
159	[% ELSE %]	163	<li class="checkbox">
160	<input id="include_suspended" name="include_suspended" type="checkbox"/>	164	<p>
161	[% END %]	165	[% IF include_suspended %]
162	<label for="include_suspended">Include suspended</label>	166	<input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
163	</li>	167	[% ELSE %]
164		168	<input id="include_suspended" name="include_suspended" type="checkbox"/>
165	<li>	169	[% END %]
166	<label for="from">Start date:</label>	170	Include suspended</p>
167	<input type="text" size="10" id="from" name="from" value="[% from \| $KohaDates %]" class="flatpickr" data-date_to="to" />	171	</li>
168	</li>	172
169		173	<li>
170	<li>	174	<p>Start date:
171	<label for="to">End date:</label>	175	<input type="text" size="10" id="from" name="from" value="[% from \| $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
172	<input size="10" id="to" name="to" value="[% to \| $KohaDates %]" type="text" class="flatpickr" />	176	</li>
173	</li>	177
174	</ol>	178	<li>
175	(inclusive)	179	<p>End date:
176		180	<input size="10" id="to" name="to" value="[% to \| $KohaDates %]" type="text" class="flatpickr" /></p>
177	<fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset>	181	</li>
178	</fieldset>	182	</ol>
179	[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]	183	<p>(inclusive)</p>
180	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />	184	<button type="submit" class="submit" id="principal">Go</button>
181	<input type="hidden" name="basketno" value="[% basketno \| html %]" />	185	</fieldset>
182	[% END %]	186	</fieldset>
183	</form>	187
184		188	[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
		189	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />
		190	<input type="hidden" name="basketno" value="[% basketno \| html %]" />
		191	[% END %]
		192	</form>
		193	</div>
185	</aside>	194	</aside>
186	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	195	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
187	</div> <!-- /.row -->	196	</div> <!-- /.row -->

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-58 / +66 lines)
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
7	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
8	[% USE TablesSettings %]	8	[% USE TablesSettings %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'checkin-search.inc' %]
		11	[% END %]
9	[% PROCESS 'member-display-address-style.inc' %]	12	[% PROCESS 'member-display-address-style.inc' %]
10	[% SET footerjs = 1 %]	13	[% SET footerjs = 1 %]
11	[% BLOCK display_bormessagepref %]	14	[% BLOCK display_bormessagepref %]
Lines 35-42 Link Here
35	<body id="circ_returns" class="circ">	38	<body id="circ_returns" class="circ">
36	<span class="audio-alert-success"></span>	39	<span class="audio-alert-success"></span>
37		40
38	[% INCLUDE 'header.inc' %]	41	[% INCLUDE 'header.inc' form=formulaire %]
39	[% INCLUDE 'checkin-search.inc' %]
40		42
41	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	43	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
42	<ol>	44	<ol>
Lines 52-57 Link Here
52	</a>	54	</a>
53	</li>	55	</li>
54	</ol>	56	</ol>
		57	<ol>
		58	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		59	</ol>
		60	<ol>
		61	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		62	</ol>
55	</nav>	63	</nav>
56		64
57	<div class="main container-fluid">	65	<div class="main container-fluid">
Lines 67-124 Link Here
67	[% END %]	75	[% END %]
68		76
69	[% BLOCK all_checkin_messages %]	77	[% BLOCK all_checkin_messages %]
70	[% IF hold_auto_filled %]
71	<div class="dialog message hold-auto-filled">
72	[% IF ( reservenotes ) %]
73	<h4>Notes: [% reservenotes \| html %]</h4>
74	[% END %]
75	<h3>Hold filled for:</h3>
76	<ul>
77	<li>
78	[% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 %]
79	<span class="patron-category"> - [% patron.category.description \| html %]</span>
80	</li>
81		78
82	[% INCLUDE display_holdpatron_address %]
83		79
84	[% IF ( patron.phone ) %]	80	<div class="dialog message hold-auto-filled">
85	<li>[% patron.phone \| html %]</li>	81	[% IF hold_auto_filled %]
86	[% END %]	82	[% IF ( reservenotes ) %]
		83	<h4>Notes: [% reservenotes \| html %]</h4>
		84	[% END %]
		85	<h3>Hold filled for:</h3>
		86	<ul>
		87	<li>
		88	[% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 %]
		89	<span class="patron-category"> - [% patron.category.description \| html %]</span>
		90	</li>
87		91
88	[% IF ( patron.email ) %]	92	[% INCLUDE display_holdpatron_address %]
89	<li>
90	[% IF ( transfertodo ) %]
91	[% patron.email \| html %]
92	[% ELSE %]
93	<a id="boremail" href="mailto:[% patron.email \| html %]">[% patron.email \| html %]</a>
94	[% END %]
95	</li>
96	[% END %]
97		93
98	[% UNLESS ( transfertodo) %]	94	[% IF ( patron.phone ) %]
99	[% INCLUDE display_bormessagepref %]	95	<li>[% patron.phone \| html %]</li>
100	[% END %]	96	[% END %]
101		97
102	[% IF ( patron.is_debarred ) %]	98	[% IF ( patron.email ) %]
103	<li class="error">Patron is RESTRICTED</li>	99	<li>
104	[% END %]	100	[% IF ( transfertodo ) %]
		101	[% patron.email \| html %]
		102	[% ELSE %]
		103	<a id="boremail" href="mailto:[% patron.email \| html %]">[% patron.email \| html %]</a>
		104	[% END %]
		105	</li>
		106	[% END %]
105		107
106	[% IF ( patron.gonenoaddress ) %]	108	[% UNLESS ( transfertodo) %]
107	<li class="error">Patron's address is in doubt</li>	109	[% INCLUDE display_bormessagepref %]
108	[% END %]	110	[% END %]
109	</ul>	111
		112	[% IF ( patron.is_debarred ) %]
		113	<li class="error">Patron is RESTRICTED</li>
		114	[% END %]
110		115
111	[% IF ( transfertodo ) %]	116	[% IF ( patron.gonenoaddress ) %]
112	<h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) \| html %]</h4>	117	<li class="error">Patron's address is in doubt</li>
113	[% ELSE %]
114	<h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) \| html %]</h4>
115	[% END %]	118	[% END %]
		119	</ul>
		120
		121	[% IF ( transfertodo ) %]
		122	<h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) \| html %]</h4>
		123	[% ELSE %]
		124	<h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) \| html %]</h4>
		125	[% END %]
116		126
117	<a href="#" class="btn btn-default print print-slip">	127	<a href="#" class="btn btn-default print print-slip">
118	<i class="fa fa-print"></i> Print	128	<i class="fa fa-print"></i> Print
119	</a>	129	</a>
120	</div> <!-- /.hold-auto-filled -->
121	[% END # /IF hold_auto_filled %]	130	[% END # /IF hold_auto_filled %]
		131	</div> <!-- /.hold-auto-filled -->
122		132
123	[% IF ( trigger ) %]	133	[% IF ( trigger ) %]
124	<div id="transfer-trigger" class="dialog message">	134	<div id="transfer-trigger" class="dialog message">
Lines 937-966 Link Here
937	</div>	947	</div>
938		948
939	<form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >	949	<form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
940	<fieldset id="circ_returns_checkin">	950	<fieldset class="brief">
941	<div class="show_checkin_dialog" style="float:right;display:none"><button type="button" class="btn btn-default btn-sm" data-toggle="tooltip" title="Show the last checkin message"><i class="fa fa-info"></i></button></div>	951	<div class="show_checkin_dialog" style="float:right;display:none"><button type="button" class="btn btn-default btn-sm" data-toggle="tooltip" title="Show the last checkin message"><i class="fa fa-info"></i></button></div>
942	<h1>Check in</h1>	952	<h3>Check in</h3>
		953	<ol>
943	<div class="row">	954	<div class="row">
944	<div class="col-sm-6">	955	<div class="col-sm-6">
945	<div class="hint">Enter item barcode:</div>
946	<div class="form-control-group">	956	<div class="form-control-group">
947	[% IF ( exemptfine ) %]	957	[% IF ( exemptfine ) %]
948	<input name="barcode" id="barcode" size="14" class="focus input-warning" type="text" />	958	<input name="barcode" size="14" class="barcode class="focus input-warning" type="text" placeholder="Enter item barcode" />
949	[% ELSIF ( dropboxmode ) %]	959	[% ELSIF ( dropboxmode ) %]
950	<input name="barcode" id="barcode" size="14" class="barcode focus input-warning" />	960	<input name="barcode" size="14" class="barcode focus input-warning" placeholder="Enter item barcode" />
951	[% ELSE %]	961	[% ELSE %]
952	<input name="barcode" id="barcode" size="14" class="barcode focus" />	962	<input name="barcode" size="14" class="barcode focus" placeholder="Enter item barcode" />
953	[% END %]	963	[% END %]
954	<button type="submit" class="btn btn-default">Check in</button>	964	<div id="show-circ-settings">
		965	<a href="#"><i class="fa-sign-out"></i></a>
		966	</div>
		967	<button class="submit" id="principal" type="submit" >Check in</button>
955	[% FOREACH inputloo IN inputloop %]	968	[% FOREACH inputloo IN inputloop %]
956	<input type="hidden" name="ri-[% inputloo.counter \| html %]" value="[% inputloo.barcode \| html %]" />	969	<input type="hidden" name="ri-[% inputloo.counter \| html %]" value="[% inputloo.barcode \| html %]" />
957	<input type="hidden" name="dd-[% inputloo.counter \| html %]" value="[% inputloo.duedate \| html %]" />	970	<input type="hidden" name="dd-[% inputloo.counter \| html %]" value="[% inputloo.duedate \| html %]" />
958	<input type="hidden" name="bn-[% inputloo.counter \| html %]" value="[% inputloo.borrowernumber \| html %]" />	971	<input type="hidden" name="bn-[% inputloo.counter \| html %]" value="[% inputloo.borrowernumber \| html %]" />
959	[% END %]	972	[% END %]
960	</div>	973	</div>
961	<div id="show-circ-settings">
962	<a href="#"><i class="fa circ-settings-icon fa-caret-down"></i> Checkin settings</a>
963	</div>
964	</div>	974	</div>
965	<div class="col-sm-6">	975	<div class="col-sm-6">
966	[% IF ( exemptfine ) %]	976	[% IF ( exemptfine ) %]
Lines 999-1007 Link Here
999	<div class="circ-settings">	1009	<div class="circ-settings">
1000	[% IF Koha.Preference('SpecifyReturnDate') %]	1010	[% IF Koha.Preference('SpecifyReturnDate') %]
1001	<div class="date-select" id="return_date_override_fields">	1011	<div class="date-select" id="return_date_override_fields">
1002	<div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
1003		1012
1004	<input type="text" size="20" id="return_date_override" name="return_date_override" value="[% return_date_override \| html %]" class="flatpickr" data-flatpickr-pastinclusive="true" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" />	1013	<input type="text" size="30" id="return_date_override" name="return_date_override" value="[% return_date_override \| html %]" class="flatpickr" data-flatpickr-pastinclusive="true" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" placeholder="Specify return date [% INCLUDE 'date-format.inc' %]" />
1005		1014
1006	<div class="circ-setting">	1015	<div class="circ-setting">
1007	[% IF ( return_date_override_remember ) %]	1016	[% IF ( return_date_override_remember ) %]
Lines 1046-1051 Link Here
1046	[% END %] <!-- overduecharges -->	1055	[% END %] <!-- overduecharges -->
1047		1056
1048	</div> <!-- /.circ-settings -->	1057	</div> <!-- /.circ-settings -->
		1058	</ol>
1049	</fieldset> <!-- /#circ_returns_checkin -->	1059	</fieldset> <!-- /#circ_returns_checkin -->
1050	</form> <!-- /#checkin-form -->	1060	</form> <!-- /#checkin-form -->
1051		1061
Lines 1158-1164 Link Here
1158	[% END # /FOREACH riloo %]	1168	[% END # /FOREACH riloo %]
1159	</table> <!-- /#checkedintable -->	1169	</table> <!-- /#checkedintable -->
1160	[% END # /IF riloop %]	1170	[% END # /IF riloop %]
1161
1162	[% IF Koha.Preference('CircSidebar') %]	1171	[% IF Koha.Preference('CircSidebar') %]
1163	</div> <!-- /.col-sm-10.col-sm-push-2 -->	1172	</div> <!-- /.col-sm-10.col-sm-push-2 -->
1164	<div class="col-sm-2 col-sm-pull-10">	1173	<div class="col-sm-2 col-sm-pull-10">
Lines 1171-1177 Link Here
1171	</div> <!-- /.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2 -->	1180	</div> <!-- /.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2 -->
1172	</div> <!-- /.row -->	1181	</div> <!-- /.row -->
1173	[% END %]	1182	[% END %]
1174
1175	</main>	1183	</main>
1176	</div> <!-- /.col-sm-12 -->	1184	</div> <!-- /.col-sm-12 -->
1177	</div> <!-- /.row -->	1185	</div> <!-- /.row -->

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt (-14 / +33 lines)
5	[% USE Registers %]	5	[% USE Registers %]
6	[% USE Koha %]	6	[% USE Koha %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'circ-search.inc' %]
		10	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
9	[% IF Koha.Preference('UseCirculationDesks') %]	12	[% IF Koha.Preference('UseCirculationDesks') %]
10	<title>Set library and desk &rsaquo; Circulation &rsaquo; Koha</title>	13	<title>Set library and desk &rsaquo; Circulation &rsaquo; Koha</title>
Lines 17-24 Link Here
17	</style>	20	</style>
18	</head>	21	</head>
19	<body id="circ_set-library" class="circ">	22	<body id="circ_set-library" class="circ">
20	[% INCLUDE 'header.inc' %]	23	[% INCLUDE 'header.inc' form=formulaire %]
21	[% INCLUDE 'circ-search.inc' %]
22		24
23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	25	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
24	<ol>	26	<ol>
Lines 32-37 Link Here
32	<a href="#" aria-current="page">Set library</a>	34	<a href="#" aria-current="page">Set library</a>
33	</li>	35	</li>
34	</ol>	36	</ol>
		37
		38	<ol>
		39	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		40	</ol>
		41	<ol>
		42	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		43	</ol>
35	</nav>	44	</nav>
36		45
37	<div class="main container-fluid">	46	<div class="main container-fluid">
Lines 82-94 Updated:<ul> Link Here
82		91
83	<form method="post" action="set-library.pl">	92	<form method="post" action="set-library.pl">
84	[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]	93	[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
85	<fieldset class="rows">	94	<fieldset class="brief">
86	<legend>Set library</legend>	95	<h3>Set library</h3>
87	<ol>	96	<ol>
88	<li><label for="branch">Choose library:</label>	97	<li><p>Choose library:
89	<select name="branch" id="branch">	98	<select name="branch" id="branch">
90	[% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]	99	[% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
91	</select></li>	100	</select></p></li>
		101
		102	<li>
		103	<button class="submit" id="principal" type="submit" >Submit</button>
		104	<a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
		105	</li>
92	</ol>	106	</ol>
93	</fieldset>	107	</fieldset>
94	[% ELSE %]	108	[% ELSE %]
Lines 98-117 Updated:<ul> Link Here
98	[% END %]	112	[% END %]
99		113
100	[% IF Koha.Preference('UseCirculationDesks') && Desks.all %]	114	[% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
101	<fieldset class="rows">	115	<fieldset class="brief">
102	<legend>Set desk</legend>	116	<h3>Set desk</h3>
103	<ol>	117	<ol>
104	<li><label for="desk">Choose desk:</label>	118	<li><label for="desk">Choose desk:</label>
105	<select name="desk_id" id="desk_id">	119	<select name="desk_id" id="desk_id">
106	[% PROCESS options_for_desks desks => Desks.all(), selected => desk_id %]	120	[% PROCESS options_for_desks desks => Desks.all(), selected => desk_id %]
107	</select></li>	121	</select></li>
		122
		123	<li>
		124	<button class="submit" id="principal" type="submit" >Submit</button>
		125	<a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
		126	</li>
108	</ol>	127	</ol>
109	</fieldset>	128	</fieldset>
110	[% END %]	129	[% END %]
111		130
112	[% IF Koha.Preference('UseCashRegisters') %]	131	[% IF Koha.Preference('UseCashRegisters') %]
113	<fieldset class="rows">	132	<fieldset class="brief">
114	<legend>Set cash register</legend>	133	<h3>Set cash register</h3>
115	<ol>	134	<ol>
116	<li>	135	<li>
117	<label for="register_id">Choose cash register:</label>	136	<label for="register_id">Choose cash register:</label>
Lines 120-133 Updated:<ul> Link Here
120	[% PROCESS options_for_registers registers => Registers.all() %]	139	[% PROCESS options_for_registers registers => Registers.all() %]
121	</select>	140	</select>
122	</li>	141	</li>
		142	<li>
		143	<button class="submit" id="principal" type="submit" >Submit</button>
		144	<a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
		145	</li>
123	</ol>	146	</ol>
124	</fieldset>	147	</fieldset>
125	[% END %]	148	[% END %]
126		149
127	<fieldset class="action">
128	<input type="submit" value="Submit" />
129	<a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
130	</fieldset>
131	<div class="noshow">	150	<div class="noshow">
132	[% FOREACH recycle_loo IN recycle_loop %]	151	[% FOREACH recycle_loo IN recycle_loop %]
133	<input type="text" name="[% recycle_loo.param \| html %]" value="[% recycle_loo.value \| html %]" />	152	<input type="text" name="[% recycle_loo.param \| html %]" value="[% recycle_loo.value \| html %]" />

Lines 5-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt (-2 / +10 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
		8	[% formulaire = BLOCK %]
		9	[% INCLUDE 'circ-search.inc' %]
		10	[% END %]
8	[% PROCESS 'transfer_reasons.inc' %]	11	[% PROCESS 'transfer_reasons.inc' %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Transfers to send &rsaquo; Circulation &rsaquo; Koha</title>	13	<title>Transfers to send &rsaquo; Circulation &rsaquo; Koha</title>
Lines 12-19 Link Here
12	</head>	15	</head>
13		16
14	<body id="circ_transferstosend" class="circ">	17	<body id="circ_transferstosend" class="circ">
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' form=formulaire %]
16	[% INCLUDE 'circ-search.inc' %]
17		19
18	<nav id="breadcrumbs" aria-labal="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-labal="Breadcrumb" class="breadcrumb">
19	<ol>	21	<ol>
Lines 27-32 Link Here
27	<a href="#" aria-current="page">Transfers to send</a>	29	<a href="#" aria-current="page">Transfers to send</a>
28	</li>	30	</li>
29	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
30	</nav>	38	</nav>
31		39
32	<div class="main container-fluid">	40	<div class="main container-fluid">

Lines 4-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-3 / +11 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
		7	[% formulaire = BLOCK %]
		8	[% INCLUDE 'circ-search.inc' %]
		9	[% END %]
7	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Transfers to receive &rsaquo; Circulation &rsaquo; Koha</title>	11	<title>Transfers to receive &rsaquo; Circulation &rsaquo; Koha</title>
9	[% INCLUDE 'doc-head-close.inc' %]	12	[% INCLUDE 'doc-head-close.inc' %]
10	</head>	13	</head>
11		14
12	<body id="circ_transferstoreceive" class="circ">	15	<body id="circ_transferstoreceive" class="circ">
13	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' form=formulaire %]
14	[% INCLUDE 'circ-search.inc' %]
15		17
16	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
17	<ol>	19	<ol>
Lines 27-32 Link Here
27	</a>	29	</a>
28	</li>	30	</li>
29	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
30	</nav>	38	</nav>
31		39
32	<div class="main container-fluid">	40	<div class="main container-fluid">
Lines 41-47 Link Here
41	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	49	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
42	[% END %]	50	[% END %]
43		51
44	<h1>Transfers made to your library as of [% show_date \| $KohaDates %]</h1>	52	<h2>Transfers made to your library as of [% show_date \| $KohaDates %]</h2>
45	[% IF ( branchesloop ) %]	53	[% IF ( branchesloop ) %]
46	<p>Your library is the destination for the following transfer(s)</p>	54	<p>Your library is the destination for the following transfer(s)</p>
47	[% IF ( latetransfers ) %]<p>Transfers are <span class="error">considered late</span> after [% TransfersMaxDaysWarning \| html %] days.</p>[% END %]	55	[% IF ( latetransfers ) %]<p>Transfers are <span class="error">considered late</span> after [% TransfersMaxDaysWarning \| html %] days.</p>[% END %]

Lines 8-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-17 / +24 lines)
8	[% USE TablesSettings %]	8	[% USE TablesSettings %]
9	[% USE Koha %]	9	[% USE Koha %]
10	[% SET footerjs = 1 %]	10	[% SET footerjs = 1 %]
		11	[% formulaire = BLOCK %]
		12	[% INCLUDE 'circ-search.inc' %]
		13	[% END %]
11	[% INCLUDE 'doc-head-open.inc' %]	14	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Holds queue &rsaquo; Circulation &rsaquo; Koha</title>	15	<title>Holds queue &rsaquo; Circulation &rsaquo; Koha</title>
13	[% INCLUDE 'doc-head-close.inc' %]	16	[% INCLUDE 'doc-head-close.inc' %]
Lines 15-22 Link Here
15	</head>	18	</head>
16		19
17	<body id="circ_view_holdsqueue" class="circ">	20	<body id="circ_view_holdsqueue" class="circ">
18	[% INCLUDE 'header.inc' %]	21	[% INCLUDE 'header.inc' form=formulaire %]
19	[% INCLUDE 'cat-search.inc' %]
20		22
21	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	23	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
22	<ol>	24	<ol>
Lines 45-50 Link Here
45	</li>	47	</li>
46	[% END %]	48	[% END %]
47	</ol>	49	</ol>
		50	<ol>
		51	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		52	</ol>
		53	<ol>
		54	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		55	</ol>
48	</nav>	56	</nav>
49		57
50	<div class="main container-fluid">	58	<div class="main container-fluid">
Lines 59-65 Link Here
59	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	67	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
60	[% END %]	68	[% END %]
61		69
62	<h1>Holds queue</h1>	70	<fieldset class="brief">
		71	<h3>Holds queue</h3>
63		72
64	[% IF ( run_report ) %]	73	[% IF ( run_report ) %]
65	[% IF ( total ) %]	74	[% IF ( total ) %]
Lines 236-280 Link Here
236	[% BLOCK filter_form %]	245	[% BLOCK filter_form %]
237	<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl">	246	<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl">
238	[% IF ( total ) %]	247	[% IF ( total ) %]
239	<fieldset class="brief">	248	<fieldset>
240	[% ELSE -%]	249	[% ELSE -%]
241	<fieldset class="rows">	250	<fieldset>
242	[% END %]	251	[% END %]
243	<ol>	252	<ol>
244	<li>	253	<li>
245	<label for="branchlimit">Library: </label>	254	<p>Library:
246	<select name="branchlimit" id="branchlimit">	255	<select name="branchlimit" id="branchlimit">
247	<option value="">All</option>	256	<option value="">All</option>
248	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchlimit, only_from_group => 1 ) %]	257	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchlimit, only_from_group => 1 ) %]
249	</select>	258	</select></p>
250	</li>	259	</li>
251	<li>	260	<li>
252	<label for="itemtypeslimit">Item type: </label>	261	<p>Item type:
253	<select name="itemtypeslimit" id="itemtypeslimit">	262	<select name="itemtypeslimit" id="itemtypeslimit">
254	<option value="">All</option>	263	<option value="">All</option>
255	[% PROCESS options_for_item_types itemtypes => ItemTypes.Get(), selected_itemtype => itemtypeslimit %]	264	[% PROCESS options_for_item_types itemtypes => ItemTypes.Get(), selected_itemtype => itemtypeslimit %]
256	</select>	265	</select></p>
257	</li>	266	</li>
258	<li>	267	<li>
259	<label for="ccodeslimit">Collection: </label>	268	<p>Collection:
260	<select name="ccodeslimit" id="ccodeslimit">	269	<select name="ccodeslimit" id="ccodeslimit">
261	<option value="">All</option>	270	<option value="">All</option>
262	[% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'CCODE' ), selected_av => ccodeslimit %]	271	[% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'CCODE' ), selected_av => ccodeslimit %]
263	</select>	272	</select></p>
264	</li>	273	</li>
265	<li>	274	<li>
266	<label for="locationsslimit">Shelving location: </label>	275	<p>Shelving location:
267	<select name="locationslimit" id="locationslimit">	276	<select name="locationslimit" id="locationslimit">
268	<option value="">All</option>	277	<option value="">All</option>
269	[% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ), selected_av => locationslimit %]	278	[% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ), selected_av => locationslimit %]
270	</select>	279	</select></p>
271	</li>	280	</li>
		281	<button type="submit" class="submit" id="principal">Submit</button>
		282	<input type="hidden" name="run_report" value="1" />
272	</ol>	283	</ol>
273	</fieldset>	284	</fieldset>
274	<fieldset class="action">
275	<input type="submit" value="Submit" />
276	<input type="hidden" name="run_report" value="1" />
277	</fieldset>
278	</form>	285	</form>
279	[% END %]	286	[% END %]
280		287

Lines 6-19 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-4 / +13 lines)
6	[% USE TablesSettings %]	6	[% USE TablesSettings %]
7	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
		9	[% formulaire = BLOCK %]
		10	[% INCLUDE 'circ-search.inc' %]
		11	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Holds awaiting pickup &rsaquo; Circulation &rsaquo; Koha</title>	13	<title>Holds awaiting pickup &rsaquo; Circulation &rsaquo; Koha</title>
11	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
12	</head>	15	</head>
13		16
14	<body id="circ_waitingreserves" class="circ">	17	<body id="circ_waitingreserves" class="circ">
15	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc'form=formulaire %]
16	[% INCLUDE 'circ-search.inc' %]
17		19
18	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
19	<ol>	21	<ol>
Lines 27-32 Link Here
27	<a href="#" aria-current="page">Holds awaiting pickup</a>	29	<a href="#" aria-current="page">Holds awaiting pickup</a>
28	</li>	30	</li>
29	</ol>	31	</ol>
		32	<ol>
		33	[% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
		34	</ol>
		35	<ol>
		36	<a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
		37	</ol>
30	</nav>	38	</nav>
31		39
32	<div class="main container-fluid">	40	<div class="main container-fluid">
Lines 44-50 Link Here
44	<h1>Holds awaiting pickup for your library on: [% show_date \| $KohaDates %]</h1>	52	<h1>Holds awaiting pickup for your library on: [% show_date \| $KohaDates %]</h1>
45	<h2>	53	<h2>
46	[% IF ( all_branches_link ) %]	54	[% IF ( all_branches_link ) %]
47	<span><a href="[% all_branches_link \| url %]">	55	<span><a href="[% all_branches_link \| url %]" id="lientype" >
48	View all libraries</a></span>	56	View all libraries</a></span>
49	[% END %]	57	[% END %]
50	</h2>	58	</h2>
Lines 81-86 Link Here
81	</div>	89	</div>
82	[% END %]	90	[% END %]
83	<div id="resultlist" class="toptabs">	91	<div id="resultlist" class="toptabs">
		92	<fieldset id="searchresults">
84	<ul class="nav nav-tabs" role="tablist">	93	<ul class="nav nav-tabs" role="tablist">
85	<li role="presentation" class="active"><a href="#holdswaiting" aria-controls="holdswaiting" role="tab" data-toggle="tab">Holds waiting: [% reservecount \| html %]</a></li>	94	<li role="presentation" class="active"><a href="#holdswaiting" aria-controls="holdswaiting" role="tab" data-toggle="tab">Holds waiting: [% reservecount \| html %]</a></li>
86	<li role="presentation">	95	<li role="presentation">
Lines 125-130 Link Here
125	<div class="dialog message">No holds found.</div>	134	<div class="dialog message">No holds found.</div>
126	[% END %]	135	[% END %]
127	</div>	136	</div>
		137	</fieldset>
128	</div>	138	</div>
129	[% END %]	139	[% END %]
130		140
131	-

Return to bug 30952