urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Joey Hess 2015-10-26 15:45:03 -04:00
parent bfed9a405e
commit 70c87f56a2
Failed to extract signature
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -7,6 +7,8 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
[ Joey Hess ] [ Joey Hess ]
* emailauth: Added emailauth_sender config. * 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 -- Simon McVittie <smcv@debian.org> Mon, 15 Jun 2015 18:13:23 +0100

6
doc/todo/Page_template_with_RTL_support.mdwn
View File

@ -1,8 +1,8 @@
Hi, 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. if the PO plugin is enabled.
@ -12,3 +12,5 @@ Pasting it here: https://paste.debian.net/318146/
Cheers. Cheers.
> [[applied|done]] --[[Joey]]

2
templates/page.tmpl
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!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> <head>
<TMPL_IF DYNAMIC> <TMPL_IF DYNAMIC>
<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE> <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>