From: patrick <patrick>
Date: Thu, 4 Aug 2005 22:42:53 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=29001aa98998d460e9469dbc2a6c23711d6174b9;p=nyc.indymedia.org.git

*** empty log message ***
---

diff --git a/etc/producer/article.template b/etc/producer/article.template
index 4045325..cd4a12d 100755
--- a/etc/producer/article.template
+++ b/etc/producer/article.template
@@ -5,26 +5,26 @@
    "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
-    <title>${config["Mir.Name"]} | ${article.title}</title>
-  <meta name="keywords" content="indymedia,imc">
-  <meta name="description" content="indymedia,imc">
-  <meta http-equiv="expires" content="599">
-  <meta http-equiv="pragma" content="no-cache">
-  <if article.mediacount!=0>
-    <if article.to_media_images>
-      <meta name="keywords" content="images"></meta>
-    </if>
-    <if article.to_media_audio>
-      <meta name="keywords" content="audio"></meta>
-    </if>
-    <if article.to_media_video>
-      <meta name="keywords" content="video"></meta>
-    </if>
-    <if article.to_media_other>
-      <meta name="keywords" content="other"></meta>
-    </if>
-  </if>
+   <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
+   <title>${config["Mir.Name"]} | ${article.title}</title>
+   <meta name="keywords" content="indymedia,imc">
+   <meta name="description" content="indymedia,imc">
+   <meta http-equiv="expires" content="599">
+   <meta http-equiv="pragma" content="no-cache">
+   <if article.mediacount!=0>
+      <if article.to_media_images>
+         <meta name="keywords" content="images"></meta>
+      </if>
+      <if article.to_media_audio>
+         <meta name="keywords" content="audio"></meta>
+      </if>
+      <if article.to_media_video>
+         <meta name="keywords" content="video"></meta>
+      </if>
+      <if article.to_media_other>
+         <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){
@@ -69,21 +69,20 @@
 
 <!--#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"-->
+<!--#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="addTranslation"><a href="${config.openAction}?do=opensession&sessiontype=translation&to_content=${article.to_original.id}">${lang("general.addtranslation")}</a></span>
+         <div>
 
-<p>
-   <a href="${config.openAction}?do=opensession&sessiontype=translation&to_content=${article.to_original.id}">${lang("general.addtranslation")}</a>
-</p>
-
-<h2>Allo Mum</h2>
-
-            <p class="headline">
-               <b>${article.title}</b>
-            </p>
-            <p class="lead">
-               ${article.subtitle}
-            </p>
+         <p class="headline">
+            <b>${article.title}</b>
+         </p>
+         <p class="lead">
+            ${article.subtitle}
+         </p>
 
          <div class="articleDetails">
          	<p class="author">
@@ -95,9 +94,7 @@
                   [(${lang("general.translatedby", article.creator)})]
                </if>
             </p>
-         	<p class="date">
-               <if article.creator || article.to_original.creator>, </if>${article.to_original.creationdate.formatted["MMM dd. yyyy HH:mm"]}
-            </p>
+
          	<p class="email">
                email [at] domain.com
             </p>
@@ -110,142 +107,155 @@
          	<p class="address">
                0000 Main ST, NY, NY 10012
             </p>
-            <p class="keywords">
-               Keywords: 
-               <list topics as t>
-                  <a href="${config["Producer.DocRoot"]}/${language.code}/${t.filename}/archive.html">${t.title}</a>,
-               </list>
    
             <blockquote class="summary">
                ${article.description_parsed}
             </blockquote>
          </div>
 
-
-
-        <if article.to_original.mediacount!=0>
-          <!-- media -->
-          <list article.to_original.to_media_audio as media>
-          <p>
-                  <img src="/img/${media["big_icon"]}" border="0" alt="">&nbsp;
-                  <a href="${media["publish_server"]}${media["publish_path"]}">
-          ${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}
-          </a>
-          </p>
-          </list>
-
-          <list article.to_original.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["media_descr"]} ${media["human_readable_size"]}</a>
-          </p>
-          </list>
-
-          <list article.to_original.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["media_descr"]} ${media["human_readable_size"]}</a>
-          </p>
-          </list>
-
-          <list article.to_original.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>
-                </if>
-
-
-            <div class="body">
-               ${article.content_data_parsed}
-            </div>
+         <p class="keywords">
+            Keywords: 
+            <list topics as t>
+               <a href="${config["Producer.DocRoot"]}/${language.code}/${t.filename}/archive.html">${t.title}</a>,
+            </list>
+         </p>
+         
+         <if article.to_original.mediacount!=0>
+            <!-- media -->
+            <list article.to_original.to_media_audio as media>
+               <p>
+                  <img src="/img/${media["big_icon"]}" border="0" />
+                  <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
+               </p>
+            </list>
+            
+            <list article.to_original.to_media_video as media>
+               <p>
+                  <img src="/img/${media["big_icon"]}" border="0" />
+                  <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
+               </p>
+            </list>
+            
+            <list article.to_original.to_media_other as media>
+               <p>
+                  <img src="/img/${media["big_icon"]}" border="0" />
+                  <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
+               </p>
+            </list>
+            
+            <list article.to_original.to_media_images as image>
+               <div class="imageWrap">
+                  <img src="${image["publish_server"]}${image["publish_path"]}" class="articleImage" width="${image["img_width"]}" height="${image["img_height"]}" alt="${image["title"]}" border="0" />
+                  <p class="caption">
+                     ${image["title"]}
+                  </p>
+               </div>
+            </list>
+         </if>
+
+         <div class="body">
+            ${article.content_data_parsed}
          </div>
 
