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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt (-11 / +27 lines)
Lines 17-26 Link Here
17
17
18
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Pending on-site checkouts</div>
18
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Pending on-site checkouts</div>
19
19
20
<div id="doc3" class="yui-t2">
20
<div class="main container-fluid">
21
  <div id="bd">
21
    <div class="row">
22
    <div id="yui-main">
22
        <div class="col-sm-12">
23
      <div class="yui-b">
23
            <main>
24
                <div class="row">
25
26
                [% IF Koha.Preference('CircSidebar') %]
27
                    <div class="col-sm-10 col-sm-push-2">
28
                [% ELSE %]
29
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
30
                [% END %]
31
24
        <h1>Pending on-site checkouts</h1>
32
        <h1>Pending on-site checkouts</h1>
25
        [% IF pending_onsite_checkouts %]
33
        [% IF pending_onsite_checkouts %]
26
          <table id="pending_onsite_checkout">
34
          <table id="pending_onsite_checkout">
Lines 56-71 Link Here
56
        [% ELSE %]
64
        [% ELSE %]
57
          <h3>No pending on-site checkout.</h3>
65
          <h3>No pending on-site checkout.</h3>
58
        [% END %]
66
        [% END %]
59
      </div>
67
60
    </div>
68
                    [% IF Koha.Preference('CircSidebar') %]
61
    <div class="yui-b">
69
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
62
      [% IF Koha.Preference('CircSidebar') %][% INCLUDE 'circ-nav.inc' %][% END %]
70
                            <div class="col-sm-2 col-sm-pull-10">
63
    </div>
71
                                <aside>
64
  </div>
72
                                    [% INCLUDE 'circ-nav.inc' %]
73
                                </aside>
74
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
75
                        </div> <!-- /.row -->
76
                    [% END %]
77
78
            </main>
79
        </div> <!-- /.col-sm-12 -->
80
    </div> <!-- /.row -->
65
81
66
[% MACRO jsinclude BLOCK %]
82
[% MACRO jsinclude BLOCK %]
67
    [% INCLUDE 'datatables.inc' %]
83
    [% INCLUDE 'datatables.inc' %]
68
    <script type="text/javascript">
84
    <script>
