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/tools/templates/dns_import_tupa.htm |   87 +++++++++++++++++--------------------------
 1 files changed, 34 insertions(+), 53 deletions(-)

diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm
index d616eba..6aadf71 100644
--- a/interface/web/tools/templates/dns_import_tupa.htm
+++ b/interface/web/tools/templates/dns_import_tupa.htm
@@ -1,56 +1,37 @@
-<h2>Import DNS recods from Tupa PowerDNS controlpanel</h2>
+<h2><tmpl_var name="list_head_txt">Import DNS records from Tupa PowerDNS controlpanel</h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_language_import">
-  
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>PowerDNS Tupa import</legend>
-	  <div class="ctrlHolder">
-		<p class="label">Tupa database hostname</p>
-		<div class="multiField">
-			<input id="dbhost" type="text" value="{tmpl_var name='dbhost'}" name="dbhost" />
-		</div>
-	  </div>
-	  <div class="ctrlHolder">
-		<p class="label">Tupa database name</p>
-		<div class="multiField">
-			<input id="dbname" type="text" value="{tmpl_var name='dbname'}" name="dbname" />
-		</div>
-	  </div>
-	  <div class="ctrlHolder">
-		<p class="label">Tupa database user</p>
-		<div class="multiField">
-			<input id="dbuser" type="text" value="{tmpl_var name='dbuser'}" name="dbuser" />
-		</div>
-	  </div>
-	  <div class="ctrlHolder">
-		<p class="label">Tupa database password</p>
-		<div class="multiField">
-			<input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
-		</div>
-	  </div>
-	  
-	  <div class="ctrlHolder">
-				<p class="label">Import DNS Records</p>
-					<div class="multiField">
-						<input id="start" type="checkbox" value="1" name="start" checked/>
-					</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="Import" onClick="submitForm('pageForm','tools/dns_import_tupa.php');"><span>Start</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
-    </div>
-  </div>
-  
-</div>
+        <legend>PowerDNS Tupa import</legend>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">Tupa database hostname</label>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">Tupa database name</label>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">Tupa database user</label>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">Tupa database password</label>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></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'}">
+		<input type="hidden" name="start" value="1">
+            
+        <div class="clear"><div class="right">
+            <button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/dns_import_tupa.php">Start</button>
+            <button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">Cancel</button>
+        </div></div>
\ No newline at end of file

--
Gitblit v1.9.1