From f8ce43af33b7a2dabe92d983d10404aa671ca1b6 Mon Sep 17 00:00:00 2001
From: mh <mh>
Date: Wed, 27 Nov 2002 07:08:07 +0000
Subject: [PATCH] use new getMedia and getIcon calls in the media
 ServletModule's to implement preview/download in admin interface

---
 templates-dist/admin/audio.template     | 3 ++-
 templates-dist/admin/audiolist.template | 5 +++--
 templates-dist/admin/content.template   | 2 +-
 templates-dist/admin/image.template     | 4 ++--
 templates-dist/admin/imagelist.template | 6 +++---
 templates-dist/admin/media.template     | 5 +++--
 templates-dist/admin/medialist.template | 5 +++--
 templates-dist/admin/video.template     | 3 ++-
 templates-dist/admin/videolist.template | 5 +++--
 9 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/templates-dist/admin/audio.template b/templates-dist/admin/audio.template
index e63977a6..cd07ebcc 100755
--- a/templates-dist/admin/audio.template
+++ b/templates-dist/admin/audio.template
@@ -26,7 +26,8 @@ function openWin(url) {
 	<tr>
     <td align="right" bgcolor="#006600">
 		<font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	  	  	<img src="${config.docRoot}/img/${data.big_icon}" border=0></font></td>
+			<a href="${config.actionRoot}?module=Audio&do=getMedia&id=${data.id}">
+	  	  	<img src="${config.docRoot}/img/${data.big_icon}" border=0></a></font></td>
     <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
 	  	${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
diff --git a/templates-dist/admin/audiolist.template b/templates-dist/admin/audiolist.template
index ea2f55b9..1a33b689 100755
--- a/templates-dist/admin/audiolist.template
+++ b/templates-dist/admin/audiolist.template
@@ -67,9 +67,10 @@
   <list data.contentlist as entry>
   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
   <td>
-	  <img src="${config.docRoot}/img/${entry.big_icon}" border=0></font></td>
+  	  <a href="${config.actionRoot}?module=Audio&do=getMedia&id=${entry.id}">
+	  <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
-  	  <if entry.decription><br>${entry.description}</if></td>
+  	  <if entry.description><br>${entry.description}</if></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/content.template b/templates-dist/admin/content.template
index 160e82c8..53da0e85 100755
--- a/templates-dist/admin/content.template
+++ b/templates-dist/admin/content.template
@@ -263,7 +263,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 	<td align=right valign=top bgcolor="#aaaaaa">
   		<B><font color="#ffffff">${lang("content.images")}:</B><br></td>
 	<td colspan="4" align="left" valign="top">
-		<a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${config.actionRoot}?module=Images&do=showicon&id=${m["id"]}" alt="edit" border="0"></a>
+		<a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${config.actionRoot}?module=Images&do=getIcon&id=${m["id"]}" alt="edit" border="0"></a>
   		<a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
 	</td>
 </tr>
diff --git a/templates-dist/admin/image.template b/templates-dist/admin/image.template
index 329fa93f..9190e548 100755
--- a/templates-dist/admin/image.template
+++ b/templates-dist/admin/image.template
@@ -41,8 +41,8 @@ function openWin(url) {
     <td align="right" bgcolor="#006600">
 		<if (data.icon_data!="" && data.icon_data!="0") && !new>
 		<font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	  	<a href="JavaScript:openWin('${config.actionRoot}?module=Images&do=showimg&id=${data.id}')">
-	  	<img src="${config.actionRoot}?module=Images&do=showicon&id=${data.id}" border=0></a></font></td>
+	  	<a href="JavaScript:openWin('${config.actionRoot}?module=Images&do=getMedia&id=${data.id}')">
+	  	<img src="${config.actionRoot}?module=Images&do=getIcon&id=${data.id}" border=0></a></font></td>
 		</if>
     <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
 	  	${lang("media.created")}: ${data.webdb_create} <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
diff --git a/templates-dist/admin/imagelist.template b/templates-dist/admin/imagelist.template
index d00b44d7..1993f61e 100755
--- a/templates-dist/admin/imagelist.template
+++ b/templates-dist/admin/imagelist.template
@@ -68,11 +68,11 @@
   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
   <td>
   	<if entry.icon_data!="" && entry.icon_data!="0">
-  	<a href="${config.actionRoot}?module=Images&do=showimg&id=${entry.id}" target="new">
-	  <img src="${config.actionRoot}?module=Images&do=showicon&id=${entry.id}" border=0></a></font></td>
+  	<a href="${config.actionRoot}?module=Images&do=getMedia&id=${entry.id}" target="new">
+	  <img src="${config.actionRoot}?module=Images&do=getIcon&id=${entry.id}" border=0></a></font></td>
 	</if>
   <td>${entry.title}&nbsp;
-  	  <if entry.decription><br>${entry.description}</if></td>
+  	  <if entry.description><br>${entry.description}</if></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 6a091394..1cb6ed01 100755
--- a/templates-dist/admin/media.template
+++ b/templates-dist/admin/media.template
@@ -26,7 +26,8 @@ function openWin(url) {
 	<tr>
     <td align="right" bgcolor="#006600">
 		<font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	  	  	<img src="${config.docRoot}/img/${data.big_icon}" border=0></font></td>
+			<a href="${config.actionRoot}?module=OtherMedia&do=getMedia&id=${entry.id}">
+	  	  	<img src="${config.docRoot}/img/${data.big_icon}" border=0></a></font></td>
     <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
 	  	${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
@@ -52,7 +53,7 @@ function openWin(url) {
 	<tr>
     <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
 	 <B>${lang("media.title")}:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="title" value="${data.title}"></td>
+    <td><input type="text" size="40" maxlength="255" name="media_title0" value="${data.title}"></td>
   	</tr>
 
 	<tr>
diff --git a/templates-dist/admin/medialist.template b/templates-dist/admin/medialist.template
index 296fb84e..8245ebf7 100755
--- a/templates-dist/admin/medialist.template
+++ b/templates-dist/admin/medialist.template
@@ -67,9 +67,10 @@
   <list data.contentlist as entry>
   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
   <td>
-	  <img src="${config.docRoot}/img/${entry.big_icon}" border=0></font></td>
+  	  <a href="${config.actionRoot}?module=OtherMedia&do=getMedia&id=${entry.id}">
+	  <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
-  	  <if entry.decription><br>${entry.description}</if></td>
+  	  <if entry.description><br>${entry.description}</if></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 e933b275..64fadcc7 100755
--- a/templates-dist/admin/video.template
+++ b/templates-dist/admin/video.template
@@ -26,7 +26,8 @@ function openWin(url) {
 	<tr>
     <td align="right" bgcolor="#006600">
 		<font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	  	  	<img src="${config.docRoot}/img/${data.big_icon}" border=0></font></td>
+			<a href="${config.actionRoot}?module=Video&do=getMedia&id=${entry.id}">
+	  	  	<img src="${config.docRoot}/img/${data.big_icon}" border=0></a></font></td>
     <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
 	  	${lang("media.created")}: ${data.webdb_create}
         <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
diff --git a/templates-dist/admin/videolist.template b/templates-dist/admin/videolist.template
index aecd8ed9..a537cafe 100755
--- a/templates-dist/admin/videolist.template
+++ b/templates-dist/admin/videolist.template
@@ -67,9 +67,10 @@
   <list data.contentlist as entry>
   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
   <td>
-	  <img src="${config.docRoot}/img/${entry.big_icon}" border=0></font></td>
+  	  <a href="${config.actionRoot}?module=Video&do=getMedia&id=${entry.id}">
+	  <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
   <td>${entry.title}&nbsp;
-  	  <if entry.decription><br>${entry.description}</if></td>
+  	  <if entry.description><br>${entry.description}</if></td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
   <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;
-- 
2.11.0