content update

templatewriter improved

content/download/10_center

@@ -0,0 +1,35 @@
+<div class="content">
+	<h2>Debian, Ubuntu (cryptobox-server)</h2>
+	<p>Install the <i>cryptobox-server</i> package to integrate the
+	features of the CryptoBox into your running server/desktop
+	without downloading the whole CD.</p>
+	<p>First add the following line to your <b>/etc/apt/sources.list:</b><br />
+	<tt>&nbsp;&nbsp;deb http://systemausfall.org/toolforge/debian unstable main"</tt></p>
+	<p>Then run:<br/>
+	<tt>&nbsp;&nbsp;apt-get install cryptobox-server</tt></p>
+	<br/>
+	<p>Mabye the package can also be installed in other Debian based
+	distributions: your mileage may vary.</p>
+</div>
+
+<div class="content">
+	<h2>Go with the sources</h2>
+	<p>Download the source package of the latest release from <a href="http://codecoop.org/frs/?group_id=60&release_id=59">CodeCoop</a>.
+	<p>You can also use the <a href="/browser/trunk">read-only webinterface</a> of trac
+	for browsing through the <a href="http://en.wikipedia.org/wiki/Subversion" title="Wikipedia: Subversion">Subversion</a> repository.
+	<p>Full Subversion access access is possible via commandline tools or your
+	favourite <a href="http://en.wikipedia.org/wiki/Subversion#GUI_front-ends.2Fclients">GUI</a>.</p>
+	<p>Create your local working copy with the following command:<br>
+	<tt>&nbsp;&nbsp;svn checkout https://svn.systemausfall.org/svn/cryptobox</tt></p>
+</div>
+
+<div class="content">
+	<h2>Get the live-CD</h2>
+	<p>Get the newest live-CD by following <a
+		href="http://codecoop.org/frs/?group_id=60">this link</a>.
+	<p>We'd like to thank <a href="http://codecoop.org">codecoop.org</a> for
+	providing bandwidth.</p>
+	<p>You could buy a Live-CD at <a href="http://www.opensoft.nl/cdshop/product_info.php/manufacturers_id/28/products_id/71">OpenSoft.nl</a> for 5.95 european bugs. Note: this is an unpaid advertisement link. So if you ask us kindly, we might send you a CD for a better price. ;)
+	</p>
+</div>
+

content/download/center

@@ -1,36 +0,0 @@
-<div class="content">
-	<h2>Debian, Ubuntu (cryptobox-server)</h2>
-	<p>With the cryptobox-server package you recieve the newest
-	version without downloading the hole CD.</p>
-	<p>First add the following to your "/etc/apt/sources.list"<br />
-	"deb http://systemausfall.org/toolforge/debian unstable main"</p>
-	<p>Then run: <i>apt-get install cryptobox-server</p></i>
-	<br />
-	<p>This package may also be installable in other Debian based
-	distributions, maybe not without some dependency trouble.</p>
-</div>
-
-<div class="content">
-	<h2>Go with the sources</h2>
-	<p>Use svn for access the latest source code of the CryptoBox. Trac provides a read-only webinterface for the svn repository.</p>
-	<p>Full svn access is possible via commandline or your favorite
-	tool. For commandline the following command creates a dir
-	"cryptobox" and downloads the latest code. To stay bleeding edge,
-	just repeat the second command everytime before you start browsing
-	the code (once a day should be enough).</p>
-	<ol>
-		<li>svn checkout https://svn.systemausfall.org/svn/ cryptobox</li>
-		<li>svn up</li>
-	</ol>
-</div>
-
-<div class="content">
-	<h2>Get the live-CD</h2>
-	<p>Get the newest live-CD by following <a
-		href="http://codecoop.org/frs/?group_id=60">this link</a>.
-	<p>We'd like to thank <a href="http://codecoop.org">codecoop.org</a> for
-	providing bandwidth.</p>
-	<p>You could buy a Live-CD at <a href="http://www.opensoft.nl/cdshop/product_info.php/manufacturers_id/28/products_id/71">OpenSoft.nl</a> for 5.95 european bugs. Note: this is an unpaid advertisement link. So if you ask us kindly, we might send you a CD for a better price. ;)
-	</p>
-</div>
-

content/index/05_left

@@ -1,6 +1,6 @@
 <div class="left">
-		<a href="screenshots.html"><img border="0" src="gfx/screen_mini.png">
+		<p><a href="screenshots.html"><img border="0" alt="img: screenshot" src="gfx/screen_mini.png"/><br/>
-		<p>See more screenshots</p></a>
+		See more screenshots</a></p>
 		<br />
 	<div class="leftcontent">
 		<h2>About</h2>

