media attach fixups. popup fix in openposting

diff --git a/bundles/admin_de.properties b/bundles/admin_de.properties
index b02aa6c..e2edb04 100755 (executable)
--- a/bundles/admin_de.properties
+++ b/bundles/admin_de.properties
@@ -98,8 +98,14 @@ content.comment=Internes Kommentar
 content.internal=(intern)
 content.attachments=Attachments
 content.images=Bilder
+content.audio=Audio
+content.video=Video
+content.other=Sonstiges
 content.media=Medien
 content.addimage=Bild hinzufügen
+content.addaudio=Audio hinzufügen
+content.addvideo=Video hinzufügen
+content.addother=Sonstiges medien hinzufügen
 content.creationdate=date
 content.modificationdate=last change
 content.status=Status
@@ -349,4 +355,4 @@ open.postingdupe.htmltitle=indymedia.de | open posting - Posting-Duplikat
 open.postingdupe.title=Immer ruhig mit den jungen Pferden!
 open.postingdupe.explanation=Du hast vermutlich den Reload-Button benutzt oder versucht, Deinen Artikel noch einmal zu posten. Das ist aber unn&ouml;tig. <br> Die Tatsache, dass Du diesen Text liest, bedeutet, dass Dein Posting schon angekommen ist. Er wird gleich auf der Seite auftauchen. Versprochen.<br><br>Technischer Hintergrund ist, daß de.indy &uuml;ber einen Proxy-Server läuft und da dauert es schon mal ein paar Minuten, bis ein neues Posting erscheint.
 open.postingdupe.no_panic=Keine Panik
-open.postingdupe.back=Zur&uuml;ck
\ No newline at end of file
+open.postingdupe.back=Zur&uuml;ck

diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties
index 002a844..f2d7bb5 100755 (executable)
--- a/bundles/admin_en.properties
+++ b/bundles/admin_en.properties
@@ -98,8 +98,14 @@ content.comment=Internal Comment
 content.internal=(internal)
 content.attachments=Attachments
 content.images=Images
+content.audio=Audio
+content.video=Video
+content.other=Other media
 content.media=Media
 content.addimage=add image
+content.addaudio=add audio
+content.addvideo=add video
+content.addother=add other media
 content.creationdate=date
 content.modificationdate=last change
 content.status=Status
@@ -355,4 +361,4 @@ open.postingdupe.explanation=       You probably clicked on the reload button or submi
                                        The technical background is that de.indy is connected to
                                        a proxy server that is not updated every minute.
 open.postingdupe.no_panic=Don't panic
-open.postingdupe.back=Back
\ No newline at end of file
+open.postingdupe.back=Back

diff --git a/templates-dist/admin/content.template b/templates-dist/admin/content.template
index 59398b2..c14a50b 100755 (executable)
--- a/templates-dist/admin/content.template
+++ b/templates-dist/admin/content.template
@@ -47,12 +47,12 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                <tr>
                <td>
                <select name="to_article_type">
-               <list data.articletypePopupData as a>
+               <list extra.articletypePopupData as a>
                        <option value="${a.key}" <if (a.key == data.to_article_type)>selected</if>>${a.value}</option>
                </list>
                </select>
                <select name="to_feature">
-               <list data.schwerpunktPopupData as s>
+               <list extra.schwerpunktPopupData as s>
                        <option value="${s.key}" <if (s.key == data.to_feature)>selected</if>>${s.value}</option>
                </list>
                </select>
@@ -60,9 +60,9 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                <td rowspan="2">
                <select name="to_topic" size="5" multiple>
 
-               <list data.themenPopupData as t>
+               <list extra.themenPopupData as t>
 
-               <option value="${t.key}" <list data.to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>
+               <option value="${t.key}" <list data.to_topics as to><if (t.key == to)>selected</if></list>>${t.value}</option>
                </list>
 
                </select>
@@ -71,7 +71,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                <tr>
                <td>
                <select name="to_language">
-               <list data.languagePopupData as l>
+               <list extra.languagePopupData as l>
                        <option value="${l.key}" <if (l.key == data.to_language)>selected</if>>${l.value}</option>
                </list>
                </select>
@@ -216,12 +216,12 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 
 <tr><td bgcolor="Pink" colspan="5">${lang("content.attachments")}</td></tr>
 <!-- image stuff -->
-<list data.to_media as m>
+<list data.to_media_images as m>
 <tr>
        <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 image" border="0"></a>
