From 494c3cf3872116a564d20a6c30d3a6e35a1ee632 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Jun 2009 16:05:23 +0000
Subject: [PATCH] Fixed: FS#752 - Cannot import lang file 3.0.1.1 => 3.0.1.3

---
 .../web/admin/templates/language_export.htm   | 52 ++++++++-------
 .../web/admin/templates/language_import.htm   | 63 ++++++++++---------
 2 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm
index b8c718b584..d0ba3a3ce7 100644
--- a/interface/web/admin/templates/language_export.htm
+++ b/interface/web/admin/templates/language_export.htm
@@ -1,24 +1,28 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_language_export">
-  
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Language Export</legend>
-      <div class="ctrlHolder">
-      	<label for="lng_select">{tmpl_var name='language_select_txt'}</label>
-        <select name="lng_select" id="language" class="selectInput withicons">
-					{tmpl_var name='language_option'}
-				</select>
-      </div>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_export.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_export">
+  
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels"><legend>Language Export</legend>
+      <div class="ctrlHolder">
+      	<label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+        <select name="lng_select" id="lng_select" class="selectInput withicons">
+					{tmpl_var name='language_option'}
+				</select>
+      </div>
+    </fieldset>
+	
+	<tmpl_if name="msg">
+	<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+	</tmpl_if>
+	
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_export.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm
index 0547e55a6f..8f4cffb4aa 100644
--- a/interface/web/admin/templates/language_import.htm
+++ b/interface/web/admin/templates/language_import.htm
@@ -1,28 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_language_import">
-  
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Language Import</legend>
-      <div class="ctrlHolder">
-	      <label for="lng_select"><em>*</em> {tmpl_var name='language_import_txt'}</label>
-	      <input name="file" id="file" size="30" type="file" class="fileUpload" />
-      </div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='language_overwrite_txt'}</p>
-					<div class="multiField">
-						<input id="overwrite" type="checkbox" value="1" name="overwrite"/>
-					</div>
-			</div>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','admin/language_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels"><legend>Language Import</legend>
+      <div class="ctrlHolder">
+	      <label for="lng_select"><em>*</em> {tmpl_var name='language_import_txt'}</label>
+	      <input name="file" id="file" size="30" type="file" class="fileUpload" />
+      </div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='language_overwrite_txt'}</p>
+					<div class="multiField">
+						<input id="overwrite" type="checkbox" value="1" name="overwrite"/>
+					</div>
+			</div>
+    </fieldset>
+	
+	<tmpl_if name="msg">
+	<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+  </tmpl_if>
+  <tmpl_if name="error">
+	<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+  </tmpl_if>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','admin/language_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
-- 
GitLab