From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty

---
 interface/web/admin/templates/language_import.htm |   66 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm
index 1043782..8bd653c 100644
--- a/interface/web/admin/templates/language_import.htm
+++ b/interface/web/admin/templates/language_import.htm
@@ -1,32 +1,34 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_language_import">
-
-  <tmpl_if name="msg">
-  <div class="box box_msg"><tmpl_var name="msg"></div>
-  </tmpl_if>
-  <tmpl_if name="error">
-  <div class="box box_error"><tmpl_var name="error"></div>
-  </tmpl_if>
-    
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_language_import"><legend>Language Import</legend>
-      <span class="wf_oneField">
-        <label for="lng_select" class="wf_preField">{tmpl_var name='language_import_txt'}</label>
-        <input type="file" id="file" name="file">
-      </span>      
-      <span class="wf_oneField">
-        <label class="wf_preField" for="overwrite"><tmpl_var name="language_overwrite_txt"></label>                    
-        <span class="">
-          <input type="checkbox" checked="" value="1" name="overwrite" id="overwrite" />
-        </span>
-      </span>
-    </fieldset>
-    
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('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>
+<div class='page-header'>
+	<h1><tmpl_var name="list_head_txt"></h1>
+</div>
+<p><tmpl_var name="list_desc_txt"></p>
+
+
+		<legend>Language Import</legend>
+            <div class="form-group">
+                <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_import_txt'}</label>
+                <input name="file" id="file" size="30" type="file" class="fileUpload" />
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
+                <div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/></div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
+                <div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/></div>
+            </div>
+                
+                
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+                
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="clear"><div class="right">
+                <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
+                <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+            </div></div>
\ No newline at end of file

--
Gitblit v1.9.1