coolaj86
/
walnut_launchpad.html
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

something asdf

This commit is contained in:
Jon Lambson 2017-10-03 15:14:52 -06:00
parent 6b81dbd564
commit 24907ece8d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/controllers/website-controller.js
View File

@ -472,6 +472,7 @@ app.controller('websiteCtrl', [
vm.autoPopulateWebPath = ''; vm.autoPopulateWebPath = '';
} }
vm.showUploadButton = true;
vm.createNewFolder = function (r) { vm.createNewFolder = function (r) {
if (vm.savedPath === undefined) { if (vm.savedPath === undefined) {
vm.savedPath = '/'; vm.savedPath = '/';
@ -495,6 +496,7 @@ app.controller('websiteCtrl', [
var site = vm.siteResults; var site = vm.siteResults;
vm.directoryPath = path; vm.directoryPath = path;
vm.getSiteContents(path, site); vm.getSiteContents(path, site);
vm.showUploadButton = false;
}; };
vm.getDirectoriesFromBreadcrumbs = function (dir) { vm.getDirectoriesFromBreadcrumbs = function (dir) {
@ -679,7 +681,6 @@ app.controller('websiteCtrl', [
vm.showBackBtn = false; vm.showBackBtn = false;
}, 150); }, 150);
}; };
}]); }]);
}()); }());

11
templates/widgets/filetree.html
View File

@ -11,7 +11,7 @@
<ul class="tree ls-none"> <ul class="tree ls-none">
<li class="directories-go-here" ng-repeat="directory in vm.siteDirectories track by $index"> <li class="directories-go-here" ng-repeat="directory in vm.siteDirectories track by $index">
<input type="checkbox" id="{{ r.challenge }}{{ $index }}" /> <input type="checkbox" id="{{ r.challenge }}{{ $index }}" />
<label class="tree_label" for="{{ r.challenge }}{{ $index }}" ng-click="vm.getDirectories(directory); vm.showUploadContainer = false" data="{{ directory }}">{{ directory }}</label><span class="pull-right"><button type="button" class="btn btn-danger btn-xs" ng-click="vm.deleteFilesFrom(r, directory)" data="{{ directory }}" data="{{ r }}"><i class="fa fa-trash"></i></button></span> <label class="tree_label" for="{{ r.challenge }}{{ $index }}" ng-click="vm.getDirectories(directory); vm.showUploadContainer = false: vm.showUploadFolderContainer = false;" data="{{ directory }}">{{ directory }}</label><span class="pull-right"><button type="button" class="btn btn-danger btn-xs" ng-click="vm.deleteFilesFrom(r, directory)" data="{{ directory }}" data="{{ r }}"><i class="fa fa-trash"></i></button></span>
</li> </li>
</ul> </ul>
<ul class="tree files-only ls-none"> <ul class="tree files-only ls-none">
@ -22,17 +22,18 @@
<div class="folder-actions"> <div class="folder-actions">
<hr> <hr>
<div class=""> <div class="">
<button type="button" name="button" class="btn btn-block btn-primary" ng-click="vm.showUploadFilesContainer = true; vm.autoPopulateFolderName()">Upload files</button> <button type="button" name="button" class="btn btn-block btn-primary" ng-click="vm.showUploadFilesContainer = true; vm.autoPopulateFolderName(); vm.showUploadFolderContainer = false" ng-show="vm.showUploadButton">Upload files</button>
<button type="button" name="button" class="btn btn-block btn-primary">Share folder</button> <button type="button" name="button" class="btn btn-block btn-primary">Share folder</button>
<ul class="ls-none"> <ul class="ls-none">
<li class="cp {{ vm.currentFolder }}"><span><i class="fa fa-upload"></i> <a ng-click="vm.showUploadFilesContainer = true; vm.autoPopulateFolderName()">Upload files</a></span></li> <li class="{{ vm.currentFolder }}"><span><i class="fa fa-upload cp"></i> <a ng-click="vm.showUploadFilesContainer = true; vm.autoPopulateFolderName(); vm.showUploadFolderContainer = false;" class="cp">Upload files</a></span></li>
<li class="cp"><span><i class="fa fa-folder"></i> <a ng-click="vm.showUploadFolderContainer = true; vm.cleanPath()">New folder</a></span></li> <li class=""><span><i class="fa fa-folder cp"></i> <a ng-click="vm.showUploadFolderContainer = true; vm.cleanPath(); vm.showUploadFilesContainer = false;" class="cp">New folder</a></span></li>
<li class="cp {{ vm.currentFolder }}"><span><i class="fa fa-trash"></i> <a ng-click="vm.triggerDeleteFolder(vm.currentFolder, r)" data="{{ vm.currentFolder }}" data="{{ r }}">Delete {{ vm.currentFolder | capitalize }} Folder</a></span></li> <li class="{{ vm.currentFolder }}"><span><i class="fa fa-trash cp"></i> <a ng-click="vm.triggerDeleteFolder(vm.currentFolder, r)" data="{{ vm.currentFolder }}" data="{{ r }}" class="cp">Delete {{ vm.currentFolder | capitalize }} Folder</a></span></li>
</ul> </ul>
</div> </div>
</div> </div>
<div class="upload-container"> <div class="upload-container">
<form ng-show="vm.showUploadFilesContainer"> <form ng-show="vm.showUploadFilesContainer">
<hr>
<div> <div>
<input type="file" ng-model="r.newFile" class="form-control" daplie-file-change="vm.Sites.setUpload(r)" /> <input type="file" ng-model="r.newFile" class="form-control" daplie-file-change="vm.Sites.setUpload(r)" />