maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Redesign of resource-recalculation, fixes #699

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-04-10 10:50:10 +02:00
parent dea3601549
commit f36643851f
3 changed files with 152 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
templates/Froxlor/admin/settings/updatecounters.tpl
View File

@@ -1,18 +1,30 @@
$header $header
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable"> <article>
<tr> <header>
<td class="maintitle" colspan="2"> <h2>
<b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['updatecounters']}: {$lng['admin']['customers']}</b> <img src="images/Froxlor/icons/res_recalculate_big.png" alt="" />&nbsp;
</td> {$lng['admin']['updatecounters']}
</tr> </h2>
</header>
<section class="fullform bradiusodd">
<table class="formtable">
<tr>
<td colspan="2" style="font-weight: bold;"><img src="images/Froxlor/icons/res_recalculate.png" alt="" />&nbsp;{$lng['admin']['customers']}</td>
</tr>
{$customers} {$customers}
<tr> </table>
<td class="maintitle" colspan="2"> <br /><br />
<b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['updatecounters']}: {$lng['admin']['admins']}</b> </section>
</td> <br /><br />
</tr> <section class="fullform bradiusodd">
<table class="formtable">
<tr>
<td colspan="2" style="font-weight: bold;"><img src="images/Froxlor/icons/res_recalculate.png" alt="" />&nbsp;{$lng['admin']['admins']}</td>
</tr>
{$admins} {$admins}
</table> </table>
<br /> <br /><br />
<br /> </section>
</article>
$footer $footer

139
templates/Froxlor/admin/settings/updatecounters_row_admin.tpl
View File

