Skip to content

Commit 3550ee0

Browse files
author
Marius Burkard
committed
Merge branch 'fix-5954' into 'develop'
addendum fixes center of database quota dashlet closes #5954 Closes #5954 See merge request ispconfig/ispconfig3!1373
2 parents 1d0bbb1 + 7de4025 commit 3550ee0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

interface/web/dashboard/dashlets/templates/databasequota.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<td>{tmpl_var name='database_name'}</td>
1515
<td>{tmpl_var name='used'}</td>
1616
<td>{tmpl_var name='database_quota'}</td>
17-
{tmpl_if name="database_quota" op="!=" value="unlimited"}<td>
17+
{tmpl_if name="quota_raw" op="!=" value="0"}<td>
1818
<div class='progress'>
19-
<div class='progress-bar-striped progress-bar progress-bar-{tmpl_if name="used_percentage" op="<" value="50"}success{tmpl_elseif name="used_percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role='progressbar' aria-valuemin='0' aria-valuemax='100' aria-valuenow='{tmpl_var name="used_percentage"}' style='width: {tmpl_var name="used_percentage"}%'>{tmpl_var name="used_percentage"}%
19+
<div class='progress-bar-striped progress-bar progress-bar-{tmpl_if name="used_percentage" op="<" value="50"}success{tmpl_elseif name="used_percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role='progressbar' aria-valuemin='0' aria-valuemax='100' aria-valuenow='{tmpl_var name="used_percentage"}' style='width: {tmpl_var name="used_percentage"}%'><span>{tmpl_var name="used_percentage"}%</span>
2020
<span class='sr-only'>{tmpl_var name='used'} {tmpl_var name='of_txt'} {tmpl_var name='database_quota'}</span>
2121
</div>
2222
</div>

interface/web/dashboard/dashlets/templates/limits.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
role='progressbar' aria-valuemin='0' aria-valuemax='100'
2020
aria-valuenow='{tmpl_var name="progressbar"}' style='width:{tmpl_var name="progressbar"}%'
2121
data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='percentage'}%">
22-
{tmpl_var name="percentage"}%
22+
<span>{tmpl_var name="percentage"}%</span>
2323
<span class='sr-only'>{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var
2424
name='value'}</span>
2525
</div>

interface/web/dashboard/dashlets/templates/mailquota.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<td>{tmpl_var name='name'}</td>
1717
<td>{tmpl_var name='used'}</td>
1818
<td>{tmpl_var name='quota'}</td>
19-
{tmpl_if name="quota" op="!=" value="unlimited"}<td>
19+
{tmpl_if name="quota_raw" op="!=" value="0"}<td>
2020
<div class='progress'>
2121
<div class='progress-bar-striped progress-bar progress-bar-{tmpl_if name="used_percentage" op="<" value="50"}success{tmpl_elseif name="used_percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role='progressbar' aria-valuemin='0' aria-valuemax='100' aria-valuenow='{tmpl_var name="used_percentage"}' style='width:{tmpl_var name="used_percentage"}%'><span>{tmpl_var name="used_percentage"}%</span>
2222
<span class='sr-only'>{tmpl_var name='used'} {tmpl_var name='of_txt'} {tmpl_var name='quota'}</span>

0 commit comments

Comments
 (0)