From c300b237b1cd1c3507361d41890acef52696d175 Mon Sep 17 00:00:00 2001
From: zapata <zapata>
Date: Tue, 1 Oct 2002 04:12:01 +0000
Subject: [PATCH] Towards a reasonable template set

---
 bundles/admin_en.properties                 |  42 ++--
 bundles/open_ay.properties                  |  18 +-
 bundles/open_de.properties                  |  16 +-
 bundles/open_en.properties                  |  72 +++---
 bundles/open_es.properties                  |  14 +-
 bundles/open_gn.properties                  |  18 +-
 bundles/open_qu.properties                  |   6 +-
 bundles/producer_de.properties              |  29 ++-
 bundles/producer_en.properties              |  28 +--
 bundles/producer_nl.properties              |  22 ++
 templates-dist/open/comment.template        |   6 +-
 templates-dist/open/posting.template        |  10 +-
 templates-dist/producer/RSS.template        |  55 +++--
 templates-dist/producer/archive.template    |  69 +++---
 templates-dist/producer/article.template    | 371 ++++++++++++++--------------
 templates-dist/producer/navigation.template |  26 +-
 templates-dist/producer/producers.xml       |  62 +++--
 templates-dist/producer/routines.template   | 107 ++++++++
 templates-dist/producer/startpage.template  |  40 +--
 templates-dist/producer/stylesheet.template |  20 ++
 templates-dist/producer/topicpage.template  | 247 +++++++++---------
 21 files changed, 756 insertions(+), 522 deletions(-)
 create mode 100755 bundles/producer_nl.properties
 create mode 100755 templates-dist/producer/routines.template
 create mode 100755 templates-dist/producer/stylesheet.template

diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties
index 1c73eebc..f3a84bf7 100755
--- a/bundles/admin_en.properties
+++ b/bundles/admin_en.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: english
-# $Id: admin_en.properties,v 1.17 2002/09/03 14:30:36 bruno Exp $
+# $Id: admin_en.properties,v 1.18 2002/10/01 04:12:01 zapata Exp $
 
 # general
 yes=yes
@@ -32,25 +32,25 @@ list.next=next
 list.previous=previous
 
 # media - used by image, audio, video and other media
-media.created=erzeugt
-media.changed=letzte &auml;nderung
-media.published=publiziert
-media.format=Format
-media.rights=Copyright
-media.type=Typ
-media.mediafolder=Mediafolder
-media.title=Titel
-media.description=Beschreibung
-media.date=Datum/Zusatz
-media.location=Ort
-media.creator=Urheber
-media.keywords=Keywords
-media.comment=Kommentar
-media.source=Quelle
-media.is_published=free to publish
-media.icon=Icon
-
-medialist.search_text_in=Text suchen in
+media.created=created
+media.changed=last modification
+media.published=published
+media.format=format
+media.rights=copyright status
+media.type=type
+media.mediafolder=Media folder
+media.title=title
+media.description=description
+media.date=date
+media.location=location
+media.creator=author
+media.keywords=keywords
+media.comment=remarks (internal use)
+media.source=source
+media.is_published=published
+media.icon=icon
+
+medialist.search_text_in=Search text in
 
 # image
 image.htmltitle=indymedia.de | image
@@ -81,7 +81,7 @@ comment.htmltitle=indymedia.de | comment
 comment.date=date
 comment.title=title
 comment.published=published
-comment.text=comment-text
+comment.text=comment text
 comment.address=address
 comment.phone=phone
 comment.email=email
diff --git a/bundles/open_ay.properties b/bundles/open_ay.properties
index c7bba51f..07b03a67 100755
--- a/bundles/open_ay.properties
+++ b/bundles/open_ay.properties
@@ -4,9 +4,10 @@
 optional=opcional
 required=requerido
 
-comment.htmltitle=indymedia | confirmar comentario
-comment.title=Añadiendo un comentario al artículo
-comment.note=Unos comentarios sobre como escribir un comentario en Indymedia.
+comment.htmltitle=Mir | confirmar comentario
+comment.header=Añadiendo un comentario al artículo
+comment.password=Password
+comment.note=
 comment.formtitle=Formulario-del-comentario
 comment.title=Título del comentario
 comment.name=su nombre
@@ -19,20 +20,21 @@ comment.text=su comentario
 comment.submit=envíar comentario
 comment.reset=limpiar formulario
 
-commentdone.htmltitle=indymedia | envío abierto
+commentdone.htmltitle=Mir | envío abierto
 commentdone.thanks=Su comentario está de camino!
 commentdone.wait=In wenigen Minuten ist Deine Ergänzung unter dem ergänzten Artikel.<br>Manchmal kann es aber aufgrund technischer Probleme etwas dauern bis sie erscheint.<br>
 commentdone.criteria=Die Moderationskriterien von indymedia kannst Du <a href="http://de.indymedia.org/static/moderation.html" target="_blank">hier</a> nachlesen.
 commentdone.stay_calm=Gedulde Dich einen Moment - Es lohnt sich!
 commentdone.back=Zur&uuml;ck zum kommentierten Artikel
 
-commentdupe.htmltitle=indymedia | envío abierto - comentario duplicado
+commentdupe.htmltitle=Mir | envío abierto - comentario duplicado
 commentdupe.title=Mantenga la calma unos breves instantes.
 commentdupe.explanation=Probablemente haya apretado el botón de recarga o enviado el comentario en una segunda ocasión. Si puede leer esto, significa que su comentario ha sido recibido con éxito y será incluido en la página de artículos en breves instantes.
 commentdupe.no_panic=No se altere!
 commentdupe.back=Volver al artículo comentado
 
-posting.htmltitle=indymedia | envío abierto
+posting.htmltitle=Mir | envío abierto
+posting.password=Password
 posting.meta.description=Indymedia | Centro de Periodismo Independiente
 posting.meta.author=Colectivo IMC
 posting.meta.keywords=Periodismo Libre
@@ -68,13 +70,13 @@ posting.criteria=Die <b>Moderationskriterien</b> kannst Du <a href="http://de.in
 posting.submit=Enviar (la paciencia es una virtud!!)
 posting.reset=Limpiar formulario
 
-postingdone.htmltitle=indymedia | open posting
+postingdone.htmltitle=Mir | open posting
 postingdone.title=Hurra, Du hast Deinen Artikel abgeschickt!
 postingdone.info=Dein Artikel landet in einigen Minuten auf der <a href="http://de.indymedia.org/open.html">"Open Posting"</a> - Seite. Das ist nicht die Startseite. Die Moderationskriterien kannst Du <a href="http://de.indymedia.org/static/moderation.html">hier lesen</a>
 postingdone.stay_calm=Gedulde Dich einen Moment! Es lohnt sich!
 postingdone.back=Zur&uuml;ck
 
-postingdupe.htmltitle=indymedia | envío abierto - envio duplicado
+postingdupe.htmltitle=Mir | envío abierto - envio duplicado
 postingdupe.title=Mantenga la calma, su envio será procesado en breves instantes.
 postingdupe.explanation=	Posiblemente haya pulsado el botón de recarga de su navegador, o enviado su articulo por segunda vez Si está leyendo este texto, significa que su envío ha sido recibido con éxito y que será incluido en la pagina de artículos en breves instantes.<br>Como detalle técnico, este imc está conectado a un servidor proxy que no es actualizado cada minuto.
 postingdupe.no_panic=No pierda los estribos!
diff --git a/bundles/open_de.properties b/bundles/open_de.properties
index a349ed3f..7f060fa5 100755
--- a/bundles/open_de.properties
+++ b/bundles/open_de.properties
@@ -4,8 +4,9 @@
 optional=optional
 required=muss ausgef&uuml;llt werden
 
-comment.htmltitle=indymedia.de | comment.commit
-comment.title=Kommentierung eines Beitr&auml;gs bei Indymedia
+comment.htmltitle=Mir | comment.commit
+comment.header=Kommentierung eines Beitr&auml;gs bei Indymedia
+comment.password=Password
 comment.note=Hinweis: Dein Kommentar kann in jedem Stil und jeder Form sein, akademisch bis pers&ouml;nlich.<br>Aber bitte bleibe beim <b>Thema des Artikels</b>, den Du kommentierst und versuche, <b>pr&auml;zise</b> zu sein.
 comment.formtitle=Kommentierungsformular
 comment.title=Titel des Kommentars
@@ -19,20 +20,21 @@ comment.text=Dein Kommentar
 comment.submit=Kommentar abschicken
 comment.reset=Formular l&ouml;schen
 
-commentdone.htmltitle=indymedia.de | open posting
+commentdone.htmltitle=Mir | open posting
 commentdone.thanks=Danke. Deine Ergänzung ist jetzt auf dem Weg zur Website!
 commentdone.wait=In wenigen Minuten ist Deine Ergänzung unter dem ergänzten Artikel.<br>Manchmal kann es aber aufgrund technischer Probleme etwas dauern bis sie erscheint.<br>
 commentdone.criteria=Die Moderationskriterien von indymedia.de kannst Du <a href="http://de.indymedia.org/static/moderation.html" target="_blank">hier</a> nachlesen.
 commentdone.stay_calm=Gedulde Dich einen Moment - Es lohnt sich!
 commentdone.back=Zur&uuml;ck zum kommentierten Artikel
 
