more work on the default templates... still not finished...
authorzapata <zapata>
Tue, 24 Sep 2002 14:20:19 +0000 (14:20 +0000)
committerzapata <zapata>
Tue, 24 Sep 2002 14:20:19 +0000 (14:20 +0000)
21 files changed:
templates-dist/producer/RSS.template [new file with mode: 0755]
templates-dist/producer/archive.template [new file with mode: 0755]
templates-dist/producer/article.template [new file with mode: 0755]
templates-dist/producer/cities.inc [deleted file]
templates-dist/producer/cities_de.inc [deleted file]
templates-dist/producer/config.template [deleted file]
templates-dist/producer/content.template [deleted file]
templates-dist/producer/copyright.template [deleted file]
templates-dist/producer/events.inc [deleted file]
templates-dist/producer/featurelist.template [deleted file]
templates-dist/producer/featuresRSS.template [deleted file]
templates-dist/producer/list.template [deleted file]
templates-dist/producer/navigation.template
templates-dist/producer/openposting.template [deleted file]
templates-dist/producer/printablecontent.template
templates-dist/producer/producers.xml
templates-dist/producer/startpage.template
templates-dist/producer/topiclist.template [deleted file]
templates-dist/producer/topicpage.template [new file with mode: 0755]
templates-dist/producer/wap.template [deleted file]
templates-dist/producer/wml2.xsl [deleted file]

