X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=etc%2Fproducer%2Ftopicpage.template;h=d30b89fd87de178a849d517e470baea62e5fa909;hb=63e0ee1fb8038eb6d8f0190cf38c3b3ab2727216;hp=ed357e0a5fe26de69b6f90ce5ee409c52fb2a9d7;hpb=8b91e8d8bf4a31a88440a404e83238dcf32f8f4a;p=mir.git

diff --git a/etc/producer/topicpage.template b/etc/producer/topicpage.template
index ed357e0a..d30b89fd 100755
--- a/etc/producer/topicpage.template
+++ b/etc/producer/topicpage.template
@@ -82,31 +82,38 @@
             <br>
               <!--- topic-special ---> <comment></comment>
 				<if (batch.current.index==batch.first.index)>
-				<list special as s>
+				<list special as ss>
+		      	          <assign sorig=ss.to_original>	
+			          <if languagepreference>
+			            <assign s=ss.to_translation(languagepreference)>
+			          <else>
+			            <assign s=ss>
+			          </if>
+
                    <table width="100%" border="0" cellspacing="0" cellpadding="10" bgcolor="#eeeeee"><tr><td>
                        <p><font size="+2">
                        <a href="${config["Producer.DocRoot"]}/${language.code}/${s.date.formatted["yyyy'/'MM"]}/${s.id}.shtml"><b>${s.title}</b></a>
                        </font><br>
-                          <font size="-2">${s.creator}, ${s.creationdate.formatted["dd-MM-yyyy - HH:mm"]}</font></p>
+                          <font size="-2">${sorig.creator} <if sorig.id!=s.id>(${lang("general.translatedby", s.creator)})</if><if s.creator || sorig.creator>, </if> ${sorig.creationdate.formatted["dd-MM-yyyy - HH:mm"]}</font></p>
                        <p><font size="-1">
-                        <if s.to_media_audio >
+                        <if sorig.to_media_audio >
                           <img align="left" vspace="4" hspace="8"
-                            src="${config["Producer.DocRoot"]}/img/${s.to_media_audio[0]["big_icon"]}">
+                            src="${config["Producer.DocRoot"]}/img/${sorig.to_media_audio[0]["big_icon"]}">
                         </if>
-                        <if s.to_media_video >
+                        <if sorig.to_media_video >
                           <img align="left" vspace="4" hspace="8"
-                            src="${config["Producer.DocRoot"]}/img/${s.to_media_video[0]["big_icon"]}">
+                            src="${config["Producer.DocRoot"]}/img/${sorig.to_media_video[0]["big_icon"]}">
                         </if>
-                        <if s.to_media_other >
+                        <if sorig.to_media_other >
                           <img align="left" vspace="4" hspace="8"
-                             src="${config["Producer.DocRoot"]}/img/${s.to_media_other[0]["big_icon"]}">
+                             src="${config["Producer.DocRoot"]}/img/${sorig.to_media_other[0]["big_icon"]}">
                         </if>
-                        <if s.to_media_images >
+                        <if sorig.to_media_images >
                           <img align="left" vspace="4" hspace="8"
-                            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"]}">
+                            src="${sorig.to_media_images[0]["icon_path"]}"
+                            width="${sorig.to_media_images[0]["icon_width"]}"
+                            height="${sorig.to_media_images[0]["icon_height"]}"
+                            border=0 alt="${sorig.to_media_images[0]["title"]}">
                         </if>
                         ${s.description_parsed}
                     <br clear="all">
@@ -119,30 +126,37 @@
               <!--- /topic-special --->
 
               <!--- articles ---> <comment></comment>
-                <list articles as i>
+                <list articles as a>
+		  <assign aorig=a.to_original>
+	        <if languagepreference>
+        	  <assign i=a.to_translation(languagepreference)>
+	        <else>
+        	  <assign i=a>
+	        </if>
+
                   <p><font size="+1">
                   <a href="${config["Producer.DocRoot"]}/${language.code}/${i.date.formatted["yyyy'/'MM"]}/${i.id}.shtml"><b>${i.title}</b></a>
                   </font><br>
-                     <font size="-2">${i.creator}, ${i.creationdate.formatted["dd-MM-yyyy - HH:mm"]}</font></p>
+                     <font size="-2">${aorig.creator} <if aorig.id!=i.id>(${lang("general.translatedby", i.creator)})</if><if i.creator || aorig.creator>, </if> ${aorig.creationdate.formatted["dd-MM-yyyy - HH:mm"]}</font></p>
                   <p><font size="-1">
-                  <if i.to_media_audio >
+                  <if aorig.to_media_audio >
                   <img align="left" vspace="4" hspace="8"
-                       src="${config["Producer.DocRoot"]}/img/${i.to_media_audio[0]["big_icon"]}">
+                       src="${config["Producer.DocRoot"]}/img/${aorig.to_media_audio[0]["big_icon"]}">
                   </if>
-                  <if i.to_media_video >
+                  <if aorig.to_media_video >
                   <img align="left" vspace="4" hspace="8"
-                       src="${config["Producer.DocRoot"]}/img/${i.to_media_video[0]["big_icon"]}">
+                       src="${config["Producer.DocRoot"]}/img/${aorig.to_media_video[0]["big_icon"]}">
                   </if>
-                  <if i.to_media_other >
+                  <if aorig.to_media_other >
                   <img align="left" vspace="4" hspace="8"
-                       src="${config["Producer.DocRoot"]}/img/${i.to_media_other[0]["big_icon"]}">
+                       src="${config["Producer.DocRoot"]}/img/${aorig.to_media_other[0]["big_icon"]}">
                   </if>
-                  <if i.to_media_images >
+                  <if aorig.to_media_images >
                   <img align="left" vspace="4" hspace="8"
-                       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"]}">
+                       src="${aorig.to_media_images[0]["icon_path"]}"
+                       width="${aorig.to_media_images[0]["icon_width"]}"
+                       height="${aorig.to_media_images[0]["icon_height"]}"
+                       border=0 alt="${aorig.to_media_images[0]["title"]}">
                   </if>
                   ${i.description_parsed}
                   <br clear="all">