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

(-)a/C4/XSLT.pm (-4 / +31 lines)
Lines 33-39 use Koha::XSLT::Base; Link Here
33
use Koha::Libraries;
33
use Koha::Libraries;
34
use Koha::Recalls;
34
use Koha::Recalls;
35
use Koha::TemplateUtils qw( process_tt );
35
use Koha::TemplateUtils qw( process_tt );
36
use Koha::AdditionalContents;
36
use C4::Scrubber;
37
use C4::Scrubber;
38
use C4::Languages;
37
39
38
my $engine;    #XSLT Handler object
40
my $engine;    #XSLT Handler object
39
41
Lines 241-253 sub XSLTParse4Display { Link Here
241
        }
243
        }
242
    }
244
    }
243
    my $extracontent = '';
245
    my $extracontent = '';
246
    my $location;
247
    my $branch = C4::Context->userenv->{branch} || '';
248
    my $lang   = C4::Languages::getlanguage;
249
250
    if ( $xslsyspref eq "XSLTDetailsDisplay" ) {
251
        $location = 'StaffDetailPage';
252
    } elsif ( $xslsyspref eq "XSLTResultsDisplay" ) {
253
        $location = 'StaffResultsPage';
254
    } elsif ( $xslsyspref eq "OPACXSLTDetailsDisplay" ) {
255
        $location = 'OPACDetailPage';
256
    } elsif ( $xslsyspref eq "OPACXSLTResultsDisplay" ) {
257
        $location = 'OPACResultsPage';
258
    }
259
260
    my @record_display_customizations = Koha::AdditionalContents->search_for_display(
261
        {
262
            category   => 'record_display',
263
            location   => $location,
264
            lang       => $lang,
265
            library_id => $branch,
266
        }
267
    )->as_list;
244
268
245
    # Check if we should add extra content based on system preference
269
    if (@record_display_customizations) {
246
    if ( C4::Context->preference('ExtraContentForXSLTDisplay') ) {
270
        foreach my $customization (@record_display_customizations) {
271
            $extracontent .= $customization->content;
272
        }
273
    }
247
274
275
    if ($extracontent) {
248
        my $scrubber               = C4::Scrubber->new('staff');
276
        my $scrubber               = C4::Scrubber->new('staff');
249
        my $extracontentvalue      = C4::Context->preference('ExtraContentForXSLTDisplay');
277
        my $extracontentproccessed = process_tt( $extracontent, { record => $record } );
250
        my $extracontentproccessed = process_tt( $extracontentvalue, { record => $record } );
251
        $extracontent = $scrubber->scrub($extracontentproccessed);
278
        $extracontent = $scrubber->scrub($extracontentproccessed);
252
    }
279
    }
253
280
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (+32 lines)
Lines 12-17 Link Here
12
            [% t("Modify news item") | html %]
12
            [% t("Modify news item") | html %]
13
        [% ELSIF category == 'pages' %]
13
        [% ELSIF category == 'pages' %]
14
            [% t("Modify page") | html %]
14
            [% t("Modify page") | html %]
15
        [% ELSIF category == 'record_display' %]
16
            [% t("Modify record display customization") | html %]
15
        [% ELSE %]
17
        [% ELSE %]
16
            [% t("Modify HTML customization") | html %]
18
            [% t("Modify HTML customization") | html %]
17
        [% END %]
19
        [% END %]
Lines 20-25 Link Here
20
            [% t("New news item") | html %]
22
            [% t("New news item") | html %]
21
        [% ELSIF category == 'pages' %]
23
        [% ELSIF category == 'pages' %]
22
            [% t("New page") | html %]
24
            [% t("New page") | html %]
25
        [% ELSIF category == 'record_display' %]
26
            [% t("New record display customization") | html %]
23
        [% ELSE %]
27
        [% ELSE %]
24
            [% t("New HTML customization") | html %]
28
            [% t("New HTML customization") | html %]
25
        [% END %]
29
        [% END %]
Lines 30-35 Link Here
30
        [% t("News") | html %]
34
        [% t("News") | html %]
31
    [% ELSIF category == 'pages' %]
35
    [% ELSIF category == 'pages' %]
32
        [% t("Pages") | html %]
36
        [% t("Pages") | html %]
37
    [% ELSIF category == 'record_display' %]
38
        [% t("Record display customizations") | html %]
33
    [% ELSE %]
39
    [% ELSE %]
34
        [% t("HTML customizations") | html %]
40
        [% t("HTML customizations") | html %]
35
    [% END %]
41
    [% END %]
Lines 97-102 Link Here
97
                    <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>
103
                    <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>
98
                [% ELSIF category == 'pages' %]
104
                [% ELSIF category == 'pages' %]
99
                    <a href="/cgi-bin/koha/tools/additional-contents.pl?category=pages">Pages</a>
105
                    <a href="/cgi-bin/koha/tools/additional-contents.pl?category=pages">Pages</a>
106
                [% ELSIF category == 'record_display' %]
