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

use correct Settings-class in templates

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-18 15:53:08 +01:00
parent 6329042d40
commit a25150babf
32 changed files with 74 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/Sparkle/admin/admins/admins_admin.tpl vendored
View File

@@ -18,12 +18,12 @@
<span class="overviewcustomerextras">
<span>Webspace:</span>
<if $row['diskspace'] != 'UL'>
<if (($row['diskspace']/100)*(int)Settings::Get('system.report_webmax')) < $row['diskspace_used']>
<if (($row['diskspace']/100)*(int)\Froxlor\Settings::Get('system.report_webmax')) < $row['diskspace_used']>
<div class="progress progress-danger tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<else>
<if (($row['diskspace']/100)*((int)Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
<if (($row['diskspace']/100)*((int)\Froxlor\Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
<div class="progress progress-warn tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div>
@@ -42,12 +42,12 @@
<span class="overviewcustomerextras">
<span>Traffic:</span>
<if $row['traffic'] != 'UL'>
<if (($row['traffic']/100)*(int)Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
<if (($row['traffic']/100)*(int)\Froxlor\Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
<div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<else>
<if (($row['traffic']/100)*((int)Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
<if (($row['traffic']/100)*((int)\Froxlor\Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
<div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div>

2
templates/Sparkle/admin/configfiles/wizard.tpl vendored
View File

@@ -59,7 +59,7 @@ $header
<td colspan="2" align="center"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
</tr>
<tr>
<if Settings::Get('panel.is_configured') == '0'>
<if \Froxlor\Settings::Get('panel.is_configured') == '0'>
<td colspan="2" align="center">{$lng['panel']['done_configuring']}:<br><br><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview', 'action' => 'setconfigured'))}" class="btnlink">{$lng['panel']['ihave_configured']}</a><br><br></td>
<else>
<td colspan="2" align="center">{$lng['panel']['system_is_configured']}</td>

8
templates/Sparkle/admin/customers/customers_customer.tpl vendored
View File

@@ -25,12 +25,12 @@
<span class="overviewcustomerextras">
<span>Webspace:</span>
<if $row['diskspace'] != 'UL'>
<if (($row['diskspace']/100)*(int)Settings::Get('system.report_webmax')) < $row['diskspace_used']>
<if (($row['diskspace']/100)*(int)\Froxlor\Settings::Get('system.report_webmax')) < $row['diskspace_used']>
<div class="progress progress-danger tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<else>
<if (($row['diskspace']/100)*((int)Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
<if (($row['diskspace']/100)*((int)\Froxlor\Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
<div class="progress progress-warn tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div>
@@ -49,12 +49,12 @@
<span class="overviewcustomerextras">
<span>Traffic:</span>
<if $row['traffic'] != 'UL'>
<if (($row['traffic']/100)*(int)Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
<if (($row['traffic']/100)*(int)\Froxlor\Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
<div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<else>
<if (($row['traffic']/100)*((int)Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
<if (($row['traffic']/100)*((int)\Froxlor\Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
<div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div>

4
templates/Sparkle/admin/domains/domains_domain.tpl vendored
View File

@@ -26,7 +26,7 @@
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'logfiles', 'domain_id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['panel']['viewlogs']}" title="{$lng['panel']['viewlogs']}" />
</a>
<if $row['isbinddomain'] == '1' && Settings::Get('system.bind_enable') == '1' && Settings::Get('system.dnsenabled') == '1'>
<if $row['isbinddomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{$lng['dnseditor']['edit']}" title="{$lng['dnseditor']['edit']}" />
</a>
@@ -34,7 +34,7 @@
<if $row['letsencrypt'] == '1'>
&nbsp;<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
</if>
<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0) && $row['id'] != Settings::Get('system.hostname_id')>
<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0) && $row['id'] != \Froxlor\Settings::Get('system.hostname_id')>
<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />

2
templates/Sparkle/admin/domains/domains_edit.tpl vendored
View File

@@ -4,7 +4,7 @@ $header
<h2>
<img src="templates/{$theme}/assets/img/icons/domain_edit_big.png" alt="{$title}" />&nbsp;
{$title}
<if $result['isbinddomain'] == '1' && Settings::Get('system.bind_enable') == '1' && Settings::Get('system.dnsenabled') == '1'>
<if $result['isbinddomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{$lng['dnseditor']['edit']}</a></small>)
</if>
</h2>

6
templates/Sparkle/admin/index/index.tpl vendored
View File

@@ -122,7 +122,7 @@ $header
</small>
</div>
<if Settings::Get('system.mail_quota_enabled') == 1>
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
<div class="canvasbox">
<input type="hidden" id="email_quota" class="circular" data-used="{$overview['email_quota_used']}" data-available="{$userinfo['email_quota']}" data-assigned="{$userinfo['email_quota_used']}">
<canvas id="email_quota-canvas" width="120" height="76"></canvas><br/>
@@ -150,7 +150,7 @@ $header
</small>
</div>
<if Settings::Get('ticket.enabled') == 1>
<if \Froxlor\Settings::Get('ticket.enabled') == 1>
<div class="canvasbox">
<input type="hidden" id="tickets" class="circular" data-used="{$overview['tickets_used']}" data-available="{$userinfo['tickets']}" data-assigned="{$userinfo['tickets_used']}">
<canvas id="tickets-canvas" width="120" height="76"></canvas><br/>
@@ -167,7 +167,7 @@ $header
</div>
<div class="grid-u-1-2">
<if Settings::Get('admin.show_news_feed') == '1'>
<if \Froxlor\Settings::Get('admin.show_news_feed') == '1'>
<table class="dboarditem full" id="newsfeed">
<thead>
<tr>

2
templates/Sparkle/admin/phpconfig/overview.tpl vendored
View File

@@ -19,7 +19,7 @@ $header
<tr>
<th>{$lng['admin']['phpsettings']['description']}</th>
<th>{$lng['admin']['phpsettings']['activedomains']}</th>
<if Settings::Get('phpfpm.enabled') == '1'>
<if \Froxlor\Settings::Get('phpfpm.enabled') == '1'>
<th>{$lng['admin']['phpsettings']['fpmdesc']}</th>
<else>
<th>{$lng['admin']['phpsettings']['binary']}</th>

2
templates/Sparkle/admin/phpconfig/overview_overview.tpl vendored
View File

@@ -1,7 +1,7 @@
<tr class="top">
<td><strong>{$row['description']}</strong></td>
<td>{$domains}<if 0 < $subdomains_count><if !empty($domains)>+ </if>{$subdomains_count} {$lng['customer']['subdomains']}</if></td>
<if Settings::Get('phpfpm.enabled') == '1'>
<if \Froxlor\Settings::Get('phpfpm.enabled') == '1'>
<td>{$row['fpmdesc']}</td>
<else>
<td>{$row['binary']}</td>

4
templates/Sparkle/admin/settings/testmail.tpl vendored
View File

@@ -29,8 +29,8 @@ $header
<td>{$mail_smtp_user}</td>
<td>{$mail_smtp_host}</td>
<td>{$mail_smtp_port}</td>
<td><img src="templates/{$theme}/assets/img/icons/<if Settings::Get('system.mail_use_smtp') == '1'>button_ok<else>cancel</if>.png" alt="" /></td>
<td><img src="templates/{$theme}/assets/img/icons/<if Settings::Get('system.mail_smtp_usetls') == '1'>button_ok<else>cancel</if>.png" alt="" /></td>
<td><img src="templates/{$theme}/assets/img/icons/<if \Froxlor\Settings::Get('system.mail_use_smtp') == '1'>button_ok<else>cancel</if>.png" alt="" /></td>
<td><img src="templates/{$theme}/assets/img/icons/<if \Froxlor\Settings::Get('system.mail_smtp_usetls') == '1'>button_ok<else>cancel</if>.png" alt="" /></td>
</tr>
</table>
<br>

4
templates/Sparkle/admin/settings/updatecounters_row_admin.tpl vendored
View File

@@ -14,11 +14,11 @@
{$lng['customer']['emails']}: <span <if $admin['emails_used'] == $admin['emails_used_new']>class="green"<else>class="red"</if>><b>{$admin['emails_used']} -&gt; {$admin['emails_used_new']}</b></span><br />
{$lng['customer']['accounts']}: <span <if $admin['email_accounts_used'] == $admin['email_accounts_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_accounts_used']} -&gt; {$admin['email_accounts_used_new']}</b></span><br />
{$lng['customer']['forwarders']}: <span <if $admin['email_forwarders_used'] == $admin['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_forwarders_used']} -&gt; {$admin['email_forwarders_used_new']}</b></span><br />
<if Settings::Get('system.mail_quota_enabled') == 1>
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
{$lng['customer']['email_quota']}: <span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span><br />
</if>
{$lng['customer']['ftps']}: <span <if $admin['ftps_used'] == $admin['ftps_used_new']>class="green"<else>class="red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span><br />
<if Settings::Get('ticket.enabled') == '1'>
<if \Froxlor\Settings::Get('ticket.enabled') == '1'>
{$lng['customer']['tickets']}: <span <if $admin['tickets_used'] == $admin['tickets_used_new']>class="green"<else>class="red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span><br />
</if>
</td>

4
templates/Sparkle/admin/settings/updatecounters_row_customer.tpl vendored
View File

@@ -10,11 +10,11 @@
</td>
<td>
{$lng['customer']['forwarders']}: <span <if $customer['email_forwarders_used'] == $customer['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_forwarders_used']} -&gt; {$customer['email_forwarders_used_new']}</b></span><br />
<if Settings::Get('system.mail_quota_enabled') == 1>
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
{$lng['customer']['email_quota']}: <span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span><br />
</if>
{$lng['customer']['ftps']}: <span <if $customer['ftps_used'] == $customer['ftps_used_new']>class="green"<else>class="red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span><br />
<if Settings::Get('ticket.enabled') == '1'>
<if \Froxlor\Settings::Get('ticket.enabled') == '1'>
{$lng['customer']['tickets']}: <span <if $customer['tickets_used'] == $customer['tickets_used_new']>class="green"<else>class="red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span><br />
</if>
</td>

2
templates/Sparkle/admin/templates/templates_add_2.tpl vendored
View File

@@ -71,7 +71,7 @@ $header
<td><em>{EMAIL}</em></td>
<td>{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<if Settings::Get('panel.sendalternativemail') == 1>
<if \Froxlor\Settings::Get('panel.sendalternativemail') == 1>
<tr>
<td colspan="2">
<strong>{$lng['admin']['templates']['pop_success_alternative']}</strong>

2
templates/Sparkle/admin/templates/templates_edit.tpl vendored
View File

@@ -73,7 +73,7 @@ $header
<td><em>{EMAIL}</em></td>
<td>{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<if Settings::Get('panel.sendalternativemail') == 1>
<if \Froxlor\Settings::Get('panel.sendalternativemail') == 1>
<tr>
<td colspan="2">
<strong>{$lng['admin']['templates']['pop_success_alternative']}</strong>