rebuilding head

[mir.git] / templates / admin / FUNCTIONS_media.template

diff --git a/templates/admin/FUNCTIONS_media.template b/templates/admin/FUNCTIONS_media.template
index 3a0932c..de87ba3 100755 (executable)
--- a/templates/admin/FUNCTIONS_media.template
+++ b/templates/admin/FUNCTIONS_media.template
@@ -7,69 +7,73 @@
 
 <function MediaSearch (module)>
 
-<form method="post" action="${config.actionRoot}">
-
-<input type="hidden" name="module" value="${module}">
-<input type="hidden" name="do" value="search">
-<input type="hidden" name="articleid" value="${articleid}">
-<input type="hidden" name="commentid" value="${commentid}">
-
-<table border="0" cellspacing="2" cellpadding="2">
-  <tr>
-    <td class="table-head">${lang("search")}:</td>
-    <td class="table-head">${lang("medialist.search_text_in")}:</td>
-    <td class="table-head">${lang("media.published")}:</td>
-    <td class="table-head">${lang("media.mediafolder")}:</td>
-    <td class="table-head">&nbsp;</td>
-    <td><a class="link-box" href="${config.actionRoot}?module=${module}&do=add">[+] ${lang("add")} </a></td>
-  </tr>
-
-  <tr>
-    <td class="listrow2">
-      <input type="text" size="20" maxlength="30" name="searchtext" value="${searchtext}">
-    </td> 
-    <td class="listrow2">
-      <select name="searchfield">
-        <option value="title"<if searchfield=="title"> selected</if>>${lang("media.title")}</option>
-        <option value="creator"<if searchfield=="creator"> selected</if>>${lang("media.creator")}</option>
-        <option value="place"<if searchfield=="place"> selected</if>>${lang("media.location")}</option>
-      </select>
-    </td>
-    
-    <td class="listrow2">
-      <select name="searchispublished">
-        <option value="">${lang("dontcare")}</option>
-        <option value="0" <if searchispublished=="0"> selected</if>>${lang("no")}</option>
-        <option value="1" <if searchispublished=="1"> selected</if>>${lang("yes")}</option>
+  <form method="GET" action="${config.actionRoot}">
+  
+  <input type="hidden" name="module" value="${module}">
+  <input type="hidden" name="do" value="search">
+  <input type="hidden" name="articleid" value="${articleid}">
+  <input type="hidden" name="commentid" value="${commentid}">
+  
+  <table border="0" cellspacing="2" cellpadding="2">
+    <tr>
+      <td class="table-head">${lang("search")}:</td>
+      <td class="table-head">${lang("medialist.search_text_in")}:</td>
+      <td class="table-head">${lang("media.published")}:</td>
+      <td class="table-head">${lang("media.mediafolder")}:</td>
+      <td class="table-head">&nbsp;</td>
+      <td><a class="link-box" href="${config.actionRoot}?module=${module}&do=add">[+] ${lang("add")} </a></td>
+    </tr>
+  
+    <tr>
+      <td class="listrow2">
+        <input type="text" size="20" maxlength="30" name="searchtext" value="${searchtext}">
+      </td> 
+      <td class="listrow2">
+        <select name="searchfield">
+          <option value="title"<if searchfield=="title"> selected</if>>${lang("media.title")}</option>
+          <option value="creator"<if searchfield=="creator"> selected</if>>${lang("media.creator")}</option>
+          <option value="place"<if searchfield=="place"> selected</if>>${lang("media.location")}</option>
+        </select>
+      </td>
+      
+      <td class="listrow2">
+        <select name="searchispublished">
+          <option value="">${lang("dontcare")}</option>
+          <option value="0" <if searchispublished=="0"> selected</if>>${lang("no")}</option>
+          <option value="1" <if searchispublished=="1"> selected</if>>${lang("yes")}</option>
+        </select>
+      </td>
+      
+      <td class="listrow2">
+      <select name="searchmediafolder">
+        <option value="">-</option>
+        <list mediafolders as m>
+          <option value="${m.id}" <if m.id == searchmediafolder>selected</if>>${m.name}</option>
+        </list>
       </select>
-    </td>
-    
-    <td class="listrow2">
-    <select name="searchmediafolder">
-      <option value="">-</option>
-      <list mediafolders as m>
-        <option value="${m.id}" <if m.id == searchmediafolder>selected</if>>${m.name}</option>
-      </list>
-    </select>
-    </td>
-    
-    <td class="listrow2">
-      <input type="submit" name="search" value="${lang("filter")}">
-    </td>
-    
-    <td>
-    &nbsp;
-    </td>
-  </tr>
-</table>
-
-</form>
-
+      </td>
+      
+      <td class="listrow2">
+        <input type="submit" class="majorbutton" name="search" value="${lang("filter")}">
+      </td>
+      
+      <td>
+      &nbsp;
+      </td>
+    </tr>
+  </table>
+  
+  </form>
+  
 </function>
 
 <function MediaList (module)>
+    <if returnurl>
+      <call showAddOrBack2("1", module, returnurl)>
+    <else>
+      <call showAddOrBack("1", module, "Admin", "start")>
+    </if>
 
-  <call showAddOrBack("1", module, "Admin", "start")>
     <if medialist>
       <call showPrevNextLinks(prevurl, nexturl, "left")>
 
@@ -83,8 +87,6 @@
           <td class="table-head">
         <b>${lang("media.format")}</b></td>
           <td class="table-head">
-        <b>${lang("media.size")}</b></td>
-          <td class="table-head">
         <b>${lang("media.mediafolder")}</b></td>
           <td class="table-head">
         <b>${lang("media.creator")}</b></td>
@@ -100,18 +102,20 @@
       <if module=="Images">
               <img src="${config.actionRoot}?module=${module}&do=getIcon&id=${entry.id}" border=0></a>        
       <else>
-              <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a>
+              <img src="${config.docRoot}/img/${entry.info.bigIcon}" border=0></a>
       </if>
           </td>
             <td>
-            ${entry.title}&nbsp;
-                <if entry.description><br>${entry.description}</if>
+                ${utility.encodeHTML(entry.title)}&nbsp;
+                <if entry.description && entry.title><br></if>${utility.encodeHTML(entry.description)}
+                <br><br>
+                <if entry.is_published=="1">${lang("media.published")}: <a href="${entry.publish_server}${entry.publish_path}">${entry.publish_server}${entry.publish_path}</a><br></if>
+                <a href="${config.actionRoot}?module=${module}&do=showarticles&id=${entry.id}">${lang("media.articles")}</a> |
+                <a href="${config.actionRoot}?module=${module}&do=showcomments&id=${entry.id}">${lang("media.comments")}</a>
+             
           </td>
             <td>
-            ${entry.media_descr}&nbsp;
-          </td>
-            <td>
-            ${entry.human_readable_size}&nbsp;
+            ${entry.info.mediaType}&nbsp;
           </td>
             <td>
              <if entry.mediafolder>
@@ -144,7 +148,12 @@
       </table>
       
       <call showPrevNextLinks(prevurl, nexturl, "left")>
-      <call showAddOrBack("1", module, "Admin", "start")>
+
+      <if returnurl>
+        <call showAddOrBack2("1", module, returnurl)>
+      <else>
+        <call showAddOrBack("1", module, "Admin", "start")>
+      </if>
   
     <else>
       <P align="center">${lang("no_matches_found")}</p>