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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-1 / +1 lines)
Lines 484-490 Link Here
484
            [% END %]
484
            [% END %]
485
        [% END %]
485
        [% END %]
486
    [% ELSE %]
486
    [% ELSE %]
487
        [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacBranchInfo' ] %]
487
        [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo' ] %]
488
        [% FOREACH l IN available_options.sort %]
488
        [% FOREACH l IN available_options.sort %]
489
            [% IF l == location %]
489
            [% IF l == location %]
490
                <option value="[% l | html %]" selected="selected">[% l | html %]</option>
490
                <option value="[% l | html %]" selected="selected">[% l | html %]</option>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt (-4 / +3 lines)
Lines 3-9 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% PROCESS 'display-library-address.inc' %]
4
[% PROCESS 'display-library-address.inc' %]
5
[% USE AdditionalContents %]
5
[% USE AdditionalContents %]
6
[% SET OpacBranchInfo = AdditionalContents.get( location => "OpacBranchInfo",  lang => lang, library => library.branchcode || branchcode, blocktitle => 0 ) %]
6
[% SET OpacLibraryInfo = AdditionalContents.get( location => "OpacLibraryInfo",  lang => lang, library => library.branchcode || branchcode, blocktitle => 0 ) %]
7
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
7
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
8
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
8
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
Lines 37-43 Link Here
37
37
38
[% BLOCK library_description %]
38
[% BLOCK library_description %]
39
    <div property="description">
39
    <div property="description">
40
        [% PROCESS koha_news_block news => OpacBranchInfo %]
40
        [% PROCESS koha_news_block news => OpacLibraryInfo %]
41
    </div>
41
    </div>
42
[% END %]
42
[% END %]
43
43
Lines 98-104 Link Here
98
                        <div class="row">
98
                        <div class="row">
99
                            <div class="col-lg-8">
99
                            <div class="col-lg-8">
100
                                [% PROCESS library_info %]
100
                                [% PROCESS library_info %]
101
                                [% IF ( OpacBranchInfo ) %]
101
                                [% IF ( OpacLibraryInfo ) %]
102
                                    <div class="library_description">
102
                                    <div class="library_description">
103
                                        <hr />
103
                                        <hr />
104
                                        [% PROCESS library_description %]
104
                                        [% PROCESS library_description %]
105
- 

Return to bug 29144