From a2681500e148299c260f02e6556eacfe545b845b Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Fri, 08 Jul 2016 04:36:22 -0400 Subject: [PATCH] Merge branch 'dashboard-quota-tooltips' into 'stable-3.1' --- interface/web/dashboard/dashlets/templates/mailquota.htm | 59 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 29 insertions(+), 30 deletions(-) diff --git a/interface/web/dashboard/dashlets/templates/mailquota.htm b/interface/web/dashboard/dashlets/templates/mailquota.htm index 45f97c9..5ad01d6 100644 --- a/interface/web/dashboard/dashlets/templates/mailquota.htm +++ b/interface/web/dashboard/dashlets/templates/mailquota.htm @@ -1,31 +1,30 @@ -<div style="float: left;"> - <h2>{tmpl_var name='mailquota_txt'}</h2> - <div style="width:350px;"> - <div class="table-wrapper marginTop15"> -<table class="table"> - <thead class="dark"> - <tr> - <td>{tmpl_var name='email_txt'}</td> - <td>{tmpl_var name='name_txt'}</td> - <td>{tmpl_var name='used_txt'}</td> - <td>{tmpl_var name='quota_txt'}</td> - </tr> + <div class='table-wrapper'> + <table class='table'> + <caption>{tmpl_var name='mailquota_txt'}</caption> + <thead class="dark form-group-sm"> + <tr> + <th>{tmpl_var name='email_txt'}</th> + <th>{tmpl_var name='name_txt'}</th> + <th>{tmpl_var name='used_txt'}</th> + <th colspan="2">{tmpl_var name='quota_txt'}</th> + </tr> </thead> - <tmpl_if name="has_mailquota"> - <tmpl_loop name='mailquota'> - <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>"> - <td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='email'}</td> - <td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='name'}</td> - <td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='used'}</td> - <td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='quota'}</td> - </tr> - </tmpl_loop> - <tmpl_else> - <tr> - <td colspan="4" style="text-align:center;">{tmpl_var name='no_email_accounts_txt'}</td> - </tr> - </tmpl_if> - </table> -</div> - </div> -</div> \ No newline at end of file + <tbody> + <tmpl_loop name='mailquota'> + <tr> + <td>{tmpl_var name='email'}</td> + <td>{tmpl_var name='name'}</td> + <td>{tmpl_var name='used'}</td> + <td>{tmpl_var name='quota'}</td> + <td> + <div class='progress'> + <div class='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"}%' data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='used_percentage'}%"> + <span class='sr-only'>{tmpl_var name='used'} {tmpl_var name='of_txt'} {tmpl_var name='quota'}</span> + </div> + </div> + </td> + </tr> + </tmpl_loop> + </tbody> + </table> + </div> \ No newline at end of file -- Gitblit v1.9.1