107
                    <a href="/cgi-bin/koha/tools/additional-contents.pl?category=record_display">Record display customizations</a>
100
                [% ELSE %]
108
                [% ELSE %]
101
                    <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a>
109
                    <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a>
102
                [% END %]
110
                [% END %]
Lines 356-361 Link Here
356
            [% t("News") | html %]
364
            [% t("News") | html %]
357
        [% ELSIF category == 'pages' %]
365
        [% ELSIF category == 'pages' %]
358
            [% t("Pages") | html %]
366
            [% t("Pages") | html %]
367
        [% ELSIF category == 'record_display' %]
368
            [% t("Record display customizations") | html %]
359
        [% ELSE %]
369
        [% ELSE %]
360
            [% t("HTML customizations") | html %]
370
            [% t("HTML customizations") | html %]
361
        [% END %]
371
        [% END %]
Lines 365-370 Link Here
365
        <a class="customization-link" href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>
375
        <a class="customization-link" href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>
366
        <a class="customization-link" href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a>
376
        <a class="customization-link" href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a>
367
        <a class="customization-link" href="/cgi-bin/koha/tools/additional-contents.pl?category=pages">Pages</a>
377
        <a class="customization-link" href="/cgi-bin/koha/tools/additional-contents.pl?category=pages">Pages</a>
378
        <a class="customization-link" href="/cgi-bin/koha/tools/additional-contents.pl?category=record_display">Record display customizations</a>
368
        [% IF ( CAN_user_parameters_manage_sysprefs ) %]
379
        [% IF ( CAN_user_parameters_manage_sysprefs ) %]
369
            <a class="syspref-link" href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS">OPACUserJS</a>
380
            <a class="syspref-link" href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS">OPACUserJS</a>
370
            <a class="syspref-link" href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS">OPACUserCSS</a>
381
            <a class="syspref-link" href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS">OPACUserCSS</a>
Lines 531-536 Link Here
531
                <option value="slip">Slip</option>
542
                <option value="slip">Slip</option>
532
            [% END %]
543
            [% END %]
533
        [% END %]
544
        [% END %]
545
    [% ELSIF category ==  'record_display' %]
546
        [% SET staff_available_options = ['StaffResultsPage' , 'StaffDetailPage'] %]
547
        <optgroup label="Staff interface">
548
            [% FOREACH l IN staff_available_options.sort %]
549
                [% IF l == location %]
550
                    <option value="[% l | html %]" selected="selected">[% l | html %]</option>
551
                [% ELSE %]
552
                    <option value="[% l | html %]">[% l | html %]</option>
553
                [% END %]
554
            [% END %]
555
        </optgroup>
556
        [% SET opac_available_options = ['OPACResultsPage' , 'OPACResultsPage'] %]
557
        <optgroup label="OPAC">
558
            [% FOREACH l IN opac_available_options.sort %]
559
                [% IF l == location %]
560
                    <option value="[% l | html %]" selected="selected">[% l | html %]</option>
561
                [% ELSE %]
562
                    <option value="[% l | html %]">[% l | html %]</option>
563
                [% END %]
564
            [% END %]
565
        </optgroup>
534
    [% ELSE %]
566
    [% ELSE %]
535
        [% SET opac_available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'OpacMaintenanceNotice', 'OPACResultsSidebar', 'OpacSuppressionMessage', 'SCOMainUserBlock', 'SelfCheckInMainUserBlock', 'SelfCheckHelpMessage', 'CatalogConcernHelp', 'CatalogConcernTemplate', 'CookieConsentBar', 'CookieConsentPopup', 'PatronSelfRegistrationAdditionalInstructions', 'ILLModuleCopyrightClearance' ] %]
567
        [% SET opac_available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'OpacMaintenanceNotice', 'OPACResultsSidebar', 'OpacSuppressionMessage', 'SCOMainUserBlock', 'SelfCheckInMainUserBlock', 'SelfCheckHelpMessage', 'CatalogConcernHelp', 'CatalogConcernTemplate', 'CookieConsentBar', 'CookieConsentPopup', 'PatronSelfRegistrationAdditionalInstructions', 'ILLModuleCopyrightClearance' ] %]
536
        <optgroup label="OPAC">
568
        <optgroup label="OPAC">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (-1 / +3 lines)
Lines 140-145 Link Here
140
140
141
                    <dt><a href="/cgi-bin/koha/tools/additional-contents.pl?category=pages">Pages</a></dt>
141
                    <dt><a href="/cgi-bin/koha/tools/additional-contents.pl?category=pages">Pages</a></dt>
142
                    <dd>Write custom pages</dd>
142
                    <dd>Write custom pages</dd>
143
144
                    <dt><a href="/cgi-bin/koha/tools/additional-contents.pl?category=record_display">Record display customizations</a></dt>
145
                    <dd>Write record display customizations</dd>
143
                [% END %]
146
                [% END %]
144
147
145
                [% IF ( CAN_user_tools_schedule_tasks ) %]
148
                [% IF ( CAN_user_tools_schedule_tasks ) %]
146
- 

Return to bug 39860