diff --git a/templates-dist/producer/RSS.template b/templates-dist/producer/RSS.template
new file mode 100755 (executable)
index 0000000..a959af3
--- /dev/null
@@ -0,0 +1,42 @@
+<comment>
+  Template file for an rdf file.
+  
+  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/"
+>
+
+<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:RDF>
+
+
diff --git a/templates-dist/producer/archive.template b/templates-dist/producer/archive.template
new file mode 100755 (executable)
index 0000000..cb54178
--- /dev/null
@@ -0,0 +1,108 @@
+<comment>
+  Template file for an archive of articles.
+  
+  Variables:
+
+</comment>
+
+<html>
+  <head>
+    <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>
+
+  <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> ${title}</h2> 
+                <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
+                  <tr> 
+                    <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>
+                      </list> 
+                      <!--- articles ---> 
+                      </td>
+    
+                      <td>
+                      <if previousPage><a href="${previousPage}">${lang("producer.previous")}</a></if>
+                      <if nextPage><a href="${nextPage}">${lang("producer.next")}</a></if>
+                      </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <p>&nbsp;</p>
+  </body>
+</html>
diff --git a/templates-dist/producer/article.template b/templates-dist/producer/article.template
new file mode 100755 (executable)
index 0000000..13879e2
--- /dev/null
@@ -0,0 +1,199 @@
+<comment>
+  Template file for an article.
+  
+  Variables:
+
+</comment>
+
+<html>
+  <head>
+    <title>${lang("producer.content.htmltitle")}${article.content.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>
+
+
+          <!-- 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"]}
+                </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>
+
+          <!-- 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>
+                            </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>
+                      </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>
+                        </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>
+</html>
diff --git a/templates-dist/producer/cities.inc b/templates-dist/producer/cities.inc
deleted file mode 100755 (executable)
index c4e3ef6..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<!-- cities.inc -->
-<!-- list of linked indymedia cities, for inclusion in all the indymedia sidebars -->
-<a href="http://www.indymedia.org">www.indymedia.org</a><br>
-<br>
-Australia<br>
-<a href="http://www.melbourne.indymedia.org/">melbourne</a><br>
-<a href="http://sydney.indymedia.org/">sydney</a><br>
-<br>
-Europe<br>
-<a href="http://austria.indymedia.org">austria</a><br>
-<a href="http://www.vaikuttava.net">finland</a><br>
-<a href="http://barcelona.indymedia.org/">barcelona</a><br>
-<a href="http://belgium.indymedia.org/">belgium</a><br>
-<a href="http://germany.indymedia.org/">germany</a><br>
-<a href="http://prague.indymedia.org/">czech republic</a><br>
-<a href="http://www.indymedia.org.uk/">united kingdom</a><br>
-<a href="http://france.indymedia.org/">france</a><br>
-<a href="http://italy.indymedia.org/">italy</a><br>
-<a href="http://russia.indymedia.org/">russia</a><br>
-<a href="http://sweden.indymedia.org/">sweden</a><br>
-<a href="http://switzerland.indymedia.org/">switzerland</a><br>
-<br>
-Canada<br>
-<a href="http://alberta.indymedia.org/">alberta</a><br>
-<a href="http://hamilton.indymedia.org/">hamilton</a><br>
-<a href="http://maritimes.indymedia.org/">maritimes</a><br>
-<a href="http://montreal.indymedia.org/">montreal</a><br>
-<a href="http://ontario.indymedia.org/">ontario</a><br>
-<a href="http://quebec.indymedia.org/">québec</a><br>
-<a href="http://vancouver.indymedia.org/">vancouver</a><br>
-<a href="http://victoria.indymedia.org/">victoria</a><br>
-<a href="http://windsor.indymedia.org/">windsor</a><br>
-<br>
-Argentina<br>
-<a href="http://argentina.indymedia.org/">argentina</a><br>
-<br>
-Brasil<br>
-<a href="http://brasil.indymedia.org/">brasil</a><br>
-<br>
-Colombia<br>
-<a href="http://colombia.indymedia.org/">colombia</a><br>
-<br>
-Congo<br>
-<a href="http://congo.indymedia.org/">congo</a><br>
-<!--<br >India<br>
-<a href="http://india.indymedia.org/">india</a><br>-->
-<br>
-Israel<br>
-<a href="http://indymedia.org.il/">israel</a><br>
-<br>
-Mexico<br>
-<a href="http://mexico.indymedia.org/">mexico</a><br>
-<a href="http://chiapas.indymedia.org/">chiapas</a><br>
-<br>
-United States<br>
-<a href="http://arizona.indymedia.org/">arizona</a><br>
-<a href="http://atlanta.indymedia.org/">atlanta</a><br>
-<a href="http://austin.indymedia.org/">austin</a><br>
-<a href="http://boston.indymedia.org/">boston</a><br>
-<a href="http://buffalo.indymedia.org/">buffalo</a><br>
-<a href="http://chicago.indymedia.org/">chicago</a><br>
-<a href="http://cleveland.indymedia.org/">cleveland</a><br>
-<a href="http://hawaii.indymedia.org/">hawaii</a><br>
-<a href="http://houston.indymedia.org/">houston</a><br>
-<a href="http://la.indymedia.org/">la</a><br>
-<a href="http://madison.indymedia.org/">madison</a><br>
-<a href="http://maine.indymedia.org/">maine</a><br>
-<a href="http://twincities.indymedia.org/">minneapolis/st. paul</a><br>
-<a href="http://newjersey.indymedia.org/">new jersey</a><br>
-<a href="http://nyc.indymedia.org/">nyc</a><br>
-<a href="http://nycap.indymedia.org/">new york capitol</a><br>
-<a href="http://ohiovalleyimc.org/">ohio valley</a><br>
-<a href="http://www.phillyimc.org/">philadelphia</a><br>
-<a href="http://portland.indymedia.org/">portland</a><br>
-<a href="http://richmond.indymedia.org/">richmond</a><br>
-<a href="http://rockymountain.indymedia.org/">rocky mountain</a><br>
-<a href="http://sf.indymedia.org/">san francisco bay area</a><br>
-<a href="http://seattle.indymedia.org/">seattle</a><br>
-<a href="http://www.stlimc.org/">st louis</a><br>
-<a href="http://urbana.indymedia.org/">urbana-champaign</a><br>
-<a href="http://utah.indymedia.org/">utah</a><br>
-<a href="http://vermont.indymedia.org/">vermont</a><br>
-<a href="http://dc.indymedia.org/">dc</a><br>
-<br>
-IMC Projects<br>
-<a href="http://satellite.indymedia.org">satellite tv news</a><br>
-<a href="http://print.indymedia.org/">print</a><br>
-<a href="http://radio.indymedia.org/">radio</a><br>
-
-<br>
-IMC Process<br>
-<a href="http://process.indymedia.org">process</a><br>
-<a href="http://global.indymedia.org.au">discussion</a><br>
-<a href="http://tech.indymedia.org">tech</a><br>
-<a href="http://volunteer.indymedia.org/">volunteer</a><br>
-<a href="http://lists.indymedia.org/">mailinglists</a><br>
-<a href="http://www.indymedia.org/fbi">fbi/legal updates</a><br>
-<br>
-
diff --git a/templates-dist/producer/cities_de.inc b/templates-dist/producer/cities_de.inc
deleted file mode 100755 (executable)
index 6ba4e26..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- cities.inc -->
-<!-- list of linked indymedia cities, for inclusion in all the indymedia sidebars -->
-<br>
-International<br>
-<a href="http://www.indymedia.org">www.indymedia.org</a><br>
-<br>
-Australien<br>
-<a href="http://www.melbourne.indymedia.org/">melbourne</a><br>
-<a href="http://sydney.indymedia.org/">sydney</a><br>
-<br>
-Europa<br>
-<a href="http://www.vaikuttava.net">finland</a><br>
-<a href="http://barcelona.indymedia.org/">barcelona</a><br>
-<a href="http://belgium.indymedia.org/">belgien</a><br>
-<a href="http://germany.indymedia.org/">deutschland</a><br>
-<a href="http://prague.indymedia.org/">tschechien</a><br>
-<a href="http://www.indymedia.org.uk/">grossbritannien</a><br>
-<a href="http://france.indymedia.org/">frankreich</a><br>
-<a href="http://italy.indymedia.org/">italien</a><br>
-<a href="http://austria.indymedia.org/">&ouml;sterreich</a><br>
-<a href="http://russia.indymedia.org/">russland</a><br>
-<a href="http://sweden.indymedia.org/">schweden</a><br>
-<a href="http://switzerland.indymedia.org/">schweiz</a><br>
-<br>
-Kanada<br>
-<a href="http://calgary.indymedia.org/">calgary</a><br>
-<a href="http://hamilton.indymedia.org/">hamilton</a><br>
-<a href="http://maritimes.indymedia.org/">maritimes</a><br>
-<a href="http://montreal.indymedia.org/">montreal</a><br>
-<a href="http://ontario.indymedia.org/">ontario</a><br>
-<a href="http://quebec.indymedia.org/">québec</a><br>
-<a href="http://vancouver.indymedia.org/">vancouver</a><br>
-<a href="http://windsor.indymedia.org/">windsor</a><br>
-<br>
-Argentinien<br>
-<a href="http://argentina.indymedia.org/">argentinien</a><br>
-<br>
-Brasilien<br>
-<a href="http://brasil.indymedia.org/">brasilien</a><br>
-<br>
-Kolumbien<br>
-<a href="http://colombia.indymedia.org/">kolumbien</a><br>
-<br>
-Kongo<br>
-<a href="http://congo.indymedia.org/">kongo</a><br>
-<!--<br >India<br>
-<a href="http://india.indymedia.org/">india</a><br>-->
-<br>
-Israel<br>
-<a href="http://indymedia.org.il/">israel</a><br>
-<br>
-Mexiko<br>
-<a href="http://mexico.indymedia.org/">mexiko/D.F.</a><br>
-<a href="http://chiapas.indymedia.org/">chiapas</a><br>
-<br>
-USA<br>
-<a href="http://arizona.indymedia.org/">arizona</a><br>
-<a href="http://atlanta.indymedia.org/">atlanta</a><br>
-<a href="http://austin.indymedia.org/">austin</a><br>
-<a href="http://boston.indymedia.org/">boston</a><br>
-<a href="http://buffalo.indymedia.org/">buffalo</a><br>
-<a href="http://chicago.indymedia.org/">chicago</a><br>
-<a href="http://cleveland.indymedia.org/">cleveland</a><br>
-<a href="http://hawaii.indymedia.org/">hawaii</a><br>
-<a href="http://houston.indymedia.org/">houston</a><br>
-<a href="http://la.indymedia.org/">la</a><br>
-<a href="http://madison.indymedia.org/">madison</a><br>
-<a href="http://maine.indymedia.org/">maine</a><br>
-<a href="http://twincities.indymedia.org/">minneapolis/st. paul</a><br>
-<a href="http://nyc.indymedia.org/">nyc</a><br>
-<a href="http://nycap.indymedia.org/">new york capitol</a><br>
-<a href="http://ohiovalleyimc.org/">ohio valley</a><br>
-<a href="http://www.phillyimc.org/">philadelphia</a><br>
-<a href="http://portland.indymedia.org/">portland</a><br>
-<a href="http://richmond.indymedia.org/">richmond</a><br>
-<a href="http://rockymountain.indymedia.org/">rocky mountain</a><br>
-<a href="http://sf.indymedia.org/">san francisco bay area</a><br>
-<a href="http://seattle.indymedia.org/">seattle</a><br>
-<a href="http://urbana.indymedia.org/">urbana-champaign</a><br>
-<a href="http://utah.indymedia.org/">utah</a><br>
-<a href="http://vermont.indymedia.org/">vermont</a><br>
-<a href="http://dc.indymedia.org/">dc</a><br>
-<br>
-IMC Projekte<br>
-<a href="http://satellite.indymedia.org">satellite tv news</a><br>
-<a href="http://print.indymedia.org/">print</a><br>
-<a href="http://radio.indymedia.org/">radio</a><br>
-
-<br>
-IMC Process<br>
-<a href="http://process.indymedia.org">process</a><br>
-<a href="http://global.indymedia.org.au">discussion</a><br>
-<a href="http://tech.indymedia.org">tech</a><br>
-<a href="http://volunteer.indymedia.org/">volunteer</a><br>
-<a href="http://lists.indymedia.org/">mailinglists</a><br>
-<a href="http://www.indymedia.org/fbi">fbi/legal updates</a><br>
-<br>
-
diff --git a/templates-dist/producer/config.template b/templates-dist/producer/config.template
deleted file mode 100755 (executable)
index b1daee4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-    <config>
-                       <docroot>${config.docroot}</docroot>
-                       <openaction>${config["Producer.OpenAction"]}</openaction>
-                       <storageroot>${config.storageroot}</storageroot>
-                       <productionhost>${config["Producer.ProductionHost"]}</productionhost>
-      <productiondate>${now}</productiondate>
-      <videohost>${videoHost}</videohost>
-      <audiohost>${audioHost}</audiohost>
-      <imagehost>${imageHost}</imagehost>
-      <previouspage>${previousPage}</previouspage>
-      <nextpage>${nextPage}</nextpage>
-               </config>
\ No newline at end of file
diff --git a/templates-dist/producer/content.template b/templates-dist/producer/content.template
deleted file mode 100755 (executable)
index 3d19ebb..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-<html>
-<head>
-<title>${lang("producer.content.htmltitle")}${data.content.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 data.content.to_media_images>
-                <meta name="keywords" content="images"></meta>
-                       </if>
-                       <if data.content.to_media_audio>
-                <meta name="keywords" content="audio"></meta>
-                       </if>
-                       <if data.content.to_media_video>
-                <meta name="keywords" content="video"></meta>
-                       </if>
-                       <if data.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="${data.content.id}.pdf">Print this article</a>
-          <else>
-            <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${data.content.id}">Print this article</a>
-         </if>
-         </td></tr>
-       </if>
-            <tr> 
-                      <td> 
-                        <h2>${data.content.title}</h2>
-                        <h4><i>${data.content.creator}, ${data.content.webdb_create_formatted}</i></h4>
-                        <p><b>${data.content.description_parsed}</b>
-
-
-          <!-- media -->
-
-            <list data.content.to_media_audio as media>
-                <list media["url"] as audio>
-                  <p>
-
-                    <img src="/img/${media["big_icon"]}" border="0" alt="">
-
-                    <a href="${audio["publish_server"]}${audio["publish_path"]}">
-                      ${audio["title"]} - ${media["descr"]}
-                    </a>
-                  </p>
-                </list>
-            </list>
-          <list data.content.to_media_video as media>
-            <list media["url"] as video>
-              <p>
-                <img src="/img/${media["big_icon"]}" border="0" alt="">
-                <a href="${video["publish_server"]}${video["publish_path"]}">
-                ${video["title"]} - ${media["descr"]}</a>
-              </p>
-            </list>
-          </list>
-          <list data.content.to_media_other as media>
-            <list media["url"] as other>
-              <p>
-                <img src="/img/${media["big_icon"]}" border="0" alt="">
-                <a href="${other["publish_server"]}${other["publish_path"]}">
-                ${other["title"]} - ${media["descr"]}</a>
-              </p>
-            </list>
-          </list>
-
-          <list data.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>
-
-          <!-- media -->
-
-          <p>${data.content.content_data_parsed}</p>
-          <if data.content.creator_main_url || data.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:${data.content.creator_email}">${data.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="${data.content.creator_main_url}" target="extern">${data.content.creator_main_url}</a><br>
-                            </if>
-                            </font>
-                           </td>
-                        </tr>
-                        </table>
-                        </if>
-                      </td>
-                    </tr>
-                    <tr><td>&nbsp;</td></tr>
-                    <tr>
-                      <td><a href="${config["Producer.OpenAction"]}?do=addcomment&aid=${data.content.id}">
-                          ${lang("producer.content.comment")}</a>
-                      </td>
-                    </tr>
-                    <if data.content.to_comments>
-                    <list data.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>
-                        </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>
-</html>
diff --git a/templates-dist/producer/copyright.template b/templates-dist/producer/copyright.template
deleted file mode 100755 (executable)
index 13801d5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-<table bgcolor="silver" width="100%" border="0" cellpadding="3" cellspacing="0">
-       <tbody>
-               <tr>
-                       <td><font size="-1">${lang("producer.copyright")}</font><br><br>
-${lang("producer.contact")}: <a href="mailto:${lang("imc.public-email.address")}">${lang("imc.public-email.name")}</a>
-                       </td>
-               </tr>
-       </tbody>
-</table>
\ No newline at end of file
diff --git a/templates-dist/producer/events.inc b/templates-dist/producer/events.inc
deleted file mode 100755 (executable)
index 84cefdc..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-               <p>
-               <font size="-1">
-               <a href="2001/05/2575.html"><b>summer of resistance</b></a>
-               <br>
-               
-               
-               <a href="http://www.genoa-g8.org/">
-               19. bis 22.7:</a>
-               &nbsp;
-               <a href="http://italy.indymedia.org/">
-               Italien
-               </a>
-               
-               <br>
-               G8 Genua, 
-               <br>
-               <br>
-                       
-               <a href="http://www.50years.org/s28/call.html">
-               28.9.
-               </a>
-               &nbsp;
-               <a href="http://dc.indymedia.org/">
-               USA
-               </a>
-               
-               
-               <br>
-               Weltbank/IWF<br>
-               Washington 
-               <br>
-               <br>
-               
-               <a href="http://www.noborder.org">
-               <b>Grenzcamps</b>
-               </a>
-               <br>
-               <a href="http://www.noborder.org/camps/ger/index.html">
-               27. bis 5.8.</a>&nbsp;
-               <a href="http://de.indymedia.org/">
-               DE
-               </a>  
-               <br>
-               Frankfurt/Main 
-                <br>
-                <br>
-                Global:<br>
-               9. bis 15.11. WTO, Qatar<br>
-
-                <hr align="CENTER"  color="Green" noshade>
-               
-               <font size="-2">
-                mehr Termine:<br>
-                z.B. 
-                <a href="http://www.protest.net" target="_blank">weltweit</a> - 
-                <a href="http://radar.squat.net" target="_blank">europa</a> - 
-                <a href="http://stressfaktor.squat.net" target="_blank">berlin</a> 
-               </font>
-               </font>
-               </p>
diff --git a/templates-dist/producer/featurelist.template b/templates-dist/producer/featurelist.template
deleted file mode 100755 (executable)
index a48c4d7..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<featurepage>
-       <include "producer/config.template">
-       <featuretitle>${topic.title}</featuretitle>
-       <articlelist>
-               <list contentlist as entry>
-               <article>
-                       <date>${entry.date}</date>
-                       <creator>${entry.creator}</creator>
-                       <time>${entry.webdb_create}</time>
-                       <title>${entry.title}</title>
-                       <description>${entry.description}</description>
-                       <keywords>${entry.keywords}</keywords>
-                       <content_data>${entry.content_data}</content_data>
-                       <mediatype>${entry.to_media_type}</mediatype>
-                       <authormail>${entry.email}</authormail>
-                       <authorhome>${entry.main_url}</authorhome>
-                       <article_type>${entry.to_article_type}</article_type>
-                       <id>${entry.id}</id>
-               </article>
-               </list>
-       </articlelist>
-</featurepage>
-
diff --git a/templates-dist/producer/featuresRSS.template b/templates-dist/producer/featuresRSS.template
deleted file mode 100755 (executable)
index 9100011..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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/"
->
-
-<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>${data.dc_now}</dc:date>
-<items>
- <rdf:Seq>
-  <list data.startspecial as s> 
-    <rdf:li rdf:resource="${config["Producer.ProductionHost"]}${config.docRoot}${s.publish_path}${s.id}.shtml" />
-  </list>
-  <list data.features as i>    
-  <rdf:li rdf:resource="${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml" />
-  </list>
- </rdf:Seq>
-</items>
-</channel>
-<list data.startspecial as s>          
-<item rdf:about="${config["Producer.ProductionHost"]}${config.docRoot}${s.publish_path}${s.id}.shtml">
-<title>${s.title}</title>
-<link>${config["Producer.ProductionHost"]}${config.docRoot}${s.publish_path}${s.id}.shtml</link>
-<description>${s.description_sentence}</description>
-<dc:date>${s.webdb_create_dc}+0200</dc:date>
-</item>
-</list>
-<list data.features 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/list.template b/templates-dist/producer/list.template
deleted file mode 100755 (executable)
index 9ff39ef..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-
-<indy>
-       <include "producer/config.template">
-       <list contentlist as entry>
-  <item>
-    <id>${entry.id}</id>
-    <date>${entry.webdb_create}</date>
-    <type>${entry.to_article_type}</type>
-    <topic>${topic.title}</topic>
-    <focus></focus>
-    <location>
-      <url></url>
-    </location>
-    <creator>
-      <name>${entry.creator}</name>
-      <email></email>
-      <homepage></homepage>
-      <snailmail></snailmail>
-      <phone></phone>
-    </creator>
-    <title>
-      <edittitle></edittitle>
-      <maintitle>${entry.title}</maintitle>
-      <subtitle></subtitle>
-    </title>
-    <abstract>${entry.description}</abstract>
-    <img>
-      <url></url>
-      <width></width>
-      <height></height>
-    </img>
-  </item>
-       </list>
-</indy>
index 3df71d3..1fde305 100755 (executable)
@@ -1,22 +1,12 @@
-                  <p> 
-                    <!-- topiclist --> 
-                    <list data.topics as t> 
-                    <br>
-                    <a href="${config["Producer.DocRoot"]}/${t.filename}.shtml"><b>${t.title}</b></a>
-                    </list> 
-                    <!-- topiclist --> 
-                  </p>
-                  <hr noshade width="146" size="1" align="left">
-                  <p> 
-                    <a href="/cgi-bin/cvsweb/mir/">cvsweb</a><br>
-                       <a href="/mir/javadoc/">java-doc</a><br>
-                    <a href="https://prod.indymedia.nl/mantis/">bug-tracker</a><br>
-                    <a href="${config["Producer.OpenAction"]}?do=addposting">publish</a><br>
-                    <a href="/download">download</a>
-                  </p>
-                  <hr noshade width="146" size="1" align="left"> 
-                  <p class="small">
-<!-- imclist --> 
-<include "producer/cities.inc"> 
-<!-- imclist --> 
-                  </p>
+<p> 
+  <list topics as t> 
+    <br>
+    <a href="${config["Producer.DocRoot"]}/${t.filename}.shtml"><b>${t.title}</b></a>
+  </list> 
+</p>
+
+<hr noshade width="146" size="1" align="left">
+
+<p class="small">
+  <include "producer/links.inc"> 
+</p>
diff --git a/templates-dist/producer/openposting.template b/templates-dist/producer/openposting.template
deleted file mode 100755 (executable)
index d022a89..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-<html>
-<head>
-<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>
-
-<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> ${title}</h2> 
-            <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
-              <tr> 
-                <td width="100%" valign="top"> 
-                  <!--- articles ---> 
-                  <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}</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>
-                 <if data.previousPage><a href="${data.previousPage}">${lang("producer.previous")}</a></if>
-                 <a href="${data.nextPage}">${lang("producer.next")}</a>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
-</html>
index d7d4833..498bb79 100755 (executable)
@@ -87,7 +87,7 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 line-height="18pt"
                 space-after.optimum="3pt"
                 text-align="center">           
-      ${data.content.title}
+      ${article.title}
       </fo:block>
       
       <!-- here is the article author and date-->
@@ -96,7 +96,7 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 line-height="13pt"
                 space-after.optimum="3pt"
                 text-align="end">              
-      ${data.content.creator},  ${data.content.webdb_create_formatted}
+      ${article.creator},  ${article.webdb_create_formatted}
       </fo:block>
 
 
@@ -107,27 +107,27 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 line-height="13pt"
                 space-after.optimum="3pt"
                 text-align="justify">          
-      ${data.content.description_parsed}
+      ${article.description_parsed}
       </fo:block>
 
 
              <!-- here is the header stuff -->
-<if content.creator_main_url || content.creator_email>
+<if article.creator_main_url || article.creator_email>
        <fo:block><fo:leader leader-pattern="rule" leader-length="18cm"
             rule-thickness="1pt" color="black"/></fo:block>
 </if>
-      <if content.creator_email>
+      <if article.creator_email>
       <fo:block font-size="10pt" 
                 font-family="sans-serif" 
                 line-height="12pt">
-      Email:           ${data.content.creator_email}
+      Email:           ${article.creator_email}
       </fo:block>
       </if>
-      <if content.creator_main_url>
+      <if article.creator_main_url>
       <fo:block font-size="10pt" 
                 font-family="sans-serif" 
                 line-height="12pt">
-      URL:     ${data.content.creator_main_url}
+      URL:     ${article.creator_main_url}
       </fo:block>
       </if> 
       <fo:block><fo:leader leader-pattern="rule" leader-length="18cm"
@@ -139,8 +139,8 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 line-height="15pt"
                 space-after.optimum="3pt"
                 text-align="justify">
-       ${data.content.content_data_parsed}
-        <list data.content.to_media_images as media>
+       ${article.content_data_parsed}
+        <list article.to_media_images as media>
        <fo:external-graphic  src="file:${config["Producer.Image.Path"]}/${media["publish_path"]}"  />
             ${media["description"]}
         </list>
index 7ea479d..ad5c3c3 100755 (executable)
@@ -7,31 +7,34 @@
     </parameters>
 
     <definition>
-      <Log message="logging: "/>
       <Enumerate key="language" table="language" selection="${languagecondition}" order="code">
-        <Log message="  language.code = ${language.code}" />
         <Resource bundle="${bundle}" key="lang" language="${language.code}"/>
-        <Define key="pathprefix" value="${language.code}/" />
+        <Define key="pathprefix" value="${language.code}" />
         <sub/>
       </Enumerate>
     </definition>
   </nodedefinition>
  
-  <producer name="content">
+  <producer name="articles">
     <verbs>
-      <verb name="new">
+      <verb name="changed" default="1">
         <Set key="verbcondition" value="' and (not is_produced)'"/>
+        <Set key="limit" value="10"/>
       </verb>
       <verb name="all">
         <Set key="verbcondition" value="''"/>
+        <Set key="limit" value="-1"/>
       </verb>
     </verbs>
     <body>
-      <Enumerate key="data.content" table="content" selection="is_published='t' ${verbcondition}"
-                  limit="10" order="webdb_create desc, date desc">
-        <Generate 
-            generator="/producer/content.template" 
-            destination="${config.storageRoot}/${data.content.date.formatted.yyyy}/${data.content.date.formatted.MM}/${data.content.id}.shtml"/>
+      <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"/>
+        </Language>
+
         <MarkContent key="data.content"/>            
       </Enumerate>
     </body>
 
   <producer name="navigation">
     <verbs>
-      <verb name="new"/>
+      <verb name="generate" default="1"/>
     </verbs>
     <body>
-      <Log message="logging"/>
       <Language>
         <Generate 
             generator="/producer/navigation.template" 
     </body>
   </producer>
   
-  <producer name="topics">
+  <producer name="topicpages">
     <verbs>
       <verb name="new">
-        <Set key="pages" value="1 + 1 -2 * 3 + 4 * ( 5+6 ) - 40 + 2"/>
+        <Set key="pages" value="3"/>
       </verb>
       <verb name="all">
         <Set key="pages" value="-1"/>
     </verbs>
     <body>
       <Enumerate key="topic" table="topic">
-        <List key="data.special" table="content" 
+        <List key="special" table="content" 
           selection="is_published='1' and to_article_type = ${articletype.topicspecial} and id in (select content_id from content_x_topic where topic_id = ${topic.id})"
           order = "webdb_create desc, date desc" limit="1"/>
       
-        <Batch key="data.contentlist" infokey="batch" table="content" 
+        <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}) 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"/>
-            <Generate 
-                generator="/producer/topiclist.template" 
-                destination="${config.storageRoot}/${topic.filename}/${filename}.shtml"/>
+            <Language>
+              <Set key="filename" value="topic.filename ++ batch.current.identifier"/>
+              <Generate 
+                  generator="/producer/topicpage.template" 
+                  destination="${config.storageRoot}/${pathprefix}/${topic.filename}/${filename}.shtml"/>
+            </Language>
           </batches>
           <batchlist>
           </batchlist>
     </body>
   </producer>
   
