*** empty log message ***

diff --git a/etc/producer/article.template b/etc/producer/article.template
index cd4a12d..f306eb0 100755 (executable)
--- a/etc/producer/article.template
+++ b/etc/producer/article.template
@@ -25,43 +25,7 @@
          <meta name="keywords" content="other"></meta>
       </if>
    </if>
-   <link rel="stylesheet" type="text/css" href="http://sarai.indymedia.org/~patrick/mir.nyc/css/main.css" />
-   <script language="javascript">
-  function addToNewsletter(id){
-    var previousValue=getCookie("myNewsletter");
-    document.cookie="myNewsletter="+previousValue+","+id + ";path=/";
-    alert("Added article id to cookie!");
-  }
-
-  function clearNewsletter(){
-                document.cookie="myNewsletter= ;path=/";
-                alert("newsletter erased!");
-        }
-
-  function getNewsletter(){
-    var cookieValue=getCookie("myNewsletter");
-    if (document.images)
-        location.replace('${config["Producer.OpenAction"]}?do=getpdf&id='+cookieValue+'&forIE=.pdf');
-    else
-        location.href = '${config["Producer.OpenAction"]}?do=getpdf&id='+cookieValue+'&forIE=.pdf';
-  }
-
-  function getCookie(name){
-
-          var cookies = document.cookie;
-
-          if (cookies.indexOf(name) != -1){
-                  var startpos = cookies.indexOf(name)+name.length+1;
-                  var endpos = cookies.indexOf(";",startpos)-1;
-                  if (endpos == -2) endpos = cookies.length;
-                  return unescape(cookies.substring(startpos,endpos));
-          }
-          else{
-                  return false; // the cookie couldn't be found! it was never set before, or it expired.
-          }
-  }
-
-   </script>
+   <!--#include virtual="/${language.code}/head.article.html" -->
 
 </head>
 
@@ -69,12 +33,12 @@
 
 <!--#include virtual="/${language.code}/navigation.html" -->
 
-<!--#include virtual="/languagebar/${article.to_original.date.formatted.yyyy}/${article.to_original.date.formatted.MM}/${article.to_original.id}.html" -->
 
          <div class="headlineWrap">
-            <span class="date"><if article.creator || article.to_original.creator>, 
-            </if>${article.to_original.creationdate.formatted["MMMM dd, yyyy hh:mma z"]}</span>
+            <span class="date">${article.to_original.creationdate.formatted["MMMM dd, yyyy hh:mma z"]}</span>
             <span class="addTranslation"><a href="${config.openAction}?do=opensession&sessiontype=translation&to_content=${article.to_original.id}">${lang("general.addtranslation")}</a></span>
+            <span class="languagebar"><!--#include virtual="/languagebar/${article.to_original.date.formatted.yyyy}/${article.to_original.date.formatted.MM}/${article.to_original.id}.html" --></span>
+
          <div>
 
          <p class="headline">
@@ -83,35 +47,17 @@
          <p class="lead">
             ${article.subtitle}
          </p>
-
-         <div class="articleDetails">
-               <p class="author">
-               by ${article.to_original.creator}
-            </p>
-               <p class="publisher">
-               [Published by ${general.authoredby}]
+       <p class="author">
+            ${general.authoredby} ${article.to_original.creator}
+               <span class="translation">
                <if article.to_original.id!=article.id>
-                  [(${lang("general.translatedby", article.creator)})]
+                  | ${lang("general.translatedby", article.creator)}
                </if>
-            </p>
-
-               <p class="email">
-               email [at] domain.com
-            </p>
-               <p class="url">
-               <a href="#">domain.com</a>
-            </p>
-               <p class="phone">
-               (212) 555-1212
-            </p>
-               <p class="address">
-               0000 Main ST, NY, NY 10012
-            </p>
-   
-            <blockquote class="summary">
-               ${article.description_parsed}
-            </blockquote>
-         </div>
+            </span>
+         </p>
+         <blockquote class="summary">
+            ${article.description_parsed}
+         </blockquote>
 
          <p class="keywords">
             Keywords: 
@@ -157,17 +103,24 @@
             ${article.content_data_parsed}
          </div>
 
