From 8c4396d7796552fbbf77e40c70f39966831a8ed5 Mon Sep 17 00:00:00 2001
From: idfx <idfx>
Date: Sat, 1 Sep 2001 15:21:22 +0000
Subject: [PATCH] languagepopup

---
 build.xml                               |  2 +-
 templates-dist/de/content.template      | 17 ++++++++++++++
 templates-dist/de/open/posting.template |  3 ++-
 templates-dist/en/content.template      | 39 +++++++++++++++++++++++----------
 templates-dist/en/open/posting.template |  3 ++-
 5 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 63f3eefd..71db9e8c 100755
--- 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 eec3491e..760c0484 100755
--- 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>
 		<list themenPopupData as t>
 		<option value="${t.key}" <list to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>			
 		</list>
 		</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 62cc8a01..01063879 100755
--- 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 21810f20..2a66f3b8 100755
--- 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>
 	</td>
 	<td colspan="4" >
-		<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>
+		<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>
 		<list themenPopupData as t>
 		<option value="${t.key}" <list to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>			
 		</list>
-		</select>
+		</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/en/open/posting.template b/templates-dist/en/open/posting.template
index 62cc8a01..01063879 100755
--- 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>
-- 
2.11.0