Attachment #127303 for bug #27631

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

Lines 40-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt (-1 / +1 lines)
40	<div class="col-sm-10 col-sm-push-2">	40	<div class="col-sm-10 col-sm-push-2">
41	<main>	41	<main>
42		42
		43	<h1>Acquisitions statistics </h1>
43	[% IF ( do_it ) %]	44	[% IF ( do_it ) %]
44	[% FOREACH mainloo IN mainloop %]	45	[% FOREACH mainloo IN mainloop %]
45	<h1>Acquisitions statistics </h1>
46	[% IF ( mainloo.loopfilter.size ) %]	46	[% IF ( mainloo.loopfilter.size ) %]
47	<p><strong>Filtered on:</strong></p>	47	<p><strong>Filtered on:</strong></p>
48	[% FOREACH loopfilte IN mainloo.loopfilter %]	48	[% FOREACH loopfilte IN mainloo.loopfilter %]

Lines 48-56 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt (-1 / +1 lines)
48	<div class="col-sm-10 col-sm-push-2">	48	<div class="col-sm-10 col-sm-push-2">
49	<main>	49	<main>
50		50
		51	<h1>Patrons statistics</h1>
51	[% IF ( do_it ) %]	52	[% IF ( do_it ) %]
52	[% FOREACH mainloo IN mainloop %]	53	[% FOREACH mainloo IN mainloop %]
53	<h1>Patrons statistics</h1>
54	[% IF ( mainloo.loopfilter.size>0 ) %]	54	[% IF ( mainloo.loopfilter.size>0 ) %]
55	<p>Filtered on:</p>	55	<p>Filtered on:</p>
56	[% FOREACH loopfilte IN mainloo.loopfilter %]	56	[% FOREACH loopfilte IN mainloo.loopfilter %]

Lines 41-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt (-1 / +1 lines)
41	<div class="col-sm-10 col-sm-push-2">	41	<div class="col-sm-10 col-sm-push-2">
42	<main>	42	<main>
43		43
		44	<h1>Catalog statistics</h1>
44	[% IF ( do_it ) %]	45	[% IF ( do_it ) %]
45	[% FOREACH mainloo IN mainloop %]	46	[% FOREACH mainloo IN mainloop %]
46	<h1>Catalog statistics</h1>
47	[% IF ( mainloo.loopfilter ) %]	47	[% IF ( mainloo.loopfilter ) %]
48	<p>Filtered on:</p>	48	<p>Filtered on:</p>
49	[% FOREACH loopfilte IN mainloo.loopfilter %]	49	[% FOREACH loopfilte IN mainloo.loopfilter %]

Lines 3-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt (+1 lines)
3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4	</head>	4	</head>
5	<body id="rep_report_convert" class="rep">	5	<body id="rep_report_convert" class="rep">
		6	<h1>Convert report</h1>
