From 9d9f16e9485bfdf8ad70f9acb4d537dd30a2f656 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 24 May 2018 13:53:30 -0700 Subject: [PATCH] Re-work the configure dialog --- src/views/apps.html | 277 ++++++++++++++++++++++---------------------- src/views/apps.js | 4 +- 2 files changed, 143 insertions(+), 138 deletions(-) diff --git a/src/views/apps.html b/src/views/apps.html index 6d6043394..852fa5e00 100644 --- a/src/views/apps.html +++ b/src/views/apps.html @@ -6,150 +6,155 @@

Repair {{ appConfigure.app.fqdn }}

Configure {{ appConfigure.app.fqdn }}

-
+
-
{{ appConfigure.error.other }}
-
- -
- - -
- - -
-
-
- -

- Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP -
-

- -
{{ appConfigure.error.port }}
-
- -
- - -
- -
- -
- -

- This app has it's own user management. -

-
- -
- -

- This app is configured to use it's own user management. -

-
- -
- -

- All users with a mailbox on this Cloudron have access. -

-
- -
- -
- -
-
- -
-
-
-
- Users: - -
- -
- Groups: - -
-
-
- -
-
-
- -

- This app is pre-configured for use with Cloudron Email. -

- - Advanced settings... -
-
- + +
-
- -
-
+
{{ appConfigure.error.other }}
+
+ +
+ -
- -
Must be empty of a valid URL
- -
- -
- - -
- -
- - -
- -
- -
{{ appConfigure.error.cert }}
-
-
- - - - - +
+ + +
-
-
- - - - - + +

+ Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP +
+

+ +
{{ appConfigure.error.port }}
+
+ +
+ + +
+ +
+ +
+ +

+ This app has it's own user management. +

+
+ +
+ +

+ This app is configured to use it's own user management. +

+
+ +
+ +

+ All users with a mailbox on this Cloudron have access. +

+
+ +
+ +
+ +
+
+ +
+
+
+
+ Users: + +
+ +
+ Groups: + +
+
+
+ +
+
+
+ +

+ This app is pre-configured for use with Cloudron Email. +

+ + + +
+
+ +
+
+
-
-
+ +
+ +
Must be empty of a valid URL
+ +
+ +
+ + +
+ +
+ + +
+ +
+ +
{{ appConfigure.error.cert }}
+
+
+ + + + + +
+
+
+
+ + + + + +
+
+
+ + diff --git a/src/views/apps.js b/src/views/apps.js index cd966e68f..c46186406 100644 --- a/src/views/apps.js +++ b/src/views/apps.js @@ -314,7 +314,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location $scope.appRestoreForm.$setUntouched(); }; - document.getElementById('appConfigureCertificateFileInput').onchange = function (event) { + $scope.readCertificate = function (event) { $scope.$apply(function () { $scope.appConfigure.certificateFile = null; $scope.appConfigure.certificateFileName = event.target.files[0].name; @@ -328,7 +328,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location }); }; - document.getElementById('appConfigureKeyFileInput').onchange = function (event) { + $scope.readKey = function (event) { $scope.$apply(function () { $scope.appConfigure.keyFile = null; $scope.appConfigure.keyFileName = event.target.files[0].name;