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

(-)a/Koha/AdditionalContents.pm (-3 / +3 lines)
Lines 176-184 sub get_html_customizations_options { Link Here
176
176
177
    if ( $interface eq 'staff' ) {
177
    if ( $interface eq 'staff' ) {
178
        return [
178
        return [
179
            'IntranetCirculationHomeHTML', 'IntranetmainUserblock', 'StaffReportsHome',     'RoutingListNote',
179
            'StaffCirculationHomeHTML', 'IntranetmainUserblock', 'StaffReportsHome',     'RoutingListNote',
180
            'StaffAcquisitionsHome',       'StaffAuthoritiesHome',  'StaffCataloguingHome', 'StaffListsHome',
180
            'StaffAcquisitionsHome',    'StaffAuthoritiesHome',  'StaffCataloguingHome', 'StaffListsHome',
181
            'StaffLoginInstructions',      'StaffPatronsHome',      'StaffPOSHome',         'StaffSerialsHome'
181
            'StaffLoginInstructions',   'StaffPatronsHome',      'StaffPOSHome',         'StaffSerialsHome'
182
        ];
182
        ];
183
    }
183
    }
184
184
(-)a/installer/data/mysql/atomicupdate/bug-34563-move-IntranetCirculationHome-to-additional-contents.pl (-4 / +4 lines)
Lines 16-35 return { Link Here
16
        if ($intranetcirculationhomehtml) {
16
        if ($intranetcirculationhomehtml) {
17
17
18
            $dbh->do(
18
            $dbh->do(
19
                "INSERT INTO additional_contents ( category, code, location, branchcode, published_on ) VALUES ('html_customizations', 'IntranetCirculationHomeHTML', 'IntranetCirculationHomeHTML', NULL, CAST(NOW() AS date) )"
19
                "INSERT INTO additional_contents ( category, code, location, branchcode, published_on ) VALUES ('html_customizations', 'StaffCirculationHomeHTML', 'StaffCirculationHomeHTML', NULL, CAST(NOW() AS date) )"
20
            );
20
            );
21
21
22
            my ($insert_id) = $dbh->selectrow_array(
22
            my ($insert_id) = $dbh->selectrow_array(
23
                "SELECT id FROM additional_contents WHERE category = 'html_customizations' AND code = 'IntranetCirculationHomeHTML' AND location = 'IntranetCirculationHomeHTML' LIMIT 1",
23
                "SELECT id FROM additional_contents WHERE category = 'html_customizations' AND code = 'StaffCirculationHomeHTML' AND location = 'StaffCirculationHomeHTML' LIMIT 1",
24
                {}
24
                {}
25
            );
25
            );
26
26
27
            $dbh->do(
27
            $dbh->do(
28
                "INSERT INTO additional_contents_localizations ( additional_content_id, title, content, lang ) VALUES ( ?, 'IntranetCirculationHomeHTML default', ?, 'default' )",
28
                "INSERT INTO additional_contents_localizations ( additional_content_id, title, content, lang ) VALUES ( ?, 'StaffCirculationHomeHTML default', ?, 'default' )",
29
                undef, $insert_id, $intranetcirculationhomehtml
29
                undef, $insert_id, $intranetcirculationhomehtml
30
            );
30
            );
31
31
32
            say $out "Added 'IntranetCirculationHomeHTML' HTML customization";
32
            say $out "Added 'StaffCirculationHomeHTML' HTML customization";
33
        }
33
        }
34
34
35
        # Remove old system preference
35
        # Remove old system preference
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc (-1 / +1 lines)
Lines 14-20 Link Here
14
    Adding content to this region will enable the copyright clearance stage in request creation. The content will appear on the OPAC during the process of placing an ILL request.
14
    Adding content to this region will enable the copyright clearance stage in request creation. The content will appear on the OPAC during the process of placing an ILL request.
15
</div>
15
</div>
16
16
17
<div id="IntranetCirculationHomeHTML_notes" class="hint customization_note"> Include this content in its own section on the circulation home page</div>
17
<div id="StaffCirculationHomeHTML_notes" class="hint customization_note"> Include this content in its own section on the circulation home page</div>
18
18
19
<div id="IntranetmainUserblock_notes" class="hint customization_note"> Include this content in its own section on the main page of the staff interface </div>
19
<div id="IntranetmainUserblock_notes" class="hint customization_note"> Include this content in its own section on the main page of the staff interface </div>
20
20
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref (-1 / +1 lines)
Lines 222-225 Staff interface: Link Here
222
                  "enforced": Enforce
222
                  "enforced": Enforce
223
                  "enabled": Enable
223
                  "enabled": Enable
224
                  "disabled": "Don't enable"
224
                  "disabled": "Don't enable"
225
            - two-factor authentication (2FA) for staff members.
225
            - two-factor authentication (2FA) for staff members.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-7 / +6 lines)
Lines 183-206 Link Here
183
        </div>
183
        </div>
184
    </div>
184
    </div>
185
185
186
    [% SET IntranetCirculationHomeHTML = AdditionalContents.get( location => "IntranetCirculationHomeHTML", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %]
186
    [% SET StaffCirculationHomeHTML = AdditionalContents.get( location => "StaffCirculationHomeHTML", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %]
187
187
188
    [% IF ( IntranetCirculationHomeHTML.content && IntranetCirculationHomeHTML.content.count > 0 ) %]
188
    [% IF ( StaffCirculationHomeHTML.content && StaffCirculationHomeHTML.content.count > 0 ) %]
189
        <div class="row">
189
        <div class="row">
190
            <div class="col-sm-12">
190
            <div class="col-sm-12">
191
                <div id="[% IntranetCirculationHomeHTML.location | html %]" class="page-section">
191
                <div id="[% StaffCirculationHomeHTML.location | html %]">
192
                    [% FOREACH n IN IntranetCirculationHomeHTML.content %]
192
                    [% FOREACH n IN StaffCirculationHomeHTML.content %]
193
                        <div class="[% n.lang | html %]_item">
193
                        <div class="[% n.lang | html %]_item">
194
                            <div class="[% n.lang | html %]_body">[% n.content | $raw %]</div>
194
                            <div class="[% n.lang | html %]_body">[% n.content | $raw %]</div>
195
                        </div>
195
                        </div>
196
                    [% END %]
196
                    [% END %]
197
                </div>
197
                </div>
198
                <!-- /#IntranetCirculationHomeHTML -->
198
                <!-- /#StaffCirculationHomeHTML -->
199
            </div>
199
            </div>
200
            <!-- /.col-sm-12 -->
200
            <!-- /.col-sm-12 -->
201
        </div>
201
        </div>
202
        <!-- /.row -->
202
        <!-- /.row -->
203
    [% END # /IF IntranetCirculationHomeHTML %]
203
    [% END # /IF StaffCirculationHomeHTML %]
204
204
205
    <div class="row" id="offline-circulation">
205
    <div class="row" id="offline-circulation">
206
        <div class="col-md-12">
206
        <div class="col-md-12">
207
- 

Return to bug 34563