-
-<if article.creator_main_url || article.creator_email>
-
+         <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>
+               <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>
+               <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>
-          </if>
-
-
-   <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.id}&forIE=.pdf">${lang("article.get_as_pdf")}</a>&#160;|
-   <a href="javascript:addToNewsletter(${article.id})">${lang("article.add_to_pdf")}</a>&#160;|
-   <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>
-
-
-          <if article.to_original.to_comments>
-              <list article.to_original.to_comments as c>
-
-
-<p>
-   ${utility.encodeHTML(c.title)}
-</p>
-
-<p>
-   ${c.creationdate.formatted["dd.MM.yyyy - HH:mm"]}
-</p>
-
-          <list c.to_media_audio as media>
-            <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
-          </list>
-          <list c.to_media_video as media>
-            <img src="/img/${media["big_icon"]}" border="0" alt="">
-            <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
-          </list>
-          <list c.to_media_other as media>
-            <img src="/img/${media["big_icon"]}" border="0" alt="">
-            <a href="${media["publish_server"]}${media["publish_path"]}">${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
-          </list>
-
-          <list c.to_media_images as image>
-            <img src="${image["publish_server"]}${image["publish_path"]}" border="0" width="${image["img_width"]}" height="${image["img_height"]}" alt="${image["title"]}"><br />
-            ${image["title"]}
-          </list>
-
-
-                <p>
-   ${c.description_parsed}
-</p>
-                <if c.email || c.main_url || c.address || c.phone || c.creator>
-                    <if c.creator>
-                      <p>
-   ${utility.encodeHTML(c.creator)}>
-</p>
-                    </if>
-                    <if c.email>
-                      <p>
-   <img src="/img/mail_small.gif" width="12" height="10" border="0" alt="">${lang("article.email.prefix")}: <a href="mailto:${utility.encodeHTML(c.email)}">${utility.encodeHTML(c.email)}</a>
-</p>
-                    </if>
-                    <if c.main_url>
-                      <p>
-   <img src="/img/link_small.gif" width="12" height="10" border="0" alt="">${lang("article.homepage.prefix")}: <a href="${utility.encodeHTML(c.main_url)}" target="_blank">${utility.encodeHTML(c.main_url)}</a>
-</p>
-                    </if>
-                </if>
-              </list>
-          </if><!-- 
-      end center column
-      --></td>
-      <td class="margin"><div><!-- --></div></td>
-   </tr>
-</table>
-
+         </if>
+            
+         <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.id}&forIE=.pdf">${lang("article.get_as_pdf")}</a>&#160;|
+         <a href="javascript:addToNewsletter(${article.id})">${lang("article.add_to_pdf")}</a>&#160;|
+         <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="commentWrap">
+            <if article.to_original.to_comments>
+               <list article.to_original.to_comments as c>
+                  <div class="comment">
+                     <div class="headlineWrap">
+                        <p class="headline">
+                           ${utility.encodeHTML(c.title)}
+                        </p>
+                        <p class="datestamp">
+                           ${c.creationdate.formatted["MMM dd, yyyy hh:mma z"]}
+                        </p>
+                     </div>
+                     <if c.email || c.main_url || c.address || c.phone || c.creator>
+                        <table class="contactWrap" cellspacing="0">
+                           <tr>
+                           <if c.creator>
+                              <td class="author">
+                                 <p>
+                                    ${utility.encodeHTML(c.creator)}
+                                 </p>
+                              </td>
+                           </if>
+                           <if c.email>
+                              <td class="email">
+                                 <p>
+                                    ${lang("article.email.prefix")}: <a href="mailto:${utility.encodeHTML(c.email)}">${utility.encodeHTML(c.email)}</a>
+                                 </p>
+                              </td>
+                           </if>
+                           <if c.main_url>
+                              <td class="url">
+                                 <p>
+                                    ${lang("article.homepage.prefix")}: <a href="${utility.encodeHTML(c.main_url)}" target="_blank">${utility.encodeHTML(c.main_url)}</a>
+                                 </p>
+                              </td>
+                           </if>
+                           </tr>
+                        </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>
+
+                     <p class="body">
+                        ${c.description_parsed}
+                     </p>
+            
+                  </div>
+               </list>
+            </if>
+         </div>
+         
 <!--#include virtual="/${language.code}/footer.html" -->
 
