jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge overview bits into other more relevant views

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-17 15:32:43 +02:00
parent 5c0a53e02a
commit 2269f15b66
2 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/views/app.html
View File

@@ -131,6 +131,8 @@
<div class="col-md-8">
<h1 style="line-height: 0.7;">
{{ app.label || app.fqdn }}
<a class="btn btn-sm btn-outline btn-primary pull-right" ng-href="https://{{ app.fqdn }}" target="_blank"><i class="fas fa-external-link-alt"></i> Open App</a>
<a class="btn btn-sm btn-outline btn-info pull-right" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
<button class="btn btn-sm btn-danger pull-right" ng-click="uninstall.show()">Uninstall</button>
<br/>
<span class="text-small">
@@ -145,7 +147,6 @@
<div class="row">
<div class="col-md-2">
<div class="app-configure-links">
<div ng-click="setView('overview')" ng-class="{ 'active': view === 'overview' }">Overview</div>
<div ng-click="setView('display')" ng-class="{ 'active': view === 'display' }">Display</div>
<div ng-click="setView('location')" ng-class="{ 'active': view === 'location' }">Location</div>
<div ng-click="setView('access')" ng-class="{ 'active': view === 'access' }">Access Control</div>
@@ -158,38 +159,6 @@
</div>
</div>
<div class="col-md-8">
<div class="card" ng-show="view === 'overview'">
<div class="row">
<div class="col-md-12">
<p>
{{ app.manifest.title }}
<span class="app-info-meta text-small">{{ app.upstreamVersion }} (Package <a ng-href="/#/appstore/{{app.manifest.id}}?version={{app.manifest.version}}">v{{ app.manifest.version }}</a>) </span>
<br/>
App ID <span class="app-info-meta text-small">{{ app.id }}</a> </span>
<br/>
Location
<a ng-href="https://{{ app.fqdn }}" target="_blank" class="app-info-meta text-small">{{ app.fqdn }}</a>
<br/>
Last updated <span class="app-info-meta text-small">{{ app.updateTime | prettyDate }}</span>
</p>
<br/>
<p ng-show="app.manifest.addons.localstorage.ftp">
<b>SFTP</b> <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#ftp-access" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup><br/>
Server: {{ config.adminFqdn }}<br/>
Port: 222<br/>
Username: {{ user.username }}@{{ app.fqdn }}<br/>
</p>
<br/>
<div>
<a class="btn btn-outline btn-primary pull-right" ng-href="https://{{ app.fqdn }}" target="_blank"><i class="fas fa-external-link-alt"></i> Open App</a>
<a class="btn btn-outline btn-primary pull-right" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
</div>
</div>
</div>
</div>
<div class="card" ng-show="view === 'display'">
<div class="row">
<div class="col-md-12">
@@ -379,6 +348,15 @@
<button class="btn btn-outline btn-primary pull-right" ng-click="access.submit()" ng-disabled="access.$invalid || access.busy"><i class="fa fa-circle-notch fa-spin" ng-show="access.busy"></i> Save</button>
</div>
</div>
<hr/>
<div class="row" ng-show="app.manifest.addons.localstorage.ftp">
<div class="col-md-12">
<label>SFTP</label> <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#ftp-access" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup><br/>
Server: {{ config.adminFqdn }}<br/>
Port: 222<br/>
Username: {{ user.username }}@{{ app.fqdn }}<br/>
</div>
</div>
</div>
<div class="card" ng-show="view === 'resources'">
@@ -478,6 +456,11 @@
</div>
<div class="card" ng-show="view === 'updates'">
<div class="row">
<div class="col-md-12">
Last updated <span class="app-info-meta text-small">{{ app.updateTime | prettyDate }}</span>
</div>
</div>
<div class="row">
<div class="col-md-6">
<input type="checkbox" id="updatesEnableAutomaticUpdate" ng-model="updates.enableAutomaticUpdate">
@@ -552,6 +535,13 @@
<div class="card" ng-show="view === 'debug'">
<div class="row">
<div class="col-md-12">
<p>
{{ app.manifest.title }}
<span class="app-info-meta text-small">{{ app.upstreamVersion }} (Package <a ng-href="/#/appstore/{{app.manifest.id}}?version={{app.manifest.version}}">v{{ app.manifest.version }}</a>) </span>
<br/>
App ID <span class="app-info-meta text-small">{{ app.id }}</a> </span>
</p>
<button class="btn btn-danger" ng-click="debug.stopAppTask(app.taskId)" ng-disabled="!app.taskId">Cancel Current Task</button>
<button class="btn btn-danger" ng-click="debug.restartApp()" ng-disabled="app.taskId || appIsRestarting"><i class="fa fa-circle-notch fa-spin" ng-show="appIsRestarting"></i> Restart App</button>
<a class="btn btn-primary pull-right" ng-href="{{ '/terminal.html?id=' + app.id }}" target="_blank">Terminal</a>