Skip to content

Commit d2713e4

Browse files
author
Marius Cramer
committed
- Fixed bug in quota lib
- New dashboard layout
1 parent 825dd67 commit d2713e4

File tree

10 files changed

+157
-134
lines changed

10 files changed

+157
-134
lines changed

‎interface/lib/classes/quota_lib.inc.php‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function get_quota_data($clientid = null, $readable = true) {
1414
//print_r($monitor_data);
1515

1616
// select all websites or websites belonging to client
17-
$sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND type = 'vhost'".(($clientid != null)?" AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)":''), $app->functions->intval($client_id));
17+
$sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND type = 'vhost'".(($clientid != null)?" AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)":''), $clientid);
1818

1919
//print_r($sites);
2020
if(is_array($sites) && !empty($sites)){
@@ -35,7 +35,13 @@ public function get_quota_data($clientid = null, $readable = true) {
3535
if (!is_numeric($sites[$i]['soft'])) $sites[$i]['soft']=$sites[$i]['soft'][1];
3636
if (!is_numeric($sites[$i]['hard'])) $sites[$i]['hard']=$sites[$i]['hard'][1];
3737
if (!is_numeric($sites[$i]['files'])) $sites[$i]['files']=$sites[$i]['files'][1];
38-
38+
39+
$sites[$i]['used_raw'] = $sites[$i]['used'];
40+
$sites[$i]['soft_raw'] = $sites[$i]['soft'];
41+
$sites[$i]['hard_raw'] = $sites[$i]['hard'];
42+
$sites[$i]['files_raw'] = $sites[$i]['files'];
43+
$sites[$i]['used_percentage'] = ($sites[$i]['soft'] > 0 && $sites[$i]['used'] > 0 ? round($sites[$i]['used'] * 100 / $sites[$i]['soft']) : 0);
44+
3945
if ($readable) {
4046
// colours
4147
$sites[$i]['display_colour'] = '#000000';
@@ -109,7 +115,7 @@ public function get_mailquota_data($clientid = null, $readable = true) {
109115
//print_r($monitor_data);
110116

111117
// select all email accounts or email accounts belonging to client
112-
$emails = $app->db->queryAllRecords("SELECT * FROM mail_user".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : ''), $app->functions->intval($client_id));
118+
$emails = $app->db->queryAllRecords("SELECT * FROM mail_user".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : ''), $clientid);
113119

114120
//print_r($emails);
115121
if(is_array($emails) && !empty($emails)){
@@ -120,6 +126,11 @@ public function get_mailquota_data($clientid = null, $readable = true) {
120126

121127
if (!is_numeric($emails[$i]['used'])) $emails[$i]['used']=$emails[$i]['used'][1];
122128

129+
$emails[$i]['quota_raw'] = $emails[$i]['quota'];
130+
$emails[$i]['used_raw'] = $emails[$i]['used'];
131+
$emails[$i]['used_percentage'] = ($emails[$i]['quota'] > 0 && $emails[$i]['used'] > 0 ? round($emails[$i]['used'] * 100 / $emails[$i]['quota']) : 0);
132+
133+
123134
if ($readable) {
124135
// colours
125136
$emails[$i]['display_colour'] = '#000000';

‎interface/web/dashboard/dashlets/limits.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,15 @@ function show() {
143143
}
144144
if($value != 0 || $value == $wb['unlimited_txt']) {
145145
$value_formatted = ($value == '-1')?$wb['unlimited_txt']:$value;
146+
$usage = $this->_get_limit_usage($limit);
147+
$percentage = ($value == '-1' || $value == 0 ? 0 : round(100 * $usage / $value));
146148
$rows[] = array('field' => $field,
147149
'field_txt' => $wb[$field.'_txt'],
148150
'value' => $value_formatted,
149-
'usage' => $this->_get_limit_usage($limit));
151+
'value_raw' => $value,
152+
'usage' => $usage,
153+
'usage_raw' => $usage,
154+
'percentage' => $percentage);
150155
}
151156
}
152157
$tpl->setLoop('rows', $rows);

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

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
1-
<h2>{tmpl_var name='limits_txt'}</h2>
2-
<div style="width:350px;">
3-
<div class="table-wrapper marginTop15">
4-
<table class="table">
5-
<tmpl_loop name='rows'>
6-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
7-
<td>{tmpl_var name='field_txt'}</td>
8-
<td style="white-space: nowrap">{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var name='value'}</td>
9-
</tr>
10-
</tmpl_loop>
11-
</table>
12-
</div>
13-
</div>
1+
<div class='table-wrapper'>
2+
<table class='table'>
3+
<caption>{tmpl_var name='limits_txt'}</caption>
4+
<thead class="dark">
5+
<tr>
6+
<th>&nbsp;</th>
7+
<th colspan='2'>&nbsp;</th>
8+
</tr>
9+
</thead>
10+
<tbody>
11+
<tmpl_loop name='rows'>
12+
<tr>
13+
<td>{tmpl_var name='field_txt'}</td>
14+
<td>{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var name='value'}</td>
15+
<td>
16+
<div class='progress'>
17+
<div class='progress-bar progress-bar-{tmpl_if name="percentage" op="<" value="50"}success{tmpl_elseif name="percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role='progressbar' aria-valuemin='0' aria-valuemax='100' aria-valuenow='{tmpl_var name="percentage"}' style='width:{tmpl_var name="percentage"}%'>
18+
<span class='sr-only'>{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var name='value'}</span>
19+
</div>
20+
</div>
21+
</td>
22+
</tr>
23+
</tmpl_loop>
24+
</tbody>
25+
</table>
26+
</div>

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

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
<div style="float: left;">
2-
<h2>{tmpl_var name='mailquota_txt'}</h2>
3-
<div style="width:350px;">
4-
<div class="table-wrapper marginTop15">
5-
<table class="table">
1+
<div class='table-wrapper'>
2+
<table class='table'>
3+
<caption>{tmpl_var name='mailquota_txt'}</caption>
64
<thead class="dark">
7-
<tr>
8-
<td>{tmpl_var name='email_txt'}</td>
9-
<td>{tmpl_var name='name_txt'}</td>
10-
<td>{tmpl_var name='used_txt'}</td>
11-
<td>{tmpl_var name='quota_txt'}</td>
12-
</tr>
5+
<tr>
6+
<th>{tmpl_var name='email_txt'}</th>
7+
<th>{tmpl_var name='name_txt'}</th>
8+
<th>{tmpl_var name='used_txt'}</th>
9+
<th colspan="2">{tmpl_var name='quota_txt'}</th>
10+
</tr>
1311
</thead>
14-
<tmpl_if name="has_mailquota">
15-
<tmpl_loop name='mailquota'>
16-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
17-
<td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='email'}</td>
18-
<td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='name'}</td>
19-
<td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='used'}</td>
20-
<td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='quota'}</td>
21-
</tr>
22-
</tmpl_loop>
23-
<tmpl_else>
24-
<tr>
25-
<td colspan="4" style="text-align:center;">{tmpl_var name='no_email_accounts_txt'}</td>
26-
</tr>
27-
</tmpl_if>
28-
</table>
29-
</div>
30-
</div>
31-
</div>
12+
<tbody>
13+
<tmpl_loop name='mailquota'>
14+
<tr>
15+
<td>{tmpl_var name='email'}</td>
16+
<td>{tmpl_var name='name'}</td>
17+
<td>{tmpl_var name='used'}</td>
18+
<td>{tmpl_var name='quota'}</td>
19+
<td>
20+
<div class='progress'>
21+
<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"}%'>
22+
<span class='sr-only'>{tmpl_var name='used'} {tmpl_var name='of_txt'} {tmpl_var name='quota'}</span>
23+
</div>
24+
</div>
25+
</td>
26+
</tr>
27+
</tmpl_loop>
28+
</tbody>
29+
</table>
30+
</div>

