data-stuff and parsed

diff --git a/templates-dist/producer/content.template b/templates-dist/producer/content.template
index 2dd64d7..e6c687e 100755 (executable)
--- a/templates-dist/producer/content.template
+++ b/templates-dist/producer/content.template
@@ -66,7 +66,7 @@
                       <td> 
                         <h2>${data.content.title}</h2>
                         <h4><i>${data.content.creator}, ${data.content.webdb_create_formatted}</i></h4>
-                        <p><b>${data.content.description}</b>
+                        <p><b>${data.content.description_parsed}</b>
                        <!-- media -->
                        <list data.content.to_media_audio as media>
                        <p>
@@ -89,7 +89,7 @@
                        </p>
                        </list>
                        <!-- media -->
-                       <p>${data.content.content_data}</p>
+                       <p>${data.content.content_data_parsed}</p>
                        <if content.creator_main_url || content.creator_email>
                         <table width="100%" bgcolor="#FFFFFF">
                         <tr>

diff --git a/templates-dist/producer/startpage.template b/templates-dist/producer/startpage.template
index 26b04d2..b213238 100755 (executable)
--- a/templates-dist/producer/startpage.template
+++ b/templates-dist/producer/startpage.template
@@ -70,7 +70,7 @@
                         <if s.to_media_images && s.to_media_images[0]["is_published"]=="1"> 
                           ${s.to_media_images[0]["list"]}
                         </if> 
-                       ${s.description} </p>
+                       ${s.description_parsed} </p>
                         <p align="right">[<a href="${config.producerDocRoot}${s.publish_path}${s.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
@@ -79,7 +79,7 @@
                  <!--- start-special ---> 
                  <br>
                   <!--- features ---> 
-                 <list features as i> 
+                 <list data.features as i> 
                   <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr> 
                       <td> 
@@ -99,7 +99,7 @@
                         <if i.to_media_images && i.to_media_images[0]["is_published"]=="1"> 
                           ${i.to_media_images[0]["list"]}
                         </if> 
-                          ${i.description} </p>
+                          ${i.description_parsed} </p>
                         <p align="right">[<a href="${config.producerDocRoot}${i.publish_path}${i.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
@@ -120,7 +120,7 @@
                 <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.producerDocRoot}${n.publish_path}${n.id}.shtml"><b>${n.title}</b></a><br>

diff --git a/templates-dist/producer/topiclist.template b/templates-dist/producer/topiclist.template
index f7f8ad7..769bea2 100755 (executable)
--- a/templates-dist/producer/topiclist.template
+++ b/templates-dist/producer/topiclist.template
@@ -51,35 +51,35 @@
               <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"]}
+                  ${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"]}
+                  ${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"]}
+                  ${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"]}
+                  ${data.special.to_media_images[0]["list"]}
                 </if> 
-                          ${special.description} </p>
-                        <p align="right">[<a href="${config.producerDocroot}${special.publish_path}${special.id}.shtml">read</a>]</p>
+                          ${data.special.description_parsed} </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> 
@@ -99,7 +99,7 @@
                                  <if i.to_media_images && i.to_media_images[0]["is_published"]=="1"> 
                   ${i.to_media_images[0]["list"]}
                 </if> 
-                         ${i.description}</p>
+                         ${i.description_parsed}</p>
                         <p align="right">[<a href="${config.producerDocroot}${i.publish_path}${i.id}.shtml">read</a>]</p>
                       </td>
                     </tr>