aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/import.php6
-rw-r--r--include/text.php7
2 files changed, 5 insertions, 8 deletions
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'),
));
}