69
        $(document).ready(function(){
85
        $(document).ready(function(){
70
            if ( $("#pending_onsite_checkout").length ) {
86
            if ( $("#pending_onsite_checkout").length ) {
71
                $("#pending_onsite_checkout").dataTable($.extend(true, {}, dataTablesDefaults, {
87
                $("#pending_onsite_checkout").dataTable($.extend(true, {}, dataTablesDefaults, {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-11 / +15 lines)
Lines 7-13 Link Here
7
<title>Koha &rsaquo; Circulation &rsaquo; Items overdue as of [% todaysdate | html %]</title>
7
<title>Koha &rsaquo; Circulation &rsaquo; Items overdue as of [% todaysdate | html %]</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
9
[% Asset.css("css/datatables.css") | $raw %]
9
[% Asset.css("css/datatables.css") | $raw %]
10
<style type="text/css">
10
<style>
11
    .sql {display:none;}
11
    .sql {display:none;}
12
</style>
12
</style>
13
</head>
13
</head>
Lines 18-28 Link Here
18
18
19
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues as of [% todaysdate | html %]</div>
19
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues as of [% todaysdate | html %]</div>
20
20
21
<div id="doc3" class="yui-t2">
21
<div class="main container-fluid">
22
22
    <div class="row">
23
   <div id="bd">
23
        <div class="col-sm-10 col-sm-push-2">
24
	<div id="yui-main">
24
            <main>
25
	<div class="yui-b">
26
25
27
[% IF ( noreport ) %]
26
[% IF ( noreport ) %]
28
  <h2>Overdue report</h2>
27
  <h2>Overdue report</h2>
Lines 89-97 Link Here
89
[% END %]  <!-- overdueloop -->
88
[% END %]  <!-- overdueloop -->
90
[% END %]  <!-- noreport -->
89
[% END %]  <!-- noreport -->
91
90
92
</div>
91
            </main>
93
</div>
92
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
94
<div class="yui-b">
93
94
        <div class="col-sm-2 col-sm-pull-10">
95
            <aside>
96
95
<form method="post" action="/cgi-bin/koha/circ/overdue.pl">
97
<form method="post" action="/cgi-bin/koha/circ/overdue.pl">
96
  <fieldset class="brief">
98
  <fieldset class="brief">
97
<h4>Filter on:</h4>
99
<h4>Filter on:</h4>
Lines 197-204 Link Here
197
   </fieldset>
199
   </fieldset>
198
   </fieldset>
200
   </fieldset>
199
  </form>
201
  </form>
200
</div>
202
201
</div>
203
            </aside>
204
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
205
     </div> <!-- /.row -->
202
206
203
[% MACRO jsinclude BLOCK %]
207
[% MACRO jsinclude BLOCK %]
204
    [% INCLUDE 'calendar.inc' %]
208
    [% INCLUDE 'calendar.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-10 / +15 lines)
Lines 20-30 Link Here
20
20
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Holds to pull</div>
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Holds to pull</div>
22
22
23
<div id="doc3" class="yui-t2">
23
<div class="main container-fluid">
24
    <div class="row">
25
        <div class="col-sm-10 col-sm-push-2">
26
            <main>
24
27
25
   <div id="bd">
26
    <div id="yui-main">
27
    <div class="yui-b">
28
        [% FOR m IN messages %]
28
        [% FOR m IN messages %]
29
            <div class="dialog [% m.type | html %]">
29
            <div class="dialog [% m.type | html %]">
30
                [% SWITCH m.code %]
30
                [% SWITCH m.code %]
Lines 162-170 Link Here
162
    [% END %]
162
    [% END %]
163
</div>
163
</div>
164
164
165
</div>
165
166
</div>
166
            </main>
167
<div class="yui-b">
167
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
168
169
        <div class="col-sm-2 col-sm-pull-10">
170
            <aside>
171
168
<div id="filters">
172
<div id="filters">
169
173
170
<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
174
<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
Lines 195-208 Link Here
195
</form>
199
</form>
196
200
197
</div>
201
</div>
198
</div>
202
            </aside>
199
</div>
203
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
204
     </div> <!-- /.row -->
200
205
201
[% MACRO jsinclude BLOCK %]
206
[% MACRO jsinclude BLOCK %]
202
    [% INCLUDE 'calendar.inc' %]
207
    [% INCLUDE 'calendar.inc' %]
203
    [% INCLUDE 'datatables.inc' %]
208
    [% INCLUDE 'datatables.inc' %]
204
    [% INCLUDE 'columns_settings.inc' %]
209
    [% INCLUDE 'columns_settings.inc' %]
205
    <script type="text/javascript">
210
    <script>
206
        $(document).ready(function() {
211
        $(document).ready(function() {
207
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
212
          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
208
          var holdst = KohaTable("holdst", {
213
          var holdst = KohaTable("holdst", {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-25 / +31 lines)
Lines 14-23 Link Here
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Renew</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Renew</div>
16
16
17
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
17
<div class="main container-fluid">
18
    <div id="bd">
18
    <div class="row">
19
        <div id="yui-main">
19
        <div class="col-sm-12">
20
            [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
20
            <main>
21
                <div class="row">
22
23
                [% IF Koha.Preference('CircSidebar') %]
24
                    <div class="col-sm-10 col-sm-push-2">
25
                [% ELSE %]
26
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
27
                [% END %]
28
21
                [% IF error %]
29
                [% IF error %]
22
                    <div class="dialog alert">
30
                    <div class="dialog alert">
23
                        <h3>Cannot renew:</h3>
31
                        <h3>Cannot renew:</h3>
Lines 142-182 Link Here
142
                    </div>
150
                    </div>
143
                [% END %]
151
                [% END %]
144
152
145
            <div class="yui-g">
146
147
            [% UNLESS error %]
153
            [% UNLESS error %]
148
                <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >
154
                <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >
149
155
150
                    <div class="yui-u first">
156
                    <fieldset>
151
                        <fieldset>
157
                        <legend>Renew</legend>
152
                            <legend>Renew</legend>
153
158
154
                            <label for="barcode">Enter item barcode: </label>
159
                        <label for="barcode">Enter item barcode: </label>
155
160
156
                            <input name="barcode" id="barcode" size="14" class="focus" type="text" />
161
                        <input name="barcode" id="barcode" size="14" class="focus" type="text" />
157
162
158
                            <input type="submit" class="submit" value="Submit" />
163
                        <input type="submit" class="submit" value="Submit" />
159
                        </fieldset>
164
                    </fieldset>
160
                    </div>
161
165
162
                </form>
166
                </form>
163
            [% END %]
167
            [% END %]
164
168
165
        </div>
169
                    [% IF Koha.Preference('CircSidebar') %]
166
    </div>
170
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
167
171
                            <div class="col-sm-2 col-sm-pull-10">
168
[% IF Koha.Preference('CircSidebar') %]
172
                                <aside>
169
</div>
173
                                    [% INCLUDE 'circ-nav.inc' %]
174
                                </aside>
175
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
176
                        </div> <!-- /.row -->
177
                    [% END %]
170
178
171
<div class="yui-b noprint">
179
            </main>
172
    [% INCLUDE 'circ-nav.inc' %]
180
        </div> <!-- /.col-sm-12 -->
173
</div>
181
    </div> <!-- /.row -->
174
[% END %]
175
<div>
176
182
177
[% MACRO jsinclude BLOCK %]
183
[% MACRO jsinclude BLOCK %]
178
    [% IF error %]
184
    [% IF error %]
179
        <script type="text/javascript">
185
        <script>
180
            $( document ).ready(function() {
186
            $( document ).ready(function() {
181
                removeFocus();
187
                removeFocus();
182
            });
188
            });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (-12 / +14 lines)
Lines 28-38 Link Here
28
        [% END %]
28
        [% END %]
29
    </div>
29
    </div>
30
30
31
    [% INCLUDE 'blocking_errors.inc' %]
31
[% INCLUDE 'blocking_errors.inc' %]
32
    <div id="doc3" class="yui-t2">
32
<div class="main container-fluid">
33
        <div id="bd">
33
    <div class="row">
34
            <div id="yui-main">
34
        <div class="col-sm-10 col-sm-push-2">
35
                <div class="yui-b">
35
            <main>
36
36
37
                    <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | html %]">[% biblio.title | html %]</a></h1>
37
                    <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | html %]">[% biblio.title | html %]</a></h1>
38
                    [% IF no_patrons_found %]
38
                    [% IF no_patrons_found %]
Lines 291-309 Link Here
291
                            </table>
291
                            </table>
292
                        </fieldset>
292
                        </fieldset>
293
                    [% END %]
293
                    [% END %]
294
                </div>
295
            </div>
296
294
297
            <div class="yui-b">
295
            </main>
296
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
297
298
        <div class="col-sm-2 col-sm-pull-10">
299
            <aside>
298
                [% INCLUDE 'biblio-view-menu.inc' %]
300
                [% INCLUDE 'biblio-view-menu.inc' %]
299
            </div>
301
            </aside>
300
        </div>
302
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
301
    </div>
303
     </div> <!-- /.row -->
302
304
303
[% MACRO jsinclude BLOCK %]
305
[% MACRO jsinclude BLOCK %]
304
    [% INCLUDE 'datatables.inc' %]
306
    [% INCLUDE 'datatables.inc' %]
305
307
306
    <script type="text/javascript">
308
    <script>
307
        $('#current-article-requests').ready(function() {
309
        $('#current-article-requests').ready(function() {
308
            $(".hide").hide();
310
            $(".hide").hide();
309
        });
311
        });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-12 / +17 lines)
Lines 9-15 Link Here
9
<title>Koha &rsaquo; Circulation &rsaquo; Hold ratios</title>
9
<title>Koha &rsaquo; Circulation &rsaquo; Hold ratios</title>
10
[% INCLUDE 'doc-head-close.inc' %]
10
[% INCLUDE 'doc-head-close.inc' %]
11
[% Asset.css("css/datatables.css") | $raw %]
11
[% Asset.css("css/datatables.css") | $raw %]
12
<style type="text/css">
12
<style>
13
    .sql { display: none; }
13
    .sql { display: none; }
14
    .ulined { text-decoration: underline; }
14
    .ulined { text-decoration: underline; }
15
    .ratiolimit { color: blue; cursor: pointer; }
15
    .ratiolimit { color: blue; cursor: pointer; }
Lines 23-32 Link Here
23
23
24
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Hold ratios</div>
24
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Hold ratios</div>
25
25
26
<div id="doc3" class="yui-t2">
26
<div class="main container-fluid">
27
   <div id="bd">
27
    <div class="row">
28
    <div id="yui-main">
28
        <div class="col-sm-10 col-sm-push-2">
29
    <div class="yui-b">
29
            <main>
30
30
<h1>Hold ratios to calculate items needed</h1>
31
<h1>Hold ratios to calculate items needed</h1>
31
   <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %]
32
   <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %]
32
    to [% to | $KohaDates %]</h3>
33
    to [% to | $KohaDates %]</h3>
Lines 101-109 Link Here
101
    [% ELSE %]
102
    [% ELSE %]
102
        <b>No items found.</b>
103
        <b>No items found.</b>
103
    [% END %]
104
    [% END %]
104
</div>
105
105
</div>
106
            </main>
106
<div class="yui-b">
107
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
108
109
        <div class="col-sm-2 col-sm-pull-10">
110
            <aside>
111
107
<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
112
<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
108
<fieldset class="brief">
113
<fieldset class="brief">
109
<h4>Refine results:</h4>
114
<h4>Refine results:</h4>
Lines 142-154 Link Here
142
[% END %]
147
[% END %]
143
</form>
148
</form>
144
149
145
</div>
150
            </aside>
146
</div>
151
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
152
     </div> <!-- /.row -->
147
153
148
[% MACRO jsinclude BLOCK %]
154
[% MACRO jsinclude BLOCK %]
149
  [% INCLUDE 'calendar.inc' %]
155
  [% INCLUDE 'calendar.inc' %]
150
  [% INCLUDE 'datatables.inc' %]
156
  [% INCLUDE 'datatables.inc' %]
151
  <script type="text/javascript">
157
  <script>
152
       $(document).ready(function() {
158
       $(document).ready(function() {
153
          $(".ratiolimit").click(function () {
159
          $(".ratiolimit").click(function () {
154
              $("#ratio").val($(this).html());
160
              $("#ratio").val($(this).html());
155
- 

Return to bug 21442