From 7c475575549161d465189fa5e726739f4a4ac76c Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 31 Jul 2016 07:30:25 -0400
Subject: Improved UI. Removed logger statements.

---
 view/tpl/webpage_import.tpl       |  2 +-
 view/tpl/website_import_tools.tpl | 62 ++++++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 28 deletions(-)

(limited to 'view')

diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl
index b047ee6f9..255a41c2b 100644
--- a/view/tpl/webpage_import.tpl
+++ b/view/tpl/webpage_import.tpl
@@ -3,7 +3,7 @@
 		<input type="hidden" name="action" value="importselected">
 		<div class="section-title-wrapper">
 			<div class="pull-right">				
-				<input class="webpage-import-button" type="submit" name="submit" value="Import selected"/>
+					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button>
 			</div>
 			<h2>{{$title}}</h2>
 			<div class="clear"></div>
diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl
index 133d6268e..cb3e6b524 100644
--- a/view/tpl/website_import_tools.tpl
+++ b/view/tpl/website_import_tools.tpl
@@ -1,29 +1,37 @@
 <div id="website-import-tools" class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills nav-stacked">
-		<li>
-			<a href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-		</li>
-		<form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
-            
-            <input type="hidden" name="action" value="scan">
-            
-            <p class="descriptive-text">{{$file_import_text}}</p>
-            <div class="form-group">
-				 <div class="input-group">
-                    <input class="widget-input" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
-                    <div class="input-group-btn">
-                        <button class="btn btn-default btn-sm" type="submit" name="cloudsubmit" value="{{$select}}"><i class="fa fa-folder-open generic-icons"></i></button>
-                    </div>
-                </div>
-			</div>
-            
-            <!-- Or upload a zipped file containing the website -->
-            <p class="descriptive-text">{{$file_upload_text}}</p>
-			<div class="form-group">
-				<input id="website-upload-choose" type="file" name="zip_file" />
-			</div>
-			<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Upload</button>
-		</form>
-	</ul>
+		<h3>{{$title}}</h3>
+		<ul class="nav nav-pills nav-stacked">
+				<li>
+						<a href="#" onclick="openClose('import-form');
+					return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+				</li>
+				<li>
+						<form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
+
+								<input type="hidden" name="action" value="scan">
+								
+								<p style="margin-top: 20px;" class="descriptive-text">{{$file_import_text}}</p>
+								<div class="form-group">
+										<div class="input-group">
+												<input class="widget-input" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
+												<div class="input-group-btn">
+														<button class="btn btn-default btn-sm" type="submit" name="cloudsubmit" value="{{$select}}"><i class="fa fa-folder-open generic-icons"></i></button>
+												</div>
+										</div>
+								</div>
+
+								<!-- Or upload a zipped file containing the website -->
+								<p class="descriptive-text">{{$file_upload_text}}</p>
+								<div class="form-group">
+
+										<div class="input-group">
+												<input class="widget-input" type="file" name="zip_file" />
+												<div class="input-group-btn">
+														<button class="btn btn-default btn-sm" type="submit" name="w_upload" value="w_upload"><i class="fa fa-file-archive-o generic-icons"></i></button>
+												</div>
+										</div>
+								</div>
+						</form>
+				</li>
+		</ul>
 </div>
-- 
cgit v1.2.3