diff options
| author | Simon McVittie <smcv@carbon.pseudorandom.co.uk> | 2008-07-14 23:34:07 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@carbon.pseudorandom.co.uk> | 2008-07-14 23:34:07 +0100 |
| commit | 18b3e970ffcc0f74d68538b7094f76442a294609 (patch) | |
| tree | 7565862f3e2f86a1e9ff623d991f3150860230a4 /templates | |
| parent | 23a3de5e8c4998c41afc99664fd4a7fe25e7bf29 (diff) | |
| parent | 66053f6fc7b300c9b49a5c69d2c7a1eeec841743 (diff) | |
Merge commit 'origin/master' into aggregateinternal
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/inlinepage.tmpl | 16 | ||||
| -rw-r--r-- | templates/page.tmpl | 10 |
2 files changed, 20 insertions, 6 deletions
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl index 71d57b008..ffcb897a8 100644 --- a/templates/inlinepage.tmpl +++ b/templates/inlinepage.tmpl @@ -1,4 +1,7 @@ <div class="inlinepage"> + +<div class="inlineheader"> + <TMPL_IF NAME="AUTHOR"> <span class="author"> <TMPL_IF NAME="AUTHORURL"> @@ -15,7 +18,14 @@ <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a> </TMPL_IF> </span> + +</div><!--.inlineheader--> + +<div class="inlinecontent"> <TMPL_VAR CONTENT> +</div><!--.inlinecontent--> + +<div class="inlinefooter"> <span class="pagedate"> Posted <TMPL_VAR CTIME> @@ -52,7 +62,9 @@ License: <TMPL_VAR LICENSE> <li><TMPL_VAR DISCUSSIONLINK></li> </TMPL_IF> </ul> -</div> +</div><!--.actions--> </TMPL_IF> -</div> +</div><!--.inlinefooter--> + +</div><!--.inlinepage--> diff --git a/templates/page.tmpl b/templates/page.tmpl index 166f3c560..d39c9aa2a 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -17,6 +17,7 @@ </head> <body> +<div class="pageheader"> <div class="header"> <span> <TMPL_LOOP NAME="PARENTLINKS"> @@ -50,6 +51,7 @@ </ul> </div> </TMPL_IF> +</div> <!-- .pageheader --> <TMPL_IF SIDEBAR> <div id="sidebar"> @@ -61,7 +63,7 @@ <TMPL_VAR CONTENT> </div> -<div id="footer"> +<div id="footer" class="pagefooter"> <div id="pageinfo"> <TMPL_IF NAME="TAGS"> @@ -88,7 +90,7 @@ Links: </span> </span> </TMPL_IF> -</div> +</div><!-- #backlinks --> </TMPL_IF> <TMPL_IF COPYRIGHT> @@ -110,10 +112,10 @@ Last edited <TMPL_VAR NAME=MTIME> <!-- Created <TMPL_VAR NAME=CTIME> --> </div> -</div> +</div><!-- #pageinfo --> <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> <!-- from <TMPL_VAR NAME=WIKINAME> --> -</div> +</div><!-- .pagefooter #footer --> </body> </html> |