-commentdupe.htmltitle=indymedia.de | open posting - Kommentar-Duplikat
+commentdupe.htmltitle=Mir | open posting - Kommentar-Duplikat
 commentdupe.title=Immer ruhig mit den jungen Pferden!
 commentdupe.explanation=Du hast vermutlich den Reload-Button benutzt oder versucht, Deinen Kommentar noch einmal zu posten. Das ist aber unn&ouml;tig. Die Tatsache, dass Du diesen Text liest, bedeutet, dass Dein Kommentar schon angekommen ist. Er wird gleich auf der Seite auftauchen. Versprochen.
 commentdupe.no_panic=Keine Panik
 commentdupe.back=Zur&uuml;ck zum kommentierten Artikel
 
-posting.htmltitle=indymedia.de | open posting
+posting.htmltitle=Mir | open posting
+posting.password=Password
 posting.meta.description=Indymedia Germany | Unabh&auml;ngiges Medienzentrum
 posting.meta.author=IMC Kollektiv
 posting.meta.keywords=Freie Medien, Gegen&ouml;ffentlichkeit
@@ -68,13 +70,13 @@ posting.criteria=Die <b>Moderationskriterien</b> kannst Du <a href="http://de.in
 posting.submit=Beitrag abschicken
 posting.reset=Formular l&ouml;schen
 
-postingdone.htmltitle=indymedia.de | open posting
+postingdone.htmltitle=Mir | open posting
 postingdone.title=Hurra, Du hast Deinen Artikel abgeschickt!
 postingdone.info=Dein Artikel landet in einigen Minuten auf der <a href="http://de.indymedia.org/html">"Open Posting"</a> - Seite. Das ist nicht die Startseite. Die Moderationskriterien kannst Du <a href="http://de.indymedia.org/static/moderation.html">hier lesen</a>
 postingdone.stay_calm=Gedulde Dich einen Moment! Es lohnt sich!
 postingdone.back=Zur&uuml;ck
 
-postingdupe.htmltitle=indymedia.de | open posting - Posting-Duplikat
+postingdupe.htmltitle=Mir | open posting - Posting-Duplikat
 postingdupe.title=Immer ruhig mit den jungen Pferden!
 postingdupe.explanation=Du hast vermutlich den Reload-Button benutzt oder versucht, Deinen Artikel noch einmal zu posten. Das ist aber unn&ouml;tig. <br> Die Tatsache, dass Du diesen Text liest, bedeutet, dass Dein Posting schon angekommen ist. Er wird gleich auf der Seite auftauchen. Versprochen.<br><br>Technischer Hintergrund ist, daß de.indy &uuml;ber einen Proxy-Server läuft und da dauert es schon mal ein paar Minuten, bis ein neues Posting erscheint.
 postingdupe.no_panic=Keine Panik
diff --git a/bundles/open_en.properties b/bundles/open_en.properties
index bfcea318..ff795967 100755
--- a/bundles/open_en.properties
+++ b/bundles/open_en.properties
@@ -4,39 +4,41 @@
 optional=optional
 required=required
 
-comment.htmltitle=indymedia.de | comment.commit
-comment.title=Adding a coment to an article
-comment.note=Just some hints (introduction) on how to write comments for Indymedia.
-comment.formtitle=Comment-form
-comment.title=titel of comment
+comment.htmltitle=Mir | comment
+comment.header=Adding a coment to an article
+comment.password=Password
+comment.note=
+comment.formtitle=Comment 
+comment.title=title of this comment
 comment.name=your name
 comment.email=your eMail
-comment.url=your Web Adress
-comment.phone=your Telephone-Number.
-comment.address=your Address
+comment.url=your web site address
+comment.phone=your telephone number.
+comment.address=your address
 comment.language=language of your comment
 comment.text=your comment
 comment.submit=submit comment
 comment.reset=reset form
 
-commentdone.htmltitle=mir.indymedia.org | open posting
-commentdone.thanks=Your comment is on the way to the Website!
+commentdone.htmltitle=Mir | open posting
+commentdone.thanks=Your comment is on the way!
 commentdone.wait=It will take some minutes until your addition appears under the article.<br>It may take even longer in case of technical problems.<br>
-commentdone.criteria=You can read the criterias of moderation <a href="http://de.indymedia.org/static/moderation.html" target="_blank">here</a>.
+commentdone.criteria=
 commentdone.stay_calm=Please wait a few minutes
-commentdone.back=Back to the commented article
+commentdone.back=Back to the article
 
-commentdupe.htmltitle=mir.indymedia.org | open posting - duplicate entry
-commentdupe.title=Keep calm. Things will happen soon.
+commentdupe.htmltitle=Mir | open posting - duplicate entry
+commentdupe.title=Stay calm. Things will happen soon.
 commentdupe.explanation=You probably clicked on the reload button or submitted your comment a second time. The fact that you can read this text means that your comment has been recieved and will soon be included in the article page.
 commentdupe.no_panic=Don't panic
-commentdupe.back=Back to the commented article
+commentdupe.back=Back to the article
 
-posting.htmltitle=mir.indymedia.org | open posting
-posting.meta.description=mir CMS system
+posting.htmltitle=Mir | open posting
+posting.password=Password
+posting.meta.description=Mir CMS system
 posting.meta.author=mir
 posting.meta.keywords=free media
-posting.jump_to_form=Jump dirctly to the form.
+posting.jump_to_form=Jump directly to the form.
 posting.title=Publish your article!
 posting.nr_of_media=Number of Media Items (max 20)
 posting.nr_of_media.info=(Enter the number of files you want to upload and press the button <b>before</b> you enter data into the other fields.)
@@ -48,34 +50,34 @@ posting.topic=<b>Topic</b> of your Posting
 posting.topic.info=(multiple selection is possible. use the [Ctrl] key)
 posting.author=<b>author</b> of this article
 posting.abstract=A short <b>abstract</b> of your article
-posting.abstract.info=(should give the readers a short info what your article is about. if you use the first paragraph of your article for this purpose, please do not include it in the main text field below.)
+posting.abstract.info=(should give the readers a short introduction on what your article is about. If you use the first paragraph of your article for this purpose, please do not include it in the main text field below.)
 posting.abstract.constraint=(not more than <b>5 lines</b>)
 posting.contact.info=Contact information is optional but enables other people to get in touch with you.
-posting.email=your eMail-Adress
-posting.url=your Web Adress
-posting.address=your Adress
-posting.phone=your Telephone-Number
-posting.language=language of your article
+posting.email=your e-mail address
+posting.url=your web-site address
+posting.address=your address
+posting.phone=your telephone number
+posting.language=the language of your article
 posting.text=your <b>article</b>
 posting.text.info=fill in the text of your article here
 posting.media=media
-posting.media.info=upload media-files (so far only jpg|gif|mp3|avi|qt|mpeg) max size: 20 Mb
-posting.media.howto=(Press "Choose..." and select the file you want to upload)
+posting.media.info=upload media-files (supported are jpg|gif|mp3|avi|qt|mpeg) max size: 20 Mb
+posting.media.howto=(Press "Browse" and select the file you want to upload)
 posting.media.media=Media
 posting.media.title=media sub-title
 posting.submit.info=Please press submit <b>only once</b>!<br>It will appear in a few minutes on the main page. It might even take longer in case of technical problems.
-posting.criteria=You can review the <b>moderation criteria</b> <a href="http://de.indymedia.org/static/moderation.html" target="_blank"><b>here</b></a>
-posting.submit=Submit (patience is a virtue!!)
+posting.criteria=
+posting.submit=Submit (patience is a virtue!)
 posting.reset=Form Reset
 
-postingdone.htmltitle=indymedia.de | open posting
-postingdone.title=Yeah, you have submitted your article!
-postingdone.info=Your article will appear in a few minutes at the "Open Posting" page. This is NOT the start page. You can review the <b>moderation criteria</b> <a href="http://de.indymedia.org/static/moderation.html" target="_blank"><b>here</b></a>
-postingdone.stay_calm=Please wait a few minutes.
+postingdone.htmltitle=open posting
+postingdone.title=You have successfully submitted your article
+postingdone.info=Your article will appear on the website in a few minutes. 
+postingdone.stay_calm=
 postingdone.back=Back
 
-postingdupe.htmltitle=indymedia.de | open posting - Posting-Duplikat
-postingdupe.title=Keep calm. Things will happen soon.
-postingdupe.explanation=	You probably clicked on the reload button or submitted your posting a second time. The fact that you can read this text means that your posting has been recieved and will soon be included in the article page.<br>The technical background is that de.indy is connected to a proxy server that is not updated every minute.
+postingdupe.htmltitle=open posting - duplicate posting 
+postingdupe.title=Stay calm. Things will happen soon.
+postingdupe.explanation=You probably clicked on the reload button or submitted your posting a second time. The fact that you can read this text means that your posting has been recieved and will soon be included in the article page.<br>
 postingdupe.no_panic=Don't panic
 postingdupe.back=Back
\ No newline at end of file
diff --git a/bundles/open_es.properties b/bundles/open_es.properties
index 458275c9..d0c36456 100755
--- a/bundles/open_es.properties
+++ b/bundles/open_es.properties
@@ -4,9 +4,10 @@
 optional=opcional
 required=requerido
 
-comment.htmltitle=indymedia | confirmar comentario
-comment.title=Añadiendo un comentario al artículo
-comment.note=Unos comentarios sobre como escribir un comentario en Indymedia.
+comment.htmltitle=Mir | confirmar comentario
+comment.header=Añadiendo un comentario al artículo
+comment.password=Password
+comment.note=
 comment.formtitle=Formulario-del-comentario
 comment.title=Título del comentario
 comment.name=su nombre
@@ -19,20 +20,21 @@ comment.text=su comentario
 comment.submit=envíar comentario
 comment.reset=limpiar formulario
 
