summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/style.css7
-rw-r--r--templates/inlinepage.tmpl16
-rw-r--r--templates/page.tmpl10
3 files changed, 24 insertions, 9 deletions
diff --git a/doc/style.css b/doc/style.css
index 246da1ffc..0e3bfb3e6 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -35,12 +35,14 @@
padding: .2em .4em;
}
-.tags {
+.pagefooter {
clear: both;
}
+.tags {
+}
+
#pageinfo {
- clear: both;
margin: 1em 0;
border-top: 1px solid #000;
}
@@ -140,7 +142,6 @@ div.recentchanges {
.pagedate,
.pagelicense,
.pagecopyright {
- clear: both;
font-style: italic;
display: block;
margin-top: 1em;
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>