diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-29 03:18:21 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-29 03:18:21 +0000 |
| commit | e41dd1e24e345c974fe4a070088f0d09d1b6ddac (patch) | |
| tree | 1e38ae17bb30573304f633ae9fe19dbf4935f562 /templates | |
| parent | bfe959167a9bad17cc23f9f8e9920aa2f2eaec1c (diff) | |
| download | ikiwiki-e41dd1e24e345c974fe4a070088f0d09d1b6ddac.tar ikiwiki-e41dd1e24e345c974fe4a070088f0d09d1b6ddac.tar.gz | |
html validation fixes:
- escape & in urls (also clean up cgi url generation)
- since markdown wraps inlined pages in <p></p>, close and re-open
the paragraph tags when generating the embedded html
- added XHTML 1.0 doctypes to templates
- fixed <hr /> and <br /> in templates
- add an alt attribute to inline images, based on the WikiLink to the
image. Allows things like [[my_image|img.png]] to customise alt text.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/blogpost.tmpl | 4 | ||||
| -rw-r--r-- | templates/editpage.tmpl | 12 | ||||
| -rw-r--r-- | templates/misc.tmpl | 2 | ||||
| -rw-r--r-- | templates/page.tmpl | 8 | ||||
| -rw-r--r-- | templates/recentchanges.tmpl | 8 |
5 files changed, 21 insertions, 13 deletions
diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl index 5ded359a1..8e4bb6a7d 100644 --- a/templates/blogpost.tmpl +++ b/templates/blogpost.tmpl @@ -1,4 +1,4 @@ -<hr> +<hr /> <form action="<TMPL_VAR CGIURL>" method="GET"> <input type="hidden" name="do" value="blog"> <input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>"> @@ -6,4 +6,4 @@ Add a new post titled: <input name=title size=40> <input type="submit" value="Edit"> </form> -<hr> +<hr /> diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c1e7113b4..f77f45036 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,3 +1,5 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head><title><TMPL_VAR FORM-TITLE></title></head> <body> @@ -16,18 +18,18 @@ confict and commit again to save your changes. <TMPL_VAR FIELD-FROM> <TMPL_VAR FIELD-RCSINFO> <TMPL_IF NAME="PAGE_SELECT"> -Page location: <TMPL_VAR FIELD-PAGE><br> +Page location: <TMPL_VAR FIELD-PAGE><br /> <TMPL_ELSE> <TMPL_VAR FIELD-PAGE> </TMPL_IF> -<TMPL_VAR FIELD-CONTENT><br> +<TMPL_VAR FIELD-CONTENT><br /> <TMPL_IF NAME="CAN_COMMIT"> -Optional comment about this change:</br> -<TMPL_VAR FIELD-COMMENTS><br> +Optional comment about this change:<br /> +<TMPL_VAR FIELD-COMMENTS><br /> </TMPL_IF> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FORM-END> -<hr> +<hr /> <TMPL_IF NAME="PAGE_PREVIEW"> <h1>Page preview:</h1> <TMPL_VAR PAGE_PREVIEW> diff --git a/templates/misc.tmpl b/templates/misc.tmpl index a8ee1684b..3e78c3162 100644 --- a/templates/misc.tmpl +++ b/templates/misc.tmpl @@ -1,3 +1,5 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head><title><TMPL_VAR TITLE></title></head> <body> diff --git a/templates/page.tmpl b/templates/page.tmpl index 468361a9d..9cef35dc6 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -1,3 +1,5 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head><title><TMPL_VAR TITLE></title></head> <body> @@ -25,11 +27,11 @@ <a href="<TMPL_VAR PREFSURL>">Preferences</a> </TMPL_IF> -<TMPL_VAR DISCUSSIONLINK><br> +<TMPL_VAR DISCUSSIONLINK><br /> -<hr> +<hr /> <TMPL_VAR CONTENT> -<hr> +<hr /> <TMPL_IF NAME="BACKLINKS"> <p>Links: diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl index b42975e95..4ab53b892 100644 --- a/templates/recentchanges.tmpl +++ b/templates/recentchanges.tmpl @@ -1,3 +1,5 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head><title><TMPL_VAR TITLE></title></head> <body> @@ -6,7 +8,7 @@ <TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE> </h1> -<hr> +<hr /> <ul> <TMPL_LOOP NAME="CHANGELOG"> @@ -17,13 +19,13 @@ (<a href="<TMPL_VAR NAME="DIFFURL">">diff</a>) </TMPL_IF> </TMPL_LOOP> - <br> + <br /> <!-- <TMPL_VAR NAME="COMMITTYPE"> --> changed <TMPL_VAR NAME="WHEN"> by <TMPL_VAR NAME="USER">: <i> <TMPL_LOOP NAME="MESSAGE"> <TMPL_IF NAME="LINE"> - <TMPL_VAR NAME="LINE"><br> + <TMPL_VAR NAME="LINE"><br /> </TMPL_IF> </TMPL_LOOP> </i> |