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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/langmenu.inc (-4 / +4 lines)
Lines 6-14 Link Here
6
    [% SET menu_id = 'header_langmenu' %]
6
    [% SET menu_id = 'header_langmenu' %]
7
[% END %]
7
[% END %]
8
<div id="[% menu_id | html %]" class="langmenu">
8
<div id="[% menu_id | html %]" class="langmenu">
9
    <ul class="navbar-nav">
9
    <ul class="navbar-nav" role="menu">
10
        <li class="[% li_class | html %]">
10
        <li class="[% li_class | html %]">
11
            <a href="#" title="Switch languages" class="nav-link dropdown-toggle" id="langmenu" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"
11
            <a href="#" title="Switch languages" class="nav-link dropdown-toggle" id="[% menu_id | html %]_dropdown" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"
12
                ><i class="fa fa-flag fa-fw fa-icon-[% context | html %]" aria-hidden="true"></i> <span class="langlabel">Languages</span> <b class="caret"></b
12
                ><i class="fa fa-flag fa-fw fa-icon-[% context | html %]" aria-hidden="true"></i> <span class="langlabel">Languages</span> <b class="caret"></b
13
            ></a>
13
            ></a>
14
            [% IF ( context == "footer" ) -%]
14
            [% IF ( context == "footer" ) -%]
Lines 16-22 Link Here
16
            [% ELSE %]
16
            [% ELSE %]
17
                [% SET div_class = 'dropdown-menu dropdown-menu-end' %]
17
                [% SET div_class = 'dropdown-menu dropdown-menu-end' %]
18
            [% END %]
18
            [% END %]
19
            <div aria-labelledby="langmenu" role="menu" class="[% div_class | html %]">
19
            <div aria-labelledby="[% menu_id | html %]_dropdown" role="menu" class="[% div_class | html %]">
20
                [% FOREACH languages_loo IN languages_loop %]
20
                [% FOREACH languages_loo IN languages_loop %]
21
                    [% IF ( languages_loo.group_enabled ) %]
21
                    [% IF ( languages_loo.group_enabled ) %]
22
                        [% IF ( languages_loo.plural ) %]
22
                        [% IF ( languages_loo.plural ) %]
Lines 62-68 Link Here
62
            <!-- /# .dropdown-menu -->
62
            <!-- /# .dropdown-menu -->
63
        </li>
63
        </li>
64
        <!-- / .dropdown -->
64
        <!-- / .dropdown -->
65
        <li class="divider-vertical" aria-hidden="false" role="presentation"></li>
65
        <li class="divider-vertical" aria-hidden="false" role="separator"></li>
66
    </ul>
66
    </ul>
67
    <!-- /.navbar-nav -->
67
    <!-- /.navbar-nav -->
68
</div>
68
</div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc (-7 / +14 lines)
Lines 5-14 Link Here
5
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
5
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
6
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
6
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
7
7
8
<!-- prettier-ignore-start -->
9
<!-- closed in opac-bottom.inc -->
8
<div id="wrapper">
10
<div id="wrapper">
11
<!-- prettier-ignore-end -->
9
    <header id="header-region" class="noprint">
12
    <header id="header-region" class="noprint">
10
        <nav class="navbar navbar-expand">
13
        <nav class="navbar navbar-expand">
11
            <h1 id="logo">
14
            <div id="logo">
12
                <a class="navbar-brand" href="/cgi-bin/koha/sci/sci-main.pl">
15
                <a class="navbar-brand" href="/cgi-bin/koha/sci/sci-main.pl">
13
                    [% IF ( LibraryNameTitle ) %]
16
                    [% IF ( LibraryNameTitle ) %]
14
                        [% LibraryNameTitle | html %]
17
                        [% LibraryNameTitle | html %]
Lines 16-27 Link Here
16
                        Koha online
19
                        Koha online
17
                    [% END %]
20
                    [% END %]
18
                </a>
21
                </a>
19
            </h1>
22
            </div>