-commentdone.htmltitle=indymedia | envío abierto
+commentdone.htmltitle=Mir | envío abierto
 commentdone.thanks=Su comentario está de camino!
 commentdone.wait=In wenigen Minuten ist Deine Ergänzung unter dem ergänzten Artikel.<br>Manchmal kann es aber aufgrund technischer Probleme etwas dauern bis sie erscheint.<br>
 commentdone.criteria=Die Moderationskriterien von indymedia kannst Du <a href="http://de.indymedia.org/static/moderation.html" target="_blank">hier</a> nachlesen.
 commentdone.stay_calm=Gedulde Dich einen Moment - Es lohnt sich!
 commentdone.back=Zur&uuml;ck zum kommentierten Artikel
 
-commentdupe.htmltitle=indymedia | envío abierto - comentario duplicado
+commentdupe.htmltitle=Mir | envío abierto - comentario duplicado
 commentdupe.title=Mantenga la calma unos breves instantes.
 commentdupe.explanation=Probablemente haya apretado el botón de recarga o enviado el comentario en una segunda ocasión. Si puede leer esto, significa que su comentario ha sido recibido con éxito y será incluido en la página de artículos en breves instantes.
 commentdupe.no_panic=No se altere!
 commentdupe.back=Volver al artículo comentado
 
-posting.htmltitle=indymedia | envío abierto
+posting.htmltitle=Mir | envío abierto
+posting.password=Password
 posting.meta.description=Indymedia | Centro de Periodismo Independiente
 posting.meta.author=Colectivo IMC
 posting.meta.keywords=Periodismo Libre
diff --git a/bundles/open_gn.properties b/bundles/open_gn.properties
index a00918c9..550ac2c6 100755
--- a/bundles/open_gn.properties
+++ b/bundles/open_gn.properties
@@ -4,9 +4,10 @@
 optional=opcional
 required=requerido
 
-comment.htmltitle=indymedia | confirmar comentario
-comment.title=Añadiendo un comentario al artículo
-comment.note=Unos comentarios sobre como escribir un comentario en Indymedia.
+comment.htmltitle=Mir | confirmar comentario
+comment.header=Añadiendo un comentario al artículo
+comment.password=Password
+comment.note=
 comment.formtitle=Formulario-del-comentario
 comment.title=Título del comentario
 comment.name=su nombre
@@ -19,20 +20,21 @@ comment.text=su comentario
 comment.submit=envíar comentario
 comment.reset=limpiar formulario
 
-commentdone.htmltitle=indymedia | envío abierto
+commentdone.htmltitle=Mir | envío abierto
 commentdone.thanks=Su comentario está de camino!
 commentdone.wait=In wenigen Minuten ist Deine Ergänzung unter dem ergänzten Artikel.<br>Manchmal kann es aber aufgrund technischer Probleme etwas dauern bis sie erscheint.<br>
 commentdone.criteria=Die Moderationskriterien von indymedia kannst Du <a href="http://de.indymedia.org/static/moderation.html" target="_blank">hier</a> nachlesen.
 commentdone.stay_calm=Gedulde Dich einen Moment - Es lohnt sich!
 commentdone.back=Zur&uuml;ck zum kommentierten Artikel
 
-commentdupe.htmltitle=indymedia | envío abierto - comentario duplicado
+commentdupe.htmltitle=Mir | envío abierto - comentario duplicado
 commentdupe.title=Mantenga la calma unos breves instantes.
 commentdupe.explanation=Probablemente haya apretado el botón de recarga o enviado el comentario en una segunda ocasión. Si puede leer esto, significa que su comentario ha sido recibido con éxito y será incluido en la página de artículos en breves instantes.
 commentdupe.no_panic=No se altere!
 commentdupe.back=Volver al artículo comentado
 
-posting.htmltitle=indymedia | envío abierto
+posting.htmltitle=Mir | envío abierto
+posting.password=Password
 posting.meta.description=Indymedia | Centro de Periodismo Independiente
 posting.meta.author=Colectivo IMC
 posting.meta.keywords=Periodismo Libre
@@ -68,13 +70,13 @@ posting.criteria=Die <b>Moderationskriterien</b> kannst Du <a href="http://de.in
 posting.submit=Enviar (la paciencia es una virtud!!)
 posting.reset=Limpiar formulario
 
-postingdone.htmltitle=indymedia | open posting
+postingdone.htmltitle=Mir | open posting
 postingdone.title=Hurra, Du hast Deinen Artikel abgeschickt!
 postingdone.info=Dein Artikel landet in einigen Minuten auf der <a href="http://de.indymedia.org/html">"Open Posting"</a> - Seite. Das ist nicht die Startseite. Die Moderationskriterien kannst Du <a href="http://de.indymedia.org/static/moderation.html">hier lesen</a>
 postingdone.stay_calm=Gedulde Dich einen Moment! Es lohnt sich!
 postingdone.back=Zur&uuml;ck
 
-postingdupe.htmltitle=indymedia | envío abierto - envio duplicado
+postingdupe.htmltitle=Mir | envío abierto - envio duplicado
 postingdupe.title=Mantenga la calma, su envio será procesado en breves instantes.
 postingdupe.explanation=	Posiblemente haya pulsado el botón de recarga de su navegador, o enviado su articulo por segunda vez Si está leyendo este texto, significa que su envío ha sido recibido con éxito y que será incluido en la pagina de artículos en breves instantes.<br>Como detalle técnico, este imc está conectado a un servidor proxy que no es actualizado cada minuto.
 postingdupe.no_panic=No pierda los estribos!
diff --git a/bundles/open_qu.properties b/bundles/open_qu.properties
index a26fdb39..d1bc454a 100755
--- a/bundles/open_qu.properties
+++ b/bundles/open_qu.properties
@@ -5,8 +5,9 @@ optional=opcional
 required=requerido
 
 comment.htmltitle=indymedia | confirmar comentario
-comment.title=Añadiendo un comentario al artículo
-comment.note=Unos comentarios sobre como escribir un comentario en Indymedia.
+comment.header=Añadiendo un comentario al artículo
+comment.password=Password
+comment.note=
 comment.formtitle=Formulario-del-comentario
 comment.title=Título del comentario
 comment.name=su nombre
@@ -33,6 +34,7 @@ commentdupe.no_panic=No se altere!
 commentdupe.back=Volver al artículo comentado
 
 posting.htmltitle=indymedia | envío abierto
+posting.password=Password
 posting.meta.description=Indymedia | Centro de Periodismo Independiente
 posting.meta.author=Colectivo IMC
 posting.meta.keywords=Periodismo Libre
diff --git a/bundles/producer_de.properties b/bundles/producer_de.properties
index 67b17202..683a7839 100755
--- a/bundles/producer_de.properties
+++ b/bundles/producer_de.properties
@@ -1,12 +1,19 @@
 ########## producer ##########
-# language: deutsch / german
-
-content.htmltitle=mir.indymedia.de:
-content.email=eMail
-content.homepage=Homepage
-content.comment=Make a quick comment on this article
-copyright=Jegliche Inhalte, die bei germany.indymedia ver&ouml;ffentlicht werden, bleiben Eigentum der Autorin/ des Autors. Soweit nicht anders vermerkt, k&ouml;nnen und sollen sie weiterverwertet werden. germany.indymedia &uuml;bernimmt keine Gew&auml;hr f&uuml;r die Inhalte.<br>Eine spezielle  Form des Copyrights wird diskutiert und folgt.
-contact=Kontakt
-openposting.htmltitle=mir.indymedia.de:
-startpage.htmltitle=mir.indymedia.de: the mir-coders-website
-topiclist.htmltitle=mir.indymedia.de:
\ No newline at end of file
+# language: deutsch (german)
+
+general.readarticle = den ganzen Artikel lesen
+
+article.htmltitle.prefix = Mir |
+article.email.prefix = Adresse:
+article.homepage.prefix = Homepage:
+article.addcomment = Ergänzung zufügen
+
+startpage.htmltitle = Mir
+
+navigation.languages = Langen
+navigation.topics = Themen
+navigation.publish = publizieren
+navigation.publish.long = veröffentliche deinen beitrag
+
+topicnavigation.page.prefix = pagina
+topicnavigation.page.infix = von
\ No newline at end of file
diff --git a/bundles/producer_en.properties b/bundles/producer_en.properties
index 49342d46..d623bd64 100755
--- a/bundles/producer_en.properties
+++ b/bundles/producer_en.properties
@@ -1,27 +1,19 @@
 ########## producer ##########
 # language: english
 
-general.dateformat = dd/MM/yyyy hh:mm
-general.city.Amsterdam.title = emsterdem
-general.city.London.title = London
-general.city.Berlin.title = Berlijn
-general.topic.Repression.title = repressiun
-general.topic.Feminism.title = feminisme
-general.read.text = Read
+general.readarticle = Read more
 
-article.title.prefix = bolivia.indymedia.org |
+article.htmltitle.prefix = Mir |
 article.email.prefix = e-mail:
 article.homepage.prefix = Homepage:
-article.makecomment.text = Make a quick comment on this article
-
-startpage.title = bolivia.indymedia.org | IMC Bolivia
-
-navigation.languages.caption = Languages:
-navigation.cities.caption = Cities:
-navigation.topics.caption = Topics:
-navigation.publish.text = Publish
-
-topicnavigation.page.prefix = pagina
+article.addcomment = Make a quick comment on this article
 
+startpage.htmltitle = Mir
 
+navigation.languages = Languages:
+navigation.topics = Topics:
+navigation.publish = Publish
+navigation.publish.long = Publish your article
 
