From ff1bd2d59749da4c8286f551b837153966743bc5 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Mon, 23 Oct 2017 14:20:54 -0600 Subject: [PATCH] asdf --- css/styles.css | 54 +++++++++++++++--------- js/controllers/website-controller.js | 62 +++++++++++----------------- templates/website.html | 2 +- 3 files changed, 61 insertions(+), 57 deletions(-) diff --git a/css/styles.css b/css/styles.css index 256ea45..10fe174 100644 --- a/css/styles.css +++ b/css/styles.css @@ -16,6 +16,9 @@ top: 25vh; } /* Common CSS */ +.avoid-clicks { + pointer-events: none; +} .cp { cursor: pointer; } @@ -265,12 +268,15 @@ -webkit-transition: all .3s ease-in-out; transition: all .3s ease-in-out; } + .invite-card-container .invite-option .price .back a.button:hover { background: #286090; } + .invite-card-container .invite-option:hover i { color: white; } + .website-card-button-group { display: flex; justify-content: space-around; @@ -287,29 +293,25 @@ -ms-flex-align: start; align-items: flex-start; } + .align-self-center { -ms-flex-item-align: center !important; align-self: center !important; } + .rounded-circle { border-radius: 50%; } + .media .media-left img { width: 75px; } + .shares-container { list-style: none; -webkit-padding-start: 0px; } - - - - - - - - /* ————————————————————– Tree core styles */ @@ -395,7 +397,7 @@ label.tree_label:before { border-left: 1px solid #777; border-radius: 0 0 0 .3em; content: ''; - } +} .tree_label.filez:after { position: absolute; @@ -410,6 +412,7 @@ label.tree_label:before { border-radius: 0 0 0 .3em; content: '\f15c'; } + label.tree_label:active:before, label.tree_label:hover:before { position: absolute; font-family: FontAwesome; @@ -422,12 +425,15 @@ label.tree_label:active:before, label.tree_label:hover:before { border-radius: 0 0 0 .3em; content: '\f07c'; } + .breadcrumbs-list:last-child { color: #777; } + li.move-back { margin-left: -20px; } + label.tree_label:after { border-bottom: 0; } ul.tree.files-only.ls-none { @@ -447,27 +453,24 @@ ul.tree.files-only.ls-none { padding: 1em; border-radius: 0.3em; } + .tree ul { -webkit-padding-start: 0; } - - - - - - .websites-tile img { height: auto; max-width: 100%; vertical-align: middle; } + .websites-tile iframe { border-width: 2px; border-style: none; border-color: none; border-image: inone; } + .websites-tile .btn { background-color: white; border: 1px solid #cccccc; @@ -475,10 +478,12 @@ ul.tree.files-only.ls-none { padding: 0.5rem; text-transform: uppercase; } + .websites-tile .btn--block { display: block; width: 100%; } + .websites-tile .cards { display: -webkit-box; display: -ms-flexbox; @@ -489,22 +494,26 @@ ul.tree.files-only.ls-none { margin: 0; padding: 0; } + .websites-tile .cards__item { display: -webkit-box; display: -ms-flexbox; display: flex; padding: 1rem; } + @media (min-width: 40rem) { .websites-tile .cards__item { width: 50%; } } + @media (min-width: 56rem) { .websites-tile .cards__item { width: 33.3333%; } } + .websites-tile .card { background-color: white; border-radius: 0.25rem; @@ -608,22 +617,24 @@ h2.ssb-title { padding:0; text-transform: uppercase; } + .folder-actions-list .root { display: none; } + .folder-actions-list { margin: 20px 0px; -webkit-padding-start: 0px; } + .folder-actions-list i { color: #337ab7; } + .folder-actions-list li { padding: 5px 0px; } - - multiselect { display:block; } @@ -740,6 +751,11 @@ multiselect .dropdown-menu > li > a { .error-notice .success strong { color: #3c763d; } -.avoid-clicks { - pointer-events: none; +.websites-tile .card__image--fence { + min-width: 350px; + min-height: 350px; + max-width: 350px; + max-height: 350px; + width: 350px; + height: 350px; } diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js index 84425b6..1070f75 100644 --- a/js/controllers/website-controller.js +++ b/js/controllers/website-controller.js @@ -401,6 +401,7 @@ app.controller('websiteCtrl', [ dir = vm.cleanedPath; vm.displaySpinner = ''; var pkg = Auth.oauth3.pkg('www@daplie.com'); + console.log('searching ->', cleanPathQuery(vm.breadcrumbsPath.join('/'))); return pkg.contents({ hostname: r.domain, domain: r.domain, @@ -440,27 +441,6 @@ app.controller('websiteCtrl', [ crumbsCleanUp(dir); 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) { @@ -491,7 +471,17 @@ app.controller('websiteCtrl', [ vm.deleteFilesFrom = function (r, 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 = { path: requestedPath }; @@ -499,6 +489,7 @@ app.controller('websiteCtrl', [ }; vm.Sites.remove = function (r, opts) { + debugger; if (!window.confirm("Delete files for this site?")) { return; } @@ -534,11 +525,12 @@ app.controller('websiteCtrl', [ }); }; - vm.doSomething = function (r) { - window.alert("Fix me"); - }; - vm.shareFolderFrom = function (r, opts) { + debugger; + opts = { + sharePath: sharePath, + shareMode: vm.copiedShareMode + }; var sharePath; if (vm.breadcrumbsPath.join('/') === '' && vm.breadcrumbs.join('/') === '') { sharePath = '/'; @@ -546,10 +538,6 @@ app.controller('websiteCtrl', [ sharePath = cleanPathQuery(vm.breadcrumbsPath.join('/')); sharePath = sharePath + '/'; } - opts = { - sharePath: sharePath, - shareMode: vm.copiedShareMode - }; vm.Shares.invite(r, opts); }; @@ -586,18 +574,19 @@ app.controller('websiteCtrl', [ vm.breadcrumbsPath.pop(); } else { if (vm.breadcrumbsPath[0] !== '') { + if (r.shareAccess.path !== '/') { + r.uploadPath = r.shareAccess.path; + } else { + r.uploadPath = r.shareAccess.path; + debugger; + } vm.breadcrumbsPath.unshift(''); } debugger; } if (vm.breadcrumbsPath.join('/') === '') { - if (vm.breadcrumbsPath.length === 0) { - debugger; - } else { - r.uploadPath = '/'; - } } else { - r.uploadPath = vm.breadcrumbsPath.join('/') + '/'; + r.uploadPath = vm.breadcrumbsPath.join('/') + '/';2 debugger; } } @@ -763,7 +752,6 @@ app.controller('websiteCtrl', [ } }; - $scope.$watch('vm.selectedDomain', function (domainSelected) { if (domainSelected !== undefined) { vm.dom = domainSelected.description; diff --git a/templates/website.html b/templates/website.html index bcf3a5d..cd2e38a 100644 --- a/templates/website.html +++ b/templates/website.html @@ -110,7 +110,7 @@
-

Your Websites

+

Your Verified Websites