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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-15 / +7 lines)
Lines 5-22 Link Here
5
        <div id="changelanguage" class="navbar navbar-fixed-bottom">
5
        <div id="changelanguage" class="navbar navbar-fixed-bottom">
6
            <div class="navbar-inner">
6
            <div class="navbar-inner">
7
        <ul id="i18nMenu" class="nav">
7
        <ul id="i18nMenu" class="nav">
8
        [% FOREACH languages_loo IN languages_loop %]
8
        [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
9
9
10
            [% IF ( languages_loo.group_enabled ) %]
10
            [% IF ( languages_loo.group_enabled ) %]
11
            [% IF ( languages_loo.plural ) %]
11
            [% IF ( languages_loo.plural ) %]
12
            <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]  <span class="caret"></span></a>
12
            <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]<span class="caret"></span></a>
13
            <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
13
            <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
14
            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
14
            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %]
15
		[% IF ( sublanguages_loo.enabled ) %]
15
		[% IF ( sublanguages_loo.enabled ) %]
16
                [% IF ( sublanguages_loo.sublanguage_current ) %]
16
                [% IF ( sublanguages_loo.sublanguage_current ) %]
17
                    <li> <a href="#">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
17
                    <li> <a href="#">[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
18
                [% ELSE %]
18
                [% ELSE %]
19
                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
19
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]">[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
20
		[% END %]
20
		[% END %]
21
                [% END %]
21
                [% END %]
22
22
Lines 27-45 Link Here
27
	    	[% IF ( languages_loo.group_enabled ) %]
27
	    	[% IF ( languages_loo.group_enabled ) %]
28
                [% IF ( languages_loo.current ) %]
28
                [% IF ( languages_loo.current ) %]
29
                    <li class="navbar-text">
29
                    <li class="navbar-text">
30
                        [% IF ( languages_loo.native_description ) %]
30
                        [% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]
31
                            [% languages_loo.native_description %]
32
                [% ELSE %]
33
                            [% languages_loo.rfc4646_subtag %]
34
                        [% END %]
35
                    </li>
31
                    </li>
36
                [% ELSE %]
32
                [% ELSE %]
37
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">
33
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">
38
                        [% IF ( languages_loo.native_description ) %]
34
                        [% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]
39
                            [% languages_loo.native_description %]
40
                        [% ELSE %]
41
                            [% languages_loo.rfc4646_subtag %]
42
                        [% END %]
43
                    </a></li>
35
                    </a></li>
44
                [% END %]
36
                [% END %]
45
		[% END %]
37
		[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-7 / +7 lines)
Lines 37-54 Link Here
37
                    <div class="navbar-inner">
37
                    <div class="navbar-inner">
38
                        <ul id="i18nMenu" class="nav">
38
                        <ul id="i18nMenu" class="nav">
39
                            <li><p class="lang navbar-text"><strong>Languages:&nbsp;</strong></p></li>
39
                            <li><p class="lang navbar-text"><strong>Languages:&nbsp;</strong></p></li>
40
                            [% FOREACH languages_loo IN languages_loop %]
40
                            [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
41
                                [% IF ( languages_loo.group_enabled ) %]
41
                                [% IF ( languages_loo.group_enabled ) %]
42
                                    [% IF ( languages_loo.plural ) %]
42
                                    [% IF ( languages_loo.plural ) %]
43
                                        <li class="dropdown">
43
                                        <li class="dropdown">
44
                                            <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] <b class="caret"></b></a>
44
                                             <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]<b class="caret"></b></a>
45
                                                <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
45
                                                <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
46
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
46
                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %]
47
                                                        [% IF ( sublanguages_loo.enabled ) %]
47
                                                        [% IF ( sublanguages_loo.enabled ) %]
48
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
48
                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