+topicnavigation.page.prefix = page
+topicnavigation.page.infix = of
\ No newline at end of file
diff --git a/bundles/producer_nl.properties b/bundles/producer_nl.properties
new file mode 100755
index 00000000..0c2da571
--- /dev/null
+++ b/bundles/producer_nl.properties
@@ -0,0 +1,22 @@
+########## producer ##########
+# language: english
+
+general.readarticle = Lees verder
+
+article.htmltitle.prefix = Mir |
+article.email.prefix = e-mail:
+article.homepage.prefix = Homepage:
+article.addcomment = Vul aan
+
+startpage.htmltitle = Mir
+
+navigation.languages = Talen:
+navigation.topics = Onderwerpen:
+navigation.publish = Publiceer
+navigation.publish.long = Publiceer je bijdrage
+
+topicnavigation.page.prefix = pagina
+topicnavigation.page.infix = van
+
+
+
diff --git a/templates-dist/open/comment.template b/templates-dist/open/comment.template
index 3f4e9bab..fd50e9c0 100755
--- a/templates-dist/open/comment.template
+++ b/templates-dist/open/comment.template
@@ -8,7 +8,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="4" bgcolor="silver">
 	<tr>
 		<td bgcolor="#663399" colspan="3">
-			<font color="White"><b>${lang("comment.title")}</b></font>
+			<font color="White"><b>${lang("comment.header")}</b></font>
 		</td>
 	</tr>
 	<tr>
@@ -27,10 +27,12 @@
 			<font face="Helvetica, Arial" color="white" size=+2><b>${lang("comment.formtitle")}</b></font>
 		</td>
 	</tr>
+	<if config["PasswdProtection"]=="yes" || config["PasswdProtection"]=="1">
 	<tr>
-		<td>Passwort:</td>
+		<td><td>${lang("comment.password")}:</td>
 		<td><input type="text" name="passwd" size="10"></td>
 	</tr>
+	</if>
 	<tr>
  		<td>
 			<b>${lang("comment.title")}:</b>
diff --git a/templates-dist/open/posting.template b/templates-dist/open/posting.template
index 94c07956..100bf7e4 100755
--- a/templates-dist/open/posting.template
+++ b/templates-dist/open/posting.template
@@ -52,10 +52,12 @@
 			<center><font size="+2" face="Helvetica, Arial,sans-serif" color="white"><b>${lang("posting.form.title")}</b></font></center>
 		</td>
 	</tr>
-        <tr>
-		<td>Passwort:</td>
-		<td><input type="text" name="passwd" size="10"></td>
-	<tr>
+	<if config["PasswdProtection"]=="yes" || config["PasswdProtection"]=="1">
+    <tr>
+  		<td>${lang("posting.password")}</td>
+  		<td><input type="text" name="passwd" size="10"></td>
+  	</tr>
+	</if>
 	<tr>
  		<td valign="top">
 			${lang("posting.title")}:<br>
diff --git a/templates-dist/producer/RSS.template b/templates-dist/producer/RSS.template
index a959af3b..26e7c32c 100755
--- a/templates-dist/producer/RSS.template
+++ b/templates-dist/producer/RSS.template
@@ -4,39 +4,40 @@
   Variables:
 
 </comment>
-
 <?xml version="1.0" encoding="UTF-8"?>
 
 <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns="http://purl.org/rss/1.0/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:syn="http://purl.org/rss/1.0/modules/syndication/"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns="http://purl.org/rss/1.0/"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:syn="http://purl.org/rss/1.0/modules/syndication/"
 >
 
-<channel rdf:about="${config["Producer.ProductionHost"]}">
-<title>Indymedia-XX</title>
-<link>${config["Producer.ProductionHost"]}</link>
-<description>Highlights from Indymedia-XX, a revolutionary expirement in democratic media</description>
-<dc:publisher>IMC Features Working Group &amp;lt;features@someindymedia.org&amp;gt;</dc:publisher>
-<dc:rights>Open Content License, http://www.opencontent.org</dc:rights>
-<dc:date>${config.now.dc}</dc:date>
-<items>
- <rdf:Seq>
-  <list articles as i> 	
-  <rdf:li rdf:resource="${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml" />
+  <channel rdf:about="${config["Producer.ProductionHost"]}">
+    <title>Indymedia-XX</title>
+    <link>${config["Producer.ProductionHost"]}</link>
+    <description>Highlights from Indymedia-XX, a revolutionary expirement in democratic media</description>
+    <dc:publisher>IMC Features Working Group &amp;lt;features@someindymedia.org&amp;gt;</dc:publisher>
+    <dc:rights>Open Content License, http://www.opencontent.org</dc:rights>
+    <dc:date>${config.now.dc}</dc:date>
+    <items>
+      <rdf:Seq>
+        <list articles as i> 	
+          <rdf:li rdf:resource="${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml" />
+        </list>
+      </rdf:Seq>
+    </items>
+  </channel>
+
+  <list articles as i> 		
+    <item rdf:about="${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml">
+      <title>${i.title}</title>
+        <link>${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml</link>
+        <description>${i.description_sentence}</description>
+      <dc:date>${i.webdb_create_dc}+0200</dc:date>
+    </item>
   </list>
- </rdf:Seq>
-</items>
-</channel>
-<list articles as i> 		
-<item rdf:about="${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml">
-<title>${i.title}</title>
-<link>${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml</link>
-<description>${i.description_sentence}</description>
-<dc:date>${i.webdb_create_dc}+0200</dc:date>
-</item>
-</list>
+  
 </rdf:RDF>
 
 
diff --git a/templates-dist/producer/archive.template b/templates-dist/producer/archive.template
index cb54178b..025de8ed 100755
--- a/templates-dist/producer/archive.template
+++ b/templates-dist/producer/archive.template
@@ -1,13 +1,12 @@
 <comment>
-  Template file for an archive of articles.
-  
-  Variables:
-
+  Freemarker template file for an archive of articles.
 </comment>
 
 <html>
   <head>
-    <title>${lang("producer.openposting.htmltitle")}${topic.title}</title>
+    <title>
+        ${lang("producer.openposting.htmltitle")}${topic.title}
+    </title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
     <link rel="stylesheet" href="/style/mir.css" type="text/css">
   </head>
@@ -29,7 +28,7 @@
                 <table width="100%" border="0" cellspacing="2" cellpadding="0">
                   <tr> 
                     <td> 
-                    <!--#include virtual="navigation.inc" -->
+                       <!--#include virtual="navigation.inc" -->
                     </td>
                   </tr>
                 </table>
@@ -59,34 +58,36 @@
                     <td width="100%" valign="top"> 
                       <!--- articles ---> 
                       <list articles as i> 
-                      <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                        <tr> 
-                          <td> 
-                            <h3>${i.title}</h3>
-                            <h4><i>${i.creator}, ${i.webdb_create_formatted}</i></h4>
-                            <p>			 
-                            <if i.to_media_audio > 
-                              <img src="/img/${i.to_media_audio[0]["big_icon"]}">
-                            </if> 
-                            <if i.to_media_video > 
-                              <img src="/img/${i.to_media_video[0]["big_icon"]}">
-                            </if> 
-                            <if i.to_media_other > 
-                              <img src="/img/${i.to_media_other[0]["big_icon"]}">
-                            </if> 
-                            <p>
-                            <if i.to_media_images >
-                              <img src="${i.to_media_images[0]["icon_path"]}"
-                                width="${i.to_media_images[0]["icon_width"]}"
-                                height="${i.to_media_images[0]["icon_height"]}"
-                                border=0 alt="${i.to_media_images[0]["title"]}">
-                            </if> 
-                            ${i.description}</p>
-                            <p align="right">[<a href="${config["Producer.DocRoot"]}${i.publish_path}${i.id}.shtml">read</a>]</p>
-                          </td>
-                        </tr>
-                      </table>
-                      <br>
+                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td> 
+                              <h3>${i.title}</h3>
+                              <h4><i>${i.creator}, ${i.webdb_create_formatted}</i></h4>
+                              <p>			 
+                              <if i.to_media_audio > 
+                                <img src="/img/${i.to_media_audio[0]["big_icon"]}">
+                              </if> 
+                              <if i.to_media_video > 
+                                <img src="/img/${i.to_media_video[0]["big_icon"]}">
+                              </if> 
+                              <if i.to_media_other > 
+                                <img src="/img/${i.to_media_other[0]["big_icon"]}">
+                              </if> 
+                              <p>
+                              <if i.to_media_images >
+                                <img src="${i.to_media_images[0]["icon_path"]}"
+                                  width="${i.to_media_images[0]["icon_width"]}"
+                                  height="${i.to_media_images[0]["icon_height"]}"
+                                  border=0 alt="${i.to_media_images[0]["title"]}">
+                              </if> 
+                              ${i.description}</p>
+                              <p align="right">
+                                [<a href="${config["Producer.DocRoot"]}${i.publish_path}${i.id}.shtml">read</a>]
+                              </p>
+                            </td>
+                          </tr>
+                        </table>
+                        <br>
                       </list> 
                       <!--- articles ---> 
                       </td>
diff --git a/templates-dist/producer/article.template b/templates-dist/producer/article.template
index 13879e2d..dc50c8e2 100755
--- a/templates-dist/producer/article.template
+++ b/templates-dist/producer/article.template
@@ -1,199 +1,202 @@
 <comment>
   Template file for an article.
-  
-  Variables:
-
 </comment>
 
+<include "routines.template">
+
 <html>
   <head>
-    <title>${lang("producer.content.htmltitle")}${article.content.title}</title>
+    <title>${lang("article.htmltitle.prefix")}${article.title}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" href="/style/mir.css" type="text/css">
-    			<if article.content.to_media_images>
-                    <meta name="keywords" content="images"></meta>
-    			</if>
-    			<if article.content.to_media_audio>
-                    <meta name="keywords" content="audio"></meta>
-    			</if>
-    			<if article.content.to_media_video>
-                    <meta name="keywords" content="video"></meta>
-    			</if>
-    			<if article.content.to_media_other>
-                    <meta name="keywords" content="other"></meta>
-    			</if>
-  </head>
-
-<body bgcolor="#CCCCCC">
-<table width="760" border="0" cellpadding="0" cellspacing="1" align="center" bgcolor="#000000">
-  <tr bgcolor="#FFFFFF">
-    <td valign="top" align="left" width="150" bgcolor="#666666">
-      <table width="150" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="140">
-            <a href="${config["Producer.ProductionHost"]}${config["Producer.DocRoot"]}/">
-             <img src="/images/mirlogo.jpg" width="150" height="205" border="0">
-            </a>
-          </td>
-        </tr>
-        <tr valign="top">
-          <td width="140" bgcolor="#666666">
-            <table width="100%" border="0" cellspacing="2" cellpadding="0">
-              <tr>
-                <td>
-                  <!--#include virtual="../../navigation.inc" -->
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-    <td align="left" valign="top" colspan="2" height="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td>
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td><img src="/images/mirfont.gif" width="600" height="68"></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        <tr bgcolor="#000000">
-          <td height="1"><img src="images/1pixel.gif" width="1" height="1"></td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
-              <tr>
-                <td width="100%" valign="top">
-                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
-	<if config.generateFO=="yes">
- 	  <tr><td align="right">	  
-	  <if config.generatePDF=="yes">
-	    <a href="${article.content.id}.pdf">Print this article</a>
-          <else>
-            <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.content.id}">Print this article</a>
-	  </if>
-	  </td></tr>
-	</if>
-            <tr> 
-                      <td> 
-                        <h2>${article.content.title}</h2>
-                        <h4><i>${article.content.creator}, ${article.content.webdb_create_formatted}</i></h4>
-                        <p><b>${article.content.description_parsed}</b>
+    <link rel="stylesheet" href="/${pathprefix}/style.css" type="text/css">
 
+    <if article.to_media_images>
+      <meta name="keywords" content="images"></meta>
+    </if>
+    <if article.to_media_audio>
+      <meta name="keywords" content="audio"></meta>
+    </if>
+    <if article.to_media_video>
+      <meta name="keywords" content="video"></meta>
+    </if>
+    <if article.to_media_other>
+      <meta name="keywords" content="other"></meta>
+    </if>
+  </head>
 
-          <!-- media -->
-
-            <list article.content.to_media_audio as media>
-              <p>
-
-                <img src="/img/${media["big_icon"]}" border="0" alt="">
-
-                <a href="${media["publish_server"]}${media["publish_path"]}">
-                  ${media["title"]} - ${media["descr"]}
+  <body bgcolor="#CCCCCC">
+    <table width="760" border="0" cellpadding="0" cellspacing="1" align="center" bgcolor="#000000">
+      <tr bgcolor="#FFFFFF">
+        <td valign="top" align="left" width="150" bgcolor="#666666">
+          <table width="150" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="140">
+                <a href="${config["Producer.DocRoot"]}/${pathprefix}">
+                 <img src="/images/mirlogo.jpg" width="150" height="205" border="0">
                 </a>
-              </p>
-            </list>
-            <list article.content.to_media_video as media>
-                <p>
-                  <img src="/img/${media["big_icon"]}" border="0" alt="">
-                  <a href="${media["publish_server"]}${media["publish_path"]}">
-                  ${media["title"]} - ${media["descr"]}</a>
-                </p>
-            </list>
-            <list article.content.to_media_other as media>
-                <p>
-                  <img src="/img/${media["big_icon"]}" border="0" alt="">
-                  <a href="${media["publish_server"]}${media["publish_path"]}">
-                  ${media["title"]} - ${media["descr"]}</a>
-                </p>
-            </list>
-  
-            <list article.content.to_media_images as image>
-                <p>
-                  <img src="${image["publish_server"]}${image["publish_path"]}"
-                   border="0" width="${image["img_width"]}"
-                   height="${image["img_height"]}" alt="${image["title"]}">
-                   <br><i>${image["title"]}</i>
-                </p>
-            </list>
+              </td>
+            </tr>
+            <tr valign="top">
+              <td width="140" bgcolor="#666666">
+                <table width="100%" border="0" cellspacing="2" cellpadding="0">
+                  <tr>
+                    <td>
+                      <!--#include virtual="../../navigation.inc" -->
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+        <td align="left" valign="top" colspan="2" height="100%">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td>
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td><img src="/images/mirfont.gif" width="600" height="68"></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr bgcolor="#000000">
+              <td height="1"><img src="images/1pixel.gif" width="1" height="1"></td>
+            </tr>
+            <tr>
+              <td align="left" valign="top">
+                <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
+                  <tr>
+                    <td width="100%" valign="top">
+                      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                      	<if config.generateFO=="yes">
+                       	  <tr><td align="right">	  
+                      	  <if config.generatePDF=="yes">
+                      	    <a href="${article.id}.pdf">Print this article</a>
+                                <else>
+                                  <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.id}">Print this article</a>
+                      	  </if>
+                      	  </td></tr>
+                      	</if>
 
