[cairo-commit] [cairo-www] 3 commits - ikiwiki.setup src/index.mdwn src/local.css templates/editpage.tmpl templates/misc.tmpl templates/page.tmpl templates/recentchanges.tmpl templates/welcome.tmpl
Nis Martensen
nmartensen at freedesktop.org
Fri Nov 16 08:51:56 PST 2007
ikiwiki.setup | 2
src/index.mdwn | 1
src/local.css | 4 +
templates/editpage.tmpl | 2
templates/misc.tmpl | 2
templates/page.tmpl | 8 +--
templates/recentchanges.tmpl | 2
templates/welcome.tmpl | 110 +++++++++++++++++++++++++++++++++++++++++++
8 files changed, 123 insertions(+), 8 deletions(-)
New commits:
commit 0d65f15c5b8f21497aed136f41d23898d30e4ef5
Author: Nis Martensen <nis.martensen at web.de>
Date: Thu Nov 15 22:05:14 2007 +0100
Use pagetemplate plugin and a new template for the index page
to remove the title header line. Enable the pagetemplate plugin
to accomplish this.
This was previously done by a patch to ikiwiki itself.
diff --git a/ikiwiki.setup b/ikiwiki.setup
index d5ee8b4..5bbc518 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -107,7 +107,7 @@ use IkiWiki::Setup::Standard {
# To add plugins, list them here.
#add_plugins => [qw{goodstuff search wikitext camelcase
# htmltidy fortune sidebar map rst anonok}],
- add_plugins => [qw{goodstuff}],
+ add_plugins => [qw{goodstuff pagetemplate}],
# If you want to disable any of the default plugins, list them here.
#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
disable_plugins => [qw{smiley}],
diff --git a/src/index.mdwn b/src/index.mdwn
index 9d4e64c..491dfce 100644
--- a/src/index.mdwn
+++ b/src/index.mdwn
@@ -1,3 +1,4 @@
+[[pagetemplate template=welcome.tmpl]]
Latest [[news]]: [[inline pages="news/*" archive="yes" show="2" rss="no" atom="no" template="dateandtitle"]]
* * *
diff --git a/templates/welcome.tmpl b/templates/welcome.tmpl
new file mode 100644
index 0000000..ba384f8
--- /dev/null
+++ b/templates/welcome.tmpl
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title><TMPL_VAR TITLE></title>
+<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" />
+<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
+<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
+</head>
+<body>
+
+<div class="header">
+<div id="logo">
+ <a href="/"><img alt="cairo" src="/cairo-banner.png" /></a>
+</div>
+</div>
+
+<div id="navcontainer">
+<ul id="navlist">
+<li><a href="/news/">News</a></li>
+<li><a href="/download/">Download</a></li>
+<li><a href="/documentation/">Documentation</a></li>
+<li><a href="/contact/">Contact</a></li>
+<li><a href="/examples/">Examples</a></li>
+</ul>
+</div>
+
+<TMPL_IF NAME="SEARCHFORM">
+<TMPL_VAR SEARCHFORM>
+</TMPL_IF>
+
+<TMPL_IF SIDEBAR>
+<div id="sidebar">
+<TMPL_VAR SIDEBAR>
+</div>
+</TMPL_IF>
+
+<div id="content">
+<TMPL_VAR CONTENT>
+</div>
+
+<div id="footer">
+
+<TMPL_IF NAME="HAVE_ACTIONS">
+<div class="actions">
+<ul>
+<TMPL_IF NAME="EDITURL">
+<li><a href="<TMPL_VAR EDITURL>">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>
+</ul>
+</div>
+</TMPL_IF>
+
+<div id="pageinfo">
+
+<TMPL_IF NAME="TAGS">
+<div class="tags">
+Tags:
+<TMPL_LOOP NAME="TAGS">
+<TMPL_VAR NAME=LINK>
+</TMPL_LOOP>
+</div>
+</TMPL_IF>
+
+<TMPL_IF NAME="BACKLINKS">
+<div id="backlinks">
+Links:
+<TMPL_LOOP NAME="BACKLINKS">
+<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
+</TMPL_LOOP>
+<TMPL_IF NAME="MORE_BACKLINKS">
+<span class="popup">...
+<span class="balloon">
+<TMPL_LOOP NAME="MORE_BACKLINKS">
+<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
+</TMPL_LOOP>
+</span>
+</span>
+</TMPL_IF>
+</div>
+</TMPL_IF>
+
+<div class="pagedate">
+Last edited <TMPL_VAR NAME=MTIME>
+</div>
+
+</div>
+<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
+<!-- from <TMPL_VAR NAME=WIKINAME> -->
+</div>
+
+</body>
+</html>
commit 08f50601d217aabff25de0511fd852193062585e
Author: Nis Martensen <nis.martensen at web.de>
Date: Thu Nov 15 21:46:29 2007 +0100
XHTML validity fixes: remove border attribute, span->div
Use the style sheet to remove the border around image links.
The title is outside any block level element. Therefore span
is not valid here, use div instead.
diff --git a/src/local.css b/src/local.css
index 9242c47..793721f 100644
--- a/src/local.css
+++ b/src/local.css
@@ -15,6 +15,10 @@ h1, .header, #footer, #title {
padding-bottom: 1em;
}
+img {
+ border: none;
+}
+
h1,h2,h3,h4,h5,h6, .header, #title {
font-family: sans-serif;
clear: both;
diff --git a/templates/page.tmpl b/templates/page.tmpl
index ad3b3c3..f62233f 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -16,7 +16,7 @@
<div class="header">
<div id="logo">
- <a href="/"><img alt="cairo" src="/cairo-banner.png" border="0" /></a>
+ <a href="/"><img alt="cairo" src="/cairo-banner.png" /></a>
</div>
</div>
@@ -31,9 +31,9 @@
</div>
<TMPL_UNLESS NAME="TOPLEVELINDEX">
-<span id="title">
+<div id="title">
<TMPL_VAR TITLE>
-</span>
+</div>
</TMPL_UNLESS>
<TMPL_IF NAME="SEARCHFORM">
<TMPL_VAR SEARCHFORM>
commit eed9df121dd865be81538c6e743b2d90956e1d59
Author: Nis Martensen <nis.martensen at web.de>
Date: Thu Nov 15 21:32:40 2007 +0100
XHTML validity: add xmlns attribute to element html
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 926aa0e..c76ad75 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<base href="<TMPL_VAR BASEURL>" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index 32e2c93..8e5ddbc 100644
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<base href="<TMPL_VAR BASEURL>" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 8921b9c..ad3b3c3 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><TMPL_VAR TITLE></title>
diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl
index e954503..2c1dc1f 100644
--- a/templates/recentchanges.tmpl
+++ b/templates/recentchanges.tmpl
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<base href="<TMPL_VAR BASEURL>" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
More information about the cairo-commit
mailing list