diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
| commit | e9462ba14529b7172ba5a21e7985d24de91faa37 (patch) | |
| tree | c2270ca2975f6683a361c5959894b6bbc954475d /view/tpl/website_import_tools.tpl | |
| parent | 2b9322fc7d879fecbe334083bbd028538c985c54 (diff) | |
| parent | b775a1aa0e36a74f0f937d85f458fd12af18a264 (diff) | |
| download | volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.gz volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.bz2 volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.zip | |
resolve merge conflict
Diffstat (limited to 'view/tpl/website_import_tools.tpl')
| -rw-r--r-- | view/tpl/website_import_tools.tpl | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl deleted file mode 100644 index cb3e6b524..000000000 --- a/view/tpl/website_import_tools.tpl +++ /dev/null @@ -1,37 +0,0 @@ -<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> - <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> |