A hundred tiny improvements

10 files changed, 19 insertions, 71 deletions

diff --git a/COPYING b/COPYING
index 1d72551..0e67f67 100644
--- a/COPYING
+++ b/COPYING
@@ -7,13 +7,6 @@ The text on this website is Copyright 2009-2010 Nick White.
 It is licensed under the Creative Commons Attribution-Share Alike 3.0
 Unported license.
 
-The icon on this website (candles.ico) is a modified version of the
-photograph "Candles in Love 07406" which is Copyright 2006 Nevit Dilmen,
-and is available from
-http://commons.wikimedia.org/wiki/File:Candles_in_Love_07406.jpg. It is
-licensed under the Creative Commons Attribution-Share Alike 3.0 Unported
-license.
-
 ------------------------------------------------------------------------------
 
                     GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/Makefile b/Makefile
index 14732a2..7779d64 100644
--- a/Makefile
+++ b/Makefile
@@ -15,27 +15,22 @@ all: $(TARGETS) $(GZIP)
 $(TARGETS): includes/header.xml includes/footer.xml
 
 $(RSS): $(PAGES) makerss.sh
-	@echo making $@
-	@sh makerss.sh $(SITENAME) $(FOAF) $* > $@
-
-index.xml: index.txt includes/header-index.xml includes/footer.xml
-	@echo making $@
-	@sed "s/TITLE/`head -n 1 < $<`/" < includes/header-index.xml > $@
-	@$(MARKDOWN) $< >> $@
-	@sed "s/MODDATE/`ls -lc --time-style=+%Y-%m-%d $<|awk '{print $$6}'`/" < includes/footer.xml >> $@
+	echo making $@
+	sh makerss.sh $(SITENAME) $(FOAF) $* > $@
 
 .txt.xml:
-	@echo making $@
-	@sed "s/TITLE/`head -n 1 < $<`/" < includes/header.xml > $@
-	@$(MARKDOWN) $< >> $@
-	@sed "s/MODDATE/`ls -lc --time-style=+%Y-%m-%d $<|awk '{print $$6}'`/" < includes/footer.xml >> $@
+	echo making $@
+	sed "s/TITLE/`head -n 1 < $<`/" < includes/header.xml > $@
+	$(MARKDOWN) $< >> $@
+	sed "s/MODDATE/`ls -lc --time-style=+%Y-%m-%d $<|awk '{print $$6}'`/" < includes/footer.xml >> $@
 
 # not POSIX compatible
 %.gz: %
-	@echo compressing $<
-	@gzip < $< > $@
+	echo compressing $<
+	gzip < $< > $@
 
 clean:
 	rm -f -- $(TARGETS) $(GZIP)
 
 .SUFFIXES: .txt .xml .rdf .gz
+.SILENT:
diff --git a/card.ttl b/card.ttl
index 792e8b4..e16bcd1 100644
--- a/card.ttl
+++ b/card.ttl
@@ -15,11 +15,10 @@
     foaf:givenName "Nick";
     foaf:nick "njw";
     foaf:homepage <http://njw.me.uk>;
-    foaf:openid <http://njw.me.uk>;
     foaf:mbox_sha1sum "6401a28665a1feaecd7f4e5591dc5eadf285eeec";
-    wot:hasKey :key.
+    wot:hasKey :gpgkey.
 
-:key a wot:PubKey;
+:gpgkey a wot:PubKey;
     wot:hex_id "04E4653F";
     wot:pubkeyAddress <http://njw.me.uk/04E4653F.gpg.asc>;
     wot:fingerprint "9732D7C7A441D79EFDF094F61F48567404E4653F".
diff --git a/graphics/candles.ico b/graphics/candles.ico
deleted file mode 100644
index b755041..0000000
--- a/graphics/candles.ico
+++ /dev/null
diff --git a/includes/footer.xml b/includes/footer.xml
index 58f2471..9604247 100644
--- a/includes/footer.xml
+++ b/includes/footer.xml
@@ -1,13 +1,8 @@
 <div id="footer">
 
-<div id="moddate">
-<p>Last updated: MODDATE</p>
-</div>
+<p id="moddate">Last updated: MODDATE</p>
 
