diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-26 01:10:58 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-26 01:10:58 +0000 |
| commit | 5466a1daf99e8e4c67a19f871aaf558312569652 (patch) | |
| tree | aac6347ea7eb762fad92857ba69ef2c7a839dd74 /templates | |
| parent | 7f64dd4f6688149306282f1a2a951535b9493300 (diff) | |
| download | ikiwiki-5466a1daf99e8e4c67a19f871aaf558312569652.tar ikiwiki-5466a1daf99e8e4c67a19f871aaf558312569652.tar.gz | |
* The page name and parent links has switched from using a <h1> to a styled
<span>, so pages can use <h1> internally instead of needing to use <h2>.
* Updated all of ikiwiki's own wiki pages for that.
* Add pagetemplate hook, which can be used by plugins that want to mess
around with adding new stuff to the page template.
* Remove headercontent; the search plugin now adds the search box to the
header by registering a pagetemplate hook, and other plugins should do
similarly.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/editpage.tmpl | 6 | ||||
| -rw-r--r-- | templates/inlinepage.tmpl | 2 | ||||
| -rw-r--r-- | templates/misc.tmpl | 4 | ||||
| -rw-r--r-- | templates/page.tmpl | 8 | ||||
| -rw-r--r-- | templates/recentchanges.tmpl | 4 |
5 files changed, 14 insertions, 10 deletions
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 4724cd65f..b7ec3fa2b 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -20,7 +20,9 @@ confict and commit again to save your changes. </p> </TMPL_IF> <TMPL_VAR FORM-START> -<h1><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></h1> +<div id="header"> +<span><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></span> +</div> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-FROM> <TMPL_VAR FIELD-RCSINFO> @@ -39,7 +41,7 @@ Optional comment about this change:<br /> <hr /> <TMPL_IF NAME="PAGE_PREVIEW"> <div id="header"> -<h1>Page preview:</h1> +<span>Page preview:</span> </div> <div id="content"> <TMPL_VAR PAGE_PREVIEW> diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl index 397ac860c..39afc7f98 100644 --- a/templates/inlinepage.tmpl +++ b/templates/inlinepage.tmpl @@ -1,5 +1,5 @@ <div class="inlinepage"> -<h1><TMPL_VAR PAGELINK></h1> +<span id="header"><TMPL_VAR PAGELINK></span> <TMPL_VAR CONTENT> diff --git a/templates/misc.tmpl b/templates/misc.tmpl index 1f724d3cd..3187f5892 100644 --- a/templates/misc.tmpl +++ b/templates/misc.tmpl @@ -12,9 +12,9 @@ <body> <div id="header"> -<h1> +<span> <TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE> -</h1> +</span> </div> <div id="content"> diff --git a/templates/page.tmpl b/templates/page.tmpl index 09e19c359..fc0094121 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -9,13 +9,15 @@ <body> <div id="header"> -<h1> +<span> <TMPL_LOOP NAME="PARENTLINKS"> <a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ </TMPL_LOOP> <TMPL_VAR TITLE> -</h1> -<TMPL_VAR HEADERCONTENT> +</span> +<TMPL_IF NAME="SEARCHFORM"> +<TMPL_VAR SEARCHFORM> +</TMPL_IF> </div> <div id="actions"> diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl index f9e7541da..389f98cb3 100644 --- a/templates/recentchanges.tmpl +++ b/templates/recentchanges.tmpl @@ -12,9 +12,9 @@ <body> <div id="header"> -<h1> +<span> <TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE> -</h1> +</span> </div> <div id="content"> |