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

dashboard: do not duplicate app info in update section

Browse Source
This commit is contained in:
Johannes Zellner
2024-07-04 16:57:54 +02:00
parent 65f6ff35e0
commit 4981854c7f
1 changed files with 15 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
dashboard/src/views/app.html
View File

@@ -1555,46 +1555,31 @@
</div>
<div class="card" ng-show="view === 'updates'">
<p><label class="control-label">{{ 'app.updates.info.title' | tr }}</label></p>
<div class="row">
<div class="col-xs-4">
<span class="text-muted">{{ 'app.updates.info.description' | tr }}</span>
</div>
<div class="col-xs-8 text-right">
<span ng-show="app.appStoreId">{{ app.manifest.title }} {{ app.upstreamVersion }}</span>
<span ng-show="!app.appStoreId">{{ app.manifest.dockerImage }}</span>
<p><label class="control-label">{{ 'app.updatesTabTitle' | tr }}</label></p>
<div class="row" ng-show="!app.appStoreId">
<div class="col-md-12 text-danger">
{{ 'app.updates.info.customAppUpdateInfo' | tr }}
</div>
</div>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.updates.info.appId' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ app.id }}</span>
<div ng-show="app.appStoreId" class="row">
<div class="col-md-12">
<p>{{ 'app.updates.auto.description' | tr }}</p>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.updates.info.packageVersion' | tr }}</span>
<div ng-show="app.appStoreId" class="row">
<div class="col-md-6" style="line-height: 34px;">
<span class="text-success" ng-show="app.enableAutomaticUpdate">{{ 'app.updates.auto.enabled' | tr }}</span>
<span class="text-danger" ng-hide="app.enableAutomaticUpdate">{{ 'app.updates.auto.disabled' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span ng-show="app.appStoreId"><a ng-href="/#/appstore/{{app.manifest.id}}?version={{app.manifest.version}}">{{ app.manifest.id }}@{{ app.manifest.version }}</a></span>
<span ng-show="!app.appStoreId">{{ app.manifest.version }}</span>
<div class="col-md-6 text-right">
<button class="btn btn-primary" uib-tooltip="{{ app.appStoreId ? '' : 'Not available for custom apps' }}" ng-class="{ 'btn-danger': app.enableAutomaticUpdate }" ng-click="updates.toggleAutomaticUpdates()" ng-disabled="updates.busyAutomaticUpdates || !app.appStoreId"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyAutomaticUpdates"></i> {{ app.enableAutomaticUpdate ? ('app.updates.auto.disableAction' | tr) : ('app.updates.auto.enableAction' | tr) }} </button>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<span class="text-muted">{{ 'app.updates.info.lastUpdated' | tr }}</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ app.updateTime | prettyDate }}</span>
</div>
</div>
<br/>
<hr ng-show="app.appStoreId"/>
<div class="row" ng-show="app.appStoreId">
<div class="col-md-6" style="line-height: 34px;">
@@ -1606,27 +1591,6 @@
</div>
</div>
<hr/>
<div class="row" ng-show="!app.appStoreId">
<div class="col-md-12">
<span class="text-danger pull-right">{{ 'app.updates.info.customAppUpdateInfo' | tr }}</span>
</div>
</div>
<div ng-show="app.appStoreId" class="row">
<div class="col-md-12">
<label class="control-label">{{ 'app.updates.auto.title' | tr }}</label>
<p>{{ 'app.updates.auto.description' | tr }}</p>
</div>
<div class="col-md-6" style="line-height: 34px;">
<span class="text-success" ng-show="app.enableAutomaticUpdate">{{ 'app.updates.auto.enabled' | tr }}</span>
<span class="text-danger" ng-hide="app.enableAutomaticUpdate">{{ 'app.updates.auto.disabled' | tr }}</span>
</div>
<div class="col-md-6">
<button class="btn btn-primary pull-right" uib-tooltip="{{ app.appStoreId ? '' : 'Not available for custom apps' }}" ng-class="{ 'btn-danger': app.enableAutomaticUpdate }" ng-click="updates.toggleAutomaticUpdates()" ng-disabled="updates.busyAutomaticUpdates || !app.appStoreId"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyAutomaticUpdates"></i> {{ app.enableAutomaticUpdate ? ('app.updates.auto.disableAction' | tr) : ('app.updates.auto.enableAction' | tr) }} </button>
</div>
</div>
</div>
<div class="card" ng-show="view === 'backups'">