move title and file field for media upload down to be compatible w/ new Streams based...

diff --git a/templates/admin/audio.template b/templates/admin/audio.template
index a062600..6f62f6d 100755 (executable)
--- a/templates/admin/audio.template
+++ b/templates/admin/audio.template
@@ -13,17 +13,31 @@ function openWin(url) {
 
 <include "templates/admin/head.template">
 
-<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Audio&do=<if data.new>insert<else>update</if>&id=${data.id}">
-<if data.icon_data=="" || data.icon_data=="0">
-       <INPUT TYPE="file" NAME="mptest">
+<if data.new>
+<form action="${config.actionRoot}?module=Audio&do=add" method="post">
+       <table border="0">
+       <tr>
+       <td align="right" class="darkgrey">
+       <span class="witesmall">
+       <b>${lang("media.nr_of_media")}</b> <br>
+       </span>
+       </td>
+       <td>
+       <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
+       </td>
+       </tr>
+       </table>
+</form>
 </if>
-
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Audio&do=<if data.new>insert<else>update</if>&id=${data.id}">
        <input type="hidden" name="where" value="${data.where}">
        <input type="hidden" name="offset" value="${data.offset}">
        <input type="hidden" name="order" value="${data.order}">
        <input type="hidden" name="id" value="${data.id}">
 
        <table border="0">
+
+       <if !data.new>
        <tr>
     <td align="right" class="darkgrey">
                <span class="witesmall">
@@ -38,6 +52,7 @@ function openWin(url) {
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>
+       </if>
 
        <tr>
     <td align="right" class="darkgrey"><span class="witesmall">
@@ -54,12 +69,6 @@ function openWin(url) {
 
        <tr>
     <td align="right" class="darkgrey"><span class="witesmall">
-        <B>${lang("media.title")}:</B></span></td>
-    <td><input type="text" size="40" maxlength="255" name="title" value="${data.title}"></td>
-       </tr>
-
-       <tr>
-    <td align="right" class="darkgrey"><span class="witesmall">
         <B>${lang("media.description")}:</B></span></td>
     <td><input type="text" size="40" maxlength="255" name="description" value="${data.description}"></td>
        </tr>
@@ -102,11 +111,45 @@ function openWin(url) {
     <td><input type="text" size="40" maxlength="80" name="source" value="${data.source}"></td>
        </tr>
        <tr>
+       <if data.new>
+       <tr>
+       <td>
+               ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
+       </td>
+       </tr>
+       <list data.mediafields as m>
+               <tr>
+               <td align="right" class="darkgrey"><span class="witesmall">
+
+                       <B>${lang("media.title")}:<B>
+               </font> </td>
+               <td>
+                       <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
+               </td>
+               </tr>
+               <tr>
+               <td align="right" class="darkgrey"></td>
+               <td>
+                               <INPUT TYPE="file" NAME="mpfile${m}"><br>
+               </td>
+               </tr>
+       </list>
+       <else>
+               <tr>
+               <td align="right" class="darkgrey"><span class="witesmall">
+                       <B>${lang("media.title")}:<B>
+               </td>
+               <td>
+                       <input type="text" name="title" size="40" maxlength="80" value="${data.title}">
+               </td>
+               </tr>
+       </if>
+
     <td colspan="2" align="right"> <span class="text">
-       ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
        <if data.new>
       <input type="submit" name="save" value="${lang("insert")}">
     <else>
+     ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
     <input type="submit" name="save" value="${lang("save")}">
     </if> </span></form></span>
     </td>

diff --git a/templates/admin/image.template b/templates/admin/image.template
index 7287101..1e1baf6 100755 (executable)
--- a/templates/admin/image.template
+++ b/templates/admin/image.template
@@ -38,6 +38,7 @@ function openWin(url) {
        <input type="hidden" name="order" value="${data.order}">
        <input type="hidden" name="id" value="${data.id}">
 
+       <if !data.new>
        <tr>
     <td align="right" class="darkgrey">
                <if (data.icon_data!="" && data.icon_data!="0") && !new>
@@ -55,34 +56,6 @@ function openWin(url) {
       </span>
        </td>
        </tr>
-
-       <if data.new>
-       <list data.mediafields as m>
-               <tr>
-               <td align="right" class="darkgrey"><span class="witesmall">
-
-                       <B>${lang("media.title")}:<B>
-               </font> </td>
-               <td>
-                       <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
-               </td>
-               </tr>
-               <tr>
-               <td align="right" class="darkgrey"></td>
-               <td>
-                               <INPUT TYPE="file" NAME="mpfile${m}"><br>
-               </td>
-               </tr>
-       </list>
-       <else>
-               <tr>
-               <td align="right" class="darkgrey"><span class="witesmall">
-                       <B>${lang("media.title")}:<B>
-               </td>
-               <td>
-                       <input type="text" name="title" size="40" maxlength="80" value="${data.title}">
-               </td>
-               </tr>
        </if>
 
        <tr>
@@ -136,16 +109,50 @@ function openWin(url) {
        </tr>
 
        <tr>
-   <td colspan="2" align="right"> <span class="text">
+    <td align="right" class="darkgrey"><span class="witesmall">
         <B>${lang("media.source")}:</B></span></td>
     <td><input type="text" size="40" maxlength="80" name="source" value="${data.source}"></td>
        </tr>
+       <if data.new>
+       <tr>
+       <td>
+               ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
+       </td>
+       </tr>
+       <list data.mediafields as m>
+               <tr>
+               <td align="right" class="darkgrey"><span class="witesmall">
+
+                       <B>${lang("media.title")}:<B>
+               </font> </td>
+               <td>
+                       <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
+               </td>
+               </tr>
+               <tr>
+               <td align="right" class="darkgrey"></td>
+               <td>
+                               <INPUT TYPE="file" NAME="mpfile${m}"><br>
+               </td>
+               </tr>
+       </list>
+       <else>
+               <tr>
+               <td align="right" class="darkgrey"><span class="witesmall">
+                       <B>${lang("media.title")}:<B>
+               </td>
+               <td>
+                       <input type="text" name="title" size="40" maxlength="80" value="${data.title}">
+               </td>
+               </tr>
+       </if>
+
        <tr>
     <td colspan="2" align="right"> <span class="text">
-       ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
        <if data.new>
       <input type="submit" name="save" value="${lang("insert")}">
     <else>
+       ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
     <input type="submit" name="save" value="${lang("save")}">
     </if> </span></form></font>
     </td>

diff --git a/templates/admin/media.template b/templates/admin/media.template
index 75f3360..987998d 100755 (executable)
--- a/templates/admin/media.template
+++ b/templates/admin/media.template
@@ -13,17 +13,31 @@ function openWin(url) {
 
 <include "templates/admin/head.template">
 
-<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=OtherMedia&do=<if data.new>insert<else>update</if>&id=${data.id}">
-<if data.icon_data=="" || data.icon_data=="0">
-       <INPUT TYPE="file" NAME="mptest">
+<if data.new>
+<form action="${config.actionRoot}?module=OtherMedia&do=add" method="post">
+       <table border="0">
+       <tr>
+       <td align="right" class="darkgrey">
+       <span class="witesmall">
+       <b>${lang("media.nr_of_media")}</b> <br>
+       </span>
+       </td>
+       <td>
+       <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
+       </td>
+       </tr>
+       </table>
+</form>
 </if>
-
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=OtherMedia&do=<if data.new>insert<else>update</if>&id=${data.id}">
        <input type="hidden" name="where" value="${data.where}">
        <input type="hidden" name="offset" value="${data.offset}">
        <input type="hidden" name="order" value="${data.order}">
        <input type="hidden" name="id" value="${data.id}">
 
        <table border="0">
+
+       <if !data.new>
        <tr>
     <td align="right" class="darkgrey">
                <span class="witesmall">
@@ -38,6 +52,7 @@ function openWin(url) {
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>
+       </if>
 
        <tr>
     <td align="right" class="darkgrey"><span class="witesmall">
@@ -54,12 +69,6 @@ function openWin(url) {
 
        <tr>
     <td align="right" class="darkgrey"><span class="witesmall">
-        <B>${lang("media.title")}:</B></span></td>
-    <td><input type="text" size="40" maxlength="255" name="title" value="${data.title}"></td>
-       </tr>
-
-       <tr>
-    <td align="right" class="darkgrey"><span class="witesmall">
         <B>${lang("media.description")}:</B></span></td>
     <td><input type="text" size="40" maxlength="255" name="description" value="${data.description}"></td>
        </tr>
@@ -102,11 +111,45 @@ function openWin(url) {
     <td><input type="text" size="40" maxlength="80" name="source" value="${data.source}"></td>
        </tr>
        <tr>
+       <if data.new>
+       <tr>
+       <td>
+               ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
+       </td>
+       </tr>
+       <list data.mediafields as m>
+               <tr>
+               <td align="right" class="darkgrey"><span class="witesmall">
+
+                       <B>${lang("media.title")}:<B>
+               </font> </td>
+               <td>
+                       <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
+               </td>
+               </tr>
+               <tr>
+               <td align="right" class="darkgrey"></td>
+               <td>
+                               <INPUT TYPE="file" NAME="mpfile${m}"><br>
+               </td>
+               </tr>
+       </list>
+       <else>
+               <tr>
+               <td align="right" class="darkgrey"><span class="witesmall">
+                       <B>${lang("media.title")}:<B>
+               </td>
+               <td>
+                       <input type="text" name="title" size="40" maxlength="80" value="${data.title}">
+               </td>
+               </tr>
+       </if>
+
     <td colspan="2" align="right"> <span class="text">
-       ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
        <if data.new>
       <input type="submit" name="save" value="${lang("insert")}">
     <else>
+     ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
     <input type="submit" name="save" value="${lang("save")}">
     </if> </span></form></span>
     </td>

diff --git a/templates/admin/video.template b/templates/admin/video.template
index 2ceeafe..f89994a 100755 (executable)
--- a/templates/admin/video.template
+++ b/templates/admin/video.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-        <title>${config["Mir.Name"]} | {lang("video.htmltitle")}</title>
+        <title>${config["Mir.Name"]} | ${lang("video.htmltitle")}</title>
         <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 <head>
 <SCRIPT LANGUAGE="JavaScript">
@@ -13,17 +13,31 @@ function openWin(url) {
 
 <include "templates/admin/head.template">
 
-<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Video&do=<if data.new>insert<else>update</if>&id=${data.id}">
-<if data.icon_data=="" || data.icon_data=="0">
-       <INPUT TYPE="file" NAME="mptest">
+<if data.new>
+<form action="${config.actionRoot}?module=Video&do=add" method="post">
+       <table border="0">
+       <tr>
+       <td align="right" class="darkgrey">
+       <span class="witesmall">
+       <b>${lang("media.nr_of_media")}</b> <br>
+       </span>
+       </td>
+       <td>
+       <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
+       </td>
+       </tr>
+       </table>
+</form>
 </if>
-
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Video&do=<if data.new>insert<else>update</if>&id=${data.id}">
        <input type="hidden" name="where" value="${data.where}">
        <input type="hidden" name="offset" value="${data.offset}">
        <input type="hidden" name="order" value="${data.order}">
        <input type="hidden" name="id" value="${data.id}">
 
        <table border="0">
+
+       <if !data.new>
        <tr>
     <td align="right" class="darkgrey">
                <span class="witesmall">
@@ -38,6 +52,7 @@ function openWin(url) {
                ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
        </td>
        </tr>
+       </if>
 
        <tr>
     <td align="right" class="darkgrey"><span class="witesmall">
@@ -54,12 +69,6 @@ function openWin(url) {
 
        <tr>
     <td align="right" class="darkgrey"><span class="witesmall">
-        <B>${lang("media.title")}:</B></span></td>
-    <td><input type="text" size="40" maxlength="255" name="title" value="${data.title}"></td>
-       </tr>
-
-       <tr>
-    <td align="right" class="darkgrey"><span class="witesmall">
         <B>${lang("media.description")}:</B></span></td>
     <td><input type="text" size="40" maxlength="255" name="description" value="${data.description}"></td>
        </tr>
@@ -102,11 +111,45 @@ function openWin(url) {
     <td><input type="text" size="40" maxlength="80" name="source" value="${data.source}"></td>
        </tr>
        <tr>
+       <if data.new>
+       <tr>
+       <td>
+               ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
+       </td>
+       </tr>
+       <list data.mediafields as m>
+               <tr>
+               <td align="right" class="darkgrey"><span class="witesmall">
+
+                       <B>${lang("media.title")}:<B>
+               </font> </td>
+               <td>
+                       <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
+               </td>
+               </tr>
+               <tr>
+               <td align="right" class="darkgrey"></td>
+               <td>
+                               <INPUT TYPE="file" NAME="mpfile${m}"><br>
+               </td>
+               </tr>
+       </list>
+       <else>
+               <tr>
+               <td align="right" class="darkgrey"><span class="witesmall">
+                       <B>${lang("media.title")}:<B>
+               </td>
+               <td>
+                       <input type="text" name="title" size="40" maxlength="80" value="${data.title}">
+               </td>
+               </tr>
+       </if>
+
     <td colspan="2" align="right"> <span class="text">
-       ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
        <if data.new>
       <input type="submit" name="save" value="${lang("insert")}">
     <else>
+     ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
     <input type="submit" name="save" value="${lang("save")}">
     </if> </span></form></span>
     </td>