]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7db6066 ee9a4e0)
Merge commit 'ee9a4e06fcce53062b38814707a0b7d6946d4a36' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:40:47 +0000 (00:40 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:40:47 +0000 (00:40 -0500)
Conflicts:
templates/page.tmpl

1  2 
templates/page.tmpl patch | diff1 | diff2 | blob | history

diff --cc templates/page.tmpl
index 8cb726cb9aa5540fc3982551f37d4adbd28492d7,41fffa2636d918ba19c66fe23c44b54c41399ba6..a6394a72ce8cd80c803b2ac45fa45f175dcc4969
--- 1/templates/page.tmpl
--- 2/templates/page.tmpl
+++ b/templates/page.tmpl
@@@ -1,17 -1,13 +1,13 @@@
  <TMPL_IF HTML5><!DOCTYPE html>
 -<html>
 +<html lang="en">
  <TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 -<html xmlns="http://www.w3.org/1999/xhtml">
 +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  </TMPL_IF>
  <head>
- <TMPL_UNLESS ISPAGE>
- <TMPL_IF FORCEBASEURL>
- <base href="<TMPL_VAR FORCEBASEURL>" />
- <TMPL_ELSE>
- <TMPL_IF BASEURL>
- <base href="<TMPL_VAR BASEURL>" />
- </TMPL_IF>
+ <TMPL_IF DYNAMIC>
+ <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+ <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
  </TMPL_IF>
  </TMPL_UNLESS>
  <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
wiki compiler