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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-22 / +31 lines)
Lines 45-56 Link Here
45
45
46
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
46
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
47
47
48
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
48
<div class="main container-fluid">
49
49
    <div class="row">
50
<div id="bd">
50
        <div class="col-sm-12">
51
<div id="yui-main">
51
            <main>
52
[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
52
                <div class="row">
53
<div class="yui-g">
53
54
                [% IF Koha.Preference('CircSidebar') %]
55
                    <div class="col-sm-10 col-sm-push-2">
56
                [% ELSE %]
57
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
58
                [% END %]
54
59
55
    [% IF hold_auto_filled %]
60
    [% IF hold_auto_filled %]
56
        <div class="dialog alert hold-auto-filled">
61
        <div class="dialog alert hold-auto-filled">
Lines 603-613 Link Here
603
    <div id="dropboxmode" class="dialog message" style="display:none;">
608
    <div id="dropboxmode" class="dialog message" style="display:none;">
604
        <p>Book drop mode.  (Effective checkin date is [% dropboxdate | html %] ).</p>
609
        <p>Book drop mode.  (Effective checkin date is [% dropboxdate | html %] ).</p>
605
    </div>
610
    </div>
606
</div>
611
607
<div class="yui-g">
612
<div class="row">
608
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
613
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
609
    <div class="yui-u first">
614
    <div class="col-sm-6">
610
        <fieldset>
615
            <fieldset>
611
            <legend>Check in</legend>
616
            <legend>Check in</legend>
612
            <label for="barcode">Enter item barcode: </label>
617
            <label for="barcode">Enter item barcode: </label>
613
            [% IF ( exemptfine ) %]
618
            [% IF ( exemptfine ) %]
Lines 644-650 Link Here
644
649
645
            </fieldset>
650
            </fieldset>
646
            </div>
651
            </div>
647
            <div class="yui-u">
652
            <div class="col-sm-6">
648
            <fieldset id="checkin_options">
653
            <fieldset id="checkin_options">
649
                <legend>Options</legend>
654
                <legend>Options</legend>
650
                    [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %]
655
                    [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %]
Lines 733-748 Link Here
733
        [% END %]
738
        [% END %]
734
    </table>
739
    </table>
735
[% END %]
740
[% END %]
736
</div>
741
737
[% IF Koha.Preference('CircSidebar') %]
742
                    [% IF Koha.Preference('CircSidebar') %]
738
</div>
743
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
739
<div class="yui-b noprint">
744
                            <div class="col-sm-2 col-sm-pull-10">
740
    [% INCLUDE 'circ-nav.inc' %]
745
                                <aside>
741
</div>
746
                                    [% INCLUDE 'circ-nav.inc' %]
742
[% END %]
747
                                </aside>
743
</div>
748
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
744
</div>
749
                        </div> <!-- /.row -->
745
</div>
750
                    [% END %]
751
752
            </main>
753
        </div> <!-- /.col-sm-12 -->
754
    </div> <!-- /.row -->
746
755
747
[% MACRO jsinclude BLOCK %]
756
[% MACRO jsinclude BLOCK %]
748
    [% INCLUDE 'datatables.inc' %]
757
    [% INCLUDE 'datatables.inc' %]
Lines 751-757 Link Here
751
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
760
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
752
    [% INCLUDE 'timepicker.inc' %]
761
    [% INCLUDE 'timepicker.inc' %]
753
762
754
    <script type="text/javascript">
763
    <script>
755
        function Dopop(link) {
764
        function Dopop(link) {
756
            var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
765
            var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
757
            $("#barcode").focus();
766
            $("#barcode").focus();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt (-13 / +27 lines)
Lines 3-9 Link Here
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
4
<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
<style type="text/css">
6
<style>
7
    .noshow {display: none;}
7
    .noshow {display: none;}
8
</style>
8
</style>
9
</head>
9
</head>
Lines 17-26 Link Here
17
&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
17
&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
18
</div>
18
</div>
19
19
20
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
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
32
25
[% IF ( updated ) %]
33
[% IF ( updated ) %]
26
34
Lines 88-99 Updated:<ul> Link Here
88
<!-- /updated -->
96
<!-- /updated -->
89
[% END %]
97
[% END %]
90
98
91
      </div>
99
                    [% IF Koha.Preference('CircSidebar') %]
92
    </div>
100
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
93
[% IF Koha.Preference('CircSidebar') %]
101
                            <div class="col-sm-2 col-sm-pull-10">
94
<div class="yui-b noprint">
102
                                <aside>
95
    [% INCLUDE 'circ-nav.inc' %]
103
                                    [% INCLUDE 'circ-nav.inc' %]
96
</div>
104
                                </aside>
97
[% END %]
105
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
98
</div>
106
                        </div> <!-- /.row -->
107
                    [% END %]
108
109
            </main>
110
        </div> <!-- /.col-sm-12 -->
111
    </div> <!-- /.row -->
112
99
[% INCLUDE 'intranet-bottom.inc' %]
113
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-15 / +24 lines)
Lines 16-27 Link Here
16
16
17
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Transfers to receive</div>
17
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Transfers to receive</div>
18
18
19
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
19
<div class="main container-fluid">
20
    <div class="row">
21
        <div class="col-sm-12">
22
            <main>
23
                <div class="row">
20
24
21
   <div id="bd">
25
                [% IF Koha.Preference('CircSidebar') %]
22
	<div id="yui-main">
26
                    <div class="col-sm-10 col-sm-push-2">
23
        [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
27
                [% ELSE %]
24
	<div class="yui-g">
28
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
29
                [% END %]
25
30
26
        <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1>
31
        <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1>
27
	[% IF ( branchesloop ) %]
32
	[% IF ( branchesloop ) %]
Lines 81-99 Link Here
81
        <p>No transfers to receive</p>
86
        <p>No transfers to receive</p>
82
    [% END %]
87
    [% END %]
83
88
84
</div>
89
                    [% IF Koha.Preference('CircSidebar') %]
85
</div>
90
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
86
[% IF Koha.Preference('CircSidebar') %]
91
                            <div class="col-sm-2 col-sm-pull-10">
87
</div>
92
                                <aside>
88
<div class="yui-b noprint">
93
                                    [% INCLUDE 'circ-nav.inc' %]
89
    [% INCLUDE 'circ-nav.inc' %]
94
                                </aside>
90
</div>
95
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
91
[% END %]
96
                        </div> <!-- /.row -->
92
</div>
97
                    [% END %]
98
99
            </main>
100
        </div> <!-- /.col-sm-12 -->
101
    </div> <!-- /.row -->
93
102
94
[% MACRO jsinclude BLOCK %]
103
[% MACRO jsinclude BLOCK %]
95
    [% INCLUDE 'datatables.inc' %]
104
    [% INCLUDE 'datatables.inc' %]
96
    <script type="text/javascript">
105
    <script>
97
        $(document).ready(function() {
106
        $(document).ready(function() {
98
            [% FOREACH branchesloo IN branchesloop %]
107
            [% FOREACH branchesloo IN branchesloop %]
99
            $("#transferst[% branchesloo.branchcode | html %]").dataTable($.extend(true, {}, dataTablesDefaults, {
108
            $("#transferst[% branchesloo.branchcode | html %]").dataTable($.extend(true, {}, dataTablesDefaults, {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-16 / +25 lines)
Lines 25-36 Link Here
25
[% IF ( run_report ) %] &rsaquo; Results[% END %]
25
[% IF ( run_report ) %] &rsaquo; Results[% END %]
26
</div>
26
</div>
27
27
28
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc2" class="yui-t7">[% END %]
28
<div class="main container-fluid">
29
29
    <div class="row">
30
   <div id="bd">
30
        <div class="col-sm-12">
31
	<div id="yui-main">
31
            <main>
32
        [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
32
                <div class="row">
33
	<div class="yui-g">
33
34
                [% IF Koha.Preference('CircSidebar') %]
35
                    <div class="col-sm-10 col-sm-push-2">
36
                [% ELSE %]
37
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
38
                [% END %]
34
39
35
<h1>Holds queue</h1>
40
<h1>Holds queue</h1>
36
41
Lines 186-205 Link Here
186
</form>
191
</form>
187
[% END %]
192
[% END %]
188
193
189
</div>
194
                    [% IF Koha.Preference('CircSidebar') %]
190
</div>
195
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
191
[% IF Koha.Preference('CircSidebar') %]
196
                            <div class="col-sm-2 col-sm-pull-10">
192
</div>
197
                                <aside>
193
<div class="yui-b noprint">
198
                                    [% INCLUDE 'circ-nav.inc' %]
194
    [% INCLUDE 'circ-nav.inc' %]
199
                                </aside>
195
</div>
200
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
196
[% END %]
201
                        </div> <!-- /.row -->
197
</div>
202
                    [% END %]
203
204
            </main>
205
        </div> <!-- /.col-sm-12 -->
206
    </div> <!-- /.row -->
198
207
199
[% MACRO jsinclude BLOCK %]
208
[% MACRO jsinclude BLOCK %]
200
    [% INCLUDE 'datatables.inc' %]
209
    [% INCLUDE 'datatables.inc' %]
201
    [% INCLUDE 'columns_settings.inc' %]
210
    [% INCLUDE 'columns_settings.inc' %]
202
    <script type="text/javascript">
211
    <script>
203
        $(document).ready(function() {
212
        $(document).ready(function() {
204
            var holdst;
213
            var holdst;
205
214
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-16 / +24 lines)
Lines 19-30 Link Here
19
&rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
19
&rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
20
</div>
20
</div>
21
21
22
[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
22
<div class="main container-fluid">
23
    <div class="row">
24
        <div class="col-sm-12">
25
            <main>
26
                <div class="row">
23
27
24
   <div id="bd">
28
                [% IF Koha.Preference('CircSidebar') %]
25
    <div id="yui-main">
29
                    <div class="col-sm-10 col-sm-push-2">
26
    [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
30
                [% ELSE %]
27
    <div class="yui-g">
31
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
32
                [% END %]
28
33
29
        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
34
        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
30
            [% IF ( all_branches_link ) %]
35
            [% IF ( all_branches_link ) %]
Lines 195-213 Link Here
195
        </div>
200
        </div>
196
    [% END %]
201
    [% END %]
197
202
198
</div>
203
                    [% IF Koha.Preference('CircSidebar') %]
199
</div>
204
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
200
[% IF Koha.Preference('CircSidebar') %]
205
                            <div class="col-sm-2 col-sm-pull-10">
201
</div>
206
                                <aside>
202
<div class="yui-b noprint">
207
                                    [% INCLUDE 'circ-nav.inc' %]
203
    [% INCLUDE 'circ-nav.inc' %]
208
                                </aside>
204
</div>
209
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
205
[% END %]
210
                        </div> <!-- /.row -->
206
</div>
211
                    [% END %]
212
213
            </main>
214
        </div> <!-- /.col-sm-12 -->
215
    </div> <!-- /.row -->
207
216
208
[% MACRO jsinclude BLOCK %]
217
[% MACRO jsinclude BLOCK %]
209
    [% INCLUDE 'datatables.inc' %]
218
    [% INCLUDE 'datatables.inc' %]
210
    <script type="text/javascript">
219
    <script>
211
        $(document).ready(function() {
220
        $(document).ready(function() {
212
            $('#resultlist').tabs();
221
            $('#resultlist').tabs();
213
            $("th a").hide();
222
            $("th a").hide();
214
- 

Return to bug 21569