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

Show disk content label in usage bar tooltip

Browse Source
This commit is contained in:
Johannes Zellner
2023-12-14 13:01:59 +01:00
parent cbefd4195f
commit 09b438850e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/views/system.html
+4 -4
View File
@@ -122,13 +122,13 @@
<div ng-repeat="content in disk.contents" class="disk-content">
<span class="color-indicator" style="background-color: {{ content.color }};">&nbsp;</span>
<span ng-show="content.type === 'cloudron-backup-default'">{{ content.path }} (Old Backups)</span>
<span ng-show="content.type === 'standard'">{{ content.label || content.id }}</span>
<span ng-show="content.type === 'swap'">{{ content.id }}</span>
<span ng-show="content.type === 'standard'">{{ content.label }}</span>
<span ng-show="content.type === 'swap'">{{ content.label }}</span>
<span ng-show="content.type === 'app'">
<a href="https://{{ content.app.fqdn }}" target="_blank" ng-hide="content.uninstalled">{{ content.app.label || content.app.fqdn }}</a>
<a href="https://{{ content.app.fqdn }}" target="_blank" ng-hide="content.uninstalled">{{ content.label }}</a>
<span ng-show="content.uninstalled">{{ 'system.diskUsage.uninstalledApp' | tr }}</span>
</span>
<span ng-show="content.type === 'volume'"><a href="/#/volumes">{{ content.volume.name }}</a></span>
<span ng-show="content.type === 'volume'"><a href="/#/volumes">{{ content.label }}</a></span>
<small class="text-muted">{{ content.usage | prettyDiskSize }}</small>
</div>
</div>
dashboard/src/views/system.js
+5
View File
@@ -96,11 +96,16 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
if (content.type === 'app') {
content.app = Client.getInstalledAppsByAppId()[content.id];
content.label = content.app.label || content.app.fqdn;
if (!content.app) content.uninstalled = true;
} else if (content.type === 'volume') {
content.volume = $scope.volumesById[content.id];
content.label = content.volume.name;
}
// ensure a label for ui
content.label = content.label || content.id;
usageOther -= content.usage;
});