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.

---
 include/import.php | 6 +++---
 include/text.php   | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/import.php b/include/import.php
index c69f2eadd..0b2cd38df 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1252,15 +1252,15 @@ function scan_webpage_elements($path, $type, $cloud = false) {
 		$dirtoscan = $path;
 		switch ($type) {
 			case 'page':
-				$dirtoscan .= 'pages/';
+				$dirtoscan .= '/pages/';
 				$json_filename = 'page.json';
 				break;
 			case 'layout':
-				$dirtoscan .= 'layouts/';
+				$dirtoscan .= '/layouts/';
 				$json_filename = 'layout.json';
 				break;
 			case 'block':
-				$dirtoscan .= 'blocks/';
+				$dirtoscan .= '/blocks/';
 				$json_filename = 'block.json';
 				break;
 			default :
diff --git a/include/text.php b/include/text.php
index f81155edb..d508f8ab3 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2258,17 +2258,14 @@ function website_import_tools() {
 		$sys = true;
 	}
 
-	$who = $channel['channel_address'];
-
 	return replace_macros(get_markup_template('website_import_tools.tpl'), array(
 		'$title' => t('Import'),
-		//'$who' => $who,
 		'$import_label' => t('Import website...'),
 		'$import_placeholder' => t('Select folder to import'),
 		'$file_upload_text' => t('Import from a zipped folder:'),
 		'$file_import_text' => t('Import from cloud files:'),
-		'$desc' => t('/path/to/folder'),
-		'$hint' => t('/path/to/folder'),
+		'$desc' => t('/cloud/channel/path/to/folder'),
+		'$hint' => t('Enter path to website files'),
 		'$select' => t('Select folder'),
 	));
 }
-- 
cgit v1.2.3