summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc.tmpl23
-rw-r--r--page.tmpl45
2 files changed, 56 insertions, 12 deletions
diff --git a/misc.tmpl b/misc.tmpl
index 7f65217..2881544 100644
--- a/misc.tmpl
+++ b/misc.tmpl
@@ -9,27 +9,46 @@
</TMPL_IF>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><TMPL_VAR TITLE></title>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>nn4.css" type="text/css" media="screen" />
+<!--link before import prevents Flash Of Unstyled Content in ie6pc -->
+<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>real.css");</style>
+<!-- import with quotes and brackets hides css from:
+Netscape 4.x
+Win IE 3
+Win IE 4
+Mac IE 4.01
+Mac IE 4.5
+Konqueror 2.1.2
+Win Amaya 5.1
+isn't that nice to know? -->
+<!-- Source of above: http://www.thenoodleincident.com/tutorials/typography/ -->
+<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>style.css");</style>
+<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>local.css");</style>
<TMPL_IF NAME="FAVICON">
<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
</TMPL_IF>
</head>
<body>
+<div id="container">
+
<div class="header">
<span>
<TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE>
</span>
</div>
+<div id="wrapper">
<div id="content">
<TMPL_VAR PAGEBODY>
</div>
+</div>
<div id="footer">
<!-- from <TMPL_VAR NAME=WIKINAME> -->
</div>
+</div><!-- #container -->
+
</body>
</html>
diff --git a/page.tmpl b/page.tmpl
index f2f9c34..3cd6ba7 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -7,8 +7,21 @@
<TMPL_IF NAME="FAVICON">
<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
</TMPL_IF>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>nn4.css" type="text/css" media="screen" />
+<!--link before import prevents Flash Of Unstyled Content in ie6pc -->
+<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>real.css");</style>
+<!-- import with quotes and brackets hides css from:
+Netscape 4.x
+Win IE 3
+Win IE 4
+Mac IE 4.01
+Mac IE 4.5
+Konqueror 2.1.2
+Win Amaya 5.1
+isn't that nice to know? -->
+<!-- Source of above: http://www.thenoodleincident.com/tutorials/typography/ -->
+<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>style.css");</style>
+<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>local.css");</style>
<TMPL_IF NAME="EDITURL">
<link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
</TMPL_IF>
@@ -17,6 +30,8 @@
</head>
<body>
+<div id="container">
+
<div class="pageheader">
<div class="header">
<span>
@@ -37,18 +52,12 @@
<TMPL_IF NAME="HAVE_ACTIONS">
<div class="actions">
<ul>
-<TMPL_IF NAME="EDITURL">
-<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
-</TMPL_IF>
<TMPL_IF NAME="RECENTCHANGESURL">
<li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
</TMPL_IF>
<TMPL_IF NAME="HISTORYURL">
<li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
</TMPL_IF>
-<TMPL_IF NAME="PREFSURL">
-<li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
-</TMPL_IF>
<TMPL_IF NAME="DISCUSSIONLINK">
<li><TMPL_VAR DISCUSSIONLINK><br /></li>
</TMPL_IF>
@@ -57,15 +66,29 @@
</TMPL_IF>
</div> <!-- .pageheader -->
+<TMPL_IF TOPBAR>
+<div id="topbar">
+<TMPL_VAR TOPBAR>
+</div>
+</TMPL_IF>
+
+<div id="wrapper">
+<div id="content">
+<TMPL_VAR CONTENT>
+</div>
+</div>
+
<TMPL_IF SIDEBAR>
<div id="sidebar">
<TMPL_VAR SIDEBAR>
</div>
</TMPL_IF>
-<div id="content">
-<TMPL_VAR CONTENT>
+<TMPL_IF FARBAR>
+<div id="farbar">
+<TMPL_VAR FARBAR>
</div>
+</TMPL_IF>
<div id="footer" class="pagefooter">
<div id="pageinfo">
@@ -121,5 +144,7 @@ Last edited <TMPL_VAR NAME=MTIME>
<!-- from <TMPL_VAR NAME=WIKINAME> -->
</div><!-- .pagefooter #footer -->
+</div><!-- #container -->
+
</body>
</html>