]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bfed9a4)
Modified page.tmpl to to set html lang= and dir= when values have been specified...
authorJoey Hess <joeyh@joeyh.name>
Mon, 26 Oct 2015 19:45:03 +0000 (15:45 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 26 Oct 2015 19:45:40 +0000 (15:45 -0400)
Note that I modified the patch slightly, to avoid blank lines before the
<html>, on the off chance bad html parsers care.

debian/changelog patch | blob | history
doc/todo/Page_template_with_RTL_support.mdwn patch | blob | history
templates/page.tmpl patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index a605b517636f7fc0a91d82ec3d1d4ad45425d949..182733b23421b179420cc6a41050f9af336a4fbb 100644 (file)
--- 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 e9034217095df6ab2d98bd686163203b98812233..7f11fd5b550c91fe76403d2c5d7a05aa27c2bc7a 100644 (file)
--- 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 9e8b330a4a25124eb799b52ad9b840b0c6105fd6..183d733e1637f518f99a0c835765364f38edffd5 100644 (file)
--- 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>
Unnamed repository; edit this file 'description' to name the repository.