49
                                                                <li> <p>[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</p></li>
49
                                                                <li> <p>[% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</p></li>
50
                                                            [% ELSE %]
50
                                                            [% ELSE %]
51
                                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
51
                                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% INCLUDE region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
52
                                                            [% END %]
52
                                                            [% END %]
53
                                                        [% END # / IF sublanguages_loo.enabled %]
53
                                                        [% END # / IF sublanguages_loo.enabled %]
54
                                                    [% END # / FOREACH sublanguages_loo %]
54
                                                    [% END # / FOREACH sublanguages_loo %]
Lines 57-65 Link Here
57
                                    [% ELSE %]
57
                                    [% ELSE %]
58
                                        [% IF ( languages_loo.group_enabled ) %]
58
                                        [% IF ( languages_loo.group_enabled ) %]
59
                                            [% IF ( languages_loo.current ) %]
59
                                            [% IF ( languages_loo.current ) %]
60
                                                <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</p></li>
60
                                                <li class="active"><p class="navbar-text">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]</p></li>
61
                                            [% ELSE %]
61
                                            [% ELSE %]
62
                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
62
                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% INCLUDE native_description subtag = languages_loo.rfc4646_subtag %]</a></li>
63
                                            [% END %]
63
                                            [% END %]
64
                                        [% END # / IF languages_loo.current %]
64
                                        [% END # / IF languages_loo.current %]
65
                                    [% END # / IF ( languages_loo.plural ) %]
65
                                    [% END # / IF ( languages_loo.plural ) %]
(-)a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc (-25 / +21 lines)
Lines 41-75 Link Here
41
            <div id="changelanguage" class="ft">
41
            <div id="changelanguage" class="ft">
42
            <div class="lang" style="float:left;padding: 0.1em 0;"><strong>Languages:&nbsp;</strong></div>
42
            <div class="lang" style="float:left;padding: 0.1em 0;"><strong>Languages:&nbsp;</strong></div>
43
            <ul id="i18nMenu" class="footermenu">
43
            <ul id="i18nMenu" class="footermenu">
44
            [% FOREACH languages_loo IN languages_loop %]
44
            [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
45
46
                [% IF ( languages_loo.group_enabled ) %]
45
                [% IF ( languages_loo.group_enabled ) %]
47
                [% IF ( languages_loo.plural ) %]
46
                    [% IF ( languages_loo.plural ) %]
48
                <li class="more" style="float:left;"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a><div id="sub[% languages_loo.rfc4646_subtag %]">
47
                        <li class="more" style="float:left;"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</a><div id="sub[% languages_loo.rfc4646_subtag %]">
49
                <div class="bd"><ul>
48
                        <div class="bd"><ul>
50
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
49
                        [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %]
51
            [% IF ( sublanguages_loo.enabled ) %]
50
                            [% IF ( sublanguages_loo.enabled ) %]
52
                    [% IF ( sublanguages_loo.sublanguage_current ) %]
51
                                [% IF ( sublanguages_loo.sublanguage_current ) %]
53
                        <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li>
52
                                    <li>[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</li>
53
                                [% ELSE %]
54
                                    <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]">[% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
55
                                [% END %]
56
                            [% END %]
57
                        [% END %]
58
                        </ul></div></div></li>
54
                    [% ELSE %]
59
                    [% ELSE %]
55
                    <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
60
                        [% IF ( languages_loo.group_enabled ) %]
56
            [% END %]
61
                            [% IF ( languages_loo.current ) %]
62
                                <li style="float:left;">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</li>
63
                            [% ELSE %]
64
                                <li style="float:left;"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</a></li>
65
                            [% END %]
66
                        [% END %]
57
                    [% END %]
67
                    [% END %]
58
59
                [% END %]
68
                [% END %]
60
                </ul></div></div></li>
61
62
                [% ELSE %]
63
                [% IF ( languages_loo.group_enabled ) %]
64
                    [% IF ( languages_loo.current ) %]
65
                        <li style="float:left;">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</li>
66
                    [% ELSE %]
67
                        <li style="float:left;"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
68
                    [% END %]
69
            [% END %]
70
                [% END %]
71
                [% END %]
72
73
            [% END %]
69
            [% END %]
74
            </ul>
70
            </ul>
75
            </div>
71
            </div>
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc (-8 / +7 lines)
Lines 9-26 Link Here
9
            <div id="changelanguage" class="ft">
9
            <div id="changelanguage" class="ft">
10
            <div class="lang"><strong>Languages:&nbsp;</strong></div>
10
            <div class="lang"><strong>Languages:&nbsp;</strong></div>
11
            <ul id="i18nMenu" class="footermenu">
11
            <ul id="i18nMenu" class="footermenu">
12
            [% FOREACH languages_loo IN languages_loop %]
12
            [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
13
13
14
                [% IF ( languages_loo.group_enabled ) %]
14
                [% IF ( languages_loo.group_enabled ) %]
15
                [% IF ( languages_loo.plural ) %]
15
                [% IF ( languages_loo.plural ) %]
16
                <li class="more"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a><div id="sub[% languages_loo.rfc4646_subtag %]">
16
                <li class="more"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</a><div id="sub[% languages_loo.rfc4646_subtag %]">
17
                <div class="bd"><ul>
17
                <div class="bd"><ul>
18
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
18
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop.sort('rfc4646_subtag') %]
19
            [% IF ( sublanguages_loo.enabled ) %]
19
            [% IF ( sublanguages_loo.enabled ) %]
20
                    [% IF ( sublanguages_loo.sublanguage_current ) %]
20
                    [% IF ( sublanguages_loo.sublanguage_current ) %]
21
                        <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li>
21
                        <li> [% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</li>
22
                    [% ELSE %]
22
                    [% ELSE %]
23
                    <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
23
                    <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% PROCESS region_description subtag = sublanguages_loo.rfc4646_subtag %] ([% sublanguages_loo.rfc4646_subtag %])</a></li>
24
            [% END %]
24
            [% END %]
25
                    [% END %]
25
                    [% END %]
26
26
Lines 30-38 Link Here
30
                [% ELSE %]
30
                [% ELSE %]
31
                [% IF ( languages_loo.group_enabled ) %]
31
                [% IF ( languages_loo.group_enabled ) %]
32
                    [% IF ( languages_loo.current ) %]
32
                    [% IF ( languages_loo.current ) %]
33
                        <li class="morelang">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</li>
33
                        <li class="morelang">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</li>
34
                    [% ELSE %]
34
                    [% ELSE %]
35
                        <li class="morelang"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
35
                        <li class="morelang"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% PROCESS native_description subtag = languages_loo.rfc4646_subtag %]</a></li>
36
                    [% END %]
36
                    [% END %]
37
            [% END %]
37
            [% END %]
38
                [% END %]
38
                [% END %]
39
- 

Return to bug 12017