diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-26 15:45:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-26 15:45:40 -0400 |
| commit | 70c87f56a21ea305085ec1ca88a12a47ed9f7fd9 (patch) | |
| tree | 1b17af19d7f67b9ba36718861ce73a319d063961 | |
| parent | bfed9a405e721e28dcfb735e75b8b51453247df9 (diff) | |
| download | ikiwiki-70c87f56a21ea305085ec1ca88a12a47ed9f7fd9.tar ikiwiki-70c87f56a21ea305085ec1ca88a12a47ed9f7fd9.tar.gz | |
Modified page.tmpl to to set html lang= and dir= when values have been specified for them, which the po plugin does.
Note that I modified the patch slightly, to avoid blank lines before the
<html>, on the off chance bad html parsers care.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/todo/Page_template_with_RTL_support.mdwn | 6 | ||||
| -rw-r--r-- | templates/page.tmpl | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index a605b5176..182733b23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium [ Joey Hess ] * emailauth: Added emailauth_sender config. + * Modified page.tmpl to to set html lang= and dir= when + values have been specified for them, which the po plugin does. -- Simon McVittie <smcv@debian.org> Mon, 15 Jun 2015 18:13:23 +0100 diff --git a/doc/todo/Page_template_with_RTL_support.mdwn b/doc/todo/Page_template_with_RTL_support.mdwn index e90342170..7f11fd5b5 100644 --- a/doc/todo/Page_template_with_RTL_support.mdwn +++ b/doc/todo/Page_template_with_RTL_support.mdwn @@ -1,8 +1,8 @@ Hi, -I've modified page.tmpl to take into account rtl languages. Basically I've modified the <html> tag to generate +I've modified page.tmpl to take into account rtl languages. Basically I've modified the `<html>` tag to generate -<html dir="$DIRECTION" lang="$LANG"> + <html dir="$DIRECTION" lang="$LANG"> if the PO plugin is enabled. @@ -12,3 +12,5 @@ Pasting it here: https://paste.debian.net/318146/ Cheers. + +> [[applied|done]] --[[Joey]] diff --git a/templates/page.tmpl b/templates/page.tmpl index 9e8b330a4..183d733e1 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml"> +<TMPL_IF HTML_LANG_CODE><html lang="<TMPL_VAR HTML_LANG_CODE>" dir="<TMPL_VAR HTML_LANG_DIR>" xmlns="http://www.w3.org/1999/xhtml"><TMPL_ELSE><html xmlns="http://www.w3.org/1999/xhtml"></TMPL_IF> <head> <TMPL_IF DYNAMIC> <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE> |