content/index/10_center

@@ -3,24 +3,24 @@
 	<h2>NEWS: Cryptobox-server 0.3.0 release</h2>
 	<p class="date">15/12/02006</p>
 	<p>Here it comes, the earliest x-mas present 02006, the
-	CryptoBox-server 0.3.0 package ready for Debian/sid and
+	CryptoBox-server 0.3.0 package ready for <i>Debian/sid</i> and
-	Ubuntu/edgy_eft. It is not a live-cd, but a software package that you can just install on your linux system.
+	<i>Ubuntu/edgy_eft</i>. It is not a live-cd, but a software package that you can just install on your linux system.
-	Take a look at the screenshots. It was a long ride and this is the
+	Take a look at the <a href="screenshots.html">screenshots</a>. It was a long ride and this is the
 	first milestone reached. Be prepared fo another 1000 miles of code.
-	The live-CD with the new version will appear in February 02007.</p>
+	The live-CD with the new version will be released in February 02007.</p>
 </div>
 <div class="content">
 	<h2>NEWS: Python rewrite progress</h2>
 	<p class="date">19/08/02006</p>
 	<p>Finally the cryptobox-python-rewrite-process is in progress.
 	From now on you can follow discussions and participate at the
-	development mailinglist via gmane.</p>
+	<a href="http://blog.gmane.org/gmane.comp.encryption.cryptobox.devel">development mailinglist via gmane</a>.</p>
 </div>
 <div class="content">
 	<h2>NEWS: Download interception</h2>
 	<p class="date">14/04/02006</p>
-	<p>Sorry folks, codecoop.org is temporarly down. Update: it's up
+	<p>Sorry folks, <i>codecoop.org</i> is temporarly down. Update: it's up
-	and running again. Fetch the latest version here</p>
+	and running again. Fetch the latest version <a href="http://codecoop.org/frs/?group_id=60&amp;release_id=33">here</a></p>
 </div>
 <div class="content">
 	<h2>NEWS: CryptoBox code splitting</h2>
@@ -34,6 +34,6 @@
 	<h2>NEWS: CryptoBox code splitting</h2>
 	<p class="date">30/10/02005</p>
 	<p>The new CryptoBox version 0.2.1 is available at
-	codecoop.org!</p>
+	<a href="http://codecoop.org/frs/?group_id=60&amp;release_id=33">codecoop.org</a>!</p>
 </div>
 

demo.html

@@ -5,7 +5,7 @@
 	<title>CryptoBox</title>
 	<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type" />
 	<meta content="" name="keywords" />
-	<meta name="description" content="a secure fileserver, live-CD, web front-end">
+	<meta name="description" content="a secure fileserver, live-CD, web front-end" />
 	<link rel="stylesheet" type="text/css" href="gfx/main.css" />
 </head>
 
@@ -40,7 +40,8 @@
 
 
 <div class="footer">
-	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="">Impressum</a> --</p>
+	<!-- TODO: add real link! -->
+	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
 </div>
 
 </div>

download.html

@@ -5,7 +5,7 @@
 	<title>CryptoBox</title>
 	<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type" />
 	<meta content="" name="keywords" />
-	<meta name="description" content="a secure fileserver, live-CD, web front-end">
+	<meta name="description" content="a secure fileserver, live-CD, web front-end" />
 	<link rel="stylesheet" type="text/css" href="gfx/main.css" />
 </head>
 
@@ -42,28 +42,27 @@
 </div>
 <div class="content">
 	<h2>Debian, Ubuntu (cryptobox-server)</h2>
-	<p>With the cryptobox-server package you recieve the newest
+	<p>Install the <i>cryptobox-server</i> package to integrate the
-	version without downloading the hole CD.</p>
+	features of the CryptoBox into your running server/desktop
-	<p>First add the following to your "/etc/apt/sources.list"<br />
+	without downloading the whole CD.</p>
-	"deb http://systemausfall.org/toolforge/debian unstable main"</p>
+	<p>First add the following line to your <b>/etc/apt/sources.list:</b><br />
-	<p>Then run: <i>apt-get install cryptobox-server</p></i>
+	<tt>&nbsp;&nbsp;deb http://systemausfall.org/toolforge/debian unstable main"</tt></p>
+	<p>Then run:<br/>
+	<tt>&nbsp;&nbsp;apt-get install cryptobox-server</tt></p>
 	<br/>