@@ -1,73 +1,76 @@
<tr> <tr>
<td class="main_field_name" style="width: 40%;"> <td style="width: 35%;">
<b><if $admin['adminid'] != $userinfo['userid']><a href="admin_admins.php?s=$s&amp;page=admins&amp;action=su&amp;id={$admin['adminid']}" target="_blank">{$admin['loginname']}</a></if><if $admin['adminid'] == $userinfo['userid']>{$admin['loginname']}</if>:</b> <b><if $admin['adminid'] != $userinfo['userid']><a href="admin_admins.php?s=$s&amp;page=admins&amp;action=su&amp;id={$admin['adminid']}" target="_blank">{$admin['loginname']}</a></if><if $admin['adminid'] == $userinfo['userid']>{$admin['loginname']}</if>:</b>
</td> </td>
<td class="main_field_name"> <td>
<table border="0" style="text-align: left;"> <section class="fullform bradiusodd">
<tr> <table class="formtable" border="0" style="text-align: left; width: 100%">
<td>{$lng['admin']['customers']}:</td> <tr>
<td><span <if $admin['customers_used'] == $admin['customers_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['customers_used']} -&gt; {$admin['customers_used_new']}</b></span></td> <td>{$lng['admin']['customers']}:</td>
</tr> <td><span <if $admin['customers_used'] == $admin['customers_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['customers_used']} -&gt; {$admin['customers_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['domains']}:</td> <tr>
<td><span <if $admin['domains_used'] == $admin['domains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['domains_used']} -&gt; {$admin['domains_used_new']}</b></span></td> <td>{$lng['customer']['domains']}:</td>
</tr> <td><span <if $admin['domains_used'] == $admin['domains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['domains_used']} -&gt; {$admin['domains_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['subdomains']}:</td> <tr>
<td><span <if $admin['subdomains_used'] == $admin['subdomains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['subdomains_used']} -&gt; {$admin['subdomains_used_new']}</b></span></td> <td>{$lng['customer']['subdomains']}:</td>
</tr> <td><span <if $admin['subdomains_used'] == $admin['subdomains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['subdomains_used']} -&gt; {$admin['subdomains_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['diskspace']}:</td> <tr>
<td><span <if $admin['diskspace_used'] == $admin['diskspace_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['diskspace_used']} -&gt; {$admin['diskspace_used_new']}</b></span></td> <td>{$lng['customer']['diskspace']}:</td>
</tr> <td><span <if $admin['diskspace_used'] == $admin['diskspace_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['diskspace_used']} -&gt; {$admin['diskspace_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['traffic']}:</td> <tr>
<td><span <if $admin['traffic_used'] == $admin['traffic_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['traffic_used']} -&gt; {$admin['traffic_used_new']}</b></span></td> <td>{$lng['customer']['traffic']}:</td>
</tr> <td><span <if $admin['traffic_used'] == $admin['traffic_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['traffic_used']} -&gt; {$admin['traffic_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['mysqls']}:</td> <tr>
<td><span <if $admin['mysqls_used'] == $admin['mysqls_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['mysqls_used']} -&gt; {$admin['mysqls_used_new']}</b></span></td> <td>{$lng['customer']['mysqls']}:</td>
</tr> <td><span <if $admin['mysqls_used'] == $admin['mysqls_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['mysqls_used']} -&gt; {$admin['mysqls_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['emails']}:</td> <tr>
<td><span <if $admin['emails_used'] == $admin['emails_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['emails_used']} -&gt; {$admin['emails_used_new']}</b></span></td> <td>{$lng['customer']['emails']}:</td>
</tr> <td><span <if $admin['emails_used'] == $admin['emails_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['emails_used']} -&gt; {$admin['emails_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['accounts']}:</td> <tr>
<td><span <if $admin['email_accounts_used'] == $admin['email_accounts_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_accounts_used']} -&gt; {$admin['email_accounts_used_new']}</b></span></td> <td>{$lng['customer']['accounts']}:</td>
</tr> <td><span <if $admin['email_accounts_used'] == $admin['email_accounts_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_accounts_used']} -&gt; {$admin['email_accounts_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['forwarders']}:</td> <tr>
<td><span <if $admin['email_forwarders_used'] == $admin['email_forwarders_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_forwarders_used']} -&gt; {$admin['email_forwarders_used_new']}</b></span></td> <td>{$lng['customer']['forwarders']}:</td>
</tr> <td><span <if $admin['email_forwarders_used'] == $admin['email_forwarders_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_forwarders_used']} -&gt; {$admin['email_forwarders_used_new']}</b></span></td>
<if $settings['system']['mail_quota_enabled'] == 1> </tr>
<tr> <if $settings['system']['mail_quota_enabled'] == 1>
<td>{$lng['customer']['email_quota']}:</td> <tr>
<td><span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span></td> <td>{$lng['customer']['email_quota']}:</td>
</tr> <td><span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span></td>
</if> </tr>
<if $settings['autoresponder']['autoresponder_active'] == 1> </if>
<tr> <if $settings['autoresponder']['autoresponder_active'] == 1>
<td>{$lng['customer']['autoresponder']}:</td> <tr>
<td><span <if $admin['email_autoresponder_used'] == $admin['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_autoresponder_used']} -&gt; {$admin['email_autoresponder_used_new']}</b></span></td> <td>{$lng['customer']['autoresponder']}:</td>
</tr> <td><span <if $admin['email_autoresponder_used'] == $admin['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_autoresponder_used']} -&gt; {$admin['email_autoresponder_used_new']}</b></span></td>
</if> </tr>
<tr> </if>
<td>{$lng['customer']['ftps']}:</td> <tr>
<td><span <if $admin['ftps_used'] == $admin['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span></td> <td>{$lng['customer']['ftps']}:</td>
</tr> <td><span <if $admin['ftps_used'] == $admin['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span></td>
<if $settings['ticket']['enabled'] == '1'> </tr>
<tr> <if $settings['ticket']['enabled'] == '1'>
<td>{$lng['customer']['tickets']}:</td> <tr>
<td><span <if $admin['tickets_used'] == $admin['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span></td> <td>{$lng['customer']['tickets']}:</td>
</tr> <td><span <if $admin['tickets_used'] == $admin['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span></td>
</if> </tr>
<if $settings['aps']['aps_active'] == '1'> </if>
<tr> <if $settings['aps']['aps_active'] == '1'>
<td>{$lng['customer']['aps']}:</td> <tr>
<td><span <if $admin['aps_packages_used'] == $admin['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['aps_packages_used']} -&gt; {$admin['aps_packages_used_new']}</b></span></td> <td>{$lng['customer']['aps']}:</td>
</tr> <td><span <if $admin['aps_packages_used'] == $admin['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['aps_packages_used']} -&gt; {$admin['aps_packages_used_new']}</b></span></td>
</if> </tr>
</table> </if>
</table>
<br /><br />
</section>
</td> </td>
</tr> </tr>

107
templates/Froxlor/admin/settings/updatecounters_row_customer.tpl
View File

@@ -1,57 +1,60 @@
<tr> <tr>
<td class="main_field_name" style="width: 40%;"> <td style="width: 35%;">
<b><if $customer['name'] != '' && $customer['firstname'] != ''>{$customer['name']}, {$customer['firstname']}</if><if $customer['name'] != '' && $customer['firstname'] != '' && $customer['company'] != ''> | </if><if $customer['company'] != ''>{$customer['company']}</if> (<a href="admin_customers.php?s=$s&amp;page=customers&amp;action=su&amp;id={$customer['customerid']}" target="_blank">{$customer['loginname']}</a>):</b> <b><if $customer['name'] != '' && $customer['firstname'] != ''>{$customer['name']}, {$customer['firstname']}</if><if $customer['name'] != '' && $customer['firstname'] != '' && $customer['company'] != ''> | </if><if $customer['company'] != ''>{$customer['company']}</if> (<a href="admin_customers.php?s=$s&amp;page=customers&amp;action=su&amp;id={$customer['customerid']}" target="_blank">{$customer['loginname']}</a>):</b>
</td> </td>
<td class="main_field_name"> <td>
<table border="0" style="text-align: left;"> <section class="fullform bradiusodd">
<tr> <table class="formtable" border="0" style="text-align: left; width: 100%">
<td>{$lng['customer']['subdomains']}:</td> <tr>
<td><span <if $customer['subdomains_used'] == $customer['subdomains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['subdomains_used']} -&gt; {$customer['subdomains_used_new']}</b></span></td> <td>{$lng['customer']['subdomains']}:</td>
</tr> <td><span <if $customer['subdomains_used'] == $customer['subdomains_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['subdomains_used']} -&gt; {$customer['subdomains_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['mysqls']}:</td> <tr>
<td><span <if $customer['mysqls_used'] == $customer['mysqls_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['mysqls_used']} -&gt; {$customer['mysqls_used_new']}</b></span></td> <td>{$lng['customer']['mysqls']}:</td>
</tr> <td><span <if $customer['mysqls_used'] == $customer['mysqls_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['mysqls_used']} -&gt; {$customer['mysqls_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['emails']}:</td> <tr>
<td><span <if $customer['emails_used'] == $customer['emails_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['emails_used']} -&gt; {$customer['emails_used_new']}</b></span></td> <td>{$lng['customer']['emails']}:</td>
</tr> <td><span <if $customer['emails_used'] == $customer['emails_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['emails_used']} -&gt; {$customer['emails_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['accounts']}:</td> <tr>
<td><span <if $customer['email_accounts_used'] == $customer['email_accounts_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_accounts_used']} -&gt; {$customer['email_accounts_used_new']}</b></span></td> <td>{$lng['customer']['accounts']}:</td>
</tr> <td><span <if $customer['email_accounts_used'] == $customer['email_accounts_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_accounts_used']} -&gt; {$customer['email_accounts_used_new']}</b></span></td>
<tr> </tr>
<td>{$lng['customer']['forwarders']}:</td> <tr>
<td><span <if $customer['email_forwarders_used'] == $customer['email_forwarders_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_forwarders_used']} -&gt; {$customer['email_forwarders_used_new']}</b></span></td> <td>{$lng['customer']['forwarders']}:</td>
</tr> <td><span <if $customer['email_forwarders_used'] == $customer['email_forwarders_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_forwarders_used']} -&gt; {$customer['email_forwarders_used_new']}</b></span></td>
<if $settings['system']['mail_quota_enabled'] == 1> </tr>
<tr> <if $settings['system']['mail_quota_enabled'] == 1>
<td>{$lng['customer']['email_quota']}:</td> <tr>
<td><span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span></td> <td>{$lng['customer']['email_quota']}:</td>
</tr> <td><span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span></td>
</if> </tr>
<if $settings['autoresponder']['autoresponder_active'] == 1> </if>
<tr> <if $settings['autoresponder']['autoresponder_active'] == 1>
<td>{$lng['customer']['autoresponder']}:</td> <tr>
<td><span <if $customer['email_autoresponder_used'] == $customer['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_autoresponder_used']} -&gt; {$customer['email_autoresponder_used_new']}</b></span></td> <td>{$lng['customer']['autoresponder']}:</td>
</tr> <td><span <if $customer['email_autoresponder_used'] == $customer['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_autoresponder_used']} -&gt; {$customer['email_autoresponder_used_new']}</b></span></td>
</if> </tr>
<tr> </if>
<td>{$lng['customer']['ftps']}:</td> <tr>
<td><span <if $customer['ftps_used'] == $customer['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span></td> <td>{$lng['customer']['ftps']}:</td>
</tr> <td><span <if $customer['ftps_used'] == $customer['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span></td>
<if $settings['ticket']['enabled'] == '1'> </tr>
<tr> <if $settings['ticket']['enabled'] == '1'>
<td>{$lng['customer']['tickets']}:</td> <tr>
<td><span <if $customer['tickets_used'] == $customer['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span></td> <td>{$lng['customer']['tickets']}:</td>
</tr> <td><span <if $customer['tickets_used'] == $customer['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span></td>
</if> </tr>
<if $settings['aps']['aps_active'] == '1'> </if>
<tr> <if $settings['aps']['aps_active'] == '1'>
<td>{$lng['customer']['aps']}:</td> <tr>
<td><span <if $customer['aps_packages_used'] == $customer['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['aps_packages_used']} -&gt; {$customer['aps_packages_used_new']}</b></span></td> <td>{$lng['customer']['aps']}:</td>
</tr> <td><span <if $customer['aps_packages_used'] == $customer['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['aps_packages_used']} -&gt; {$customer['aps_packages_used_new']}</b></span></td>
</if> </tr>
</table> </if>
</table>
<br /><br />
</section>
</td> </td>
</tr> </tr>