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

(-)a/C4/Auth.pm (-2 / +6 lines)
Lines 573-579 sub get_template_and_user { Link Here
573
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),
573
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),
574
            OPACShelfBrowser                      => "" . C4::Context->preference("OPACShelfBrowser"),
574
            OPACShelfBrowser                      => "" . C4::Context->preference("OPACShelfBrowser"),
575
            OPACURLOpenInNewWindow                => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
575
            OPACURLOpenInNewWindow                => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
576
            OPACUserCSS                           => "" . C4::Context->preference("OPACUserCSS"),
577
            OpacAuthorities                       => C4::Context->preference("OpacAuthorities"),
576
            OpacAuthorities                       => C4::Context->preference("OpacAuthorities"),
578
            opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
577
            opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
579
            opac_search_limit                     => $opac_search_limit,
578
            opac_search_limit                     => $opac_search_limit,
Lines 593-599 sub get_template_and_user { Link Here
593
            OpacFavicon                           => C4::Context->preference("OpacFavicon"),
592
            OpacFavicon                           => C4::Context->preference("OpacFavicon"),
594
            opaclanguagesdisplay                  => "" . C4::Context->preference("opaclanguagesdisplay"),
593
            opaclanguagesdisplay                  => "" . C4::Context->preference("opaclanguagesdisplay"),
595
            opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
594
            opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
596
            OPACUserJS                            => C4::Context->preference("OPACUserJS"),
597
            opacuserlogin                         => "" . C4::Context->preference("opacuserlogin"),
595
            opacuserlogin                         => "" . C4::Context->preference("opacuserlogin"),
598
            OpenLibrarySearch                     => C4::Context->preference("OpenLibrarySearch"),
596
            OpenLibrarySearch                     => C4::Context->preference("OpenLibrarySearch"),
599
            ShowReviewer                          => C4::Context->preference("ShowReviewer"),
597
            ShowReviewer                          => C4::Context->preference("ShowReviewer"),
Lines 1373-1378 sub checkauth { Link Here
1373
        OpacFavicon                           => C4::Context->preference("OpacFavicon"),
1371
        OpacFavicon                           => C4::Context->preference("OpacFavicon"),
1374
        opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
1372
        opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
1375
        opaclanguagesdisplay                  => C4::Context->preference("opaclanguagesdisplay"),
1373
        opaclanguagesdisplay                  => C4::Context->preference("opaclanguagesdisplay"),
1374
        opacbookbag                           => "" . C4::Context->preference("opacbookbag"),
1375
        OpacCloud                             => C4::Context->preference("OpacCloud"),
1376
        OpacTopissue                          => C4::Context->preference("OpacTopissue"),
1377
        OpacAuthorities                       => C4::Context->preference("OpacAuthorities"),
1378
        OpacBrowser                           => C4::Context->preference("OpacBrowser"),
1379
        TagsEnabled                           => C4::Context->preference("TagsEnabled"),
1376
        OPACUserJS                            => C4::Context->preference("OPACUserJS"),
1380
        OPACUserJS                            => C4::Context->preference("OPACUserJS"),
1377
        OPACUserCSS                           => C4::Context->preference("OPACUserCSS"),
1381
        OPACUserCSS                           => C4::Context->preference("OPACUserCSS"),
1378
        intranetcolorstylesheet               => C4::Context->preference("intranetcolorstylesheet"),
1382
        intranetcolorstylesheet               => C4::Context->preference("intranetcolorstylesheet"),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-4 / +2 lines)
Lines 292-298 Link Here
292
                    <label for="UserJS">UserJS: </label>
292
                    <label for="UserJS">UserJS: </label>
293
                    <div style="display:flex; flex-direction:column;">
293
                    <div style="display:flex; flex-direction:column;">
294
                        <a class="expand-textarea" id="expand_userjs" data-target="userjs" data-syntax="javascript" href="#">Click to edit</a>
294
                        <a class="expand-textarea" id="expand_userjs" data-target="userjs" data-syntax="javascript" href="#">Click to edit</a>
295
                        <textarea style="display:none" name="userjs" id="userjs" class="codemirror" rows="10" cols="40">[% library.userjs %]</textarea>
295
                        <textarea style="display:none" name="userjs" id="userjs" class="codemirror" rows="10" cols="40">[% library.userjs | html %]</textarea>
296
                        <a class="collapse-textarea" id="collapse_userjs" data-target="userjs" data-syntax="javascript" style="display:none" href="#">Click to collapse</br></a>
296
                        <a class="collapse-textarea" id="collapse_userjs" data-target="userjs" data-syntax="javascript" style="display:none" href="#">Click to collapse</br></a>
297
                    </div>
297
                    </div>
298
                </li>
298
                </li>
Lines 300-306 Link Here
300
                    <label for="UserCSS">UserCSS: </label>
300
                    <label for="UserCSS">UserCSS: </label>
301
                    <div style="display:flex; flex-direction:column;">
301
                    <div style="display:flex; flex-direction:column;">
302
                        <a class="expand-textarea" id="expand_usercss" data-target="usercss" data-syntax="css" href="#">Click to edit</a>
302
                        <a class="expand-textarea" id="expand_usercss" data-target="usercss" data-syntax="css" href="#">Click to edit</a>
303
                        <textarea style="display:none" name="usercss" id="usercss" class="" rows="10" cols="40">[% library.usercss %]</textarea>
303
                        <textarea style="display:none" name="usercss" id="usercss" class="" rows="10" cols="40">[% library.usercss | html %]</textarea>
304
                        <a class="collapse-textarea" id="collapse_usercss" data-target="usercss" data-syntax="css" style="display:none" href="#">Click to collapse</br></a>
304
                        <a class="collapse-textarea" id="collapse_usercss" data-target="usercss" data-syntax="css" style="display:none" href="#">Click to collapse</br></a>
305
                    </div>
305
                    </div>
306
                </li>
306
                </li>
Lines 504-510 Link Here
504
    [% Asset.js("js/admin-menu.js") | $raw %]
504
    [% Asset.js("js/admin-menu.js") | $raw %]
505
    [% INCLUDE 'datatables.inc' %]
505
    [% INCLUDE 'datatables.inc' %]
506
    [% INCLUDE 'columns_settings.inc' %]
506
    [% INCLUDE 'columns_settings.inc' %]
507
    [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %]
508
    [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
507
    [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
509
    [% Asset.js( "lib/codemirror/css.min.js" ) | $raw %]
508
    [% Asset.js( "lib/codemirror/css.min.js" ) | $raw %]
510
    [% Asset.js( "lib/codemirror/javascript.min.js" ) | $raw %]
509
    [% Asset.js( "lib/codemirror/javascript.min.js" ) | $raw %]
Lines 520-526 Link Here
520
    [% Asset.js( "lib/codemirror/css-lint.min.js" ) | $raw %]
519
    [% Asset.js( "lib/codemirror/css-lint.min.js" ) | $raw %]
521
    [% Asset.js( "lib/codemirror/yaml-lint.min.js" ) | $raw %]
520
    [% Asset.js( "lib/codemirror/yaml-lint.min.js" ) | $raw %]
522
    [% Asset.css("lib/codemirror/codemirror.css") | $raw %]
521
    [% Asset.css("lib/codemirror/codemirror.css") | $raw %]
523
    [% INCLUDE 'str/tinymce_i18n.inc' %]
524
    <style>
522
    <style>
525
        .CodeMirror {
523
        .CodeMirror {
526
            border: 1px solid #EEE;
524
            border: 1px solid #EEE;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc (+1 lines)
Lines 1-5 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Branches %]
3
[%- USE KohaPlugins -%]
4
[%- USE KohaPlugins -%]
4
[% USE Asset %]
5
[% USE Asset %]
5
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt (+5 lines)
Lines 40-45 Link Here
40
    [% Asset.css("css/sco.css") | $raw %]
40
    [% Asset.css("css/sco.css") | $raw %]
41
[% END %]
41
[% END %]
42
[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
42
[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
43
[% IF Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) %]
44
    <style>
45
        [% Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) | $raw %]
46
    </style>
47
[% END %]
43
[% IF ( Koha.Preference('SelfCheckInUserCSS') ) %]<style>[% Koha.Preference('SelfCheckInUserCSS') | $raw %]</style>[% END %]
48
[% IF ( Koha.Preference('SelfCheckInUserCSS') ) %]<style>[% Koha.Preference('SelfCheckInUserCSS') | $raw %]</style>[% END %]
44
<script>
49
<script>
45
    var Koha = {};
50
    var Koha = {};
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt (+5 lines)
Lines 11-16 Link Here
11
[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
11
[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
12
[% Asset.css("css/sco.css") | $raw %]
12
[% Asset.css("css/sco.css") | $raw %]
13
[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
13
[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
14
[% IF Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) %]
15
    <style>
16
        [% Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) | $raw %]
17
    </style>
18
[% END %]
14
[% IF ( SCOUserCSS ) %]<style>[% SCOUserCSS | $raw %]</style>[% END %]
19
[% IF ( SCOUserCSS ) %]<style>[% SCOUserCSS | $raw %]</style>[% END %]
15
<script>
20
<script>
16
    var Koha = {};
21
    var Koha = {};
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (+5 lines)
Lines 21-26 Link Here
21
    [% Asset.css("css/sco.css") | $raw %]
21
    [% Asset.css("css/sco.css") | $raw %]
22
[% END %]
22
[% END %]
23
[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
23
[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
24
[% IF Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) %]
25
    <style>
26
        [% Branches.GetBranchSpecificCSS( Branches.GetLoggedInBranchcode() || default_branch) | $raw %]
27
    </style>
28
[% END %]
24
[% IF ( Koha.Preference('SCOUserCSS') ) %]<style>[% Koha.Preference('SCOUserCSS') | $raw %]</style>[% END %]
29
[% IF ( Koha.Preference('SCOUserCSS') ) %]<style>[% Koha.Preference('SCOUserCSS') | $raw %]</style>[% END %]
25
<script>
30
<script>
26
    var Koha = {};
31
    var Koha = {};
(-)a/t/db_dependent/Template/Plugin/Branches.t (-2 / +1 lines)
Lines 218-224 subtest 'pickup_locations() tests' => sub { Link Here
218
    $schema->storage->txn_rollback;
218
    $schema->storage->txn_rollback;
219
};
219
};
220
220
221
subtest 'branch specfic js and css' => sub {
221
subtest 'branch specific js and css' => sub {
222
222
223
    plan tests => 2;
223
    plan tests => 2;
224
224
225
- 

Return to bug 32721