diff --git a/src/theme.scss b/src/theme.scss index dcec8d2ff..c986ed3de 100644 --- a/src/theme.scss +++ b/src/theme.scss @@ -436,6 +436,24 @@ multiselect { // App view // ---------------------------- +.app-configure { + h3 { + margin-top: 0; + } + + .card { + min-height: 314px; + } + + .col-md-2 { + padding-right: 0; + } + + .col-md-8 { + padding-left: 0; + } +} + .task-indicator { font-size: 18px; position: fixed; @@ -452,36 +470,29 @@ multiselect { } .app-configure-links { - position: fixed; - left: 20px; - top: 100px; - div { cursor: pointer; display: block; - padding: 6px 10px; + padding: 6px 15px; margin: 0; overflow: hidden; color: black; text-overflow: ellipsis; white-space: nowrap; font-size: 16px; + user-select: none; &:hover, - &:focus, - &.category-active { + &:focus { text-decoration: none; background-color: white; - color: black; + box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1); } - &.category-active { - background-color: $navbar-default-link-hover-color; - color: white; - } - - & > i { - width: 30px; + &.active { + background-color: white; + color: $navbar-default-link-color; + box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1); } } } diff --git a/src/views/app.html b/src/views/app.html index 36ddfb5cf..fe28c1505 100644 --- a/src/views/app.html +++ b/src/views/app.html @@ -114,456 +114,456 @@ -
+
{{ app | installationStateLabel:user }}
-
-
Overview
-
Display
-
Location
-
Access Control
-
Resources
-
Security
-
Updates
-
Backups
-
Debug
+
+ +
+
+ +
+
+

+ {{ app.label || app.fqdn }} + +
+ + {{ app | installationStateLabel:user }} + +

+

-
-
-
-
-

- - {{ app.label || app.location || app.fqdn }} -

-
- -

- {{ app | installationStateLabel:user }} -

- -
- -

- {{ app.manifest.title }} - {{ app.upstreamVersion }} (Package v{{ app.manifest.version }}) -
- App ID {{ app.id }} -
- Last updated {{ app.updateTime | prettyDate }} -

- -
- -

- SFTP
- Server: {{ config.adminFqdn }}
- Port: 222
- Username: {{ user.username }}@{{ app.fqdn }}
-

-
-
- - Open App - Documentation -
+
+
+
+
Overview
+
Display
+
Location
+
Access Control
+
Resources
+
Security
+
Updates
+
Backups
+
Debug
-
- -

Display

-
-
-
-
-
-
- -
{{display.error.label}}
- -
-
- - -
-
-
- -
-
-
-
- Reset Icon - -
- - -
-
-
-
-
-
- -
-
-
- -

Location

-
-
App task in progress...
-
-
-
-
-
{{ location.error.other }}
-
- -
- - -
- - -
-
-
- -

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

+
+
+
+

+ {{ app.manifest.title }} + {{ app.upstreamVersion }} (Package v{{ app.manifest.version }}) +
+ App ID {{ app.id }} +
+ Last updated {{ app.updateTime | prettyDate }}

-
{{ location.error.port }}
-
- -
- - -
- +
+ +

+ SFTP
+ Server: {{ config.adminFqdn }}
+ Port: 222
+ Username: {{ user.username }}@{{ app.fqdn }}
+

+
+ +
+
+
-
- -
{{ location.error.alternateDomains }}
+
+
+
+
+ +
+ +
{{display.error.label}}
+ +
+
+ + +
+
+
+ +
+
+
+
+ Reset Icon + +
-
-
-
- + + +
+
+
+
+
+ +
+
+
+ +
+
App task in progress...
+
+
+
+
+
{{ location.error.other }}
+
+ +
+
-
- + +

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

+ +
{{ location.error.port }}
+
+ +
+ + +
+
-
-
- No alternate domains are configured. Add a domain -
- -
- - -
-
-
-
-
- -
-
-
+
+ +
{{ location.error.alternateDomains }}
-

Access Control

-
-
-
-
-
-
-
- -

This setting also controls SFTP access.

-
-
- -

- This app has it's own user management. - This setting also controls SFTP access. -

-

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

-
+
+
+
+ -
- -
-
- -
-
-
-
- Users: +
+ + +
+
+
+
+ +
- -
- Groups: +
+ No alternate domains are configured. Add a domain +
+
-
- -
- -
-
-
-
-
- Saved -
- -
- -
-
-
- -

Resources

-
-
App task in progress...
-
-
-
-
-
- -
-
- -
-
- - -
- - -
{{resources.error.dataDir}}
- -
- - -
-
-
-
-
-
- -
-
-
- -

Email

-
-
App task in progress...
-
-
-
-
- -
- - -
{{ email.error.mailboxName }}
- -
- - -
- -
-
- -

-
- This app is configured to send mail using {{app.domain}}'s Outbound Email settings. -

-
- - -
-
-
-
-
-
- Saved -
- -
- -
-
-
- -

Security

-
-
-
-
-
-
- - -
- - -
-
-
-
-
-
- -
-
-
- -

Updates

-
-
-
- - -
-
- -
-
-
- -

Backups

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
 CreatedVersionActions
This app has no backups yet.
{{ backup.creationTime | prettyDate }}v{{ backup.version }} - - - - -
-
-
-
-
-
-
-
-
+ + + +
+
+
+
+
-
{{ app.message }}
-
- + +
+
+
+
+
+
+
+ +

This setting also controls SFTP access.

+
+
+ +

+ This app has it's own user management. + This setting also controls SFTP access. +

+

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

+
+ +
+ +
+
+ +
+
+
+
+ Users: +
+ +
+ Groups: +
+
+
+ + +
+
+
+
+
+
+
+ Saved +
+ +
+ +
+
-
-
-
-
- - + +
+
App task in progress...
+
+
+
+
+
+ +
+
+ +
+
+ + +
+ + +
{{resources.error.dataDir}}
+ +
+ + +
+
+
+
+
+
+ +
+
-
- + +
+
App task in progress...
+
+
+
+
+ +
+ + +
{{ email.error.mailboxName }}
+ +
+ + +
+ +
+
+ +

+
+ This app is configured to send mail using {{app.domain}}'s Outbound Email settings. +

+
+ + +
+
+
+
+
+
+ Saved +
+ +
+ +
+
+ +
+
+
+
+
+
+ + +
+ + +
+
+
+
+
+
+ +
+
+
+ +
+
+
+ + +
+
+ +
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
 CreatedVersionActions
This app has no backups yet.
{{ backup.creationTime | prettyDate }}v{{ backup.version }} + + + + +
+
+
+
+
+
+
+
+
+
+
{{ app.message }}
+
+
+
+ +
+
+
+
+
+ + +
+
+ +
+
+
+ +
+
+
+ + + Terminal + Logs +
+
+
+
- -

Debug

-
-
-
- - - Terminal - Logs -
-
-
-
diff --git a/src/views/app.js b/src/views/app.js index 1dc09a8c2..21c2c42c0 100644 --- a/src/views/app.js +++ b/src/views/app.js @@ -39,6 +39,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location' var appId = $location.path().slice('/app/'.length); + $scope.view = 'overview'; $scope.app = null; $scope.activeTask = null; $scope.appIsRestarting = false; @@ -53,11 +54,6 @@ angular.module('Application').controller('AppController', ['$scope', '$location' $scope.backupsEnabled = true; $scope.disableIndexingTemplate = '# Disable search engine indexing\n\nUser-agent: *\nDisallow: /'; - $scope.scrollTo = function (elemId) { - var elem = document.getElementById(elemId); - elem.scrollIntoView(); - }; - $scope.display = { busy: false, error: {},