From cbcd1954618da8ba7013a42fcec5bff531535ba9 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 20 Mar 2017 22:39:29 +0100
Subject: [PATCH] fix webpages widgets

---
 view/theme/redbasic/css/style.css    |   3 +-
 view/theme/redbasic/js/redbasic.js   |   4 +-
 view/tpl/design_tools.tpl            |  14 ++--
 view/tpl/website_portation_tools.tpl | 116 +++++++++++----------------
 4 files changed, 57 insertions(+), 80 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3548e237f..f233e9a76 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1672,9 +1672,10 @@ dl.bb-dl > dd > li {
 }
 
 .sub-menu {
+	width: 100%;
 	margin-top: 10px;
 	padding-left: 15px;
-	border-left: 3px solid #eee;
+	border-left: 0.2rem solid #eee;
 }
 
 .app-icon {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 8106f913d..6aba457f1 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -74,12 +74,12 @@ $(document).ready(function() {
 function makeFullScreen(full) {
 	if(typeof full=='undefined' || full == true) {
 		$('main').addClass('fullscreen');
-		$('header, nav, aside, #fullscreen-btn').css({'visibility': 'hidden'});
+		$('header, nav, aside, #fullscreen-btn').hide();
 		$('#inline-btn').show();
 	}
 	else {
 		$('main').removeClass('fullscreen');
-		$('header, nav, aside, #fullscreen-btn').css({'visibility': ''});
+		$('header, nav, aside, #fullscreen-btn').show();
 		$('#inline-btn').hide();
 		$(document.body).trigger("sticky_kit:recalc");
 	}
diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
index dffeeafa0..bc7d46dc1 100644
--- a/view/tpl/design_tools.tpl
+++ b/view/tpl/design_tools.tpl
@@ -1,9 +1,9 @@
 <div id="design-tools" class="widget design-tools">
-<h3>{{$title}}</h3>
-<ul class="nav nav-pills nav-stacked">
-<li><a href="blocks/{{$who}}">{{$blocks}}</a></li>
-<li><a href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a></li>
-<li><a href="layouts/{{$who}}">{{$layout}}</a></li>
-<li><a href="webpages/{{$who}}">{{$pages}}</a></li>
-</ul>
+	<h3>{{$title}}</h3>
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link" href="blocks/{{$who}}">{{$blocks}}</a>
+		<a class="nav-link" href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a>
+		<a class="nav-link" href="layouts/{{$who}}">{{$layout}}</a>
+		<a class="nav-link" href="webpages/{{$who}}">{{$pages}}</a>
+	</div>
 </div>
diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl
index 2910c0e29..b59e135c2 100644
--- a/view/tpl/website_portation_tools.tpl
+++ b/view/tpl/website_portation_tools.tpl
@@ -1,72 +1,48 @@
 <div id="website-portation-tools" class="widget">
-		<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 style="margin-left: 12px;" >
-						<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: 10px;" 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-outline-secondary 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-outline-secondary 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>
-		<ul class="nav nav-pills nav-stacked">
-				<li>
-						<a href="#" onclick="openClose('export-form'); openClose('export-cloud-form');
-					return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a>
-				</li>
-				<li style="margin-left: 12px;" >
-						<form id="export-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
-								<input type="hidden" name="action" value="exportzipfile">
-								<!-- Or download a zipped file containing the website -->
-								<p style="margin-top: 10px;" class="descriptive-text">{{$file_download_text}}</p>
-								<div class="form-group">
-
-										<div class="input-group">
-												<input class="widget-input" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
-												<div class="input-group-btn">
-														<button class="btn btn-outline-secondary btn-sm" type="submit" name="w_download" value="w_download"><i class="fa fa-download generic-icons"></i></button>
-												</div>
-										</div>
-								</div>
-						</form>
-						<form id="export-cloud-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
-								<input type="hidden" name="action" value="exportcloud">
-								<!-- Or export the website elements to a cloud files folder -->
-								<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
-								<div class="form-group">
-
-										<div class="input-group">
-												<input class="widget-input" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
-												<div class="input-group-btn">
-														<button class="btn btn-outline-secondary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}"><i class="fa fa-folder-open generic-icons"></i></button>
-												</div>
-										</div>
-								</div>
-						</form>
-				</li>
-		</ul>
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link"  href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		<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">
+				<input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
+			</div>
+			<div class="form-group">
+				<button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button>
+			</div>
+			<!-- Or upload a zipped file containing the website -->
+			<p class="descriptive-text">{{$file_upload_text}}</p>
+			<div class="form-group">
+				<input class="form-control-file" type="file" name="zip_file" />
+			</div>
+			<div class="form-group">
+				<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button>
+			</div>
+		</form>
+	</div>
+	<div class="nav nav-pills flex-column">
+		<a class="nav-link" href="#" onclick="openClose('export-form'); openClose('export-cloud-form'); return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a>
+		<form id="export-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
+			<input type="hidden" name="action" value="exportzipfile">
+			<!-- Or download a zipped file containing the website -->
+			<p class="descriptive-text">{{$file_download_text}}</p>
+			<div class="form-group">
+				<input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
+			</div>
+			<div class="form-group">
+				<button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button>
+			</div>
+		</form>
+		<form id="export-cloud-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
+			<input type="hidden" name="action" value="exportcloud">
+			<!-- Or export the website elements to a cloud files folder -->
+			<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
+			<div class="form-group">
+				<input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
+			</div>
+			<div class="form-group">
+				<button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button>
+			</div>
+		</form>
+	</div>
 </div>