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

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (-2 / +7 lines)
Lines 1738-1747 ul#i18nMenu { Link Here
1738
ul#i18nMenu li {
1738
ul#i18nMenu li {
1739
 	border-left : 1px solid #CCC;
1739
 	border-left : 1px solid #CCC;
1740
 	display : inline;
1740
 	display : inline;
1741
 	float: left;
1741
	list-style : none;
1742
	list-style : none;
1742
	padding : 0 10px;
1743
	padding : 0 10px;
1743
 }
1744
}
1744
 
1745
1746
ul#i18nMenu li.yuimenuitem {
1747
	float: none;
1748
}
1749
1745
ul#i18nMenu li:first-child {
1750
ul#i18nMenu li:first-child {
1746
 	border-left : 0;
1751
 	border-left : 0;
1747
 }
1752
 }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-2 / +2 lines)
Lines 5-11 Link Here
5
        <div id="changelanguage" class="ft">
5
        <div id="changelanguage" class="ft">
6
        <ul id="i18nMenu" class="footermenu">
6
        <ul id="i18nMenu" class="footermenu">
7
        [% FOREACH languages_loo IN languages_loop %]
7
        [% FOREACH languages_loo IN languages_loop %]
8
	    <div class="lang">
8
9
            [% IF ( languages_loo.group_enabled ) %]
9
            [% IF ( languages_loo.group_enabled ) %]
10
            [% IF ( languages_loo.plural ) %]
10
            [% IF ( languages_loo.plural ) %]
11
            <li class="more"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% languages_loo.native_description %] ([% languages_loo.rfc4646_subtag %])</a><div id="sub[% languages_loo.rfc4646_subtag %]">
11
            <li class="more"><a class="sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% languages_loo.native_description %] ([% languages_loo.rfc4646_subtag %])</a><div id="sub[% languages_loo.rfc4646_subtag %]">
Lines 32-38 Link Here
32
		[% END %]
32
		[% END %]
33
            [% END %]
33
            [% END %]
34
            [% END %]
34
            [% END %]
35
            </div>
35
36
        [% END %]
36
        [% END %]
37
        </ul>
37
        </ul>
38
        </div>
38
        </div>
(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (-16 / +45 lines)
Lines 1476-1504 div#changelanguage{ Link Here
1476
 
1476
 
1477
div#changelanguage a {
1477
div#changelanguage a {
1478
	font-weight : normal;
1478
	font-weight : normal;
1479
	padding : .5em;
1479
	padding : .5em 0;
1480
} 
1481
 		
1482
div#changelanguage a.more {
1483
	background-image:url(../../images/more-up-arrow.gif);
1484
	background-position:right center;
1485
	background-repeat:no-repeat;
1486
	padding-right:13px;
1487
}
1480
}
1488
 
1481
1489
div#changelanguage li.yuimenuitem {
1482
div#changelanguage li.yuimenuitem {
1490
	font-size : 120%;
1483
    font-size: 120%;
1491
	font-weight : normal;
1484
    font-weight: normal;
1492
	margin : 0;
1485
    margin: 0;
1493
	padding : 0 1em;
1486
    padding: 0 1em;
1494
}
1487
}
1495
1496
div#changelanguage li.yuimenuitem a.yuimenuitemlabel {
1488
div#changelanguage li.yuimenuitem a.yuimenuitemlabel {
1489
    padding: 0;
1490
}
1491
1492
ul#i18nMenu {
1493
 	margin : 0;
1494
	padding : .2em 0;
1495
 }
1496
 
1497
ul#i18nMenu li {
1498
 	border-left : 1px solid #CCC;
1499
 	display : inline;
1500
	list-style : none;
1501
	padding : 0 .4em;
1502
 }
1503
 
1504
ul#i18nMenu li:first-child {
1505
 	border-left : 0;
1506
 }
1507
 
1508
ul#i18nMenu li ul li {
1509
 	border : 0;
1510
 	display : block;
1497
	padding : 0;
1511
	padding : 0;
1512
 }
1513
 
1514
 		
1515
ul#i18nMenu li.more a {
1516
	background-image:url(../../images/more-up-arrow.gif);
1517
	background-position:right center;
1518
	background-repeat:no-repeat;
1519
	padding-right: 1.3em;
1520
}
1521
		
