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

(-)a/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql (-1 / +1 lines)
Lines 1-4 Link Here
1
--
1
--
2
-- Adds OpacLangSelectorMode syspref for bug 14252
2
-- Adds OpacLangSelectorMode syspref for bug 14252
3
--
3
--
4
INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLangSelectorMode','both','both|head|foot','Select the location to display the language selector','Choice');
4
INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLangSelectorMode','both','both|mast|foot','Select the location to display the language selector','Choice');
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 270-276 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
270
('OpacItemLocation','callnum','callnum|ccode|location','Show the shelving location of items in the opac','Choice'),
270
('OpacItemLocation','callnum','callnum|ccode|location','Show the shelving location of items in the opac','Choice'),
271
('OPACItemsResultsDisplay','0','','If OFF : show only the status of items in result list.If ON : show full location of items (branch+location+callnumber) as in staff interface','YesNo'),
271
('OPACItemsResultsDisplay','0','','If OFF : show only the status of items in result list.If ON : show full location of items (branch+location+callnumber) as in staff interface','YesNo'),
272
('OpacKohaUrl','1',NULL,'Show \'Powered by Koha\' text on OPAC footer.',NULL),
272
('OpacKohaUrl','1',NULL,'Show \'Powered by Koha\' text on OPAC footer.',NULL),
273
('OpacLangSelectorMode','both','both|head|foot','Select the location to display the language selector','Choice'),
273
('OpacLangSelectorMode','both','both|mast|foot','Select the location to display the language selector','Choice'),
274
('opaclanguages','en',NULL,'Set the default language in the OPAC.','Languages'),
274
('opaclanguages','en',NULL,'Set the default language in the OPAC.','Languages'),
275
('opaclanguagesdisplay','0','','If ON, enables display of Change Language feature on OPAC','YesNo'),
275
('opaclanguagesdisplay','0','','If ON, enables display of Change Language feature on OPAC','YesNo'),
276
('opaclayoutstylesheet','opac.css','','Enter the name of the layout CSS stylesheet to use in the OPAC','free'),
276
('opaclayoutstylesheet','opac.css','','Enter the name of the layout CSS stylesheet to use in the OPAC','free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-1 / +1 lines)
Lines 322-328 OPAC: Link Here
322
            - pref: OpacLangSelectorMode
322
            - pref: OpacLangSelectorMode
323
              choices:
323
              choices:
324
                  both: "both masthead and footer"
324
                  both: "both masthead and footer"
325
                  head: "only header"
325
                  mast: "only masthead"
326
                  foot: "only footer"
326
                  foot: "only footer"
327
    Features:
327
    Features:
328
        -
328
        -
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-38 / +36 lines)
Lines 1-4 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
2
<div id="wrap">
3
<div id="wrap">
3
    <div id="header-region" class="noprint">
4
    <div id="header-region" class="noprint">
4
        <div class="navbar navbar-inverse navbar-static-top">
5
        <div class="navbar navbar-inverse navbar-static-top">
Lines 9-17 Link Here
9
                            [% IF ( LibraryNameTitle ) %]
10
                            [% IF ( LibraryNameTitle ) %]
10
                                [% LibraryNameTitle %]
11
                                [% LibraryNameTitle %]
11
                            [% ELSE %]
12
                            [% ELSE %]
12
                                Koha online
13
                            [% END %]
14
                        </a>
15
                    </h1>
13
                    </h1>