-          <!-- media -->
-
-          <p>${article.content.content_data_parsed}</p>
-          <if article.content.creator_main_url || article.content.creator_email>
-                        <table width="100%" bgcolor="#FFFFFF">
-                        <tr>
-                           <td>
-                            <font size="-1">
-                            <if content.creator_email>
-                            <img src="/images/mail_small.gif" width="12" height="10" border="0" alt="-"> ${lang("producer.content.email")}: <a href="mailto:${article.content.creator_email}">${article.content.creator_email}</a><br>
+                        <tr> 
+                          <td> 
+                            <h2>${article.title}</h2>
+                            <h4><i>${article.creator}, ${article.creationdate.formatted["dd.MM.yyyy HH:mm"]}</i></h4>
+                            <p><b>${article.description_parsed}</b>
+    
+    
+                            <!-- media -->
+                              <call showArticleMedia(article)>
+                  
+                              <comment>                
+                                <list article.to_media_audio as media>
+                                  <p>
+                    
+                    
+                                    <a href="${media["publish_server"]}${media["publish_path"]}">
+                                      ${media["title"]} - ${media["descr"]}
+                                    </a>
+                                  </p>
+                                </list>
+                                <list article.to_media_video as media>
+                                    <p>
+                                      <img src="/img/${media["big_icon"]}" border="0" alt="">
+                                      <a href="${media["publish_server"]}${media["publish_path"]}">
+                                      ${media["title"]} - ${media["descr"]}</a>
+                                    </p>
+                                </list>
+                                <list article.content.to_media_other as media>
+                                    <p>
+                                      <img src="/img/${media["big_icon"]}" border="0" alt="">
+                                      <a href="${media["publish_server"]}${media["publish_path"]}">
+                                      ${media["title"]} - ${media["descr"]}</a>
+                                    </p>
+                                </list>
+                      
+                                <list article.content.to_media_images as image>
+                                    <p>
+                                      <img src="${image["publish_server"]}${image["publish_path"]}"
+                                       border="0" width="${image["img_width"]}"
+                                       height="${image["img_height"]}" alt="${image["title"]}">
+                                       <br><i>${image["title"]}</i>
+                                    </p>
+                                </list>
+                              </comment>                
+                  
+                            <!-- media -->
+    
+                            <p>${article.content_data_parsed}</p>
+                            <if article.creator_main_url || article.creator_email>
+                              <table width="100%" bgcolor="#FFFFFF">
+                              <tr>
+                                <td>
+                                  <font size="-1">
+                                  <if content.creator_email>
+                                    <img src="/images/mail_small.gif" width="12" height="10" border="0" alt="-"> ${lang("producer.content.email")}: <a href="mailto:${article.content.creator_email}">${article.content.creator_email}</a><br>
+                                  </if>
+                                  <if content.creator_main_url>
+                                    <img src="/images/link_small.gif" width="12" height="10" border="0" alt=""> ${lang("producer.content.homepage")}: <a href="${article.content.creator_main_url}" target="extern">${article.content.creator_main_url}</a><br>
+                                  </if>
+                                  </font>
+                                </td>
+                              </tr>
+                              </table>
                             </if>
-                            <if content.creator_main_url>
-                            <img src="/images/link_small.gif" width="12" height="10" border="0" alt=""> ${lang("producer.content.homepage")}: <a href="${article.content.creator_main_url}" target="extern">${article.content.creator_main_url}</a><br>
-                            </if>
-                            </font>
-                           </td>
+                          </td>
                         </tr>
