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

(-)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/circ/circulation-home.tt (-6 / +6 lines)
Lines 181-204 Link Here
181
        </div>
181
        </div>
182
    </div>
182
    </div>
183
183
184
    [% SET IntranetCirculationHomeHTML = AdditionalContents.get( location => "IntranetCirculationHomeHTML", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %]
184
    [% SET StaffCirculationHomeHTML = AdditionalContents.get( location => "StaffCirculationHomeHTML", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %]
185
185
186
    [% IF ( IntranetCirculationHomeHTML.content && IntranetCirculationHomeHTML.content.count > 0 ) %]
186
    [% IF ( StaffCirculationHomeHTML.content && StaffCirculationHomeHTML.content.count > 0 ) %]
187
        <div class="row">
187
        <div class="row">
188
            <div class="col-sm-12">
188
            <div class="col-sm-12">
189
                <div id="[% IntranetCirculationHomeHTML.location | html %]" class="page-section">
189
                <div id="[% StaffCirculationHomeHTML.location | html %]">
190
                    [% FOREACH n IN IntranetCirculationHomeHTML.content %]
190
                    [% FOREACH n IN StaffCirculationHomeHTML.content %]
191
                        <div class="[% n.lang | html %]_item">
191
                        <div class="[% n.lang | html %]_item">
192
                            <div class="[% n.lang | html %]_body">[% n.content | $raw %]</div>
192
                            <div class="[% n.lang | html %]_body">[% n.content | $raw %]</div>
193
                        </div>
193
                        </div>
194
                    [% END %]
194
                    [% END %]
195
                </div>
195
                </div>
196
                <!-- /#IntranetCirculationHomeHTML -->
196
                <!-- /#StaffCirculationHomeHTML -->
197
            </div>
197
            </div>
198
            <!-- /.col-sm-12 -->
198
            <!-- /.col-sm-12 -->
199
        </div>
199
        </div>
200
        <!-- /.row -->
200
        <!-- /.row -->
201
    [% END # /IF IntranetCirculationHomeHTML %]
201
    [% END # /IF StaffCirculationHomeHTML %]
202
202
203
    <div class="row" id="offline-circulation">
203
    <div class="row" id="offline-circulation">
204
        <div class="col-md-12">
204
        <div class="col-md-12">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-2 / +1 lines)
Lines 542-548 Link Here
542
                [% END %]
542
                [% END %]
543
            [% END %]
543
            [% END %]
544
        </optgroup>
544
        </optgroup>
545
        [% SET staff_available_options = [ 'IntranetCirculationHomeHTML', 'IntranetmainUserblock', 'RoutingListNote', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', 'StaffLoginInstructions', 'StaffPatronsHome', 'StaffPOSHome', 'StaffSerialsHome' ] %]
545
        [% SET staff_available_options = [ 'StaffCirculationHomeHTML', 'IntranetmainUserblock', 'RoutingListNote', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', 'StaffLoginInstructions', 'StaffPatronsHome', 'StaffPOSHome', 'StaffSerialsHome' ] %]
546
        <optgroup label="Staff interface">
546
        <optgroup label="Staff interface">
547
            [% FOREACH l IN staff_available_options.sort %]
547
            [% FOREACH l IN staff_available_options.sort %]
548
                [% IF l == location %]
548
                [% IF l == location %]
549
- 

Return to bug 34563