data. and config. stuff

diff --git a/templates-dist/producer/content.template b/templates-dist/producer/content.template
index 04fb3e6..2dd64d7 100755 (executable)
--- a/templates-dist/producer/content.template
+++ b/templates-dist/producer/content.template
@@ -3,16 +3,16 @@
 <title>mir.indymedia.de: ${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 content.to_media_images>
+                       <if data.content.to_media_images>
                 <meta name="keywords" content="images"></meta>
                        </if>
-                       <if content.to_media_audio>
+                       <if data.content.to_media_audio>
                 <meta name="keywords" content="audio"></meta>
                        </if>
-                       <if content.to_media_video>
+                       <if data.content.to_media_video>
                 <meta name="keywords" content="video"></meta>
                        </if>
-                       <if content.to_media_other>
+                       <if data.content.to_media_other>
                 <meta name="keywords" content="other"></meta>
                        </if>
 </head>
@@ -24,7 +24,7 @@
       <table width="150" border="0" cellspacing="0" cellpadding="0">
         <tr> 
           <td width="140">
-            <a href="${config.productionhost}${config.docroot}">
+            <a href="${data.config.productionhost}${config.docroot}">
              <img src="/images/mirlogo.jpg" width="150" height="205" border="0">
             </a>
           </td>
@@ -64,42 +64,42 @@
                   <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr> 
                       <td> 
-                        <h2>${content.title}</h2>
-                        <h4><i>${content.creator}, ${content.webdb_create_formatted}</i></h4>
-                        <p><b>${content.description}</b>
+                        <h2>${data.content.title}</h2>
+                        <h4><i>${data.content.creator}, ${data.content.webdb_create_formatted}</i></h4>
+                        <p><b>${data.content.description}</b>
                        <!-- media -->
-                       <list content.to_media_audio as media>
+                       <list data.content.to_media_audio as media>
                        <p>
                             ${media["url"]}
                        </p>
             </list>
-                       <list content.to_media_video as media>
+                       <list data.content.to_media_video as media>
                        <p>
                             ${media["url"]}
                        </p>
                        </list>
-                       <list content.to_media_other as media>
+                       <list data.content.to_media_other as media>
                        <p>
                             ${media["url"]}
                        </p>
                        </list>
-                       <list content.to_media_images as media>
+                       <list data.content.to_media_images as media>
                        <p> I
                             ${media["url"]}
                        </p>
                        </list>
                        <!-- media -->
-                       <p>${content.content_data}</p>
+                       <p>${data.content.content_data}</p>
                        <if content.creator_main_url || 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="-"> eMail: <a href="mailto:${content.creator_email}">${content.creator_email}</a><br>
+                            <img src="/images/mail_small.gif" width="12" height="10" border="0" alt="-"> 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=""> Homepage: <a href="${content.creator_main_url}" target="extern">${content.creator_main_url}</a><br>
+                            <img src="/images/link_small.gif" width="12" height="10" border="0" alt=""> Homepage: <a href="${data.content.creator_main_url}" target="extern">${data.content.creator_main_url}</a><br>
                             </if>
                             </font>
                            </td>
@@ -110,11 +110,11 @@
                     </tr>
                     <tr><td>&nbsp;</td></tr>
                     <tr>
-                      <td><a href="${config.openaction}?do=addcomment&aid=${content.id}">
+                      <td><a href="${config.openAction}?do=addcomment&aid=${data.content.id}">
                           Make a quick comment on this article</a>
                       </td>                
                     </tr>
-                    <if content.to_comments>
+                    <if data.content.to_comments>
                     <list content.to_comments as c>
                     <tr>
                        <td>

diff --git a/templates-dist/producer/navigation.template b/templates-dist/producer/navigation.template
index dcf843c..4e0a34c 100755 (executable)
--- a/templates-dist/producer/navigation.template
+++ b/templates-dist/producer/navigation.template
@@ -1,8 +1,8 @@
                   <p> 
                     <!-- topiclist --> 
-                    <list topics as t> 
+                    <list data.topics as t> 
                     <br>
-                    <a href="${config.docroot}/${t.filename}.shtml"><b>${t.title}</b></a> 
+                    <a href="${config.producerDocRoot}/${t.filename}.shtml"><b>${t.title}</b></a> 
                     </list> 
                     <!-- topiclist --> 
                   </p>
@@ -11,7 +11,7 @@
                     <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.openaction}?do=addposting">publish</a>
+                    <a href="${config.openAction}?do=addposting">publish</a>
                   </p>
                   <hr noshade width="146" size="1" align="left"> 
                   <p class="small">