1522
ul#i18nMenu li.more ul li a {
1523
	background-image : none;
1524
	padding: 0 1.3em;
1498
}
1525
}
1499
1526
1500
div.lang{
1527
span.lang{
1501
        float:left;
1528
	float:left;
1529
	border-right : 1px solid black;
1530
	padding : 0 .5em;
1502
}
1531
}
1503
1532
1504
#cartDetails,#cartUpdate,#holdDetails,#listsDetails {
1533
#cartDetails,#cartUpdate,#holdDetails,#listsDetails {
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc (-32 / +33 lines)
Lines 6-48 Link Here
6
</div>
6
</div>
7
7
8
[% IF ( opaclanguagesdisplay || OpacKohaUrl ) %]
8
[% IF ( opaclanguagesdisplay || OpacKohaUrl ) %]
9
<div id="changelanguage" class="ft">
9
    [% IF ( languages_loop && opaclanguagesdisplay ) %]
10
[% IF ( languages_loop && opaclanguagesdisplay ) %]
10
        [% UNLESS ( one_language_enabled ) %]
11
    [% UNLESS ( one_language_enabled ) %]
11
            <div id="changelanguage" class="ft">
12
        <div class="lang"><strong>Languages:&nbsp;</strong></div>
12
            <div class="lang" style="float:left;padding: 0.1em 0;"><strong>Languages:&nbsp;</strong></div>
13
        [% FOREACH languages_loo IN languages_loop %]
13
            <ul id="i18nMenu" class="footermenu">
14
	    <div class="lang">
14
            [% FOREACH languages_loo IN languages_loop %]
15
            [% IF ( languages_loo.group_enabled ) %]
15
16
            [% IF ( languages_loo.plural ) %]
16
                [% IF ( languages_loo.group_enabled ) %]
17
            <a id="show[% languages_loo.rfc4646_subtag %]" class="sublangs more" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a>[% UNLESS ( loop.last ) %] | [% END %]
17
                [% IF ( languages_loo.plural ) %]
18
			<div id="sub[% languages_loo.rfc4646_subtag %]">
18
                <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 %]">
19
            <div class="bd"><ul>
19
                <div class="bd"><ul>
20
            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
20
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
21
		[% IF ( sublanguages_loo.enabled ) %]
21
            [% IF ( sublanguages_loo.enabled ) %]
22
                [% IF ( sublanguages_loo.sublanguage_current ) %]
22
                    [% IF ( sublanguages_loo.sublanguage_current ) %]
23
                    <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li>
23
                        <li> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</li>
24
                [% ELSE %]
24
                    [% ELSE %]
25
                <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>
25
                    <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>
26
                [% END %]
27
               [% END %]
28
            [% END %]
26
            [% END %]
29
            </ul>
27
                    [% END %]
30
			</div>
28
31
			</div>
29
                [% END %]
32
            [% ELSE %]
30
                </ul></div></div></li>
33
		      [% IF ( languages_loo.group_enabled ) %]
31
34
                [% IF ( languages_loo.current ) %]
35
                    [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
36
                [% ELSE %]
32
                [% ELSE %]
37
                    <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>
33
                [% IF ( languages_loo.group_enabled ) %]
34
                    [% IF ( languages_loo.current ) %]
35
                        <li style="float:left;">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</li>
36
                    [% ELSE %]
37
                        <li style="float:left;"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
38
                    [% END %]
39
            [% END %]
40
                [% END %]
38
                [% END %]
41
                [% END %]
39
		[% END %]
42
40
            [% END %]
43
            [% END %]
41
            [% END %][% UNLESS ( loop.last || languages_loo.plural ) %] | [% END %]
44
            </ul>
42
            </div>
45
            </div>
43
        [% END %]
46
        [% END %]
44
    [% END %]
47
    [% END %]
45
[% END %]
48
46
49
47
[% IF ( OpacKohaUrl ) %]
50
[% IF ( OpacKohaUrl ) %]
48
    <span class="koha_url">
51
    <span class="koha_url">
Lines 50-56 Link Here
50
    </span>
53
    </span>
51
[% END %]
54
[% END %]
52
55
53
</div>
54
[% END %]
56
[% END %]
55
57
56
[% IF ( Babeltheque ) %]
58
[% IF ( Babeltheque ) %]
57
- 

Return to bug 7644