+
+               <p class="phone">
+               (212) 555-1212
+            </p>
+               <p class="address">
+               0000 Main ST, NY, NY 10012
+            </p>
+   
+
          <if article.creator_main_url || article.creator_email>
-            <if article.creator_email>
-               <p>
-                  <img src="/img/mail_small.gif" width="12" height="10" border="0" alt="-"> ${lang("article.email.prefix")}: <a href="mailto:${article.creator_email}">${article.creator_email}</a>
-               </p>
-            </if>
-            <if article.creator_main_url>
-               <p>
-                  <img src="/img/link_small.gif" width="12" height="10" border="0" alt=""> ${lang("article.homepage.prefix")}: <a href="${article.creator_main_url}" target="extern">${article.creator_main_url}</a>
-               </p>
-            </if>
+            <p class="contactWrap">
+               <if article.creator_email>
+                  <span class="email"><a href="mailto:${article.creator_email}">${article.creator_email}</a></span>
+               </if>
+               <if article.creator_main_url>
+                  <span class="url"><a href="${article.creator_main_url}" target="extern">${article.creator_main_url}</a></span>
+               </if>
+            </p>
          </if>
             
          <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.id}&forIE=.pdf">${lang("article.get_as_pdf")}</a>&#160;|
@@ -175,8 +128,11 @@
          <a href="javascript:getNewsletter()">${lang("article.newsletter_checkout")}</a>&#160;|
          <a href="${config["Producer.OpenAction"]}?do=mail&mail_aid=${article.id}&mail_language=${language.code}">${lang("article.send_as_email")}</a>&#160;|
 
-         <a href="${config["Producer.OpenAction"]}?do=opensession&sessiontype=comment&to_media=${article.to_original.id}&language=${language.code}">${lang("article.addcomment")}</a>
-         
+         <div class="commentAdd">
+            <p>
+               <a href="${config["Producer.OpenAction"]}?do=opensession&sessiontype=comment&to_media=${article.to_original.id}&language=${language.code}">${lang("article.addcomment")}</a>
+            </p>
+         </div>         
 
          <div class="commentWrap">
             <if article.to_original.to_comments>
@@ -218,35 +174,33 @@
                         </table>
                      </if>
 
-                     <div class="mediaWrap">
-                        <list c.to_media_audio as media>
-                           <div class="audioWrap">
-                              <img src="/img/${media["big_icon"]}" />
-                              <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
-                           </div>
-                        </list>
-                        <list c.to_media_video as media>
-                           <div class="videoWrap">
-                              <img src="/img/${media["big_icon"]}" />
-                              <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
-                           </div>
-                        </list>
-                        <list c.to_media_other as media>
-                           <div class="otherWrap">
-                              <img src="/img/${media["big_icon"]}" />
-                              <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
-                           </div>
-                        </list>
-                        
-                        <list c.to_media_images as image>
-                           <div class="imageWrap">
-                              <img src="${image["publish_server"]}${image["publish_path"]}" class="commentImage" width="${image["img_width"]}" height="${image["img_height"]}" alt="${image["title"]}" />
-                              <p class="caption">
-                                 ${image["title"]}
-                              </p>
-                           </div>
-                        </list>
-                     </div>
+                     <list c.to_media_audio as media>
+                        <div class="audioWrap">
+                           <img src="/img/${media["big_icon"]}" />
+                           <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
+                        </div>
+                     </list>
+                     <list c.to_media_video as media>
+                        <div class="videoWrap">
+                           <img src="/img/${media["big_icon"]}" />
+                           <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
+                        </div>
+                     </list>
+                     <list c.to_media_other as media>
+                        <div class="otherWrap">
+                           <img src="/img/${media["big_icon"]}" />
+                           <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
+                        </div>
+                     </list>
+                     
+                     <list c.to_media_images as image>
+                        <div class="imageWrap">
+                           <img src="${image["publish_server"]}${image["publish_path"]}" class="commentImage" width="${image["img_width"]}" height="${image["img_height"]}" alt="${image["title"]}" />
+                           <p class="caption">
+                              ${image["title"]}
+                           </p>
+                        </div>
+                     </list>
 
                      <p class="body">
                         ${c.description_parsed}