From a000c8e6aef598938324a20140ef7b0745ca21e5 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Tue, 24 Oct 2017 14:58:46 -0600 Subject: [PATCH] fixing mulitple loading controllers --- css/styles.css | 2 +- js/app.js | 9 --------- js/controllers/website-controller.js | 11 ----------- templates/websites.html | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 templates/websites.html diff --git a/css/styles.css b/css/styles.css index f963495..10fe174 100644 --- a/css/styles.css +++ b/css/styles.css @@ -593,7 +593,7 @@ a:hover, a:focus { background-color: #e74c3c; border-radius: 5px; display: block; - padding: 30px 20px; + padding: 60px 20px; text-align: center; width: 100%; } diff --git a/js/app.js b/js/app.js index 6713c1a..46b5613 100644 --- a/js/app.js +++ b/js/app.js @@ -112,15 +112,6 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider } } }) - .state('app.websites', { - url: 'websites', - views: { - 'content@': { - templateUrl: 'templates/websites.html', - controller: 'websiteCtrl as vm', - } - } - }) .state('app.dns', { url: 'dns', views: { diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js index 6fe1b7d..e041509 100644 --- a/js/controllers/website-controller.js +++ b/js/controllers/website-controller.js @@ -55,7 +55,6 @@ app.directive('fileTree', [function () { return { restrict: 'EA', templateUrl: '/templates/widgets/filetree.html', - controller: 'websiteCtrl as vm' }; }]); @@ -63,7 +62,6 @@ app.directive('notificationBar', [function () { return { restrict: 'EA', templateUrl: '/templates/widgets/website-notification-bar.html', - controller: 'websiteCtrl as vm' }; }]); @@ -88,9 +86,6 @@ app.controller('websiteCtrl', [ return r.verifiedAt || r.mode; } - // vm.selectedShow = websitesService.find($stateParams.id); - // vm.shows = websitesService.list(); - Auth.api = function (apiname, opts) { var els = []; @@ -714,11 +709,6 @@ app.controller('websiteCtrl', [ }); }; - vm.websiteSelected = function (x) { - vm.selectedShow = x; - debugger; - }; - //vm.getDomains(); Auth.api('domains.list', {}).then(function (els) { // console.log('[init] domains.list els:'); @@ -726,7 +716,6 @@ app.controller('websiteCtrl', [ vm.domains = els; $scope.domain = vm.domains; }); - console.log('asdfasdfa') vm.listSites(); vm.triggerDropdown = function() { diff --git a/templates/websites.html b/templates/websites.html deleted file mode 100644 index e69de29..0000000