* rss without <h3>

* correct README link
 * removed <br>
 * and the things we discussed via mail

content/details/05_left

@@ -20,7 +20,7 @@
 	<div class="leftcontent">
 		<h2>You need more details?</h2>
 		<p>Take a look at the <a
-			href="http://devel.cryptobox.org/browser/trunk/README">README file</a>
+			href="http://devel.cryptobox.org/file/trunk/README">README file</a>
 			for more detailed installation and usage instructions.</p>
 	</div>
 </div>

content/development/10_center

@@ -23,6 +23,14 @@
 		href="https://systemausfall.org/mail-archive/?0">mailing list archive</a>.</p>
 </div>
 
+<div class="content">
+	<h2>Bleeding edge source code</h2>
+	<p>The current source code of the <i>CryptoBox-Server</i> package is always
+		available via our <a href="https://svn.systemausfall.org/svn/cryptobox/"
+		title="browse subversion repository">Subversion repository</a>.</p>
+	<p><a href="http://devel.cryptobox.org/wiki/SvnNotes">Read more ...</a></p>
+</div>
+
 <div class="content">
 	<h2>Acknowledgements</h2>
 	<p>The whole is nothing without its parts. We would like to thank

content/download/05_left

@@ -6,16 +6,5 @@
 		<p>CryptoBox-CD: <a
 			href="http://codecoop.org/frs/?group_id=60&amp;release_id=33">0.2.1</a></p>
 	</div>
-	<div class="leftcontent">
-		<h2>Future release plans</h2>
-		<p>CryptoBox-Server:</p>
-		<ul><li>v0.4 <span class="date">04/15/02007</span></li></ul>
-		<p>CryptoBox-CD:</p>
-		<ul><li>v0.3.2 <span class="date">02/15/02007</span></li></ul>
-		<p>Read the <a href="http://devel.cryptobox.org/roadmap">development roadmap</a>
-			for more details.</p>
-	</div>
-
-
 </div>
 

content/download/10_center

@@ -11,12 +11,10 @@
 		<p>A modern actual system should meet most of the dependencies, but
 		you probably have to install some missing packages.</p>
 	-->
-	<br />
 	<p>If you are a Debian/Ubuntu/... Linux user, then we strongly recommend to use
 		the <i>cryptobox-server</i> package of our (inofficial) <a
 		href="http://systemausfall.org/toolforge/debian/">debian package repository</a>
 		to stay up to date.</p>
-	<br />
 	<p><a
 		href="http://devel.cryptobox.org/wiki/RepositoryNotes">Read more ...</a></p>
 </div>
@@ -25,7 +23,6 @@
 	<h2>CryptoBox-CD</h2>
 	<p>Get the latest <i>CryptoBox-CD</i> image and burn the bootable live-CD.</p>
 	<p><a href="http://codecoop.org/frs/?group_id=60&amp;release_id=33">Download it now!</a></p>
-	<br />
 	<p>We would like to thank <a href="http://codecoop.org">codecoop.org</a> for
 	providing the necessary bandwidth.</p>
 	<p>Alternatively you can buy a live-CD at <a href="http://www.opensoft.nl/cdshop/product_info.php/manufacturers_id/28/products_id/71">OpenSoft.nl</a>
@@ -33,15 +30,6 @@
 	So if you ask us kindly, we might send you a CD for a better price. ;)</p>
 </div>
 
-<div class="content">
-	<h2>Bleeding edge</h2>
-	<p>The current source code of the <i>CryptoBox-Server</i> package is always
-		available via our <a href="https://svn.systemausfall.org/svn/cryptobox/"
-		title="browse subversion repository">Subversion repository</a>.</p>
-	<br />
-	<p><a href="http://devel.cryptobox.org/wiki/SvnNotes">Read more ...</a></p>
-</div>
-
 <div class="content">
 	<h2>License</h2>
 	<p>The code of the CryptoBox-Server and the CryptoBox-CD is licensed under the

content/index/02_top

@@ -1,7 +1,7 @@
 <div class="centercontent">
 	<h2>What is it about?</h2>
 	<p>The CryptoBox project wants to bring data encryption to the masses.</p>
-	<p>Therefore we develop two free software packages:</p>
+	<p>Therefore we develop two Free Software packages:</p>
 	<ul>
 		<li>The <i>CryptoBox-Server package</i> adds harddisk encryption to a fileserver
 		(samba, nfs, dav, ...) without annoying its users.</li>

content/index/05_left

@@ -6,6 +6,17 @@
 		about the CryptoBox.</p>
 		<p>Any questions left? Send a mail to <a href="mailt&#x006F;:%(mailaddress)s">%(mailaddress)s</a>!</p>	
 	</div>
+	
+	<div class="leftcontent">
+		<h2>Future release plans</h2>
+		<p>CryptoBox-Server:</p>
+		<ul><li>v0.4 <span class="date">04/15/02007</span></li></ul>
+		<p>CryptoBox-CD:</p>
+		<ul><li>v0.3.2 <span class="date">02/15/02007</span></li></ul>
+		<p>Read the <a href="http://devel.cryptobox.org/roadmap">development roadmap</a>
+			for more details.</p>
+	</div>
+
 	<div class="leftcontent">
 		<h2>License</h2>
 		<p>All code is licensed under the <a href="http://www.fsf.org/licensing/licenses/gpl.html">GPL</a>.</p>

html/gfx/main.css

@@ -85,7 +85,7 @@ div.centercontent h2 {
 	padding: 0.1em 0 0.1em 0.5em;
 }
 div.centercontent p {
-	padding: 0.1em 1.8em 0.1em 0.8em;
+	padding: 0.1em 1.8em 0.5em 0.8em;
 }
 div.centercontent ul {
 	padding: 0.1em 1.8em 0.1em 2.8em;
@@ -132,7 +132,7 @@ div.leftcontent {
 }
 
 div.leftcontent p {
-	padding: 0 0 0.5em 0.5em;
+	padding: 0.1em 0 0.5em 0.5em;
 }
 
 div.content {
@@ -156,7 +156,7 @@ div.content h2, div.onecolumn h2 {
 }
 
 div.content p, div.onecolumn p {
-	padding: 0.1em 0.8em 0.1em 0.8em;
+	padding: 0.1em 0.8em 0.5em 0.8em;
 }
 
 div.onecolumn p {

templatewriter.py

@@ -93,7 +93,7 @@ class TemplateWriter:
 	def get_rss_info(self):
 		"""retrieve rss feed from http://devel.cryptobox.org/timeline"""
 		timeline_url = r'http://devel.cryptobox.org/timeline?max=%d&wiki=off&ticket=on&changeset=on&milestone=off&format=rss' % self.max_rss_items
-		entry_html = r'<li><p class="date">%(updated)s</p><h3><a href="%(link)s">%(title)s</a></h3>%(summary)s</li>'
+		entry_html = r'<li><p class="date">%(updated)s</p><a href="%(link)s">%(title)s</a>%(summary)s</li>'
 		feed = feedparser.parse(timeline_url)
 		if feed["entries"]:
 			html_items = [ entry_html % e for e in feed["entries"] ]