+               <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=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
        </td>
 </tr>
@@ -233,6 +233,57 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                <a href="${config.actionRoot}?module=Images&do=list&cid=${data.id}">${lang("content.addimage")}</a>
        </td>
 </tr>
+<list data.to_media_audio as m>
+<tr>
+       <td align=right valign=top bgcolor="#aaaaaa">
+               <B><font color="#ffffff">${lang("content.audio")}:</B><br></td>
+       <td colspan="4" align="left" valign="top">
+               <a href="${config.actionRoot}?module=Audio&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
+               <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
+       </td>
+</tr>
+</list>
+<tr>
+       <td align=right valign=top bgcolor="#aaaaaa">
+               <B><font color="#ffffff">${lang("content.media")}:</B><br></td>
+       <td colspan="4" align="left" valign="top">
+               <a href="${config.actionRoot}?module=Audio&do=list&cid=${data.id}">${lang("content.addaudio")}</a>
+       </td>
+</tr>
+<list data.to_media_video as m>
+<tr>
+       <td align=right valign=top bgcolor="#aaaaaa">
+               <B><font color="#ffffff">${lang("content.video")}:</B><br></td>
+       <td colspan="4" align="left" valign="top">
+               <a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
+               <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
+       </td>
+</tr>
+</list>
+<tr>
+       <td align=right valign=top bgcolor="#aaaaaa">
+               <B><font color="#ffffff">${lang("content.media")}:</B><br></td>
+       <td colspan="4" align="left" valign="top">
+               <a href="${config.actionRoot}?module=Video&do=list&cid=${data.id}">${lang("content.addvideo")}</a>
+       </td>
+</tr>
+<list data.to_media_other as m>
+<tr>
+       <td align=right valign=top bgcolor="#aaaaaa">
+               <B><font color="#ffffff">${lang("content.other")}:</B><br></td>
+       <td colspan="4" align="left" valign="top">
+               <a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
+               <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
+       </td>
+</tr>
+</list>
+<tr>
+       <td align=right valign=top bgcolor="#aaaaaa">
+               <B><font color="#ffffff">${lang("content.media")}:</B><br></td>
+       <td colspan="4" align="left" valign="top">
+               <a href="${config.actionRoot}?module=Other&do=list&cid=${data.id}">${lang("content.addother")}</a>
+       </td>
+</tr>
 </table>
 </form>
 <include "admin/foot.template">

diff --git a/templates-dist/admin/image.template b/templates-dist/admin/image.template
index 24677c4..2661bf9 100755 (executable)
--- a/templates-dist/admin/image.template
+++ b/templates-dist/admin/image.template
@@ -45,7 +45,7 @@ function openWin(url) {
         <B>${lang("image.mediafolder")}:</B></font></td>
     <td>
                <select name="to_media_folder">
-               <list popups.mediafolderPopupData as m>
+               <list extra.mediafolderPopupData as m>
                <option value="${m.key}" <if m.key == data.to_media_folder>selected</if>>${m.value}</option>
                </list>
            </select>

diff --git a/templates-dist/admin/imagelist.template b/templates-dist/admin/imagelist.template
index 813550c..a1760be 100755 (executable)
--- a/templates-dist/admin/imagelist.template
+++ b/templates-dist/admin/imagelist.template
@@ -39,7 +39,7 @@
        </td>
        <td>
        <select name="query_media_folder">
-       <list popups.mediafolderPopupData as m>
+       <list extra.mediafolderPopupData as m>
        <option value="${m.key}" <if m.key == query_media_folder>selected</if>>${m.value}</option>
        </list>
        </select>

diff --git a/templates-dist/open/posting.template b/templates-dist/open/posting.template
index f8e2d2b..40eb937 100755 (executable)
--- a/templates-dist/open/posting.template
+++ b/templates-dist/open/posting.template
@@ -68,7 +68,7 @@
         </td>
        <td colspan="2">
        <select name="data.to_topic" size="3" multiple>
-       <list themenPopupData as t>
+       <list extra.themenPopupData as t>
        <option value="${t.key}" <list to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>
        </list>
        </select>
@@ -148,7 +148,7 @@
                </td>
                <td colspan="2">
                        <select name="to_language">
-                               <list languagePopUpData as l>
+                               <list extra.languagePopUpData as l>
                                <option value="${l.key}">${l.value}</option>
                                </list>
                        </select>