6	<div>	7	<div>
7	[% IF msg == 'no_report' %]	8	[% IF msg == 'no_report' %]
8	There is no valid report for this id.	9	There is no valid report for this id.




                [% INCLUDE "reports-toolbar.inc" %]

                [% IF ( start ) %]
                    <h1>Guided reports</h1>
                    <p>Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.</p>

                    <h3>Build and run reports</h3>

                [% END %]

                [% IF ( saved1 ) %]
                    [% IF ( savedreports ) %]
                        <h1>Saved reports</h1>
                    [% IF ( savedreports ) %]

                        [% IF ( filters.date || filters.author || filters.keyword ) %]
                            <p>Filtered by:

                [% END #/IF ( execute ) %]

                [% IF ( create ) %]
                    <h1>Create from SQL</h1>
                    <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">
                        <fieldset class="rows">
                            <legend>Create report from SQL</legend>

                [% END # /IF saved_results %]

                [% IF ( showsql ) %]
                <h1>Saved reports - SQL</h1>
                    <fieldset class="rows">
                        <legend>[% reportname | html %]</legend>
                        <ol>

Lines 41-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt (-1 / +1 lines)
41	<div class="col-sm-10 col-sm-push-2">	41	<div class="col-sm-10 col-sm-push-2">
42	<main>	42	<main>
43		43
		44	<h1>Average checkout period</h1>
44	[% IF ( do_it ) %]	45	[% IF ( do_it ) %]
45	[% FOREACH mainloo IN mainloop %]	46	[% FOREACH mainloo IN mainloop %]
46	<h1>Average checkout period</h1>
47	[% IF ( mainloo.loopfilter ) %]	47	[% IF ( mainloo.loopfilter ) %]
48	<p>Filtered on:</p>	48	<p>Filtered on:</p>
49	[% FOREACH loopfilte IN mainloo.loopfilter %]	49	[% FOREACH loopfilte IN mainloo.loopfilter %]

Lines 44-52 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt (-1 / +1 lines)
44	<div class="col-sm-10 col-sm-push-2">	44	<div class="col-sm-10 col-sm-push-2">
45	<main>	45	<main>
46		46
		47	<h1>Circulation statistics</h1>
47	[% IF ( do_it ) %]	48	[% IF ( do_it ) %]
48	[% FOREACH mainloo IN mainloop %]	49	[% FOREACH mainloo IN mainloop %]
49	<h1>Circulation statistics</h1>
50	[% IF ( mainloo.loopfilter ) %]	50	[% IF ( mainloo.loopfilter ) %]
51	<p>Filtered on:</p>	51	<p>Filtered on:</p>
52	<ul>	52	<ul>

Lines 74-80 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt (-1 / +1 lines)
74	</table>	74	</table>
75	[% END %]	75	[% END %]
76	[% ELSE %]	76	[% ELSE %]
77	<h3>View a count of items held at your library grouped by item type</h3>	77	<h1>View a count of items held at your library grouped by item type</h1>
78	<form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">	78	<form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">
79	<fieldset class="rows">	79	<fieldset class="rows">
80	<ol>	80	<ol>

Lines 24-30 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt (-1 / +1 lines)
24	<div class="main container-fluid">	24	<div class="main container-fluid">
25	<div class="row">	25	<div class="row">
26	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	26	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
27		27	<h1>Reports</h1>
28	<div class="row">	28	<div class="row">
29	<div class="col-xs-6">	29	<div class="col-xs-6">
30		30

Lines 45-53 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt (-1 / +1 lines)
45	<main>	45	<main>
46		46
47		47
		48	<h1>Holds statistics</h1>
48	[% IF ( do_it ) %]	49	[% IF ( do_it ) %]
49	[% IF ( mainloop ) %]	50	[% IF ( mainloop ) %]
50	<h1>Holds statistics</h1>
51	[% IF ( loopfilter ) %]	51	[% IF ( loopfilter ) %]
52	<p>Filtered on:</p>	52	<p>Filtered on:</p>
53	<ul>	53	<ul>

Lines 32-38 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt (-1 / +1 lines)
32	<div class="col-sm-10 col-sm-push-2">	32	<div class="col-sm-10 col-sm-push-2">
33	<main>	33	<main>
34		34
35	<h2>Preview routing list for <em>[% title \| html %]</em></h2>	35	<h1>Preview routing list for <em>[% title \| html %]</em></h1>
36		36
37	<form method="post" action="routing-preview.pl">	37	<form method="post" action="routing-preview.pl">
38	<input type="hidden" id="subscriptionid" name="subscriptionid" value="[% subscriptionid \| html %]" />	38	<input type="hidden" id="subscriptionid" name="subscriptionid" value="[% subscriptionid \| html %]" />

Lines 45-51 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt (-1 / +1 lines)
45	<div class="row">	45	<div class="row">
46	<div class="col-sm-10 col-sm-push-2">	46	<div class="col-sm-10 col-sm-push-2">
47	<main>	47	<main>
48	[% INCLUDE 'blocking_errors.inc' %]
49		48
50	[% IF ( op ) %]	49	[% IF ( op ) %]
51	<h1>Create routing list for <em>[% title \| html %]</em></h1>	50	<h1>Create routing list for <em>[% title \| html %]</em></h1>
Lines 53-58 Link Here
53	<h1>Edit routing list for <em>[% title \| html %]</em></h1>	52	<h1>Edit routing list for <em>[% title \| html %]</em></h1>
54	[% END %]	53	[% END %]
55		54
		55	[% INCLUDE 'blocking_errors.inc' %]
56	<form method="post" action="routing.pl">	56	<form method="post" action="routing.pl">
57	<input type="hidden" name="op" value="save" />	57	<input type="hidden" name="op" value="save" />
58	<input type="hidden" name="subscriptionid" value="[% subscriptionid \| html %]" />	58	<input type="hidden" name="subscriptionid" value="[% subscriptionid \| html %]" />

Lines 102-112 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-2 / +3 lines)
102	<div class="col-sm-10 col-sm-push-2">	102	<div class="col-sm-10 col-sm-push-2">
103	<main>	103	<main>
104		104
105	[% INCLUDE 'modals/serials_multi_receiving.inc' %]
106
107	<h1>Serial edition <em>[% bibliotitle \| html %]</em>	105	<h1>Serial edition <em>[% bibliotitle \| html %]</em>
108	[% IF location %] ([% AuthorisedValues.GetByCode('LOC', location) \| html %])[% END %]	106	[% IF location %] ([% AuthorisedValues.GetByCode('LOC', location) \| html %])[% END %]
109	[% IF ( callnumber ) %] callnumber: [% callnumber \| html %][% END %]</h1>	107	[% IF ( callnumber ) %] callnumber: [% callnumber \| html %][% END %]</h1>
		108
		109	[% INCLUDE 'modals/serials_multi_receiving.inc' %]
		110
110	[% IF internalnotes %]<p>Nonpublic note: [% internalnotes \| html \| html_line_break %]</p>[% END %]	111	[% IF internalnotes %]<p>Nonpublic note: [% internalnotes \| html \| html_line_break %]</p>[% END %]
111	<form method="post" name="f" class="noEnterSubmit" action="serials-edit.pl" id="serials_edit">	112	<form method="post" name="f" class="noEnterSubmit" action="serials-edit.pl" id="serials_edit">
112		113

Lines 31-36 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt (+2 lines)
31		31
32	[% INCLUDE 'serials-toolbar.inc' %]	32	[% INCLUDE 'serials-toolbar.inc' %]
33		33
		34	<h1>Serials</h1>
		35
34	</main>	36	</main>
35	</div> <!-- /.col-sm-10.col-sm-push-2 -->	37	</div> <!-- /.col-sm-10.col-sm-push-2 -->
36		38





                    [% IF ( mana ) %]
                        [% IF ( done_searched ) %]
                            <h1>Mana subscriptions ([% total | html %] found)</h1>
                        [% ELSE %]
                            <h1>Mana subscriptions search</h1>
                        [% END %]
                    [% ELSE %]
                        [% IF ( done_searched ) %]
                            <h1>Serials subscriptions ([% total | html %] found)</h1>
                        [% ELSE %]
                            <h1>Serials subscriptions search</h1>
                        [% END %]
                    [% END %]


Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt (-1 / +1 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
2	<h2>Prediction pattern</h1>	2	<h2>Prediction pattern</h2>
3	[% IF (not_consistent_end_date) %]	3	[% IF (not_consistent_end_date) %]
4	<p><em>End date is not consistent with subscription length.</em></p>	4	<p><em>End date is not consistent with subscription length.</em></p>
5	[% END %]	5	[% END %]

Lines 13-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt (-1 / +2 lines)
13	<body id="ser_subscription-renew" class="ser">	13	<body id="ser_subscription-renew" class="ser">
14	<div class="container-fluid">	14	<div class="container-fluid">
15		15
		16	<h1>Serials subscription renew</h1>
		17
16	[% INCLUDE 'blocking_errors.inc' %]	18	[% INCLUDE 'blocking_errors.inc' %]
17		19
18	[% IF op == 'renew' OR op =='multi_renew' %]	20	[% IF op == 'renew' OR op =='multi_renew' %]
19	-

Return to bug 27631

Lines 167-173 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-2 / +4 lines)
167	[% INCLUDE "reports-toolbar.inc" %]	167	[% INCLUDE "reports-toolbar.inc" %]
168		168
169	[% IF ( start ) %]	169	[% IF ( start ) %]
170	<h2>Guided reports</h2>	170	<h1>Guided reports</h1>
171	<p>Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.</p>	171	<p>Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.</p>
172		172
173	<h3>Build and run reports</h3>	173	<h3>Build and run reports</h3>
Lines 214-221 Link Here
214	[% END %]	214	[% END %]
215		215
216	[% IF ( saved1 ) %]	216	[% IF ( saved1 ) %]
217	[% IF ( savedreports ) %]
218	<h1>Saved reports</h1>	217	<h1>Saved reports</h1>
		218	[% IF ( savedreports ) %]
219		219
220	[% IF ( filters.date \|\| filters.author \|\| filters.keyword ) %]	220	[% IF ( filters.date \|\| filters.author \|\| filters.keyword ) %]
221	<p>Filtered by:	221	<p>Filtered by:
Lines 1122-1127 Link Here
1122	[% END #/IF ( execute ) %]	1122	[% END #/IF ( execute ) %]
1123		1123
1124	[% IF ( create ) %]	1124	[% IF ( create ) %]
		1125	<h1>Create from SQL</h1>
1125	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">	1126	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">
1126	<fieldset class="rows">	1127	<fieldset class="rows">
1127	<legend>Create report from SQL</legend>	1128	<legend>Create report from SQL</legend>
Lines 1207-1212 Link Here
1207	[% END # /IF saved_results %]	1208	[% END # /IF saved_results %]
1208		1209
1209	[% IF ( showsql ) %]	1210	[% IF ( showsql ) %]
		1211	<h1>Saved reports - SQL</h1>
1210	<fieldset class="rows">	1212	<fieldset class="rows">
1211	<legend>[% reportname \| html %]</legend>	1213	<legend>[% reportname \| html %]</legend>
1212	<ol>	1214	<ol>

Lines 231-245 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-4 / +4 lines)
231		231
232	[% IF ( mana ) %]	232	[% IF ( mana ) %]
233	[% IF ( done_searched ) %]	233	[% IF ( done_searched ) %]
234	<h2>Mana subscriptions ([% total \| html %] found)</h2>	234	<h1>Mana subscriptions ([% total \| html %] found)</h1>
235	[% ELSE %]	235	[% ELSE %]
236	<h2>Mana subscriptions search</h2>	236	<h1>Mana subscriptions search</h1>
237	[% END %]	237	[% END %]
238	[% ELSE %]	238	[% ELSE %]
239	[% IF ( done_searched ) %]	239	[% IF ( done_searched ) %]
240	<h2>Serials subscriptions ([% total \| html %] found)</h2>	240	<h1>Serials subscriptions ([% total \| html %] found)</h1>
241	[% ELSE %]	241	[% ELSE %]
242	<h2>Serials subscriptions search</h2>	242	<h1>Serials subscriptions search</h1>
243	[% END %]	243	[% END %]
244	[% END %]	244	[% END %]
245		245