Attachment #132887 for bug #27631

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

Lines 42-47 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt (+2 lines)
42	<div class="col-sm-10 col-sm-push-2">	42	<div class="col-sm-10 col-sm-push-2">
43	<main>	43	<main>
44		44
		45	<h1>Circulation statistics for [% title \| html %]</h1>
		46
45	[% INCLUDE 'blocking_errors.inc' %]	47	[% INCLUDE 'blocking_errors.inc' %]
46	<h2>[% title \|html %] [% IF ( author ) %] by [% author \|html %][% END %]</h2>	48	<h2>[% title \|html %] [% IF ( author ) %] by [% author \|html %][% END %]</h2>
47	<h3>Barcode [% barcode \| html %]</h3>	49	<h3>Barcode [% barcode \| html %]</h3>

Lines 24-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+2 lines)
24		24
25	<div class="main container-fluid">	25	<div class="main container-fluid">
26		26
		27	<h1>Circulation</h1>
		28
27	<div class="row">	29	<div class="row">
28		30
29	<div class="col-sm-5 col-md-4">	31	<div class="col-sm-5 col-md-4">

Lines 60-65 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+2 lines)
60	<div class="row">	60	<div class="row">
61	<div class="col-sm-10 col-sm-push-2">	61	<div class="col-sm-10 col-sm-push-2">
62		62
		63	<h1>Checkouts</h1>
		64
63	[% IF patron %]	65	[% IF patron %]
64	[% INCLUDE 'members-toolbar.inc' %]	66	[% INCLUDE 'members-toolbar.inc' %]
65	[% END %]	67	[% END %]

Lines 59-64 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (+1 lines)
59	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	59	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
60	[% END %]	60	[% END %]
61	<main>	61	<main>
		62	<h1>Batch check out</h1>
62		63
63	[% IF patron %]	64	[% IF patron %]
64	[% INCLUDE 'members-toolbar.inc' %]	65	[% INCLUDE 'members-toolbar.inc' %]

Lines 38-43 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt (-1 / +1 lines)
38	<div class="row">	38	<div class="row">
39	<div class="col-sm-10 col-sm-push-2">	39	<div class="col-sm-10 col-sm-push-2">
40	<main>	40	<main>
		41	<h1>Offline circulation</h1>
41		42
42	<audio id="alert_sound" src="[% interface \| html %]/prog/sound/critical.ogg" preload="auto"></audio>	43	<audio id="alert_sound" src="[% interface \| html %]/prog/sound/critical.ogg" preload="auto"></audio>
43	<audio id="success_sound" src="[% interface \| html %]/prog/sound/beep.ogg" preload="auto"></audio>	44	<audio id="success_sound" src="[% interface \| html %]/prog/sound/beep.ogg" preload="auto"></audio>
Lines 51-57 Link Here
51	[% END %]	52	[% END %]
52		53
53	<div id="offline-home" class="offline-home">	54	<div id="offline-home" class="offline-home">
54	<h1>Offline circulation</h1>
55	<div class="row">	55	<div class="row">
56	<div class="col-sm-6">	56	<div class="col-sm-6">
57	<ul>	57	<ul>

Lines 54-60 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-2 / +2 lines)
54	<main>	54	<main>
55		55
56	[% IF ( noreport ) %]	56	[% IF ( noreport ) %]
57	<h2>Overdue report</h2>	57	<h1>Overdue report</h1>
58	<p>Please choose one or more filters to proceed.</p>	58	<p>Please choose one or more filters to proceed.</p>
59	[% ELSE %]	59	[% ELSE %]
60		60
Lines 125-131 Link Here
125		125
126	[% ELSE %]	126	[% ELSE %]
127		127
128	<h2>Overdue report</h2>	128	<h1>Overdue report</h1>
129	[% IF ( isfiltered ) %]	129	[% IF ( isfiltered ) %]
130	<p>There are no overdues matching your search. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a></p>	130	<p>There are no overdues matching your search. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a></p>
131	[% ELSE %]	131	[% ELSE %]

Lines 57-63 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-1 / +1 lines)
57	</div>	57	</div>
58	[% END %]	58	[% END %]
59		59
60	<h2>Holds to pull placed between [% from \| $KohaDates %] and [% to \| $KohaDates %]</h2>	60	<h1>Holds to pull placed between [% from \| $KohaDates %] and [% to \| $KohaDates %]</h1>
61	<h3>Reported on [% todaysdate \| $KohaDates %]</h3>	61	<h3>Reported on [% todaysdate \| $KohaDates %]</h3>
62	<p>The following holds have not been filled. Please retrieve them and check them in.</p>	62	<p>The following holds have not been filled. Please retrieve them and check them in.</p>
63	<div id="searchresults">	63	<div id="searchresults">





                [% IF error %]
                    <div class="dialog alert">
                        <h1>Cannot renew:</h1>

                            [% IF error == "no_item" %]



                [% IF date_due %]
                    <div class="dialog message">
                        <h1>Item renewed:</h1>
                        <p>
                            [% INCLUDE 'biblio-title.inc' biblio=item.biblio link = 1 %]
                            ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblio.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> )

                <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >

                    <fieldset>
                        <h1>Renew</h1>

                        [% IF Koha.Preference('UnseenRenewals') %]
                            <div class="renew_formfield">




        </ol>
    </nav>