‎interface/web/dashboard/dashlets/templates/modules.htm‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
<h2>{tmpl_var name='available_modules_txt'}</h2>
2-
<div style="width:350px;">
2+
<div style='margin: 0 auto;'>
3+
<ul class='modules clear'>
34
<tmpl_loop name='modules'>
4-
<div class="dashboard-modules {tmpl_var name='modules_name'}">
5-
<a href="#" onclick="capp('{tmpl_var name='modules_name'}')">
6-
{tmpl_var name='modules_title'}
7-
</a>
8-
</div>
5+
<li>
6+
<div class='clear'>
7+
<div class='icon icon-{tmpl_var name='modules_name'}'></div>
8+
<div class='left'>
9+
<div class='title'>{tmpl_var name='modules_title'}</div>
10+
</div>
11+
</div>
12+
<div class='btn btn-default button'>
13+
<a href='#' data-capp='{tmp_var name="modules_name"}'>Go to {tmpl_var name='modules_title'}</a>
14+
</div>
15+
</li>
916
</tmpl_loop>
17+
</ul>
1018
</div>

‎interface/web/dashboard/dashlets/templates/quota.htm‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
<div style="float: left;">
2-
<h2>{tmpl_var name='quota_txt'}</h2>
3-
<div style="width:350px;">
4-
<div class="table-wrapper marginTop15">
5-
<table class="table">
1+
<div class='table-wrapper'>
2+
<table class='table'>
3+
<caption>{tmpl_var name='quota_txt'}</caption>
64
<thead class="dark">
7-
<tr>
8-
<td>{tmpl_var name='domain_txt'}</td>
9-
<td>{tmpl_var name='used_txt'}</td>
10-
<td>{tmpl_var name='soft_txt'}</td>
11-
<td>{tmpl_var name='hard_txt'}</td>
12-
</tr>
5+
<tr>
6+
<th>{tmpl_var name='domain_txt'}</th>
7+
<th>{tmpl_var name='used_txt'}</th>
8+
<th>{tmpl_var name='soft_txt'}</th>
9+
<th colspan="2">{tmpl_var name='hard_txt'}</th>
10+
</tr>
1311
</thead>
14-
<tmpl_if name="has_quota">
15-
<tmpl_loop name='quota'>
16-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
17-
<td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='domain'}</td>
18-
<td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='used'}</td>
19-
<td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='soft'}</td>
20-
<td style="color:{tmpl_var name='display_colour'}">{tmpl_var name='hard'}</td>
21-
</tr>
22-
</tmpl_loop>
23-
<tmpl_else>
24-
<tr>
25-
<td colspan="4" style="text-align:center;">{tmpl_var name='no_sites_txt'}</td>
26-
</tr>
27-
</tmpl_if>
28-
</table>
29-
</div>
12+
<tbody>
13+
<tmpl_loop name='quota'>
14+
<tr>
15+
<td>{tmpl_var name='domain'}</td>
16+
<td>{tmpl_var name='used'}</td>
17+
<td>{tmpl_var name='soft'}</td>
18+
<td>{tmpl_var name='hard'}</td>
19+
<td>
20+
<div class='progress'>
21+
<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"}%'>
22+
<span class='sr-only'>{tmpl_var name='used'} {tmpl_var name='of_txt'} {tmpl_var name='soft'}</span>
23+
</div>
24+
</div>
25+
</td>
26+
</tr>
27+
</tmpl_loop>
28+
</tbody>
29+
</table>
3030
</div>
31-
</div>