23
24
        [% IF ( Koha.Preference( 'opaclanguagesdisplay' ) && ( ! one_language_enabled ) && ( languages_loop ) && ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top') ) %]
25
            [% context = "header" %]
26
            [% INCLUDE 'langmenu.inc' %]
27
        [% END %]
20
28
21
            <ul class="navbar-nav ml-auto">
29
        <ul class="navbar-nav ml-auto">
22
                [% IF ( Koha.Preference( 'opaclanguagesdisplay' ) ) %]
23
                    <li class="nav-item"> [% INCLUDE 'langmenu.inc' %] </li>
24
                [% END # / IF opaclanguagedisplay %]
25
30
26
                <li class="nav-item">
31
                <li class="nav-item">
27
                    <ul class="navbar-nav">
32
                    <ul class="navbar-nav">
Lines 46-49 Link Here
46
        [% END # /IF opacheader %]
51
        [% END # /IF opacheader %]
47
    </header>
52
    </header>
48
    <!-- /navbar -->
53
    <!-- /navbar -->
49
</div>
54
<!-- prettier-ignore-start -->
55
    <div id="wrapper"><!-- / closed in opac-bottom.inc -->
56
<!-- prettier-ignore-end -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc (-2 / +9 lines)
Lines 5-13 Link Here
5
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
5
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
6
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
6
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
7
7
8
<!-- prettier-ignore-start -->
9
<!-- closed in opac-bottom.inc -->
10
<div id="wrapper">
11
<!-- prettier-ignore-end -->
8
<header id="header-region" class="noprint">
12
<header id="header-region" class="noprint">
9
    <nav class="navbar navbar-expand">
13
    <nav class="navbar navbar-expand">
10
        <h1 id="logo">
14
        <div id="logo">
11
            <a class="navbar-brand" href="/cgi-bin/koha/sco/sco-main.pl">
15
            <a class="navbar-brand" href="/cgi-bin/koha/sco/sco-main.pl">
12
                [% IF ( LibraryNameTitle ) %]
16
                [% IF ( LibraryNameTitle ) %]
13
                    [% LibraryNameTitle | html %]
17
                    [% LibraryNameTitle | html %]
Lines 15-21 Link Here
15
                    Koha online
19
                    Koha online
16
                [% END %]
20
                [% END %]
17
            </a>
21
            </a>
18
        </h1>
22
        </div>
19
23
20
        <ul class="navbar-nav ml-auto">
24
        <ul class="navbar-nav ml-auto">
21
            [% IF ( Koha.Preference( 'opaclanguagesdisplay' ) ) %]
25
            [% IF ( Koha.Preference( 'opaclanguagesdisplay' ) ) %]
Lines 42-44 Link Here
42
    [% END # /IF opacheader %]
46
    [% END # /IF opacheader %]
43
</header>
47
</header>
44
<!-- /navbar -->
48
<!-- /navbar -->
49
<!-- prettier-ignore-start -->
50
    <div id="wrapper"><!-- / closed in opac-bottom.inc -->
51
<!-- prettier-ignore-end -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt (-17 / +21 lines)
Lines 103-110 Link Here
103
                            <table id="sci_bcheckins_table" class="table table-bordered table-striped dataTable no-footer">
103
                            <table id="sci_bcheckins_table" class="table table-bordered table-striped dataTable no-footer">
104
                                <caption><h2>Results</h2></caption>
104
                                <caption><h2>Results</h2></caption>
105
                                <thead>
105
                                <thead>
106
                                    <th>Barcode</th>
106
                                    <tr>
107
                                    <th>Status</th>
107
                                        <th>Barcode</th>
108
                                        <th>Status</th>
109
                                    </tr>
108
                                </thead>
110
                                </thead>
109
                                <tbody>
111
                                <tbody>
110
                                    [% FOREACH success_line IN success %]
112
                                    [% FOREACH success_line IN success %]
Lines 135-160 Link Here
135
                    <div id="new_checkins" class="sci_entry">
137
                    <div id="new_checkins" class="sci_entry">
136
                        <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sci/sci-main.pl">
138
                        <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sci/sci-main.pl">
137
                            [% INCLUDE 'csrf-token.inc' %]
139
                            [% INCLUDE 'csrf-token.inc' %]
138
                            <legend class="sr-only">Scan</legend>
140
                            <fieldset class="mb-3">
139
                            <div class="row">
141
                                <legend class="sr-only">Scan</legend>
140
                                <div class="col-auto">
142
                                <div class="row">
141
                                    <label for="barcode_input">Scan the item or enter its barcode:</label>
143
                                    <div class="col-auto">
142
                                </div>
144
                                        <label for="barcode_input">Scan the item or enter its barcode:</label>
143
                                <div class="col-4">
145
                                    </div>
144
                                    <input id="barcode_input" name="barcode_input" size="20" type="text" class="focus form-control" autocomplete="off" />
146
                                    <div class="col-4">
145
                                </div>
147
                                        <input id="barcode_input" name="barcode_input" size="20" type="text" class="focus form-control" autocomplete="off" />
146
                                <div class="col-auto">
148
                                    </div>
147
                                    <button id="sci_append_button" type="submit" class="btn btn-primary"> Submit </button>
149
                                    <div class="col-auto">
150
                                        <button id="sci_append_button" type="submit" class="btn btn-primary"> Submit </button>
151
                                    </div>
148
                                </div>
152
                                </div>
149
                            </div>
153
                                <!-- /.row -->
150
                            <!-- /.row -->
154
                            </fieldset>
151
                            <div class="row">
155
                            <div class="row">
152
                                <div class="col">
156
                                <div class="col">
153
                                    <div class="sci_input_append">
157
                                    <div class="sci_input_append">
154
                                        <table id="sci_barcodes_table" class="table table-bordered table-striped dataTable no-footer" style="display: none;">
158
                                        <table id="sci_barcodes_table" class="table table-bordered table-striped dataTable no-footer" style="display: none;">
155
                                            <caption class="sr-only">Barcodes</caption>
159
                                            <caption class="sr-only">Barcodes</caption>
156
                                            <thead>
160
                                            <thead>
157
                                                <th class="barcodes_column">Barcode</th>
161
                                                <tr>
162
                                                    <th class="barcodes_column">Barcode</th>
163
                                                </tr>
158
                                            </thead>
164
                                            </thead>
159
                                            <tbody> </tbody>
165
                                            <tbody> </tbody>
160
                                        </table>
166
                                        </table>
Lines 218-225 Link Here
218
</div>
224
</div>
219
<!-- /#helpModal -->
225
<!-- /#helpModal -->
220
226
221
</body>
222
223
[% INCLUDE 'opac-bottom.inc' %]
227
[% INCLUDE 'opac-bottom.inc' %]
224
[% BLOCK jsinclude %]
228
[% BLOCK jsinclude %]
225
    <script>
229
    <script>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-18 / +17 lines)
Lines 57-63 Link Here
57
[% Asset.js('js/i18n.js') | $raw %]
57
[% Asset.js('js/i18n.js') | $raw %]
58
</head>
58
</head>
59
<body id="sco_main" class="sco">
59
<body id="sco_main" class="sco">
60
<div id="wrapper">
60
61
    [% INCLUDE 'masthead-sco.inc' %]
61
    [% INCLUDE 'masthead-sco.inc' %]
62
62
63
    <main class="main">
63
    <main class="main">
Lines 85-99 Link Here
85
                            <div id="newcheckout" class="sco_entry">
85
                            <div id="newcheckout" class="sco_entry">
86
                                <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl">
86
                                <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl">
87
                                    [% INCLUDE 'csrf-token.inc' %]
87
                                    [% INCLUDE 'csrf-token.inc' %]
88
                                    <legend
88
                                    <fieldset class="mb-3">
89
                                        ><h2>
89
                                        <legend>
90
                                            [% IF ( Koha.Preference('SCOAllowCheckin') ) %]
90
                                            <h2>
91
                                                <span>Check out, return, or renew an item:</span>
91
                                                [% IF ( Koha.Preference('SCOAllowCheckin') ) %]
92
                                            [% ELSE %]
92
                                                    <span>Check out, return, or renew an item:</span>
93
                                                <span>Check out or renew an item:</span>
93
                                                [% ELSE %]
94
                                            [% END %]
94
                                                    <span>Check out or renew an item:</span>
95
                                        </h2></legend
95
                                                [% END %]
96
                                    >
96
                                            </h2>
97
                                        </legend>
97
                                    <div class="row">
98
                                    <div class="row">
98
                                        <div class="col">
99
                                        <div class="col">
99
                                            <label for="barcode">Scan a new item or enter its barcode[% IF batch_checkouts_allowed %](or for <b>multiple checkouts only,</b> enter a barcode list, one barcode per line)[% END %]:</label>
100
                                            <label for="barcode">Scan a new item or enter its barcode[% IF batch_checkouts_allowed %](or for <b>multiple checkouts only,</b> enter a barcode list, one barcode per line)[% END %]:</label>
Lines 117-122 Link Here
117
                                        </div>
118
                                        </div>
118
                                    </div>
119
                                    </div>
119
                                    <!-- /.row -->
120
                                    <!-- /.row -->
121
                                    </fieldset>
120
                                </form>
122
                                </form>
121
                                <!-- /#scan_form -->
123
                                <!-- /#scan_form -->
122
                            </div>
124
                            </div>
Lines 130-142 Link Here
130
                        [% END %]
132
                        [% END %]
131
                    </div>
133
                    </div>
132
                    <!-- / .row -->
134
                    <!-- / .row -->
133
                </div>
134
                <!-- / .container-fluid -->
135
135
136
                <div class="container-fluid">
137
                    <div class="row">
136
                    <div class="row">
138
                        <div class="col order-first order-md-first order-lg-2">
137
                        <div class="col order-first order-md-first order-lg-2">
139
                            [% WRAPPER tabs %]
138
                            [% WRAPPER tabs id="checkouts" %]
140
                                [% WRAPPER tabs_nav %]
139
                                [% WRAPPER tabs_nav %]
141
                                    [% WRAPPER tab_item tabname= "checkouts" bt_active= 1 %]
140
                                    [% WRAPPER tab_item tabname= "checkouts" bt_active= 1 %]
142
                                        <span>Checkouts ([% issues_count | html %])</span>
141
                                        <span>Checkouts ([% issues_count | html %])</span>
Lines 154-160 Link Here
154
153
155
                                [% WRAPPER tab_panels %]
154
                                [% WRAPPER tab_panels %]
156
                                    [% WRAPPER tab_panel tabname="checkouts" bt_active= 1 %]
155
                                    [% WRAPPER tab_panel tabname="checkouts" bt_active= 1 %]
157
                                        <div id="checkouts-tab" class="tab-pane show active" aria-labelledby="checkouts">
158
                                            <div id="borrowerdetails">
156
                                            <div id="borrowerdetails">
159
                                                [% IF ( new_issue ) %]
157
                                                [% IF ( new_issue ) %]
160
                                                    <div class="lastchecked">
158
                                                    <div class="lastchecked">
Lines 215-220 Link Here
215
                                                                        <td>
213
                                                                        <td>
216
                                                                            <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
214
                                                                            <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
217
                                                                                [% INCLUDE 'csrf-token.inc' %]
215
                                                                                [% INCLUDE 'csrf-token.inc' %]
216
                                                                                <fieldset>
218
                                                                                <legend class="sr-only">Issue renews</legend>
217
                                                                                <legend class="sr-only">Issue renews</legend>
219
                                                                                <input type="hidden" name="patronid" value="[% patronid | html %]" />
218
                                                                                <input type="hidden" name="patronid" value="[% patronid | html %]" />
220
                                                                                <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
219
                                                                                <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
Lines 242-253 Link Here
242
                                                                                [% IF ISSUE.auto_renew %]
241
                                                                                [% IF ISSUE.auto_renew %]
243
                                                                                    <br /><span>This item is scheduled for automatic renewal</span>
242
                                                                                    <br /><span>This item is scheduled for automatic renewal</span>
244
                                                                                [% END %]
243
                                                                                [% END %]
244
                                                                                </fieldset>
245
                                                                            </form>
245
                                                                            </form>
246
                                                                        </td>
246
                                                                        </td>
247
                                                                        [% IF Koha.Preference('SCOAllowCheckin') %]
247
                                                                        [% IF Koha.Preference('SCOAllowCheckin') %]
248
                                                                            <td>
248
                                                                            <td>
249
                                                                                <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
249
                                                                                <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
250
                                                                                    [% INCLUDE 'csrf-token.inc' %]
250
                                                                                    [% INCLUDE 'csrf-token.inc' %]
251
                                                                                    <fieldset>
251
                                                                                    <legend class="sr-only">Issue renews</legend>
252
                                                                                    <legend class="sr-only">Issue renews</legend>
252
                                                                                    <input type="hidden" name="patronid" value="[% patronid | html %]" />
253
                                                                                    <input type="hidden" name="patronid" value="[% patronid | html %]" />
253
                                                                                    <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
254
                                                                                    <input type="hidden" name="load_checkouts" value="[% load_checkouts | html %]" />
Lines 255-260 Link Here
255
                                                                                    <input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
256
                                                                                    <input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
256
                                                                                    <input type="hidden" name="op" value="cud-returnbook" />
257
                                                                                    <input type="hidden" name="op" value="cud-returnbook" />
257
                                                                                    <input type="hidden" name="confirmed" value="" />
258
                                                                                    <input type="hidden" name="confirmed" value="" />
259
                                                                                    </fieldset>
258
                                                                                </form>
260
                                                                                </form>
259
                                                                            </td>
261
                                                                            </td>
260
                                                                        [% END %]
262
                                                                        [% END %]
Lines 274-280 Link Here
274
                                                [% END # / IF issues_count %]
276
                                                [% END # / IF issues_count %]
275
                                            </div>
277
                                            </div>
276
                                            <!-- / #borrowerdetails -->
278
                                            <!-- / #borrowerdetails -->
277
                                        </div>
278
                                    [% END # /tab_panel %]
279
                                    [% END # /tab_panel %]
279
                                    [% WRAPPER tab_panel tabname="holds" %]
280
                                    [% WRAPPER tab_panel tabname="holds" %]
280
                                        [% IF HOLDS.count > 0 %]
281
                                        [% IF HOLDS.count > 0 %]
Lines 727-730 Link Here
727
            </div>
728
            </div>
728
        [% END %]
729
        [% END %]
729
    [% END %]
730
    [% END %]
730
</div>
731
- 

Return to bug 41144