-                        </table>
-                        </if>
-                      </td>
-                    </tr>
-                    <tr><td>&nbsp;</td></tr>
-                    <tr>
-                      <td><a href="${config["Producer.OpenAction"]}?do=addcomment&aid=${article.content.id}">
-                          ${lang("producer.content.comment")}</a>
-                      </td>
-                    </tr>
-                    <if article.content.to_comments>
-                    <list article.content.to_comments as c>
-                    <tr>
-                       <td>
-                       <table width="100%" border="0" cellspacing="0" cellpadding="4">
-                       <tr bgcolor="#cccccc">
-                         <td><b>${c.title}</b></td>
-                         <td align="right"><i>${c.date}</i></td>
-                       </tr>
-                       <tr>
-                         <td colspan="2"><br>${c.description}</td>
-                       </tr>
-                   <if c.email || c.main_url || c.address || c.phone || c.creator>
-                       <tr>
-                         <td bgcolor="#cccccc" colspan="2">
-	                 <if c.creator><b>${c.creator}</b></if>
-                     <if c.email || c.main_url>
-                        <if c.email>
-                           <br>
-                           <img src="/images/mail_small.gif" width="12" height="10" border="0" alt="">${lang("producer.content.email")}: <a href="mailto:${c.email}"> ${c.email}</a>
-                        </if>
-                        <if c.main_url>
-                           <br>
-                           <img src="/images/link_small.gif" width="12" height="10" border="0" alt="">
-                           ${lang("producer.content.homepage")}: <a href="${c.main_url}" target="extern"> ${c.main_url}</a>
+                        <tr><td>&nbsp;</td></tr>
+                        <tr>
+                          <td>
+                            <call showAddCommentLink(article, lang("article.addcomment"), language)>
+                          </td>
+                        </tr>
+                        <if article.to_comments>
+                          <list article.to_comments as c>
+                            <tr>
+                              <td>
+                                <table width="100%" border="0" cellspacing="0" cellpadding="4">
+                                  <tr bgcolor="#cccccc">
+                                    <td><b><call showSafeText(c.title)></b></td>
+                                    <td align="right"><i>${c.creationdate.formated["dd.MM.yyyy HH:mm"]}</i></td>
+                                  </tr>
+                                  <tr>
+                                    <td colspan="2"><br>${c.description_parsed}</td>
+                                  </tr>
+                                  <if c.email || c.main_url || c.address || c.phone || c.creator>
+                                    <tr>
+                                      <td bgcolor="#cccccc" colspan="2">
+                                        <if c.creator><b><call showSafeText(c.creator)></b></if>
+                                        <if c.email>
+                                          <br>
+                                          <img src="/images/mail_small.gif" width="12" height="10" border="0" alt="">${lang("article.email")}: <a href="mailto:${utility.encodeHTML(c.email)}"><call showSafeText(c.email)></a>
+                                        </if>
+                                        <if c.main_url>
+                                          <br>
+                                          <img src="/images/link_small.gif" width="12" height="10" border="0" alt="">
+                                            ${lang("article.homepage")}: <a href="${utility.encodeHTML(c.main_url)}" target="_blank"><call showSafeText(c.email)></a>
+                                        </if>
+            			                    </td>
+                                    </tr>
+                                  </if>
+                                </table>
+                              </td>
+                            </tr>
+                            <tr><td>&nbsp;</td></tr>
+                          </list>
                         </if>
-			              </if>
-			                  </td>
-                      </tr>
-                  </if>
-                     </table>
-                     </td>
-                    </tr>
-                    <tr><td>&nbsp;</td></tr>
-                    </list>
-                    </if>
-                  </table>
-                  </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <p>
+      &nbsp;
+    </p>
+  </body>
 </html>
diff --git a/templates-dist/producer/navigation.template b/templates-dist/producer/navigation.template
index 1fde3059..609798a1 100755
--- a/templates-dist/producer/navigation.template
+++ b/templates-dist/producer/navigation.template
@@ -1,12 +1,34 @@
 <p> 
+  ${lang("navigation.languages")}
+  <list languages as l> 
+    <br>
+      <if l.code==pathprefix>
+        <b>
+      </if>
+        <a href="${config["Producer.DocRoot"]}/${l.code}">${l.name}</a>
+      <if l.code==pathprefix>
+        </b>
+      </if>
+  </list> 
+</p>
+
+<p> 
+  ${lang("navigation.topics")}
   <list topics as t> 
     <br>
-    <a href="${config["Producer.DocRoot"]}/${t.filename}.shtml"><b>${t.title}</b></a>
+    <a href="${config["Producer.DocRoot"]}/${pathprefix}/${t.filename}/${t.filename}.shtml"><b>${t.title}</b></a>
   </list> 
 </p>
 
 <hr noshade width="146" size="1" align="left">
 
+<p>
+  <br>
+  <a href="${config["Producer.OpenAction"]}">${lang("navigation.publish")}</a>
+</p>
+
+<hr noshade width="146" size="1" align="left">
+
 <p class="small">
-  <include "producer/links.inc"> 
+  <include "links.inc"> 
 </p>
diff --git a/templates-dist/producer/producers.xml b/templates-dist/producer/producers.xml
index 869db633..40cbb5fb 100755
--- a/templates-dist/producer/producers.xml
+++ b/templates-dist/producer/producers.xml
@@ -1,3 +1,13 @@
+<!-- 
+  This XML file defines a set of producers intended for a typical indymedia 
+  site:
+    - a start page
+    - a navigational bar
+    - topic pages
+    - a newswire archive
+    - articles
+-->  
+
 <producers>
   <nodedefinition name="Language">
     <parameters>
@@ -7,6 +17,7 @@
     </parameters>
 
     <definition>
+      <List key="languages" table="language" selection="${languagecondition}" order="code"/>
       <Enumerate key="language" table="language" selection="${languagecondition}" order="code">
         <Resource bundle="${bundle}" key="lang" language="${language.code}"/>
         <Define key="pathprefix" value="${language.code}" />
@@ -18,46 +29,67 @@
   <producer name="articles">
     <verbs>
       <verb name="changed" default="1">
-        <Set key="verbcondition" value="' and (not is_produced)'"/>
+        <Define key="verbcondition" value=" and (not is_produced)"/>
         <Set key="limit" value="10"/>
       </verb>
       <verb name="all">
-        <Set key="verbcondition" value="''"/>
+        <Define key="verbcondition" value=""/>
         <Set key="limit" value="-1"/>
       </verb>
+
+      <verb name="sample">
+        <Define key="verbcondition" value=""/>
+        <Set key="limit" value="10"/>
+      </verb>
     </verbs>
     <body>
       <Enumerate key="article" table="content" selection="is_published='t' ${verbcondition}"
                   limit="limit" order="webdb_create desc, date desc">
         <Language>
           <Generate 
-              generator="/producer/article.template" 
-              destination="${config.storageRoot}/$pathprefix/${data.content.date.formatted.yyyy}/${data.content.date.formatted.MM}/${data.content.id}.shtml"/>
+              generator="/article.template" 
+              destination="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.shtml"/>
         </Language>
 
