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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/langmenu.inc (-51 / +48 lines)
Lines 1-52 Link Here
1
[%# Following on one line for translatability %]
1
<div id="header_langmenu">
2
[% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && ( languages_loop ) && ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top') ) %]
2
    <ul class="navbar-nav">
3
    <div id="header_langmenu">
3
        [% IF ( context == "footer" ) -%]
4
        <ul class="navbar-nav">
4
            <li class="nav-item dropup">
5
            [% IF ( context == "footer" ) -%]
5
        [% ELSE -%]
6
                <li class="nav-item dropup">
6
            <li class="nav-item dropdown">
7
            [% ELSE -%]
7
        [% END %]
8
                <li class="nav-item dropdown">
8
            <a href="#" title="Switch languages" class="nav-link dropdown-toggle" id="langmenu" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-flag fa-fw fa-icon-[% context | html %]" aria-hidden="true"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
9
            [% END %]
9
            <div aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-end">
10
              <a href="#" title="Switch languages" class="nav-link dropdown-toggle" id="langmenu" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-flag fa-fw fa-icon-[% context | html %]" aria-hidden="true"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
10
                [% FOREACH languages_loo IN languages_loop %]
11
                <div aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-end">
11
                    [% IF ( languages_loo.group_enabled ) %]
12
                    [% FOREACH languages_loo IN languages_loop %]
12
                        [% IF ( languages_loo.plural ) %]
13
                        [% IF ( languages_loo.group_enabled ) %]
13
                            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
14
                            [% IF ( languages_loo.plural ) %]
14
                                [% IF ( sublanguages_loo.enabled ) %]
15
                                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
15
                                    [% IF ( sublanguages_loo.sublanguage_current ) %]
16
                                    [% IF ( sublanguages_loo.enabled ) %]
16
                                        <a class="dropdown-item" href="#" tabindex="-1" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check" aria-hidden="true"></i></a>
17
                                        [% IF ( sublanguages_loo.sublanguage_current ) %]
18
                                            <a class="dropdown-item" href="#" tabindex="-1" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check" aria-hidden="true"></i></a>
19
                                        [% ELSE %]
20
                                            <a class="dropdown-item" href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a>
21
                                        [% END # /IF ( sublanguages_loo.sublanguage_current ) %]
22
                                    [% END # / IF sublanguages_loo.enabled %]
23
                                [% END # / FOREACH sublanguages_loo %]
24
                            [% ELSE %]
25
                                [% IF ( languages_loo.group_enabled ) %]
26
                                    [% IF ( languages_loo.current ) %]
27
                                        <a class="dropdown-item menu-inactive" href="#" tabindex="-1" role="menuitem">
28
                                            [% IF ( languages_loo.native_description ) %]
29
                                                [% languages_loo.native_description | html %]
30
                                            [% ELSE %]
31
                                                [% languages_loo.rfc4646_subtag | html %]
32
                                            [% END %]&nbsp;<i class="fa fa-check" aria-hidden="true"></i>
33
                                        </a>
34
                                    [% ELSE %]
17
                                    [% ELSE %]
35
                                        <a class="dropdown-item" href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem">
18
                                        <a class="dropdown-item" href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a>
36
                                            [% IF ( languages_loo.native_description ) %]
19
                                    [% END # /IF ( sublanguages_loo.sublanguage_current ) %]
37
                                                [% languages_loo.native_description | html %]
20
                                [% END # / IF sublanguages_loo.enabled %]
38
                                            [% ELSE %]
21
                            [% END # / FOREACH sublanguages_loo %]
39
                                                [% languages_loo.rfc4646_subtag | html %]
22
                        [% ELSE %]
40
                                            [% END %]
23
                            [% IF ( languages_loo.group_enabled ) %]
41
                                        </a>
24
                                [% IF ( languages_loo.current ) %]
42
                                    [% END # / IF ( languages_loo.current )%]
25
                                    <a class="dropdown-item menu-inactive" href="#" tabindex="-1" role="menuitem">
43
                                [% END # / IF languages_loo.current %]
26
                                        [% IF ( languages_loo.native_description ) %]
44
                            [% END # / IF ( languages_loo.plural ) %]
27
                                            [% languages_loo.native_description | html %]
45
                        [% END # / IF ( languages_loo.group_enabled ) %]
28
                                        [% ELSE %]
46
                    [% END # / FOREACH languages_loo IN languages_loop %]
29
                                            [% languages_loo.rfc4646_subtag | html %]
47
                </div> <!-- /# .dropdown-menu -->
30
                                        [% END %]&nbsp;<i class="fa fa-check" aria-hidden="true"></i>
48
            </li> <!-- / .dropdown -->
31
                                    </a>
49
            <li class="divider-vertical" aria-hidden="false"></li>
32
                                [% ELSE %]
50
        </ul> <!-- /.nav.pull-right -->
33
                                    <a class="dropdown-item" href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem">
51
    </div> <!-- /#header_langmenu -->
34
                                        [% IF ( languages_loo.native_description ) %]
52
[% END # / IF opaclanguagedisplay %]
35
                                            [% languages_loo.native_description | html %]
36
                                        [% ELSE %]
37
                                            [% languages_loo.rfc4646_subtag | html %]
38
                                        [% END %]
39
                                    </a>
40
                                [% END # / IF ( languages_loo.current )%]
41
                            [% END # / IF languages_loo.current %]
42
                        [% END # / IF ( languages_loo.plural ) %]
43
                    [% END # / IF ( languages_loo.group_enabled ) %]
44
                [% END # / FOREACH languages_loo IN languages_loop %]
45
            </div> <!-- /# .dropdown-menu -->
46
        </li> <!-- / .dropdown -->
47
        <li class="divider-vertical" aria-hidden="false"></li>
48
    </ul> <!-- /.nav.pull-right -->
49
</div> <!-- /#header_langmenu -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +2 lines)
Lines 99-105 Link Here
99
                </ul> <!-- / .navbar-nav -->
99
                </ul> <!-- / .navbar-nav -->
100
            [% END # /IF OpacPublic %]
100
            [% END # /IF OpacPublic %]
101
            [% IF Koha.Preference( 'opacuserlogin' ) == 1 ||  Koha.Preference( 'EnableOpacSearchHistory') || Koha.Preference( 'opaclanguagesdisplay' ) %]
101
            [% IF Koha.Preference( 'opacuserlogin' ) == 1 ||  Koha.Preference( 'EnableOpacSearchHistory') || Koha.Preference( 'opaclanguagesdisplay' ) %]
102
                [% IF ( Koha.Preference( 'opaclanguagesdisplay' ) ) %]
102
                [%# Following on one line for translatability %]
103
                [% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && ( languages_loop ) && ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top') ) %]
103
                    [% context = "header" %]
104
                    [% context = "header" %]
104
                    [% INCLUDE 'langmenu.inc' %]
105
                    [% INCLUDE 'langmenu.inc' %]
105
                [% END %]
106
                [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-41 / +37 lines)
Lines 22-67 Link Here
22
        [% END #/ opaccredits %]
22
        [% END #/ opaccredits %]
23
    </div> <!-- / #wrapper in masthead.inc -->
23
    </div> <!-- / #wrapper in masthead.inc -->
24
24
25
    [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
25
    [% IF ( Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') ) || Koha.Preference( 'CookieConsent' ) || OpacKohaUrl || ( ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer') ) %]
26
        [% IF ( Koha.Preference('opaclanguagesdisplay') ) %]
26
        <footer id="changelanguage" class="navbar navbar-expand navbar-light bg-light noprint">
27
            [% IF ( languages_loop ) %]
27
            <div class="container-fluid">
28
                [% UNLESS ( one_language_enabled ) %]
28
                <div class="collapse navbar-collapse">
29
                    <footer id="changelanguage" class="navbar navbar-expand navbar-light bg-light noprint">
29
                    [%# Following on one line for translatability %]
30
                        <div class="container-fluid">
30
                    [% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && ( languages_loop ) && ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer') ) %]
31
                            <div class="collapse navbar-collapse">
31
                        [% context = "footer" %]
32
                                [% context = "footer" %]
32
                        [% INCLUDE 'langmenu.inc' %]
33
                                [% INCLUDE 'langmenu.inc' %]
33
                    [% END # / IF opaclanguagedisplay %]
34
34
35
                                <div class="navbar-nav flex-grow-1">
35
                    <div class="navbar-nav flex-grow-1">
36
                                    [% IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') %]
36
                        [% IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') %]
37
                                        <a id="report_a_problem" class="nav-link" href="/cgi-bin/koha/opac-reportproblem.pl">
37
                            <a id="report_a_problem" class="nav-link" href="/cgi-bin/koha/opac-reportproblem.pl">
38
                                            <i class="fa fa-warning fa-fw fa-icon-footer" aria-hidden="true"></i>
38
                                <i class="fa fa-warning fa-fw fa-icon-footer" aria-hidden="true"></i>
39
                                            <span class="report_a_problem_text">Report a problem</span>
39
                                <span class="report_a_problem_text">Report a problem</span>
40
                                        </a>
40
                            </a>
41
                                    [% END %]
41
                        [% END %]
42
42
43
                                    [% IF Koha.Preference( 'CookieConsent' ) %]
43
                        [% IF Koha.Preference( 'CookieConsent' ) %]
44
                                        <a id="cookieConsentFooter" class="nav-link" href="#">
44
                            <a id="cookieConsentFooter" class="nav-link" href="#">
45
                                            <i class="fa fa-cookie fa-fw fa-icon-footer" aria-hidden="true"></i>
45
                                <i class="fa fa-cookie fa-fw fa-icon-footer" aria-hidden="true"></i>
46
                                            <span class="cookieConsentFooter_text">Cookies</span>
46
                                <span class="cookieConsentFooter_text">Cookies</span>
47
                                        </a>
47
                            </a>
48
                                    [% END %]
48
                        [% END %]
49
                                </div>
49
                    </div>
50
                                    [% IF OpacKohaUrl %]
50
                        [% IF OpacKohaUrl %]
51
                                        <div class="navbar-nav">
51
                            <div class="navbar-nav">
52
                                            <a id="koha_url" class="nav-link koha_url" href="http://koha-community.org">
52
                                <a id="koha_url" class="nav-link koha_url" href="http://koha-community.org">
53
                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M7.394.75c.82-.45 1.75-.72 2.69-.75.5.015.99.1 1.45.27.92.35 1.68 1.05 2.15 1.9.53.865.76 1.875.87 2.875.25 3.315-.98 6.635-3.07 9.18-.825.82-1.835 1.52-3 1.735-.96.135-2-.07-2.775-.675-.48-.365-.67-1-.63-1.575.425.6 1.12 1.015 1.86 1.035.675.03 1.35-.275 1.8-.765.75-.825.835-2.21.12-3.08-.325-.375-.7-.715-1.15-.95-.44-.265-.95-.38-1.46-.45-.93-.06-1.9.11-2.72.57a3.22 3.22 0 0 0-1.565 2.15c-.2.7-.125 1.43-.05 2.14-.31-.81-.43-1.67-.5-2.53v-.64c.12-3.13 1.43-6.2 3.53-8.515.725-.75 1.53-1.43 2.45-1.92Zm0 0" style="stroke-width:.500008"/></svg>
53
                                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M7.394.75c.82-.45 1.75-.72 2.69-.75.5.015.99.1 1.45.27.92.35 1.68 1.05 2.15 1.9.53.865.76 1.875.87 2.875.25 3.315-.98 6.635-3.07 9.18-.825.82-1.835 1.52-3 1.735-.96.135-2-.07-2.775-.675-.48-.365-.67-1-.63-1.575.425.6 1.12 1.015 1.86 1.035.675.03 1.35-.275 1.8-.765.75-.825.835-2.21.12-3.08-.325-.375-.7-.715-1.15-.95-.44-.265-.95-.38-1.46-.45-.93-.06-1.9.11-2.72.57a3.22 3.22 0 0 0-1.565 2.15c-.2.7-.125 1.43-.05 2.14-.31-.81-.43-1.67-.5-2.53v-.64c.12-3.13 1.43-6.2 3.53-8.515.725-.75 1.53-1.43 2.45-1.92Zm0 0" style="stroke-width:.500008"/></svg>
54
                                                <span class="koha_url_text">Powered by Koha</span>
54
                                    <span class="koha_url_text">Powered by Koha</span>
55
                                            </a>
55
                                </a>
56
                                        </div>
56
                            </div>
57
                                    [% END # /IF OpacKohaUrl %]
57
                        [% END # /IF OpacKohaUrl %]
58
                                </ul> <!-- /.navbar-nav -->
58
                    </ul> <!-- /.navbar-nav -->
59
                            </div> <!-- /.collapse.navbar-collapse -->
59
                </div> <!-- /.collapse.navbar-collapse -->
60
                        </div> <!-- /.container-fluid -->
60
            </div> <!-- /.container-fluid -->
61
                    </footer> <!-- / #changelanguage -->
61
        </footer> <!-- / #changelanguage -->
62
                [% END # / UNLESS ( one_language_enabled ) %]
63
            [% END # / IF ( languages_loop && opaclanguagesdisplay ) %]
64
        [% END # / IF opaclanguagesdisplay %]
65
    [% END # /IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
62
    [% END # /IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
66
[% END # / UNLESS is_popup %]
63
[% END # / UNLESS is_popup %]
67
64
68
- 

Return to bug 37833