languagepopup

diff --git a/build.xml b/build.xml
index 63f3eef..71db9e8 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,7 @@
     </copy>
     <mkdir  dir="${deploy.home}/templates"/>
     <copy todir="${deploy.home}/templates">
-      <fileset dir="templates-dist"/>
+      <fileset dir="templates"/>
     </copy>
     <mkdir  dir="${deploy.home}/src"/>
     <copy todir="${deploy.home}/src">

diff --git a/templates-dist/de/content.template b/templates-dist/de/content.template
index eec3491..760c048 100755 (executable)
--- a/templates-dist/de/content.template
+++ b/templates-dist/de/content.template
@@ -43,6 +43,9 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                </B></font>
        </td>
        <td colspan="4" >
+               <table border=0 cellpadding="0" cellspacing="0">
+               <tr>
+               <td>
                <select name="to_article_type">
                <list articletypePopupData as a>
                        <option value="${a.key}" <if (a.key == to_article_type)>selected</if>>${a.value}</option>
@@ -53,11 +56,25 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                        <option value="${s.key}" <if (s.key == to_feature)>selected</if>>${s.value}</option>
                </list>
                </select>
+               </td>
+               <td rowspan="2">
                <select name="to_topic" size="5" multiple>\r
                <list themenPopupData as t>\r
                <option value="${t.key}" <list to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>                        
                </list>\r
                </select>
+               </td>
+               </tr>
+               <tr>
+               <td>
+               <select name="to_language">
+               <list languagePopupData as l>
+                       <option value="${l.key}" <if (l.key == to_language)>selected</if>>${l.value}</option>
+               </list>
+               </select>
+               <td>
+               </tr>
+               </table>
        </td>
 </tr>
 <tr>

diff --git a/templates-dist/de/open/posting.template b/templates-dist/de/open/posting.template
index 62cc8a0..0106387 100755 (executable)
--- a/templates-dist/de/open/posting.template
+++ b/templates-dist/de/open/posting.template
@@ -137,7 +137,8 @@
                </td>
                <td colspan="2">
                        <select name="to_language">
-                               <list languagePopup as language>
+                               <list languagePopUpData as l>
+                               <option value="${l.key}">${l.value}</option>
                                </list>
                        </select>
                        <font size="-1"><i>(optional)</i></font>

diff --git a/templates-dist/en/content.template b/templates-dist/en/content.template
index 21810f2..2a66f3b 100755 (executable)
--- a/templates-dist/en/content.template
+++ b/templates-dist/en/content.template
@@ -43,21 +43,38 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                </B></font>\r
        </td>\r
        <td colspan="4" >\r
-               <select name="to_article_type">\r
-               <list articletypePopupData as a>\r
-                       <option value="${a.key}" <if (a.key == to_article_type)>selected</if>>${a.value}</option>\r
-               </list>\r
-               </select>\r
-               <select name="to_feature">\r
-               <list schwerpunktPopupData as s>\r
-                       <option value="${s.key}" <if (s.key == to_feature)>selected</if>>${s.value}</option>\r
-               </list>\r
-               </select>\r
+               <table border=0 cellpadding="0" cellspacing="0">
+               <tr>
+               <td>
+               <select name="to_article_type">
+               <list articletypePopupData as a>
+                       <option value="${a.key}" <if (a.key == to_article_type)>selected</if>>${a.value}</option>
+               </list>
+               </select>
+               <select name="to_feature">
+               <list schwerpunktPopupData as s>
+                       <option value="${s.key}" <if (s.key == to_feature)>selected</if>>${s.value}</option>
+               </list>
+               </select>
+               </td>
+               <td rowspan="2">
                <select name="to_topic" size="5" multiple>\r
                <list themenPopupData as t>\r
                <option value="${t.key}" <list to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>                        
                </list>\r
-               </select>\r
+               </select>
+               </td>
+               </tr>
+               <tr>
+               <td>
+               <select name="to_language">
+               <list languagePopupData as l>
+                       <option value="${l.key}" <if (l.key == to_language)>selected</if>>${l.value}</option>
+               </list>
+               </select>
+               <td>
+               </tr>
+               </table>
        </td>\r
 </tr>\r
 <tr>\r

diff --git a/templates-dist/en/open/posting.template b/templates-dist/en/open/posting.template
index 62cc8a0..0106387 100755 (executable)
--- a/templates-dist/en/open/posting.template
+++ b/templates-dist/en/open/posting.template
@@ -137,7 +137,8 @@
                </td>
                <td colspan="2">
                        <select name="to_language">
-                               <list languagePopup as language>
+                               <list languagePopUpData as l>
+                               <option value="${l.key}">${l.value}</option>
                                </list>
                        </select>
                        <font size="-1"><i>(optional)</i></font>