[% INCLUDE 'blocking_errors.inc' %]
<div class="main container-fluid">
    <div class="row">
        <div class="col-sm-10 col-sm-push-2">

                        [% END %]
                        </div>
                    [% END %]

                    [% INCLUDE 'blocking_errors.inc' %]

                    [% IF no_patrons_found %]
                        <div class="dialog alert">
                            <h3>Patron not found</h3>

Lines 939-945 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
939	<form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >	939	<form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
940	<fieldset id="circ_returns_checkin">	940	<fieldset id="circ_returns_checkin">
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>	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>
942	<h3>Check in</h3>	942	<h1>Check in</h1>
943	<div class="row">	943	<div class="row">
944	<div class="col-sm-6">	944	<div class="col-sm-6">
945	<div class="hint">Enter item barcode:</div>	945	<div class="hint">Enter item barcode:</div>

Lines 42-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt (+2 lines)
42		42
43	[% IF Koha.Preference('CircSidebar') %]	43	[% IF Koha.Preference('CircSidebar') %]
44	<div class="col-sm-10 col-sm-push-2">	44	<div class="col-sm-10 col-sm-push-2">
		45	<h1>Set library</h1>
45	[% ELSE %]	46	[% ELSE %]
46	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	47	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
		48	<h1>Set library</h1>
47	[% END %]	49	[% END %]
48		50
49		51

Lines 41-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-3 / +3 lines)
41	<div class="col-sm-12">	41	<div class="col-sm-12">
42	[% END %]	42	[% END %]
43		43
44	<h2>Holds awaiting pickup for your library on: [% show_date \| $KohaDates %]	44	<h1>Holds awaiting pickup for your library on: [% show_date \| $KohaDates %]</h1>
		45	<h2>
45	[% IF ( all_branches_link ) %]	46	[% IF ( all_branches_link ) %]
46	<span style="margin-left:20px"><a href="[% all_branches_link \| url %]">	47	<span><a href="[% all_branches_link \| url %]">
47	View all libraries</a></span>	48	View all libraries</a></span>
48	[% END %]	49	[% END %]
49	</h2>	50	</h2>
50	-

Return to bug 27631

Lines 81-87 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (-1 / +3 lines)
81	</ol>	81	</ol>
82	</nav>	82	</nav>
83		83
84	[% INCLUDE 'blocking_errors.inc' %]
85	<div class="main container-fluid">	84	<div class="main container-fluid">
86	<div class="row">	85	<div class="row">
87	<div class="col-sm-10 col-sm-push-2">	86	<div class="col-sm-10 col-sm-push-2">
Lines 96-101 Link Here
96	[% END %]	95	[% END %]
97	</div>	96	</div>
98	[% END %]	97	[% END %]
		98
		99	[% INCLUDE 'blocking_errors.inc' %]
		100
99	[% IF no_patrons_found %]	101	[% IF no_patrons_found %]
100	<div class="dialog alert">	102	<div class="dialog alert">
101	<h3>Patron not found</h3>	103	<h3>Patron not found</h3>

Lines 44-50 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-3 / +3 lines)
44		44
45	[% IF error %]	45	[% IF error %]
46	<div class="dialog alert">	46	<div class="dialog alert">
47	<h3>Cannot renew:</h3>	47	<h1>Cannot renew:</h1>
48		48
49	[% IF error == "no_item" %]	49	[% IF error == "no_item" %]
50		50
Lines 182-188 Link Here
182		182
183	[% IF date_due %]	183	[% IF date_due %]
184	<div class="dialog message">	184	<div class="dialog message">
185	<h3>Item renewed:</h3>	185	<h1>Item renewed:</h1>
186	<p>	186	<p>
187	[% INCLUDE 'biblio-title.inc' biblio=item.biblio link = 1 %]	187	[% INCLUDE 'biblio-title.inc' biblio=item.biblio link = 1 %]
188	( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber \| uri %]&biblionumber=[% item.biblio.biblionumber \| uri %]&bi=[% item.biblioitemnumber.biblioitemnumber \| uri %]#item[% item.itemnumber \| uri %]">[% item.barcode \| html %]</a> )	188	( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber \| uri %]&biblionumber=[% item.biblio.biblionumber \| uri %]&bi=[% item.biblioitemnumber.biblioitemnumber \| uri %]#item[% item.itemnumber \| uri %]">[% item.barcode \| html %]</a> )
Lines 197-203 Link Here
197	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >	197	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >
198		198
199	<fieldset>	199	<fieldset>
200	<h2>Renew</h2>	200	<h1>Renew</h1>
201		201
202	[% IF Koha.Preference('UnseenRenewals') %]	202	[% IF Koha.Preference('UnseenRenewals') %]
203	<div class="renew_formfield">	203	<div class="renew_formfield">