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

Always use binary byte units

Browse Source
This commit is contained in:
Johannes Zellner
2020-06-02 14:34:38 +02:00
parent 2178dcc963
commit 589ee2d0c5
9 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/system.html
View File

@@ -102,7 +102,7 @@
<uib-tab index="1" heading="System Memory" select="graphs.show()">
<div class="card card-large" style="min-height: 300px;">
<label>RAM ({{ memory.memory | prettyDiskSize }}) + Swap ({{ memory.swap | prettyDiskSize }}) in MB</label>
<label style="display: block">Megabyte <span class="pull-right">RAM ({{ memory.memory | prettyByteSize }}) + Swap ({{ memory.swap | prettyByteSize }})</span></label>
<canvas id="graphsSystemMemoryChart" style="width: 100%;"></canvas>
App values are not stacked up
</div>
@@ -185,7 +185,7 @@
</div>
</td>
<td class="elide-table-cell text-center">
<span ng-show="service.config.memory">{{ service.config.memorySwap / 1024 / 1024 + ' MB' }}</span>
<span ng-show="service.config.memory">{{ service.config.memorySwap | prettyByteSize }}</span>
</td>
<td class="text-right no-wrap" style="vertical-align: bottom">
<button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="Configure Memory Limit" ng-show="service.config.memory"><i class="fa fa-pencil-alt"></i></button>
@@ -213,7 +213,7 @@
</div>
</td>
<td class="elide-table-cell text-center">
<span ng-show="service.config.memory">{{ service.config.memorySwap / 1024 / 1024 + ' MB' }}</span>
<span ng-show="service.config.memory">{{ service.config.memorySwap | prettyByteSize }}</span>
</td>
<td class="text-right no-wrap" style="vertical-align: bottom">
<button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="Configure Memory Limit" ng-show="service.config.memory"><i class="fa fa-pencil-alt"></i></button>