-        <MarkContent key="data.content"/>               
+        <MarkContent key="article"/>            
+
     <!-- uncomment the following if you want to make a pdf version of each article  -->
     <!-- also, you could move it up into the language tag and adjust the paths accordingly
          to make pdfs in each language -->
     <!-- PDFPreFormat splits up the text and mixes images in with it -->
     <!--<PDFPreFormat key="article.content" numLinesBetweenImages="3" charWidthCM="0.19" pixelWidthCM="0.035" contentAreaWidthCM="16" lineHeightCM="0.5" />-->
     <!-- Regular Generate Tag is used to produce an fo file(but using the split-up content -->
-    <!--<Generate generator="/producer/printablecontent.template" destination="${config.storageRoot}/${article.content.date.formatted.yyyy}/${article.content.date.formatted.MM}/${article.content.id}.fo"/>-->
+    <!--<Generate generator="/printablecontent.template" destination="${config.storageRoot}/${article.content.date.formatted.yyyy}/${article.content.date.formatted.MM}/${article.content.id}.fo"/>-->
     <!-- Finally, PDFGenerate turns the fo file into a pdf.  You could leave this step out 
     and generate pdfs on the fly using the getpdf OpenMir module as well.  Make sure to fill in the real path on the stylesheet attribute-->
     <!--<PDFGenerate generator="${config.storageRoot}/${article.content.date.formatted.yyyy}/${article.content.date.formatted.MM}/${article.content.id}.fo" destination="${config.storageRoot}/${article.content.date.formatted.yyyy}/${article.content.date.formatted.MM}/${article.content.id}.pdf" stylesheet="/real/path/goes/here/templates/producer/html2fo.xsl" />-->
+
+
       </Enumerate>
     </body>
   </producer>  
 
+  <producer name="stylesheet">
+    <verbs>
+      <verb name="generate" default="1" description="generates the style sheet"/>
+    </verbs>
+    <body>
+      <Language>
+        <Generate 
+            generator="/stylesheet.template" 
+            destination="${config.storageRoot}/${pathprefix}/style.css"/>
+      </Language>
+    </body>
+  </producer>
+
   <producer name="navigation">
     <verbs>
-      <verb name="generate" default="1"/>
+      <verb name="generate" default="1" description="generates the left column"/>
     </verbs>
     <body>
       <Language>
         <Generate 
-            generator="/producer/navigation.template" 
+            generator="/navigation.template" 
             destination="${config.storageRoot}/${pathprefix}/navigation.inc"/>
       </Language>
     </body>
@@ -83,10 +115,10 @@
                selection="is_published='1' and to_article_type in (${articletype.newswire}, ${articletype.feature}) and id in (select content_id from content_x_topic where topic_id = ${topic.id})"
                order="webdb_create asc">
           <batches>
+            <Set key="filename" value="topic.filename ++ batch.current.identifier"/>
             <Language>
-              <Set key="filename" value="topic.filename ++ batch.current.identifier"/>
               <Generate 
-                  generator="/producer/topicpage.template" 
+                  generator="/topicpage.template" 
                   destination="${config.storageRoot}/${pathprefix}/${topic.filename}/${filename}.shtml"/>
             </Language>
           </batches>
@@ -97,7 +129,7 @@
     </body>
   </producer>
   
-  <producer name="archive">
+  <producer name="newswirearchive">
     <verbs>
       <verb name="new">
         <Set key="pages" value="3"/>
@@ -109,13 +141,13 @@
     <body> 
         <Batch key="articles" infokey="batch" table="content" 
                process="pages" batchsize="20" minbatchsize="10"
-               selection="is_published='1' and to_article_type in (${articletype.newswire}, ${articletype.feature})"
+               selection="is_published='1' and to_article_type in (${articletype.newswire})"
                order="webdb_create asc">
           <batches>
+            <Set key="filename" value="archive ++ batch.current.identifier"/>
             <Language>
-              <Set key="filename" value="archive ++ batch.current.identifier"/>
               <Generate 
-                  generator="/producer/archive.template" 
+                  generator="/archive.template" 
                   destination="${config.storageRoot}/${pathprefix}/archive/${filename}.shtml"/>
             </Language>
           </batches>
@@ -145,7 +177,7 @@
         
       <Language>
         <Generate 
-            generator="/producer/startpage.template" 
+            generator="/startpage.template" 
             destination="${config.storageRoot}/${pathprefix}/index.shtml"/>
       </Language>
     </body>
diff --git a/templates-dist/producer/routines.template b/templates-dist/producer/routines.template
new file mode 100755
index 00000000..ed337b7f
--- /dev/null
+++ b/templates-dist/producer/routines.template
@@ -0,0 +1,107 @@
+<comment>
+  This file contains several routines to be used in the templates
+</comment>
+
+<function showArticleUrl(aPrefix, anArticle, aText, aCSSClass)>
+  <a class="${aCSSClass}" href="/${aPrefix}/${anArticle.date.formatted.yyyy}/${anArticle.date.formatted.MM}/${anArticle.id}.shtml">${aText}</a>
+</function>
+
+<function showSafeText(aText)>
+  ${utility.encodeHTML(aText)}
+</function>
+
+<function showSafeTextOrDefault(aField, aDefault)>
+  <if aField>
+    <call showSafeText(aField)>
+  <else>
+    ${aDefault}
+  </if>
+</function>
+
+<function showAddCommentLink(anArticle, aText, aLanguage)>
+  <a href="${config["Producer.OpenAction"]}?do=addcomment&aid=${anArticle.id}&language=${aLanguage.code}">${aText}</a>
+</function>
+                            
+<function showArticleMedia(anArticle)>
+ <!-- media -->
+   <list anArticle.to_media_audio as audio>
+      <br>
+      <br>
+      <a href="${audio["publish_server"]}${audio["publish_path"]}">
+          <img src="/images/${video["big_icon"]}" border="0" alt="">
+          <call showSafeText(audio.title)> - <call showSafeText(audio.descr)>
+      </a>
+   </list>
+
+   <list anArticle.to_media_video as video>
+      <br>
+      <br>
+      <a href="${video["publish_server"]}${video["publish_path"]}">
+          <img src="/images/${video["big_icon"]}" border="0" alt="">
+          <call showSafeText(video.title)> - <call showSafeText(video.descr)>
+      </a>
+   </list>
+
+   <list anArticle.to_media_other as other>
+      <br>
+      <br>
+      <a href="${other["publish_server"]}${other["publish_path"]}">
+          <img src="/images/${other["big_icon"]}" border="0" alt="">
+          <call showSafeText(other.title)> - <call showSafeText(other.descr)>
+      </a>
+   </list>
+
+   <list anArticle.to_media_images as image>
+      <br>
+      <br>
+      <img src="${image["publish_server"]}${image["publish_path"]}"
+              border="0" width="${image["img_width"]}"
+              height="${image["img_height"]}" alt="${image["title"]}"><br>
+      <i><call showSafeText(image.title)></i>
+   </list>
+ <!-- media -->
+</function>
+
+<function showArticleMediaIcons(anArticle)>
+    <if anArticle.to_media_audio > 
+      <img src="/img/${anArticle.to_media_audio[0]["big_icon"]}">
+    </if> 
+    
+    <if anArticle.to_media_video > 
+      <img src="/img/${anArticle.to_media_video[0]["big_icon"]}">
+    </if> 
+    
+    <if anArticle.to_media_other > 
+      <img src="/img/${anArticle.to_media_other[0]["big_icon"]}">
+    </if> 
+    
+      <if anArticle.to_media_images >
+        <img src="${anArticle.to_media_images[0]["icon_path"]}"
+          width="${anArticle.to_media_images[0]["icon_width"]}"
+          height="${anArticle.to_media_images[0]["icon_height"]}"
+          border=0 alt="${anArticle.to_media_images[0]["title"]}">
+      </if> 
+</function>
+
+<function showArticleAsFeature(anArticle)>
+  <h3><call showSafeText(anArticle.title)></h3>
+  <h4><i><call showSafeText(anArticle.creator)>, ${anArticle.creationdate.formatted["dd.MM.yyyy HH:mm"]}</i></h4>
+    <p>			 
+        <call showArticleMediaIcons(anArticle)>
+        ${anArticle.description_parsed} 
+    </p>
+
+    <p align="right">
+      [<call showArticleUrl(pathprefix, anArticle, lang("general.readarticle"), "featurelink")>]
+    </p>
+</function>
+
+
+<function showArticleAsNewswire(anArticle)>
+  <img alt=${anArticle.to_media_icon["icon_alt"]} border="0" height="10"
+       src="${anArticle.to_media_icon["tiny_icon"]}" width="12"> 
+       
+  <call showArticleUrl(pathprefix, anArticle, anArticle.title, "")><br />
+  <font size="-2">${n.creationdate.formatted["dd-MM-yyyy HH:mm"]}</font><br>
+</function>
+
diff --git a/templates-dist/producer/startpage.template b/templates-dist/producer/startpage.template
index 158655d3..458a27c3 100755
--- a/templates-dist/producer/startpage.template
+++ b/templates-dist/producer/startpage.template
@@ -1,10 +1,10 @@
-
+<include "routines.template">
 
 <html>
   <head>
-    <title>${lang("producer.startpage.htmltitle")}</title>
+    <title>${lang("startpage.htmltitle")}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" href="/style/mir.css" type="text/css">
+    <link rel="stylesheet" href="/${pathprefix}/style.css" type="text/css">
   </head>
 
   <body bgcolor="#CCCCCC">
@@ -14,7 +14,7 @@
           <table width="150" border="0" cellspacing="0" cellpadding="0">
             <tr> 
               <td width="140">
-                <img src="images/mirlogo.jpg" width="150" height="205">
+                <img src="/images/mirlogo.jpg" width="150" height="205">
               </td>
             </tr>
             <tr valign="top"> 
@@ -37,7 +37,7 @@
                 <table width="100%" border="0" cellspacing="0" cellpadding="0">
                   <tr> 
                     <td valign="top">
-                      <img src="images/mirfont.gif" width="600" height="68">
+                      <img src="/images/mirfont.gif" width="600" height="68">
                     </td>
                   </tr>
                 </table>
@@ -52,10 +52,12 @@
                   <tr> 
                     <td width="457" valign="top"> 
                       <!--- start-special ---> 
-                      <list data.startspecial as s> 
+                      <list startspecial as s> 
                         <table width="100%" border="0" cellspacing="0" cellpadding="0">
                           <tr> 
                             <td> 
+                              <call showArticleAsFeature(s)>
+<comment>                      
                               <h3>${s.title}</h3>
                               <h4><i>${s.creator}, ${s.webdb_create_formatted}</i></h4>
                               <p>			 
@@ -77,17 +79,20 @@
                               </if> 
                               ${s.description_parsed} </p>
                               <p align="right">[<a href="${config["Producer.DocRoot"]}${s.publish_path}${s.id}.shtml">read</a>]</p>
+</comment>
                             </td>
                           </tr>
                         </table>
                       </list> 
-                      <!--- start-special ---> 
+                      <!--- /start-special ---> 
                       <br>
                       <!--- features ---> 
-                      <list data.features as i> 
+                      <list features as i>
                         <table width="100%" border="0" cellspacing="0" cellpadding="0">
                           <tr> 
                             <td> 
+                              <call showArticleAsFeature(i)>
+<comment>                        
                               <h3>${i.title}</h3>
                               <h4><i>${i.creator}, ${i.webdb_create_formatted}</i></h4>
                               <p>			 
@@ -109,12 +114,13 @@
                               </if> 
                                 ${i.description_parsed} </p>
                               <p align="right">[<a href="${config["Producer.DocRoot"]}${i.publish_path}${i.id}.shtml">read</a>]</p>
+</comment>                        
                             </td>
                           </tr>
                         </table>
                         <br>
                       </list> 
-    		              <!--- features ---> 
+    		              <!--- /features ---> 
                     </td>
                   </tr>
                 </table>
@@ -126,16 +132,20 @@
                 <table width="150" border="0" cellspacing="2" cellpadding="0">
                   <tr> 
                     <td> 
-                		  <!-- newswire --> 
-                                  <p> 
-                		    <list data.newswire as n>
+                		    <!-- newswire --> 
+                        <p> 
+                		    <list newswire as n>
+                          <call showArticleAsNewswire(n)>
+<comment>                		    
                             <img alt=${n.to_media_icon["icon_alt"]} border="0" height="10"
                                  src="${n.to_media_icon["tiny_icon"]}" width="12"> 
                             <a href="${config["Producer.DocRoot"]}${n.publish_path}${n.id}.shtml"><b>${n.title}</b></a><br>
-                           <font size="-2"><b></b>${n.webdb_create_formatted}</font><br>
+                           <font size="-2"><b></b>${n.webdb_create_formatted}</font>
+                          <br>
+</comment>                           
                           <br>
-                                    </list> 
-                		    <!-- newswire -->
+                        </list> 
+                		    <!-- /newswire -->
                       </p>
                     </td>
                   </tr>
diff --git a/templates-dist/producer/stylesheet.template b/templates-dist/producer/stylesheet.template
new file mode 100755
index 00000000..1fb2d418
--- /dev/null
+++ b/templates-dist/producer/stylesheet.template
@@ -0,0 +1,20 @@
+a {
+  color: #0000CC; 
+  text-decoration: underline
+}
+
+a:hover {  
+  color: #333333; 
+  text-decoration: none
+}
+
+td {  
+  font-family: "Times New Roman", Times, serif
+}
+
+.small {  
+  font-size: x-small
+}
+pre {  
+  font-family: "Courier", Courier, serif
+}
diff --git a/templates-dist/producer/topicpage.template b/templates-dist/producer/topicpage.template
index 99709d1e..882e0c97 100755
--- a/templates-dist/producer/topicpage.template
+++ b/templates-dist/producer/topicpage.template
@@ -1,127 +1,128 @@
 <html>
-<head>
-<title>${lang("producer.topiclist.htmltitle")}${topic.title}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="/style/mir.css" type="text/css">
-</head>
+  <head>
+    <title>${lang("producer.topiclist.htmltitle")}${topic.title}</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <link rel="stylesheet" href="/style/mir.css" type="text/css">
+  </head>
 
-<body bgcolor="#CCCCCC">
-<table width="760" border="0" cellpadding="0" cellspacing="1" align="center" bgcolor="#000000">
-  <tr bgcolor="#FFFFFF"> 
-    <td valign="top" align="left" width="150" bgcolor="#666666"> 
-      <table width="150" border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td width="140">
-             <a href="${config["Producer.ProductionHost"]}${config["Producer.DocRoot"]}/">
-             <img src="images/mirlogo.jpg" width="150" height="205" border="0">
-             </a>
-          </td>
-        </tr>
-        <tr valign="top"> 
-          <td width="140" bgcolor="#666666"> 
-            <table width="100%" border="0" cellspacing="2" cellpadding="0">
-              <tr> 
-                <td> 
-                <!--#include virtual="navigation.inc" -->
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-    <td align="left" valign="top" colspan="2" height="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td> 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr> 
-                <td><img src="images/mirfont.gif" width="600" height="68"></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        <tr bgcolor="#000000"> 
-          <td height="1"><img src="images/1pixel.gif" width="1" height="1"></td>
-        </tr>
-        <tr> 
-          <td align="left" valign="top">
-            <h2> ${topic.title}</h2> 
-            <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
-              <tr> 
-                <td width="100%" valign="top"> 
-                <!--- start-special ---> 
-                  <if data.special> 
-                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr> 
-                      <td> 
-                        <h3>${data.special.title}</h3>
-                        <h4><i>${data.special.creator}, ${data.special.webdb_create_formatted}</i></h4>
-                        <p> 
-                        <if data.special.to_media_audio > 
-                          <img src="/img/${data.special.to_media_audio[0]["big_icon"]}">
-                        </if> 
-                        <if data.special.to_media_video > 
-                          <img src="/img/${data.special.to_media_video[0]["big_icon"]}">
-                        </if> 
-                        <if data.special.to_media_other > 
-                          <img src="/img/${data.special.to_media_other[0]["big_icon"]}">
-                        </if> 
-                        <p>
-                        <if data.special.to_media_images >
-                          <img src="${data.special.to_media_images[0]["icon_path"]}"
-                            width="${data.special.to_media_images[0]["icon_width"]}"
-                            height="${data.special.to_media_images[0]["icon_height"]}"
-                            border=0 alt="${data.special.to_media_images[0]["title"]}">
-                        </if> 
-                          ${data.special.description_parsed} </p>
-                        <p align="right">[<a href="${config["Producer.DocRoot"]}${data.special.publish_path}${data.special.id}.shtml">read</a>]</p>
+  <body bgcolor="#CCCCCC">
+    <table width="760" border="0" cellpadding="0" cellspacing="1" align="center" bgcolor="#000000">
+      <tr bgcolor="#FFFFFF"> 
+        <td valign="top" align="left" width="150" bgcolor="#666666"> 
+          <table width="150" border="0" cellspacing="0" cellpadding="0">
+            <tr> 
+              <td width="140">
+                 <a href="${config["Producer.ProductionHost"]}${config["Producer.DocRoot"]}/">
+                 <img src="images/mirlogo.jpg" width="150" height="205" border="0">
+                 </a>
+              </td>
+            </tr>
+            <tr valign="top"> 
+              <td width="140" bgcolor="#666666"> 
+                <table width="100%" border="0" cellspacing="2" cellpadding="0">
+                  <tr> 
+                    <td> 
+                    <!--#include virtual="navigation.inc" -->
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+        <td align="left" valign="top" colspan="2" height="100%">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr> 
+              <td> 
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                  <tr> 
+                    <td><img src="images/mirfont.gif" width="600" height="68"></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr bgcolor="#000000"> 
+              <td height="1"><img src="images/1pixel.gif" width="1" height="1"></td>
+            </tr>
+            <tr> 
+              <td align="left" valign="top">
+                <h2> ${topic.title}</h2> 
+                <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
+                  <tr> 
+                    <td width="100%" valign="top"> 
+                    <!--- start-special ---> 
+                      <if data.special> 
+                      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td> 
+                            <h3>${data.special.title}</h3>
+                            <h4><i>${data.special.creator}, ${data.special.webdb_create_formatted}</i></h4>
+                            <p> 
+                            <if data.special.to_media_audio > 
+                              <img src="/img/${data.special.to_media_audio[0]["big_icon"]}">
+                            </if> 
+                            <if data.special.to_media_video > 
+                              <img src="/img/${data.special.to_media_video[0]["big_icon"]}">
+                            </if> 
+                            <if data.special.to_media_other > 
+                              <img src="/img/${data.special.to_media_other[0]["big_icon"]}">
+                            </if> 
+                            <p>
+                            <if data.special.to_media_images >
+                              <img src="${data.special.to_media_images[0]["icon_path"]}"
+                                width="${data.special.to_media_images[0]["icon_width"]}"
+                                height="${data.special.to_media_images[0]["icon_height"]}"
+                                border=0 alt="${data.special.to_media_images[0]["title"]}">
+                            </if> 
+                              ${data.special.description_parsed} </p>
+                            <p align="right">[<a href="${config["Producer.DocRoot"]}${data.special.publish_path}${data.special.id}.shtml">read</a>]</p>
+                          </td>
+                        </tr>
+                      </table>
+                      </if> 
+                      <!--- /start-special --->
+                      
+                      <!--- features ---> 
+                      <list data.contentlist as i> 
+                      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                        <tr> 
+                          <td> 
+                            <h3>${i.title}</h3>
+                            <h4><i>${i.creator}, ${i.webdb_create_formatted}</i></h4>
+                            <p>			 
+                            <if i.to_media_audio > 
+                              <img src="/img/${i.to_media_audio[0]["big_icon"]}">
+                            </if> 
+                            <if i.to_media_video > 
+                              <img src="/img/${i.to_media_video[0]["big_icon"]}">
+                            </if> 
+                            <if i.to_media_other > 
+                              <img src="/img/${i.to_media_other[0]["big_icon"]}">
+                            </if> 
+                            <p>
+                            <if i.to_media_images >
+                              <img src="${i.to_media_images[0]["icon_path"]}"
+                                width="${i.to_media_images[0]["icon_width"]}"
+                                height="${i.to_media_images[0]["icon_height"]}"
+                                border=0 alt="${i.to_media_images[0]["title"]}">
+                            </if> 
+    			                  ${i.description_parsed}</p>
+                            <p align="right">[<a href="${config["Producer.DocRoot"]}${i.publish_path}${i.id}.shtml">read</a>]</p>
+                          </td>
+                        </tr>
+                      </table>
+                      <br>
+                      </list> 
+                      <!--- features ---> 
                       </td>
-                    </tr>
-                  </table>
-                  </if> 
-		  <!--- start-special --->
-                  <!--- features ---> 
-                  <list data.contentlist as i> 
-                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr> 
-                      <td> 
-                        <h3>${i.title}</h3>
-                        <h4><i>${i.creator}, ${i.webdb_create_formatted}</i></h4>
-                        <p>			 
-                        <if i.to_media_audio > 
-                          <img src="/img/${i.to_media_audio[0]["big_icon"]}">
-                        </if> 
-                        <if i.to_media_video > 
-                          <img src="/img/${i.to_media_video[0]["big_icon"]}">
-                        </if> 
-                        <if i.to_media_other > 
-                          <img src="/img/${i.to_media_other[0]["big_icon"]}">
-                        </if> 
-                        <p>
-                        <if i.to_media_images >
-                          <img src="${i.to_media_images[0]["icon_path"]}"
-                            width="${i.to_media_images[0]["icon_width"]}"
-                            height="${i.to_media_images[0]["icon_height"]}"
-                            border=0 alt="${i.to_media_images[0]["title"]}">
-                        </if> 
-			  ${i.description_parsed}</p>
-                        <p align="right">[<a href="${config["Producer.DocRoot"]}${i.publish_path}${i.id}.shtml">read</a>]</p>
-                      </td>
-                    </tr>
-                  </table>
-                  <br>
-                  </list> 
-                  <!--- features ---> 
-                  </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <p>&nbsp;</p>
+  </body>
 </html>
-- 
2.11.0