From af4bbcc1d7ab88b7b0ee535ad16b040f98aa50f5 Mon Sep 17 00:00:00 2001
From: patrick <patrick>
Date: Fri, 5 Aug 2005 01:18:12 +0000
Subject: [PATCH] *** empty log message ***

---
 etc/producer/article.template | 225 ++++++++++++++++++++----------------------
 1 file changed, 108 insertions(+), 117 deletions(-)

diff --git a/etc/producer/article.template b/etc/producer/article.template
index dfb65c0..79580e6 100755
--- a/etc/producer/article.template
+++ b/etc/producer/article.template
@@ -33,113 +33,113 @@
 
 <!--#include virtual="/${language.code}/navigation.html" -->
 
-
-         <div class="articleOptions">
-            <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="pdfDownload"><a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.id}&forIE=.pdf">${lang("article.get_as_pdf")}</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>
-
-         <div class="headlineWrap">
-            <p class="headline">
-               <b>${article.title}</b>
-            </p>
-            <p class="lead">
-               ${article.subtitle}
-            </p>
-         <div>
-
-         <blockquote class="summaryWrap">
-            <div class="authorWrap">
-            	<p class="author">
-                   ${lang("general.authoredby")} ${article.to_original.creator}
-               	<span class="translation">
-                     <if article.to_original.id!=article.id>
-                        | ${lang("general.translatedby", article.creator)}
-                     </if>
-                  </span>
-               </p>
+         <div class="articleHeader">
+            <div class="articleOptions">
+               <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="pdfDownload"><a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.id}&forIE=.pdf">${lang("article.get_as_pdf")}</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="summary">
-               ${article.description_parsed}
-            </p>
-         </blockquote>
-
-         <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>
+            <div class="headlineWrap">
+               <p class="headline">
+                  <b>${article.title}</b>
                </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 class="lead">
+                  ${article.subtitle}
                </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"]}
+            <div>
+            <blockquote class="summaryWrap">
+               <div class="authorWrap">
+               	<p class="author">
+                      ${lang("general.authoredby")} ${article.to_original.creator}
+                  	<span class="translation">
+                        <if article.to_original.id!=article.id>
+                           | ${lang("general.translatedby", article.creator)}
+                        </if>
+                     </span>
                   </p>
-               </div>
-            </list>
-         </if>
+               <div>
+               <p class="summary">
+                  ${article.description_parsed}
+               </p>
+            </blockquote>
+            <p class="keywords">
+               Keywords: 
+               <list topics as t>
+                  <a href="${config["Producer.DocRoot"]}/${language.code}/${t.filename}/archive.html">${t.title}</a>,
+               </list>
+            </p>
+         </div>
 
-         <div class="body">
-            ${article.content_data_parsed}
+         <div class="articleBody">
+            <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>
          </div>
 
-         <if article.creator_main_url || article.creator_email || creator_phone || creator_address>
-            <p class="contactWrap">
-               <if article.creator_email>
-                  <span class="email">${article.creator_email}</span>
-               </if>
-               <if article.creator_main_url>
-                  <span class="url"><a href="${article.creator_main_url}">${article.creator_main_url}</a></span>
-               </if>
-               <if article.creator_phone>
-                  <span class="url">${article.creator_phone}</span>
-               </if>
-               <if article.creator_address>
-                  <span class="url">${article.creator_address}</span>
-               </if>
-            </p>
-         </if>
+         <div class="articleFooter">
+            <if article.creator_main_url || article.creator_email || creator_phone || creator_address>
+               <p class="contactWrap">
+                  <if article.creator>
+                     <span class="author">${article.creator}</span>
+                  </if>
+                  <if article.creator_email>
+                     <span class="email">${article.creator_email}</span>
+                  </if>
+                  <if article.creator_main_url>
+                     <span class="url"><a href="${article.creator_main_url}">${article.creator_main_url}</a></span>
+                  </if>
+                  <if article.creator_phone>
+                     <span class="phone">${article.creator_phone}</span>
+                  </if>
+                  <if article.creator_address>
+                     <span class="address">${article.creator_address}</span>
+                  </if>
+               </p>
+            </if>
             
-         <div class="articleOptions">
-            <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.id}&forIE=.pdf">${lang("article.get_as_pdf")}</a>
-            <a href="javascript:addToNewsletter(${article.id})">${lang("article.add_to_pdf")}</a>
-            <a href="javascript:getNewsletter()">${lang("article.newsletter_checkout")}</a>
-            <a href="${config["Producer.OpenAction"]}?do=mail&mail_aid=${article.id}&mail_language=${language.code}">${lang("article.send_as_email")}</a>
+            <div class="articleOptions">
+               <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${article.id}&forIE=.pdf">${lang("article.get_as_pdf")}</a>
+               <a href="javascript:addToNewsletter(${article.id})">${lang("article.add_to_pdf")}</a>
+               <a href="javascript:getNewsletter()">${lang("article.newsletter_checkout")}</a>
+               <a href="${config["Producer.OpenAction"]}?do=mail&mail_aid=${article.id}&mail_language=${language.code}">${lang("article.send_as_email")}</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>
          </div>
 
-         <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>
                <list article.to_original.to_comments as c>
@@ -153,31 +153,23 @@
                         </p>
                      </div>
                      <if c.email || c.main_url || c.address || c.phone || c.creator>
-                        <table class="contactWrap" cellspacing="0">
-                           <tr>
+                        <div class="contactWrap">
                            <if c.creator>
-                              <td class="author">
-                                 <p>
-                                    ${utility.encodeHTML(c.creator)}
-                                 </p>
-                              </td>
+                              <span class="author">
+                                 ${utility.encodeHTML(c.creator)}
+                              </span>
                            </if>
                            <if c.email>
-                              <td class="email">
-                                 <p>
-                                    <a href="mailto:${utility.encodeHTML(c.email)}">${utility.encodeHTML(c.email)}</a>
-                                 </p>
-                              </td>
+                              <span class="email">
+                                 <a href="mailto:${utility.encodeHTML(c.email)}">${utility.encodeHTML(c.email)}</a>
+                              </span>
                            </if>
                            <if c.main_url>
-                              <td class="url">
-                                 <p>
-                                    <a href="${utility.encodeHTML(c.main_url)}" target="_blank">${utility.encodeHTML(c.main_url)}</a>
-                                 </p>
-                              </td>
+                              <span class="url">
+                                 <a href="${utility.encodeHTML(c.main_url)}" target="_blank">${utility.encodeHTML(c.main_url)}</a>
+                              </span>
                            </if>
-                           </tr>
-                        </table>
+                        </div>
                      </if>
 
                      <list c.to_media_audio as media>
@@ -198,7 +190,6 @@
                            <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"]}" />
-- 
2.11.0