-	<p>This package may also be installable in other Debian based
+	<p>Mabye the package can also be installed in other Debian based
-	distributions, maybe not without some dependency trouble.</p>
+	distributions: your mileage may vary.</p>
 </div>
 
 <div class="content">
 	<h2>Go with the sources</h2>
-	<p>Use svn for access the latest source code of the CryptoBox. Trac provides a read-only webinterface for the svn repository.</p>
+	<p>Download the source package of the latest release from <a href="http://codecoop.org/frs/?group_id=60&release_id=59">CodeCoop</a>.
-	<p>Full svn access is possible via commandline or your favorite
+	<p>You can also use the <a href="/browser/trunk">read-only webinterface</a> of trac
-	tool. For commandline the following command creates a dir
+	for browsing through the <a href="http://en.wikipedia.org/wiki/Subversion" title="Wikipedia: Subversion">Subversion</a> repository.
-	"cryptobox" and downloads the latest code. To stay bleeding edge,
+	<p>Full Subversion access access is possible via commandline tools or your
-	just repeat the second command everytime before you start browsing
+	favourite <a href="http://en.wikipedia.org/wiki/Subversion#GUI_front-ends.2Fclients">GUI</a>.</p>
-	the code (once a day should be enough).</p>
+	<p>Create your local working copy with the following command:<br>
-	<ol>
+	<tt>&nbsp;&nbsp;svn checkout https://svn.systemausfall.org/svn/cryptobox</tt></p>
-		<li>svn checkout https://svn.systemausfall.org/svn/ cryptobox</li>
-		<li>svn up</li>
-	</ol>
 </div>
 
 <div class="content">
@@ -79,7 +78,8 @@
 
 
 <div class="footer">
-	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="">Impressum</a> --</p>
+	<!-- TODO: add real link! -->
+	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
 </div>
 
 </div>

index.html

@@ -5,7 +5,7 @@
 	<title>CryptoBox</title>
 	<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type" />
 	<meta content="" name="keywords" />
-	<meta name="description" content="a secure fileserver, live-CD, web front-end">
+	<meta name="description" content="a secure fileserver, live-CD, web front-end" />
 	<link rel="stylesheet" type="text/css" href="gfx/main.css" />
 </head>
 
@@ -24,8 +24,8 @@
 <br />
 
 	<div class="left">
-		<a href="screenshots.html"><img border="0" src="gfx/screen_mini.png">
+		<p><a href="screenshots.html"><img border="0" alt="img: screenshot" src="gfx/screen_mini.png"/><br/>
-		<p>See more screenshots</p></a>
+		See more screenshots</a></p>
 		<br />
 	<div class="leftcontent">
 		<h2>About</h2>
@@ -50,24 +50,24 @@
 	<h2>NEWS: Cryptobox-server 0.3.0 release</h2>
 	<p class="date">15/12/02006</p>
 	<p>Here it comes, the earliest x-mas present 02006, the
-	CryptoBox-server 0.3.0 package ready for Debian/sid and
+	CryptoBox-server 0.3.0 package ready for <i>Debian/sid</i> and
-	Ubuntu/edgy_eft. It is not a live-cd, but a software package that you can just install on your linux system.
+	<i>Ubuntu/edgy_eft</i>. It is not a live-cd, but a software package that you can just install on your linux system.
-	Take a look at the screenshots. It was a long ride and this is the
+	Take a look at the <a href="screenshots.html">screenshots</a>. It was a long ride and this is the
 	first milestone reached. Be prepared fo another 1000 miles of code.
-	The live-CD with the new version will appear in February 02007.</p>
+	The live-CD with the new version will be released in February 02007.</p>
 </div>
 <div class="content">
 	<h2>NEWS: Python rewrite progress</h2>
 	<p class="date">19/08/02006</p>
 	<p>Finally the cryptobox-python-rewrite-process is in progress.
 	From now on you can follow discussions and participate at the
-	development mailinglist via gmane.</p>
+	<a href="http://blog.gmane.org/gmane.comp.encryption.cryptobox.devel">development mailinglist via gmane</a>.</p>
 </div>
 <div class="content">
 	<h2>NEWS: Download interception</h2>
 	<p class="date">14/04/02006</p>
-	<p>Sorry folks, codecoop.org is temporarly down. Update: it's up
+	<p>Sorry folks, <i>codecoop.org</i> is temporarly down. Update: it's up
-	and running again. Fetch the latest version here</p>
+	and running again. Fetch the latest version <a href="http://codecoop.org/frs/?group_id=60&amp;release_id=33">here</a></p>
 </div>
 <div class="content">
 	<h2>NEWS: CryptoBox code splitting</h2>