16
                    [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
14
                    [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
17
                        <div id="cartDetails" class="cart-message">Your cart is empty.</div>
15
                        <div id="cartDetails" class="cart-message">Your cart is empty.</div>
Lines 71-111 Link Here
71
                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a>
69
                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a>
72
                        <div id="members">
70
                        <div id="members">
73
                            <ul class="nav pull-right">
71
                            <ul class="nav pull-right">
74
                            [% IF ( Koha.Preference( 'OpacLangSelectorMode' ) == 'both' ) || ( Koha.Preference( 'OpacLangSelectorMode' ) == 'head' ) %]
72
                            [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'mast' %]
75
                            [% IF ( opaclanguagesdisplay ) %]
73
                                [% IF ( opaclanguagesdisplay ) %]
76
                                [% IF ( languages_loop && opaclanguagesdisplay ) %]
74
                                    [% IF ( languages_loop && opaclanguagesdisplay ) %]
77
                                    [% UNLESS ( one_language_enabled ) %]
75
                                        [% UNLESS ( one_language_enabled ) %]
78
                                    <li class="dropdown">
76
                                        <li class="dropdown">
79
                                       <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="icon-flag icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
77
                                          <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="icon-flag icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
80
                                       <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu">
78
                                          <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu">
81
                                       [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
79
                                          [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
82
                                           [% IF ( languages_loo.group_enabled ) %]
80
                                              [% IF ( languages_loo.group_enabled ) %]
83
                                               [% IF ( languages_loo.plural ) %]
81
                                                  [% IF ( languages_loo.plural ) %]
84
                                                     [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
82
                                                      [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
85
                                                         [% IF ( sublanguages_loo.enabled ) %]
83
                                                          [% IF ( sublanguages_loo.enabled ) %]
86
                                                             [% IF ( sublanguages_loo.sublanguage_current ) %]
84
                                                              [% IF ( sublanguages_loo.sublanguage_current ) %]
87
                                                             <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]&nbsp;<i class="icon-ok"></i></a></li>
85
                                                              <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]&nbsp;<i class="icon-ok"></i></a></li>
88
                                                             [% ELSE %]
86
                                                              [% ELSE %]
89
                                                             <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem" class="listmenulink"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li>
87
                                                              <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem" class="listmenulink"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li>
90
                                                             [% END %]
88
                                                              [% END %]
91
                                                         [% END # / IF sublanguages_loo.enabled %]
89
                                                          [% END # / IF sublanguages_loo.enabled %]
92
                                                     [% END # / FOREACH sublanguages_loo %]
90
                                                      [% END # / FOREACH sublanguages_loo %]
93
                                               [% ELSE %]
91
                                                  [% ELSE %]
94
                                                   [% IF ( languages_loo.group_enabled ) %]
92
                                                      [% IF ( languages_loo.group_enabled ) %]
95
                                                       [% IF ( languages_loo.current ) %]
93
                                                          [% IF ( languages_loo.current ) %]
96
                                                       <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]&nbsp;<i class="icon-ok"></i></a></li>
94
                                                          <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]&nbsp;<i class="icon-ok"></i></a></li>
97
                                                       [% ELSE %]
95
                                                          [% ELSE %]
98
                                                       <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem" class="listmenulink">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
96
                                                          <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem" class="listmenulink">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
99
                                                       [% END %]
97
                                                          [% END %]
100
                                                       [% END # / IF languages_loo.current %]
98
                                                      [% END # / IF languages_loo.current %]
101
                                               [% END # / IF ( languages_loo.plural ) %]
99
                                                  [% END # / IF ( languages_loo.plural ) %]
102
                                           [% END # / IF ( languages_loo.group_enabled ) %]
100
                                              [% END # / IF ( languages_loo.group_enabled ) %]
103
                                       [% END # / FOREACH languages_loo IN languages_loop %]
101
                                          [% END # / FOREACH languages_loo IN languages_loop %]
104
                                       </ul> <!-- /# .dropdown-menu -->
102
                                          </ul> <!-- /# .dropdown-menu -->
105
                                    </li> <!-- / .dropdown -->
103
                                        </li> <!-- / .dropdown -->
106
                                    [% END # / UNLESS ( one_language_enabled ) %]
104
                                        [% END # / UNLESS ( one_language_enabled ) %]
107
                                [% END # / IF ( languages_loop && opaclanguagesdisplay ) %]
105
                                    [% END # / IF ( languages_loop && opaclanguagesdisplay ) %]
108
                            [% END # / IF opaclanguagesdisplay %]
106
                                [% END # / IF opaclanguagesdisplay %]
109
                            [% END # / IF OpacLangSelectorMode %]
107
                            [% END # / IF OpacLangSelectorMode %]
110
                                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
108
                                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
111
                                    [% UNLESS ( loggedinusername ) %]
109
                                    [% UNLESS ( loggedinusername ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-2 / +1 lines)
Lines 29-35 Link Here
29
    [% END # / OpacKohaUrl %]
29
    [% END # / OpacKohaUrl %]
30
30
31
</div> <!-- / #wrap in masthead.inc -->
31
</div> <!-- / #wrap in masthead.inc -->
32
[% IF ( Koha.Preference( 'OpacLangSelectorMode' ) == 'both' ) || ( Koha.Preference( 'OpacLangSelectorMode' ) == 'foot' ) %]
32
[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'foot' %]
33
    [% IF ( opaclanguagesdisplay ) %]
33
    [% IF ( opaclanguagesdisplay ) %]
34
        [% IF ( languages_loop && opaclanguagesdisplay ) %]
34
        [% IF ( languages_loop && opaclanguagesdisplay ) %]
35
            [% UNLESS ( one_language_enabled ) %]
35
            [% UNLESS ( one_language_enabled ) %]
36
- 

Return to bug 14252