diff --git a/templates-dist/producer/openposting.template b/templates-dist/producer/openposting.template
index 577490d..35ae1f3 100755 (executable)
--- a/templates-dist/producer/openposting.template
+++ b/templates-dist/producer/openposting.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>mir.indymedia.de: ${topic.title}</title>
+<title>mir.indymedia.de: ${data.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>
@@ -12,7 +12,7 @@
       <table width="150" border="0" cellspacing="0" cellpadding="0">
         <tr> 
           <td width="140">
-             <a href="${config.productionhost}${config.docroot}">
+             <a href="${config.productionHost}${config.producerDocRoot}">
              <img src="images/mirlogo.jpg" width="150" height="205" border="0">
              </a>
           </td>
@@ -46,12 +46,12 @@
         </tr>
         <tr> 
           <td align="left" valign="top">
-            <h2> ${title}</h2> 
+            <h2> ${data.title}</h2> 
             <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
               <tr> 
                 <td width="100%" valign="top"> 
                   <!--- articles ---> 
-                  <list contentlist as i> 
+                  <list data.contentlist as i> 
                   <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr> 
                       <td> 
@@ -72,7 +72,7 @@
                           ${i.to_media_images[0]["list"]}
                       </if> 
                          ${i.description}</p>
-                        <p align="right">[<a href="${config.docroot}${i.publish_path}${i.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config.producerDocRoot}${i.publish_path}${i.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>

diff --git a/templates-dist/producer/startpage.template b/templates-dist/producer/startpage.template
index d5f4bc7..2fb51f7 100755 (executable)
--- a/templates-dist/producer/startpage.template
+++ b/templates-dist/producer/startpage.template
@@ -50,7 +50,7 @@
               <tr> 
                 <td width="457" valign="top"> 
                <!--- start-special ---> 
-               <list startspecial as s> 
+               <list data.startspecial as s> 
                   <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr> 
                       <td> 
@@ -71,7 +71,7 @@
                           ${s.to_media_images[0]["list"]}
                         </if> 
                        ${s.description} </p>
-                        <p align="right">[<a href="${config.docroot}${s.publish_path}${s.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config.producerDocRoot}${s.publish_path}${s.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>
@@ -100,7 +100,7 @@
                           ${i.to_media_images[0]["list"]}
                         </if> 
                           ${i.description} </p>
-                        <p align="right">[<a href="${config.docroot}${i.publish_path}${i.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config.producerDocRoot}${i.publish_path}${i.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>
@@ -120,10 +120,10 @@
                 <td> 
                  <!-- newswire --> 
                   <p> 
-                   <list newswire as n>
+                   <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.docroot}${n.publish_path}${n.id}.shtml"><b>${n.title}</b></a><br>
+                    <a href="${config.producerDocRoot}${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> 

diff --git a/templates-dist/producer/topiclist.template b/templates-dist/producer/topiclist.template
index 1b75e66..ff2c000 100755 (executable)
--- a/templates-dist/producer/topiclist.template
+++ b/templates-dist/producer/topiclist.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>mir.indymedia.de: ${topic.title}</title>
+<title>mir.indymedia.de: ${data.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>
@@ -12,7 +12,7 @@
       <table width="150" border="0" cellspacing="0" cellpadding="0">
         <tr> 
           <td width="140">
-             <a href="${config.productionhost}${config.docroot}">
+             <a href="${config.productionHost}${config.producerDocRoot}">
              <img src="images/mirlogo.jpg" width="150" height="205" border="0">
              </a>
           </td>
@@ -46,40 +46,40 @@
         </tr>
         <tr> 
           <td align="left" valign="top">
-            <h2> ${topic.title}</h2> 
+            <h2> ${data.topic.title}</h2> 
             <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
               <tr> 
                 <td width="100%" valign="top"> 
                 <!--- start-special ---> 
-                  <if special> 
+                  <if data.special> 
                   <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr> 
                       <td> 
-                        <h3>${special.title}</h3>
-                        <h4><i>${special.creator}, ${special.webdb_create_formatted}</i></h4>
+                        <h3>${data.special.title}</h3>
+                        <h4><i>${data.special.creator}, ${data.special.webdb_create_formatted}</i></h4>
                         <p> 
-                <if special.to_media_audio && special.to_media_audio[0]["is_published"]=="1"> 
-                  ${special.to_media_audio[0]["list"]}
+                <if data.special.to_media_audio && data.special.to_media_audio[0]["is_published"]=="1"> 
+                  ${data.special.to_media_audio[0]["list"]}
                 </if> 
-                                 <if special.to_media_video && special.to_media_video[0]["is_published"]=="1"> 
-                  ${special.to_media_video[0]["list"]}
+                <if data.special.to_media_video && data.special.to_media_video[0]["is_published"]=="1"> 
+                  ${data.special.to_media_video[0]["list"]}
                 </if> 
-                                 <if special.to_media_other && special.to_media_other[0]["is_published"]=="1"> 
-                  ${special.to_media_other[0]["list"]}
+                <if data.special.to_media_other && data.special.to_media_other[0]["is_published"]=="1"> 
+                  ${data.special.to_media_other[0]["list"]}
                 </if> 
                 <p>
-                                 <if special.to_media_images && special.to_media_images[0]["is_published"]=="1"> 
-                  ${special.to_media_images[0]["list"]}
+                <if data.special.to_media_images && data.special.to_media_images[0]["is_published"]=="1"> 
+                  ${data.special.to_media_images[0]["list"]}
                 </if> 
-                          ${special.description} </p>
-                        <p align="right">[<a href="${config.docroot}${special.publish_path}${special.id}.shtml">read</a>]</p>
+                          ${data.special.description} </p>
+                        <p align="right">[<a href="${config.producerDocroot}${data.special.publish_path}${data.special.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>
                   </if> 
                  <!--- start-special --->
                   <!--- features ---> 
-                  <list contentlist as i> 
+                  <list data.contentlist as i> 
                   <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr> 
                       <td> 
@@ -100,7 +100,7 @@
                   ${i.to_media_images[0]["list"]}
                 </if> 
                          ${i.description}</p>
-                        <p align="right">[<a href="${config.docroot}${i.publish_path}${i.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config.producerDocroot}${i.publish_path}${i.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>