aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-07-16 21:02:13 -0400
committerAndrew Manning <tamanning@zoho.com>2016-07-16 21:02:13 -0400
commite7b853175154688d60d83ca5935650d1128973c6 (patch)
tree61dbf6b129669a3ae4e3bf9f71540507a527c424 /view/tpl
parentff2f599142348162b6459a02aa014c7dbca84f76 (diff)
downloadvolse-hubzilla-e7b853175154688d60d83ca5935650d1128973c6.tar.gz
volse-hubzilla-e7b853175154688d60d83ca5935650d1128973c6.tar.bz2
volse-hubzilla-e7b853175154688d60d83ca5935650d1128973c6.zip
Stash changes to merge from dev
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/website_import_tools.tpl19
1 files changed, 6 insertions, 13 deletions
diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl
index d4360f634..dc9ba6c08 100644
--- a/view/tpl/website_import_tools.tpl
+++ b/view/tpl/website_import_tools.tpl
@@ -5,24 +5,17 @@
<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">
- <!--
+
<p class="descriptive-text">{{$file_import_text}}</p>
<div class="form-group">
- <select id="import" name="target" class="form-control">
- <option value="">{{$import_placeholder}}</option>
- </select>
- </div>
- -->
- <!-- Or download from another channel cloud files -->
- <p class="descriptive-text">{{$file_remote_text}}</p>
- <div class="form-group">
- <div class="input-group">
- <input class="widget-input" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
+ <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="remotesubmit" value="{{$follow}}"><i class="fa fa-cloud-download generic-icons"></i></button>
+ <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>
+ </div>
+
<!-- Or upload a zipped file containing the website -->
<p class="descriptive-text">{{$file_upload_text}}</p>
<div class="form-group">