-<div id="copyright">
-<p>The text on this website is licensed under the <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Attribution-Share Alike 3.0 License</a>.</p>
-<p>The code used to build this website is released under the <a href="http://www.gnu.org/licenses/agpl.html" rel="license">GNU Affero General Public License</a>. It is available in a <a href="http://git.njw.me.uk/cgit/cgit.cgi/njw-website/">git repository</a>.</p>
-</div>
+<p id="copyright">The text on this website is licensed under the <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Attribution-Share Alike 3.0 License</a>. The <a href="http://git.njw.me.uk/cgit/cgit.cgi/njw-website/">code used to build this website</a> is released under the <a href="http://www.gnu.org/licenses/agpl.html" rel="license">GNU Affero General Public License</a>.</p>
 
 </div>
 
diff --git a/includes/header-index.xml b/includes/header-index.xml
deleted file mode 100644
index d6cb771..0000000
--- a/includes/header-index.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
-	<title>TITLE</title>
-	<link rel="stylesheet" type="text/css" href="/includes/style" />
-	<link rel="icon" href="/graphics/candles.ico" />
-	<link rel="alternate" title="rss" type="text/turtle" href="/index.ttl" />
-	<link rel="meta" title="foaf" type="text/turtle" href="/card#i" />
-	<link rel="openid.server" href="http://certifi.ca/_serve" />
-	<link rel="openid.delegate" href="http://certifi.ca/njw" />
-</head>
-
-<body>
diff --git a/includes/header.xml b/includes/header.xml
index 0b90e1f..d96175d 100644
--- a/includes/header.xml
+++ b/includes/header.xml
@@ -1,13 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
 	<title>TITLE</title>
 	<link rel="stylesheet" type="text/css" href="/includes/style" />
-	<link rel="icon" href="/graphics/candles.ico" />
-	<link rel="alternate" title="rss" type="text/turtle" href="/index.ttl" />
+	<link rel="alternate" title="RSS" type="text/turtle" href="/index.ttl" />
+	<link rel="meta" title="FOAF" type="text/turtle" href="/card#i" />
 </head>
 
 <body>
diff --git a/includes/style.css b/includes/style.css
index 84ec65b..1382be0 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -19,25 +19,8 @@ h2 {
 
 a { text-decoration: none; }
 
-a:hover { color: #5555dd; }
-
-p a:hover { text-decoration: underline; }
-
 div#footer {
 	border-top: thin solid black;
-	margin: 6ex auto 1ex;
+	margin-top: 6ex;
 	font-size: xx-small;
 }
-
-div#copyright {
-	border: thin solid #777;
-	background-color: #eee;
-	color: black;
-	padding: 0.4ex 1em;
-	margin: auto 2%;
-}
-
-div#copyright p {
-	margin-top: 0.2ex;
-	margin-bottom: 0.2ex;
-}
diff --git a/index.txt b/index.txt
index 38d8c12..61e9fce 100644
--- a/index.txt
+++ b/index.txt
@@ -5,7 +5,7 @@ Nick  J. White (njw)
 -----------------------------------------------------------------------
 More information about the
 [free software](http://www.gnu.org/philosophy/free-sw.html) projects I
-I have been and am involved with.
+have been and am involved with.
 
 [Web Development](webdevelopment)
 -----------------------------------------------------------------------
diff --git a/makerss.sh b/makerss.sh
index 2345651..2133f8e 100755
--- a/makerss.sh
+++ b/makerss.sh
@@ -17,7 +17,6 @@ cat << EOF
     rss:link <${siteurl}>;
     dc:creator <${creator}>;
     cc:license <http://creativecommons.org/licenses/by-sa/3.0/>;
-
     rss:items [ a rdf:Seq;
 EOF
 
@@ -32,6 +31,7 @@ for item in $items; do
     moddate=`ls -lc --time-style=+%Y-%m-%d ./${item}.txt|awk '{print $6}'`
     link="${siteurl}${item}"
     cat << EOF
+
 <${link}> a rss:item;
     rss:title "${title}";
     rss:link <${link}>;