This commit is contained in:
Jon Lambson 2017-10-23 14:20:54 -06:00
parent 2ad1d1b96b
commit ff1bd2d597
3 changed files with 61 additions and 57 deletions

View File

@ -16,6 +16,9 @@
top: 25vh; top: 25vh;
} }
/* Common CSS */ /* Common CSS */
.avoid-clicks {
pointer-events: none;
}
.cp { .cp {
cursor: pointer; cursor: pointer;
} }
@ -265,12 +268,15 @@
-webkit-transition: all .3s ease-in-out; -webkit-transition: all .3s ease-in-out;
transition: all .3s ease-in-out; transition: all .3s ease-in-out;
} }
.invite-card-container .invite-option .price .back a.button:hover { .invite-card-container .invite-option .price .back a.button:hover {
background: #286090; background: #286090;
} }
.invite-card-container .invite-option:hover i { .invite-card-container .invite-option:hover i {
color: white; color: white;
} }
.website-card-button-group { .website-card-button-group {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
@ -287,29 +293,25 @@
-ms-flex-align: start; -ms-flex-align: start;
align-items: flex-start; align-items: flex-start;
} }
.align-self-center { .align-self-center {
-ms-flex-item-align: center !important; -ms-flex-item-align: center !important;
align-self: center !important; align-self: center !important;
} }
.rounded-circle { .rounded-circle {
border-radius: 50%; border-radius: 50%;
} }
.media .media-left img { .media .media-left img {
width: 75px; width: 75px;
} }
.shares-container { .shares-container {
list-style: none; list-style: none;
-webkit-padding-start: 0px; -webkit-padding-start: 0px;
} }
/* /*
Tree core styles Tree core styles
*/ */
@ -395,7 +397,7 @@ label.tree_label:before {
border-left: 1px solid #777; border-left: 1px solid #777;
border-radius: 0 0 0 .3em; border-radius: 0 0 0 .3em;
content: ''; content: '';
} }
.tree_label.filez:after { .tree_label.filez:after {
position: absolute; position: absolute;
@ -410,6 +412,7 @@ label.tree_label:before {
border-radius: 0 0 0 .3em; border-radius: 0 0 0 .3em;
content: '\f15c'; content: '\f15c';
} }
label.tree_label:active:before, label.tree_label:hover:before { label.tree_label:active:before, label.tree_label:hover:before {
position: absolute; position: absolute;
font-family: FontAwesome; font-family: FontAwesome;
@ -422,12 +425,15 @@ label.tree_label:active:before, label.tree_label:hover:before {
border-radius: 0 0 0 .3em; border-radius: 0 0 0 .3em;
content: '\f07c'; content: '\f07c';
} }
.breadcrumbs-list:last-child { .breadcrumbs-list:last-child {
color: #777; color: #777;
} }
li.move-back { li.move-back {
margin-left: -20px; margin-left: -20px;
} }
label.tree_label:after { border-bottom: 0; } label.tree_label:after { border-bottom: 0; }
ul.tree.files-only.ls-none { ul.tree.files-only.ls-none {
@ -447,27 +453,24 @@ ul.tree.files-only.ls-none {
padding: 1em; padding: 1em;
border-radius: 0.3em; border-radius: 0.3em;
} }
.tree ul { .tree ul {
-webkit-padding-start: 0; -webkit-padding-start: 0;
} }
.websites-tile img { .websites-tile img {
height: auto; height: auto;
max-width: 100%; max-width: 100%;
vertical-align: middle; vertical-align: middle;
} }
.websites-tile iframe { .websites-tile iframe {
border-width: 2px; border-width: 2px;
border-style: none; border-style: none;
border-color: none; border-color: none;
border-image: inone; border-image: inone;
} }
.websites-tile .btn { .websites-tile .btn {
background-color: white; background-color: white;
border: 1px solid #cccccc; border: 1px solid #cccccc;
@ -475,10 +478,12 @@ ul.tree.files-only.ls-none {
padding: 0.5rem; padding: 0.5rem;
text-transform: uppercase; text-transform: uppercase;
} }
.websites-tile .btn--block { .websites-tile .btn--block {
display: block; display: block;
width: 100%; width: 100%;
} }
.websites-tile .cards { .websites-tile .cards {
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
@ -489,22 +494,26 @@ ul.tree.files-only.ls-none {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.websites-tile .cards__item { .websites-tile .cards__item {
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
padding: 1rem; padding: 1rem;
} }
@media (min-width: 40rem) { @media (min-width: 40rem) {
.websites-tile .cards__item { .websites-tile .cards__item {
width: 50%; width: 50%;
} }
} }
@media (min-width: 56rem) { @media (min-width: 56rem) {
.websites-tile .cards__item { .websites-tile .cards__item {
width: 33.3333%; width: 33.3333%;
} }
} }
.websites-tile .card { .websites-tile .card {
background-color: white; background-color: white;
border-radius: 0.25rem; border-radius: 0.25rem;
@ -608,22 +617,24 @@ h2.ssb-title {
padding:0; padding:0;
text-transform: uppercase; text-transform: uppercase;
} }
.folder-actions-list .root { .folder-actions-list .root {
display: none; display: none;
} }
.folder-actions-list { .folder-actions-list {
margin: 20px 0px; margin: 20px 0px;
-webkit-padding-start: 0px; -webkit-padding-start: 0px;
} }
.folder-actions-list i { .folder-actions-list i {
color: #337ab7; color: #337ab7;
} }
.folder-actions-list li { .folder-actions-list li {
padding: 5px 0px; padding: 5px 0px;
} }
multiselect { multiselect {
display:block; display:block;
} }
@ -740,6 +751,11 @@ multiselect .dropdown-menu > li > a {
.error-notice .success strong { .error-notice .success strong {
color: #3c763d; color: #3c763d;
} }
.avoid-clicks { .websites-tile .card__image--fence {
pointer-events: none; min-width: 350px;
min-height: 350px;
max-width: 350px;
max-height: 350px;
width: 350px;
height: 350px;
} }

View File

@ -401,6 +401,7 @@ app.controller('websiteCtrl', [
dir = vm.cleanedPath; dir = vm.cleanedPath;
vm.displaySpinner = ''; vm.displaySpinner = '';
var pkg = Auth.oauth3.pkg('www@daplie.com'); var pkg = Auth.oauth3.pkg('www@daplie.com');
console.log('searching ->', cleanPathQuery(vm.breadcrumbsPath.join('/')));
return pkg.contents({ return pkg.contents({
hostname: r.domain, hostname: r.domain,
domain: r.domain, domain: r.domain,
@ -440,27 +441,6 @@ app.controller('websiteCtrl', [
crumbsCleanUp(dir); crumbsCleanUp(dir);
vm.Sites.contents(vm.copyR, vm.breadcrumbsPath.join('/')); vm.Sites.contents(vm.copyR, vm.breadcrumbsPath.join('/'));
} }
// var removeFromBreadcrumbs;
// if (vm.copyR.shareAccess.path !== '/') {
// var arry = vm.breadcrumbsPath.split('/');
// arry.pop();
// removeFromBreadcrumbs = arry.indexOf(dir) + 1;
// var newArry = vm.breadcrumbs;
// newArry.pop();
// vm.breadcrumbsPath = arry.splice(0,removeFromBreadcrumbs);
// vm.breadcrumbs = vm.breadcrumbs.splice(0,removeFromBreadcrumbs);
// vm.Sites.contents(vm.copyR, vm.breadcrumbsPath.join('/'));
// } else {
// vm.breadcrumbsPath.unshift('');
// removeFromBreadcrumbs = vm.breadcrumbsPath.indexOf(dir) + 1;
// vm.breadcrumbsPath = vm.breadcrumbsPath.splice(0,removeFromBreadcrumbs);
// vm.breadcrumbs = vm.breadcrumbs.splice(0,removeFromBreadcrumbs);
// vm.Sites.contents(vm.copyR, vm.breadcrumbsPath.join('/'));
// if (dir === 'root') {
// vm.breadcrumbs = ['root'];
// vm.breadcrumbsPath = [];
// }
// }
}; };
vm.getDirectories = function (dir) { vm.getDirectories = function (dir) {
@ -491,7 +471,17 @@ app.controller('websiteCtrl', [
vm.deleteFilesFrom = function (r, opts) { vm.deleteFilesFrom = function (r, opts) {
var file = opts; var file = opts;
var requestedPath = vm.breadcrumbsPath.join('/') + '/' + file; var requestedPath;
if (r.shareAccess.path !== '/') {
if (vm.breadcrumbsPath.length === 0) {
requestedPath = r.shareAccess.path + file;
} else {
requestedPath = vm.breadcrumbsPath.join('/') + '/' + file;
}
} else {
debugger;
}
debugger;
opts = { opts = {
path: requestedPath path: requestedPath
}; };
@ -499,6 +489,7 @@ app.controller('websiteCtrl', [
}; };
vm.Sites.remove = function (r, opts) { vm.Sites.remove = function (r, opts) {
debugger;
if (!window.confirm("Delete files for this site?")) { if (!window.confirm("Delete files for this site?")) {
return; return;
} }
@ -534,11 +525,12 @@ app.controller('websiteCtrl', [
}); });
}; };
vm.doSomething = function (r) {
window.alert("Fix me");
};
vm.shareFolderFrom = function (r, opts) { vm.shareFolderFrom = function (r, opts) {
debugger;
opts = {
sharePath: sharePath,
shareMode: vm.copiedShareMode
};
var sharePath; var sharePath;
if (vm.breadcrumbsPath.join('/') === '' && vm.breadcrumbs.join('/') === '') { if (vm.breadcrumbsPath.join('/') === '' && vm.breadcrumbs.join('/') === '') {
sharePath = '/'; sharePath = '/';
@ -546,10 +538,6 @@ app.controller('websiteCtrl', [
sharePath = cleanPathQuery(vm.breadcrumbsPath.join('/')); sharePath = cleanPathQuery(vm.breadcrumbsPath.join('/'));
sharePath = sharePath + '/'; sharePath = sharePath + '/';
} }
opts = {
sharePath: sharePath,
shareMode: vm.copiedShareMode
};
vm.Shares.invite(r, opts); vm.Shares.invite(r, opts);
}; };
@ -586,18 +574,19 @@ app.controller('websiteCtrl', [
vm.breadcrumbsPath.pop(); vm.breadcrumbsPath.pop();
} else { } else {
if (vm.breadcrumbsPath[0] !== '') { if (vm.breadcrumbsPath[0] !== '') {
if (r.shareAccess.path !== '/') {
r.uploadPath = r.shareAccess.path;
} else {
r.uploadPath = r.shareAccess.path;
debugger;
}
vm.breadcrumbsPath.unshift(''); vm.breadcrumbsPath.unshift('');
} }
debugger; debugger;
} }
if (vm.breadcrumbsPath.join('/') === '') { if (vm.breadcrumbsPath.join('/') === '') {
if (vm.breadcrumbsPath.length === 0) {
debugger;
} else {
r.uploadPath = '/';
}
} else { } else {
r.uploadPath = vm.breadcrumbsPath.join('/') + '/'; r.uploadPath = vm.breadcrumbsPath.join('/') + '/';2
debugger; debugger;
} }
} }
@ -763,7 +752,6 @@ app.controller('websiteCtrl', [
} }
}; };
$scope.$watch('vm.selectedDomain', function (domainSelected) { $scope.$watch('vm.selectedDomain', function (domainSelected) {
if (domainSelected !== undefined) { if (domainSelected !== undefined) {
vm.dom = domainSelected.description; vm.dom = domainSelected.description;

View File

@ -110,7 +110,7 @@
<hr> <hr>
<div class="row"> <div class="row">
<div class="websites-tile"> <div class="websites-tile">
<h1>Your Websites</h1> <h1>Your Verified Websites</h1>
<ul class="cards"> <ul class="cards">
<li class="cards__item" ng-repeat="r in vm.sites"> <li class="cards__item" ng-repeat="r in vm.sites">
<div class="card"> <div class="card">