diff options
author | Frank Lichtenheld <djpig> | 2004-12-09 16:39:15 +0000 |
---|---|---|
committer | Frank Lichtenheld <djpig> | 2004-12-09 16:39:15 +0000 |
commit | 0cb104be9ce069006b6f8d562f8d847f18765d9d (patch) | |
tree | 164e917f611262acf7bb17dc6af7bebac60f7bcf /english/template/debian/languages.wml | |
parent | daff56ebf1fd461f04b856dcb27d5cb8e00d3646 (diff) |
Use CSS for overall page layout, reduce the amount of tables.
Patch by Jutta Wrage, Denis Barbier and me.
(I backed out the changes to the navbar on the mainpage until the
clipping issues are fixed)
CVS version numbers
english/template/debian/basic.wml: 1.78 -> 1.79
english/template/debian/common_tags.wml: 1.8 -> 1.9
english/template/debian/consultant.wml: 1.54 -> 1.55
english/template/debian/header.wml: 1.10 -> 1.11
english/template/debian/languages.wml: 1.131 -> 1.132
english/template/debian/mainpage.wml: 1.43 -> 1.44
english/template/debian/navbar.wml: 1.67 -> 1.68
english/template/debian/news.wml: 1.55 -> 1.56
english/template/debian/security.wml: 1.122 -> 1.123
english/template/debian/template.wml: 1.17 -> 1.18
english/template/debian/votebar.wml: 1.99 -> 1.100
Diffstat (limited to 'english/template/debian/languages.wml')
-rw-r--r-- | english/template/debian/languages.wml | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/english/template/debian/languages.wml b/english/template/debian/languages.wml index 9d3dcae4fa3..3df50b219d4 100644 --- a/english/template/debian/languages.wml +++ b/english/template/debian/languages.wml @@ -158,10 +158,10 @@ sub languages { # printf STDERR join(', ', @used_langs); if ($rel_dir eq "" && $file eq "sitemap") { # special case for the site map - $str .= "\n"; $str .= "<!--UdmComment-->\n"; - $str .= q{<gettext>This page is also available in the following languages:</gettext>}."\n"; - $str .= "<br />\n"; + $str .= "<p>\n"; + $str .= q{<gettext>This page is also available in the following languages:</gettext>}."</p>\n"; + $str .= "<p class=\"navpara\">\n"; foreach (keys %langs) { if ($_ ne lc($cur_lang) or $cur_lang eq "Chinese") { $sorted_langs{$selflang{$_}} = $_; @@ -171,21 +171,23 @@ sub languages { $cur_lang = $sorted_langs{$_}; $tooltip = $trans{$CUR_ISO_LANG}{$cur_lang}; if ($cur_lang ne "chinese") { - $str .= "<a href=\"$file.$langs{$cur_lang}.html\" title=\"$tooltip\" hreflang=\"$langs{$cur_lang}\" lang=\"$langs{$cur_lang}\" rel=\"alternate\">$_"; + $str .= " <a href=\"$file.$langs{$cur_lang}.html\" title=\"$tooltip\" hreflang=\"$langs{$cur_lang}\" lang=\"$langs{$cur_lang}\" rel=\"alternate\">$_"; $str .= " ($translit{$cur_lang})" if defined $translit{$cur_lang}; - $str .= "</a> \n"; + $str .= "</a>\n"; } else { - $str .= "<a href=\"$file.$langs{$cur_lang}-cn.html\" title=\"$tooltip (<CNc/>)\" hreflang=\"$langs{$cur_lang}-CN\" lang=\"$langs{$cur_lang}-CN\" rel=\"alternate\" style=\"white-space: nowrap\">$_(简)</a> \n"; - $str .= "<a href=\"$file.$langs{$cur_lang}-hk.html\" title=\"$tooltip (<HKc/>)\" hreflang=\"$langs{$cur_lang}-HK\" lang=\"$langs{$cur_lang}-HK\" rel=\"alternate\" style=\"white-space: nowrap\">$_(HK)</a> \n"; - $str .= "<a href=\"$file.$langs{$cur_lang}-tw.html\" title=\"$tooltip (<TWc/>)\" hreflang=\"$langs{$cur_lang}-TW\" lang=\"$langs{$cur_lang}-TW\" rel=\"alternate\" style=\"white-space: nowrap\">$_(繁)</a> \n"; + $str .= " <a href=\"$file.$langs{$cur_lang}-cn.html\" title=\"$tooltip (<CNc/>)\" hreflang=\"$langs{$cur_lang}-CN\" lang=\"$langs{$cur_lang}-CN\" rel=\"alternate\">$_(简)</a>\n"; + $str .= " <a href=\"$file.$langs{$cur_lang}-hk.html\" title=\"$tooltip (<HKc/>)\" hreflang=\"$langs{$cur_lang}-HK\" lang=\"$langs{$cur_lang}-HK\" rel=\"alternate\">$_(HK)</a>\n"; + $str .= " <a href=\"$file.$langs{$cur_lang}-tw.html\" title=\"$tooltip (<TWc/>)\" hreflang=\"$langs{$cur_lang}-TW\" lang=\"$langs{$cur_lang}-TW\" rel=\"alternate\">$_(繁)</a>\n"; } } + $str .= "</p>\n"; $str .= "<!--/UdmComment-->\n"; } elsif (@used_langs) { $str .= "<!--UdmComment-->\n"; + $str .= "<p>\n"; $str .= q{<gettext>This page is also available in the following languages:</gettext>}."\n"; - $str .= "<br />\n"; + $str .= "</p><p class=\"navpara\">\n"; # Language sorting. Create a hash going from the language's own name # for itself to the language's ISO keys. Then work with the sorted # keys. @@ -198,18 +200,18 @@ sub languages { $cur_lang = $sorted_langs{$_}; $tooltip = $trans{$CUR_ISO_LANG}{$cur_lang}; if ($cur_lang ne "chinese") { - $str .= "<a href=\"$file.$langs{$cur_lang}.html\" title=\"$tooltip\" hreflang=\"$langs{$cur_lang}\" lang=\"$langs{$cur_lang}\" rel=\"alternate\">$_"; + $str .= " <a href=\"$file.$langs{$cur_lang}.html\" title=\"$tooltip\" hreflang=\"$langs{$cur_lang}\" lang=\"$langs{$cur_lang}\" rel=\"alternate\">$_"; $str .= " ($translit{$cur_lang})" if defined $translit{$cur_lang}; - $str .= "</a> \n"; + $str .= "</a>\n"; } else { - $str .= "<a href=\"$file.$langs{$cur_lang}-cn.html\" title=\"$tooltip (<CNc/>)\" hreflang=\"$langs{$cur_lang}-CN\" lang=\"$langs{$cur_lang}-CN\" rel=\"alternate\" style=\"white-space: nowrap\">$_(简)</a> \n"; - $str .= "<a href=\"$file.$langs{$cur_lang}-hk.html\" title=\"$tooltip (<HKc/>)\" hreflang=\"$langs{$cur_lang}-HK\" lang=\"$langs{$cur_lang}-HK\" rel=\"alternate\" style=\"white-space: nowrap\">$_(HK)</a> \n"; - $str .= "<a href=\"$file.$langs{$cur_lang}-tw.html\" title=\"$tooltip (<TWc/>)\" hreflang=\"$langs{$cur_lang}-TW\" lang=\"$langs{$cur_lang}-TW\" rel=\"alternate\" style=\"white-space: nowrap\">$_(繁)</a> \n"; + $str .= " <a href=\"$file.$langs{$cur_lang}-cn.html\" title=\"$tooltip (<CNc/>)\" hreflang=\"$langs{$cur_lang}-CN\" lang=\"$langs{$cur_lang}-CN\" rel=\"alternate\">$_(简)</a>\n"; + $str .= " <a href=\"$file.$langs{$cur_lang}-hk.html\" title=\"$tooltip (<HKc/>)\" hreflang=\"$langs{$cur_lang}-HK\" lang=\"$langs{$cur_lang}-HK\" rel=\"alternate\">$_(HK)</a>\n"; + $str .= " <a href=\"$file.$langs{$cur_lang}-tw.html\" title=\"$tooltip (<TWc/>)\" hreflang=\"$langs{$cur_lang}-TW\" lang=\"$langs{$cur_lang}-TW\" rel=\"alternate\">$_(繁)</a>\n"; } } - $str .= "\n<br />\n"; + $str .= "\n</p><p>\n"; $str .= q{<gettext>How to set <a href=m4_HOME/intro/cn>the default document language</a></gettext>}; - $str .= "\n<!--/UdmComment-->\n"; + $str .= "\n</p>\n<!--/UdmComment-->\n"; } return $str; |