+  <producer name="archive">
+    <verbs>
+      <verb name="new">
+        <Set key="pages" value="3"/>
+      </verb>
+      <verb name="all">
+        <Set key="pages" value="-1"/>
+      </verb> 
+    </verbs>
+    <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})"
+               order="webdb_create asc">
+          <batches>
+            <Language>
+              <Set key="filename" value="archive ++ batch.current.identifier"/>
+              <Generate 
+                  generator="/producer/archive.template" 
+                  destination="${config.storageRoot}/${pathprefix}/archive/${filename}.shtml"/>
+            </Language>
+          </batches>
+          <batchlist>
+          </batchlist>
+        </Batch>
+    </body>
+  </producer>
+
   <producer name="startpage">
     <verbs>
-      <verb name="new"/>
+      <verb name="generate" default="1" description="Generates the startpage"/>
     </verbs>
 
     <body>
         selection="is_published=true and to_article_type=${articletype.startspecial}"
         order="webdb_create desc, date desc"/>
                                         
-      <List key="data.features" table="content" limit="10 12" 
+      <List key="features" table="content" limit="10 12" 
         selection="is_published=true and to_article_type=${articletype.feature}"
         order="webdb_create desc, date desc"/>
-      <List key="data.newswire" table="content" limit="30"
+
+      <List key="newswire" table="content" limit="30"
         selection="is_published=true and to_article_type=${articletype.newswire}"
         order="webdb_create desc, date desc"/>
