show the 'size' field for media

diff --git a/templates-dist/admin/audio.template b/templates-dist/admin/audio.template
index cd07ebc..8e942c8 100755 (executable)
--- a/templates-dist/admin/audio.template
+++ b/templates-dist/admin/audio.template
@@ -32,7 +32,7 @@ function openWin(url) {
                ${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
                <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-               ${lang("media.format")}: ${data.mimetype} / ${data.descr}<br>
+               ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates-dist/admin/audiolist.template b/templates-dist/admin/audiolist.template
index 1a33b68..f0ea98f 100755 (executable)
--- a/templates-dist/admin/audiolist.template
+++ b/templates-dist/admin/audiolist.template
@@ -59,6 +59,8 @@
        <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.title")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+       <b>${lang("media.size")}</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.mediafolder")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.creator")}</b></font></td>
@@ -71,6 +73,7 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
          <if entry.description><br>${entry.description}</if></td>
+  <td>${entry.size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;

diff --git a/templates-dist/admin/image.template b/templates-dist/admin/image.template
index 9190e54..4da4c44 100755 (executable)
--- a/templates-dist/admin/image.template
+++ b/templates-dist/admin/image.template
@@ -98,7 +98,7 @@ function openWin(url) {
        <tr>
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>${lang("media.description")}:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="description" value="${data.description}"></td>
+    <td><input type="text" size="40" maxlength="255" name="description" value="${data.description} ${data.size}"></td>
        </tr>
 
        <tr>

diff --git a/templates-dist/admin/imagelist.template b/templates-dist/admin/imagelist.template
index 1993f61..748a494 100755 (executable)
--- a/templates-dist/admin/imagelist.template
+++ b/templates-dist/admin/imagelist.template
@@ -59,6 +59,8 @@
        <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.title")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+       <b>${lang("media.size")}</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.mediafolder")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.creator")}</b></font></td>
@@ -73,6 +75,7 @@
        </if>
   <td>${entry.title}&nbsp;
          <if entry.description><br>${entry.description}</if></td>
+  <td>${entry.size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;

diff --git a/templates-dist/admin/media.template b/templates-dist/admin/media.template
index 42650d6..9a86246 100755 (executable)
--- a/templates-dist/admin/media.template
+++ b/templates-dist/admin/media.template
@@ -32,7 +32,7 @@ function openWin(url) {
                ${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
                <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-               ${lang("media.format")}: ${data.mimetype} / ${data.descr}<br>
+               ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates-dist/admin/medialist.template b/templates-dist/admin/medialist.template
index 8245ebf..539bde2 100755 (executable)
--- a/templates-dist/admin/medialist.template
+++ b/templates-dist/admin/medialist.template
@@ -59,6 +59,8 @@
        <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.title")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+       <b>${lang("media.size")}</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.mediafolder")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.creator")}</b></font></td>
@@ -71,6 +73,7 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
          <if entry.description><br>${entry.description}</if></td>
+  <td>${entry.size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;

diff --git a/templates-dist/admin/video.template b/templates-dist/admin/video.template
index 1ca36e1..86ee08e 100755 (executable)
--- a/templates-dist/admin/video.template
+++ b/templates-dist/admin/video.template
@@ -32,7 +32,7 @@ function openWin(url) {
                ${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
                <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-               ${lang("media.format")}: ${data.mimetype} / ${data.descr}<br>
+               ${lang("media.format")}: ${data.mimetype} / ${data.descr} / ${data.size}<br>
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>

diff --git a/templates-dist/admin/videolist.template b/templates-dist/admin/videolist.template
index a537caf..5934536 100755 (executable)
--- a/templates-dist/admin/videolist.template
+++ b/templates-dist/admin/videolist.template
@@ -59,6 +59,8 @@
        <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.title")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+       <b>${lang("media.size")}</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.mediafolder")}</b></font></td>
     <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <b>${lang("media.creator")}</b></font></td>
@@ -71,6 +73,7 @@
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
          <if entry.description><br>${entry.description}</if></td>
+  <td>${entry.size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;

diff --git a/templates-dist/producer/content.template b/templates-dist/producer/content.template
index a91c42e..b55cb03 100755 (executable)
--- a/templates-dist/producer/content.template
+++ b/templates-dist/producer/content.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>${lang("producer.content.htmltitle")}${data.content.title}</title>
+<title>${lang("producer.content.htmltitle")}${content.title}</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="/style/mir.css" type="text/css">
                        <if data.content.to_media_images>
@@ -19,22 +19,22 @@
 
 <body bgcolor="#CCCCCC">
 <table width="760" border="0" cellpadding="0" cellspacing="1" align="center" bgcolor="#000000">
-  <tr bgcolor="#FFFFFF">
-    <td valign="top" align="left" width="150" bgcolor="#666666">
+  <tr bgcolor="#FFFFFF"> 
+    <td valign="top" align="left" width="150" bgcolor="#666666"> 
       <table width="150" border="0" cellspacing="0" cellpadding="0">
-        <tr>
+        <tr> 
           <td width="140">
-            <a href="${config.productionHost}${config.producerDocRoot}/">
+            <a href="${data.config.productionHost}${config.producerDocRoot}/">
              <img src="/images/mirlogo.jpg" width="150" height="205" border="0">
             </a>
           </td>
         </tr>
-        <tr valign="top">
-          <td width="140" bgcolor="#666666">
+        <tr valign="top"> 
+          <td width="140" bgcolor="#666666"> 
             <table width="100%" border="0" cellspacing="2" cellpadding="0">
-              <tr>
-                <td>
-                  <!--#include virtual="../../navigation.inc" -->
+              <tr> 
+                <td> 
+               <!--#include virtual="../../navigation.inc" -->
                 </td>
               </tr>
             </table>
@@ -44,24 +44,25 @@
     </td>
     <td align="left" valign="top" colspan="2" height="100%">
       <table width="100%" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td>
+        <tr> 
+          <td> 
             <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr>
+              <tr> 
                 <td><img src="/images/mirfont.gif" width="600" height="68"></td>
               </tr>
             </table>
           </td>
         </tr>
-        <tr bgcolor="#000000">
+        <tr bgcolor="#000000"> 
           <td height="1"><img src="images/1pixel.gif" width="1" height="1"></td>
         </tr>
-        <tr>
-          <td align="left" valign="top">
+        <tr> 
+          <td align="left" valign="top"> 
             <table width="100%" border="0" cellpadding="0" cellspacing="2" height="100%">
-              <tr>
+              <tr> 
                 <td width="100%" valign="top">
                   <table width="100%" border="0" cellspacing="0" cellpadding="0">
+
        <if config.generateFO=="yes">
          <tr><td align="right">          
          <if config.generatePDF=="yes">
@@ -76,28 +77,22 @@
                         <h2>${data.content.title}</h2>
                         <h4><i>${data.content.creator}, ${data.content.webdb_create_formatted}</i></h4>
                         <p><b>${data.content.description_parsed}</b>
-
-
           <!-- media -->
-
-            <list data.content.to_media_audio as media>
-                <list media["url"] as audio>
-                  <p>
-
-                    <img src="/img/${media["big_icon"]}" border="0" alt="">
-
-                    <a href="${audio["publish_server"]}${audio["publish_path"]}">
-                      ${audio["title"]} - ${media["descr"]}
-                    </a>
-                  </p>
-                </list>
+          <list data.content.to_media_audio as media>
+            <list media["url"] as audio>
+              <p>
+                <img src="/img/${media["big_icon"]}" border="0" alt="">
+                <a href="${audio["publish_server"]}${audio["publish_path"]}">
+                ${audio["title"]} - ${media["descr"]} ${media["size"]} </a>
+              </p>
             </list>
+          </list>
           <list data.content.to_media_video as media>
             <list media["url"] as video>
               <p>
                 <img src="/img/${media["big_icon"]}" border="0" alt="">
                 <a href="${video["publish_server"]}${video["publish_path"]}">
-                ${video["title"]} - ${media["descr"]}</a>
+                ${video["title"]} - ${media["descr"]}  ${media["size"]} </a>
               </p>
             </list>
           </list>
@@ -106,24 +101,23 @@
               <p>
                 <img src="/img/${media["big_icon"]}" border="0" alt="">
                 <a href="${other["publish_server"]}${other["publish_path"]}">
-                ${other["title"]} - ${media["descr"]}</a>
+                ${other["title"]} - ${media["descr"]}  ${media["size"]}</a>
               </p>
             </list>
           </list>
-
-          <list data.content.to_media_images as image>
+          <list data.content.to_media_images as media>
+            <list media["url"] 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>
           </list>
-
           <!-- media -->
-
           <p>${data.content.content_data_parsed}</p>
-          <if data.content.creator_main_url || data.content.creator_email>
+          <if content.creator_main_url || content.creator_email>
                         <table width="100%" bgcolor="#FFFFFF">
                         <tr>
                            <td>
@@ -145,7 +139,7 @@
                     <tr>
                       <td><a href="${config.openAction}?do=addcomment&aid=${data.content.id}">
                           ${lang("producer.content.comment")}</a>
-                      </td>
+                      </td>                
                     </tr>
                     <if data.content.to_comments>
                     <list data.content.to_comments as c>
@@ -159,24 +153,24 @@
                        <tr>
                          <td colspan="2"><br>${c.description}</td>
                        </tr>
-                   <if c.email || c.main_url || c.address || c.phone || c.creator>
+                      <if c.email || c.main_url || c.address || c.phone || c.creator>
                        <tr>
                          <td bgcolor="#cccccc" colspan="2">
                         <if c.creator><b>${c.creator}</b></if>
-                     <if c.email || c.main_url>
-                        <if c.email>
+                        <if c.email || c.main_url> 
+                          <if c.email>
                            <br>
                            <img src="/images/mail_small.gif" width="12" height="10" border="0" alt="">${lang("producer.content.email")}: <a href="mailto:${c.email}"> ${c.email}</a>
-                        </if>
-                        <if c.main_url>
+                           </if>
+                          <if c.main_url>
                            <br>
                            <img src="/images/link_small.gif" width="12" height="10" border="0" alt="">
                            ${lang("producer.content.homepage")}: <a href="${c.main_url}" target="extern"> ${c.main_url}</a>
-                        </if>
-                                     </if>
-                                         </td>
+                           </if>
+                         </if>
+                        </td>
                       </tr>
-                  </if>
+                    </if>
                      </table>
                      </td>
                     </tr>