diff --git a/src/filemanager.html b/src/filemanager.html index f74f365e5..643e87934 100644 --- a/src/filemanager.html +++ b/src/filemanager.html @@ -23,6 +23,10 @@ + + + + @@ -122,64 +126,71 @@ -
-
-
-
-
+
+
+
+
+
+
- - + + -

{{ app.fqdn }}

+

{{ app.fqdn }}

-
-
- - -
-
- - -
-
- - - +
+
+ + +
+
+ + +
+
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + +
 NameSizeOwnerActions
+ + + {{ entry.fileName }}{{ entry.size | prettyDiskSize }}{{ entry.uid | prettyOwner }} + + +
- -
- - - - - - - - - - - - - - - - - - - - -
TypeNameSizeOwnerActions
- - - {{ entry.fileName }}{{ entry.size | prettyDiskSize }}{{ entry.uid | prettyOwner }} - - -
+ +
diff --git a/src/js/filemanager.js b/src/js/filemanager.js index 103383a3a..79e34492a 100644 --- a/src/js/filemanager.js +++ b/src/js/filemanager.js @@ -16,10 +16,16 @@ angular.module('Application').filter('prettyOwner', function () { } }); +// disable sce for footer https://code.angularjs.org/1.5.8/docs/api/ng/service/$sce +app.config(function ($sceProvider) { + $sceProvider.enabled(false); +}); + app.controller('FileManagerController', ['$scope', 'Client', function ($scope, Client) { var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {}); $scope.initialized = false; + $scope.status = null; $scope.client = Client; $scope.cwd = '/'; $scope.cwdParts = []; @@ -42,8 +48,6 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C Client.filesGet($scope.appId, $scope.cwd, function (error, result) { if (error) return Client.error(error); - console.log(result); - $scope.entries = result.entries; }); }; @@ -255,27 +259,25 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C window.location.reload(true); } + $scope.status = status; + console.log('Running filemanager version ', localStorage.version); // get user profile as the first thing. this populates the "scope" and affects subsequent API calls Client.refreshUserInfo(function (error) { if (error) return Client.initError(error, init); - Client.refreshConfig(function (error) { + Client.getApp($scope.appId, function (error, result) { if (error) return Client.initError(error, init); - Client.getApp($scope.appId, function (error, result) { - if (error) return Client.initError(error, init); + $scope.app = result; - $scope.app = result; + // now mark the Client to be ready + Client.setReady(); - // now mark the Client to be ready - Client.setReady(); + $scope.refresh(); - $scope.refresh(); - - $scope.initialized = true; - }); + $scope.initialized = true; }); }); });