@@ -81,13 +81,14 @@
 	<h2>NEWS: CryptoBox code splitting</h2>
 	<p class="date">30/10/02005</p>
 	<p>The new CryptoBox version 0.2.1 is available at
-	codecoop.org!</p>
+	<a href="http://codecoop.org/frs/?group_id=60&amp;release_id=33">codecoop.org</a>!</p>
 </div>
 
 
 
 <div class="footer">
-	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="">Impressum</a> --</p>
+	<!-- TODO: add real link! -->
+	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
 </div>
 
 </div>

placeholder/footer

@@ -1,6 +1,7 @@
 
 <div class="footer">
-	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="">Impressum</a> --</p>
+	<!-- TODO: add real link! -->
+	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
 </div>
 
 </div>

placeholder/header

@@ -5,7 +5,7 @@
 	<title>CryptoBox</title>
 	<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type" />
 	<meta content="" name="keywords" />
-	<meta name="description" content="a secure fileserver, live-CD, web front-end">
+	<meta name="description" content="a secure fileserver, live-CD, web front-end" />
 	<link rel="stylesheet" type="text/css" href="gfx/main.css" />
 </head>
 

project.html

@@ -5,7 +5,7 @@
 	<title>CryptoBox</title>
 	<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type" />
 	<meta content="" name="keywords" />
-	<meta name="description" content="a secure fileserver, live-CD, web front-end">
+	<meta name="description" content="a secure fileserver, live-CD, web front-end" />
 	<link rel="stylesheet" type="text/css" href="gfx/main.css" />
 </head>
 
@@ -26,7 +26,8 @@
 	
 
 <div class="footer">
-	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="">Impressum</a> --</p>
+	<!-- TODO: add real link! -->
+	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
 </div>
 
 </div>

screenshots.html

@@ -5,7 +5,7 @@
 	<title>CryptoBox</title>
 	<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type" />
 	<meta content="" name="keywords" />
-	<meta name="description" content="a secure fileserver, live-CD, web front-end">
+	<meta name="description" content="a secure fileserver, live-CD, web front-end" />
 	<link rel="stylesheet" type="text/css" href="gfx/main.css" />
 </head>
 
@@ -47,7 +47,8 @@
 
 
 <div class="footer">
-	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="">Impressum</a> --</p>
+	<!-- TODO: add real link! -->
+	<p>-- a <a href="http://senselab.org">Sense.Lab</a> project -- <a href="index.html">Impressum</a> --</p>
 </div>
 
 </div>

templatewriter.py

@@ -8,15 +8,25 @@ class TemplateWriter:
 	contentdir = "./content"
 	tmplfileext = ".tmpl"
 	outfileext = ".html"
+	ignore_items = [ ".svn" ]
 
 	def __init__(self):
 		pass
 	
+
+	def get_sorted(self, list):
+		result = list[:]
+		result.sort()
+		return result
+
+
 	def string_replace(self, infile, outfile):
 		template = open(infile).read()
 		open(outfile,"w").write(template)
 		text = {}
-		for tmpl in os.listdir(self.tmpldir):
+		for tmpl in self.get_sorted(os.listdir(self.tmpldir)):
+			if tmpl in self.ignore_items:
+				continue
 			tmplfile = str(self.tmpldir+"/"+tmpl)
 			if not os.path.isfile(tmplfile):
 				print "    str.repl: cancelling "+tmplfile+" - not a file"
@@ -30,7 +40,9 @@ class TemplateWriter:
 
 	def build_sites(self):
 		'''use all files ending with .tmpl'''
-		for tmplfile in os.listdir("./"):
+		for tmplfile in self.get_sorted(os.listdir("./")):
+			if tmplfile in self.ignore_items:
+				continue
 			if tmplfile.rfind(self.tmplfileext) >= 1:
 				infile = tmplfile
 				(tmplfilename, tmplfileext)=os.path.splitext(tmplfile)
@@ -41,10 +53,14 @@ class TemplateWriter:
 
 	def build_sites_from_gerippe(self):
 		print "Let's build some html files from: "+self.templatefile
-		for html in os.listdir(self.contentdir):
+		for html in self.get_sorted(os.listdir(self.contentdir)):
+			if html in self.ignore_items:
+				continue
 			print "  building: "+html+self.outfileext
 			entries = ""
-			for entry in os.listdir(self.contentdir+"/"+html):
+			for entry in self.get_sorted(os.listdir(self.contentdir+"/"+html)):
+				if entry in self.ignore_items:
+					continue
 				print "    adding entry: "+entry
 				entries += open(self.contentdir+"/"+html+"/"+entry).read()