-         
-      <Generate 
-          generator="/producer/startpage.template" 
-          destination="${config.storageRoot}/index.shtml"/>
+        
+      <Language>
+        <Generate 
+            generator="/producer/startpage.template" 
+            destination="${config.storageRoot}/${pathprefix}/index.shtml"/>
+      </Language>
     </body>
   </producer>  
   
index abd53fd..158655d 100755 (executable)
+
+
 <html>
-<head>
-<title>${lang("producer.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">
-</head>
+  <head>
+    <title>${lang("producer.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">
+  </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">
-            <img src="images/mirlogo.jpg" width="150" height="205">
-          </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 colspan="3">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr> 
-                <td valign="top">
-                  <img src="images/mirfont.gif" width="600" height="68">
-                </td>
-              </tr>
-            </table>
-                       </td>
-        </tr>
-        <tr bgcolor="#000000"> 
-          <td colspan="3" height="1"><img src="images/1pixel.gif" width="1" height="1"></td>
-        </tr>
-        <tr> 
-          <td align="left" valign="top"> 
-            <table width="457" border="0" cellpadding="0" cellspacing="2" height="100%">
-              <tr> 
-                <td width="457" valign="top"> 
-               <!--- start-special ---> 
-               <list data.startspecial as s> 
-                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr> 
-                      <td> 
-                        <h3>${s.title}</h3>
-                        <h4><i>${s.creator}, ${s.webdb_create_formatted}</i></h4>
-                        <p>                     
-                        <if s.to_media_audio > 
-                          <img src="/img/${s.to_media_audio[0]["big_icon"]}">
-                        </if> 
-                        <if s.to_media_video > 
-                          <img src="/img/${s.to_media_video[0]["big_icon"]}">
-                        </if> 
-                        <if s.to_media_other > 
-                          <img src="/img/${s.to_media_other[0]["big_icon"]}">
-                        </if> 
-                        <p>
-                        <if s.to_media_images >
-                          <img src="${s.to_media_images[0]["icon_path"]}"
-                            width="${s.to_media_images[0]["icon_width"]}"
-                            height="${s.to_media_images[0]["icon_height"]}"
-                            border=0 alt="${s.to_media_images[0]["title"]}">
-                        </if> 
-                       ${s.description_parsed} </p>
-                        <p align="right">[<a href="${config["Producer.DocRoot"]}${s.publish_path}${s.id}.shtml">read</a>]</p>
-                      </td>
-                    </tr>
-                  </table>
-                  </list> 
-                 <!--- start-special ---> 
-                 <br>
-                  <!--- features ---> 
-                 <list data.features 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>
-          <td width=1 bgcolor="#000000">
-            <img src="images/1pixel.gif" width="1" height="1">
-         </td>
-          <td width="150" bgcolor="#666666" valign="top" align="left"> 
-            <table width="150" border="0" cellspacing="2" cellpadding="0">
-              <tr> 
-                <td> 
-                 <!-- newswire --> 
-                  <p> 
-                   <list data.newswire as n>
-                   <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>
-                    <br>
-                    </list> 
-                   <!-- newswire -->
-                  </p>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
+  <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">
+                <img src="images/mirlogo.jpg" width="150" height="205">
+              </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 colspan="3">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                  <tr> 
+                    <td valign="top">
+                      <img src="images/mirfont.gif" width="600" height="68">
+                    </td>
+                  </tr>
+                </table>
+                           </td>
+            </tr>
+            <tr bgcolor="#000000"> 
+              <td colspan="3" height="1"><img src="images/1pixel.gif" width="1" height="1"></td>
+            </tr>
+            <tr> 
+              <td align="left" valign="top"> 
+                <table width="457" border="0" cellpadding="0" cellspacing="2" height="100%">
+                  <tr> 
+                    <td width="457" valign="top"> 
+                      <!--- start-special ---> 
+                      <list data.startspecial as s> 
+                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                          <tr> 
+                            <td> 
+                              <h3>${s.title}</h3>
+                              <h4><i>${s.creator}, ${s.webdb_create_formatted}</i></h4>
+                              <p>                       
+                              <if s.to_media_audio > 
+                                <img src="/img/${s.to_media_audio[0]["big_icon"]}">
+                              </if> 
+                              <if s.to_media_video > 
+                                <img src="/img/${s.to_media_video[0]["big_icon"]}">
+                              </if> 
+                              <if s.to_media_other > 
+                                <img src="/img/${s.to_media_other[0]["big_icon"]}">
+                              </if> 
+                              <p>
+                              <if s.to_media_images >
+                                <img src="${s.to_media_images[0]["icon_path"]}"
+                                  width="${s.to_media_images[0]["icon_width"]}"
+                                  height="${s.to_media_images[0]["icon_height"]}"
+                                  border=0 alt="${s.to_media_images[0]["title"]}">
+                              </if> 
+                              ${s.description_parsed} </p>
+                              <p align="right">[<a href="${config["Producer.DocRoot"]}${s.publish_path}${s.id}.shtml">read</a>]</p>
+                            </td>
+                          </tr>
+                        </table>
+                      </list> 
+                      <!--- start-special ---> 
+                      <br>
+                      <!--- features ---> 
+                      <list data.features 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>
+              <td width=1 bgcolor="#000000">
+                 <img src="images/1pixel.gif" width="1" height="1">
+               </td>
+              <td width="150" bgcolor="#666666" valign="top" align="left"> 
+                <table width="150" border="0" cellspacing="2" cellpadding="0">
+                  <tr> 
+                    <td> 
+                                 <!-- newswire --> 
+                                  <p> 
+                                   <list data.newswire as n>
+                            <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>
+                          <br>
+                                    </list> 
+                                   <!-- newswire -->
+                      </p>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </body>
 </html>
diff --git a/templates-dist/producer/topiclist.template b/templates-dist/producer/topiclist.template
deleted file mode 100755 (executable)
index 99709d1..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<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>
-
-<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>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/templates-dist/producer/topicpage.template b/templates-dist/producer/topicpage.template
new file mode 100755 (executable)
index 0000000..99709d1
--- /dev/null
@@ -0,0 +1,127 @@
+<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>
+
+<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>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/templates-dist/producer/wap.template b/templates-dist/producer/wap.template
deleted file mode 100755 (executable)
index e435066..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-
-<indy>
-       <wap>
-               <breakingnews>
-                       <list breaking as b>
-      <breakingitem>
-        <id>${b.id}</id>
-                               <date>${b.webdb_create_formatted}</date>
-                               <content>${b.text}</content>
-                       </breakingitem>
-      </list>
-               </breakingnews>
-       </wap>
-</indy>
diff --git a/templates-dist/producer/wml2.xsl b/templates-dist/producer/wml2.xsl
deleted file mode 100755 (executable)
index 3787604..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output
-                  method="xml"
-                  encoding="iso-8859-1"
-                  omit-xml-declaration="yes"
-                  doctype-public="-//WAPFORUM//DTD WML 1.1//EN"
-                  doctype-system="http://www.wapforum.org/DTD/wml_1.1.xml"
-                  media-type="text/vnd.wap.wml"/>
-<xsl:template match="/">
-
-<wml>
-<!--
-<xsl:text>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-</xsl:text>
--->
-
-       <card title="indymedia" id="card1">
-               <p align="center">
-               <strong>CASTOR STOPPEN!</strong>
-               </p>
-               <p align="center">
-               de.indymedia.org
-               </p>
-               <p align="center">
-               <a href="#card2" title="news">NEWS</a>
-               </p>
-       </card>
-
-
-       <card id="card2" title="news">
-                       <p align="center">
-                       <strong>Breaking News</strong>
-                       </p>
-               <xsl:for-each select="//breakingitem">
-                       <p align="center">
-                       <xsl:value-of select="date"/>
-                       </p>
-                       <p aligen="left">
-                       <xsl:value-of select="content"/>
-                       </p>
-               </xsl:for-each>
-       </card>
-</wml>
-</xsl:template>
-</xsl:stylesheet>
-