‎interface/web/dashboard/templates/dashboard.htm‎

Lines changed: 32 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,32 @@
1-
<h1><tmpl_var name="welcome_user"></h1>
2-
<hr />
3-
<div class="panel panel_dashboard">
4-
<div>
5-
<tmpl_if name='error'>
6-
<div class="systemmonitor-state state-error">
7-
<div class="status"></div>
8-
<div class="statusMsg">
9-
<tmpl_loop name="error">
10-
{tmpl_var name='error_msg'}
11-
</tmpl_loop>
12-
</div>
13-
</div>
14-
</tmpl_if>
15-
<tmpl_if name='warning'>
16-
<div class="systemmonitor-state state-warning">
17-
<div class="status"></div>
18-
<div class="statusMsg">
19-
<tmpl_loop name="warning">
20-
{tmpl_var name='warning_msg'}
21-
</tmpl_loop>
22-
</div>
23-
</div>
24-
</tmpl_if>
25-
<tmpl_if name='info'>
26-
<div class="systemmonitor-state state-info">
27-
<div class="status"></div>
28-
<div class="statusMsg">
29-
<tmpl_loop name="info">
30-
{tmpl_var name='info_msg'}
31-
</tmpl_loop>
32-
</div>
33-
</div>
34-
</tmpl_if>
35-
</div>
36-
<div style="float:left; width:350px;">
37-
<tmpl_loop name='leftcol'>
38-
{tmpl_var name='content'}
39-
<tmpl_if name='content'>
40-
<p style="clear:left">&nbsp;</p>
41-
</tmpl_if>
42-
</tmpl_loop>
43-
</div>
44-
<div style="float:right; width:350px;padding-left:15px;">
45-
<tmpl_loop name='rightcol'>
46-
{tmpl_var name='content'}
47-
<tmpl_if name='content'>
48-
<p>&nbsp;</p>
49-
</tmpl_if>
50-
</tmpl_loop>
51-
</div>
52-
</div>
1+
<div class='page-header'>
2+
<h1>Welcome Admin</h1>
3+
</div>
4+
5+
<tmpl_if name='error'>
6+
<div class="alert alert-danger">
7+
<tmpl_loop name="error">
8+
{tmpl_var name='error_msg'}
9+
</tmpl_loop>
10+
</div>
11+
</tmpl_if>
12+
<tmpl_if name='warning'>
13+
<div class="alert alert-danger">
14+
<tmpl_loop name="warning">
15+
{tmpl_var name='warning_msg'}
16+
</tmpl_loop>
17+
</div>
18+
</tmpl_if>
19+
<tmpl_if name='info'>
20+
<div class="alert alert-notification">
21+
<tmpl_loop name="info">
22+
{tmpl_var name='info_msg'}
23+
</tmpl_loop>
24+
</div>
25+
</tmpl_if>
26+
27+
<tmpl_loop name='leftcol'>
28+
{tmpl_var name='content'}
29+
</tmpl_loop>
30+
<tmpl_loop name='rightcol'>
31+
{tmpl_var name='content'}
32+
</tmpl_loop>

‎interface/web/themes/default/assets/stylesheets/ispconfig.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ body {
217217
.progress {
218218
display: inline-block;
219219
margin-bottom: 0;
220-
width: 300px;
220+
width: 150px;
221221
height: 10px; }
222222

223223
.content-tab-wrapper {

0 commit comments

Comments
 (0)