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

Merge pull request #140 from BNoiZe/master

Browse Source 
Many bugfixes and usability improvements (thanks to oschn0r)
This commit is contained in:
Michael Kaufmann
2013-10-27 14:18:52 -07:00
parent 23da3259c4 8f7ab2a243
commit 8b06c897f6
10 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@
</div>
</if>
<else>
<div class="progress">
<div class="progress">∞
<div class="bar" style="width: 0%"></div>
</div>
</if>
@@ -46,7 +46,7 @@
</div>
</if>
<else>
<div class="progress">
<div class="progress">∞
<div class="bar" style="width: 0%"></div>
</div>
</if>

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

@@ -1,5 +1,5 @@
<p>
<label><b>{$realname}:</b></label><br />
<label><b>{$realname}</b></label><br />
<textarea rows="<if $numbrows <= 8 >{$numbrows}</if><if 8 < $numbrows >8</if>" cols="70" readonly="readonly">{$file_content}</textarea>
</p>

14
templates/Sparkle/admin/cronjobs/cronjobs.tpl vendored
View File

@@ -5,6 +5,13 @@ $header
{$lng['admin']['cron']['cronsettings']}</h2>
</header>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning">{$lng['cron']['changewarning']}</div>
</div>
</div>
<section>
<table class="bradius">
<thead>
@@ -22,12 +29,5 @@ $header
</table>
</section>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning">{$lng['cron']['changewarning']}</div>
</div>
</div>
</article>
$footer

4
templates/Sparkle/admin/customers/customers.tpl vendored
View File

@@ -11,7 +11,7 @@ $header
<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used'] >
<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
@@ -61,7 +61,7 @@ $header
</form>
<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used'] >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>

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

@@ -20,7 +20,7 @@
<td>
{$last_login}
</td>
<td style="min-width:270px;">
<td>
<div>
<span class="overviewcustomerextras">
<span>Webspace:</span>

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

@@ -6,7 +6,7 @@ $header
</h2>
<div class="canvasitems" id="statsbox">
<div class="canvasbox">
<input type="hidden" id="customers" class="circular" used="{$overview['number_customers']}" available="{$userinfo['customers']}">
<input type="hidden" id="customers" class="circular" data-used="{$overview['number_customers']}" data-available="{$userinfo['customers']}">
<canvas id="customers-canvas" width="120" height="76"></canvas><br/>
{$lng['admin']['customers']}<br />
<small>
@@ -18,7 +18,7 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="domains" class="circular" used="{$overview['number_domains']}" available="{$userinfo['domains']}">
<input type="hidden" id="domains" class="circular" data-used="{$overview['number_domains']}" data-available="{$userinfo['domains']}">
<canvas id="domains-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['domains']}<br />
<small>
@@ -30,7 +30,7 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="subdomains" class="circular" used="{$overview['subdomains_used']}" available="{$userinfo['subdomains']}" assigned="{$userinfo['subdomains_used']}">
<input type="hidden" id="subdomains" class="circular" data-used="{$overview['subdomains_used']}" data-available="{$userinfo['subdomains']}" data-assigned="{$userinfo['subdomains_used']}">
<canvas id="subdomains-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['subdomains']}<br />
<small>
@@ -43,7 +43,7 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="diskspace" class="circular" used="{$overview['diskspace_used']}" available="{$userinfo['diskspace']}" assigned="{$userinfo['diskspace_used']}">
<input type="hidden" id="diskspace" class="circular" data-used="{$overview['diskspace_used']}" data-available="{$userinfo['diskspace']}" data-assigned="{$userinfo['diskspace_used']}">
<canvas id="diskspace-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['diskspace']}<br />
<small>
@@ -56,7 +56,7 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="traffic" class="circular" used="{$overview['traffic_used']}" available="{$userinfo['traffic']}" assigned="{$userinfo['traffic_used']}">
<input type="hidden" id="traffic" class="circular" data-used="{$overview['traffic_used']}" data-available="{$userinfo['traffic']}" data-assigned="{$userinfo['traffic_used']}">
<canvas id="traffic-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['traffic']}<br />
<small>
@@ -69,7 +69,7 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="mysqls" class="circular" used="{$overview['mysqls_used']}" available="{$userinfo['mysqls']}" assigned="{$userinfo['mysqls_used']}">
<input type="hidden" id="mysqls" class="circular" data-used="{$overview['mysqls_used']}" data-available="{$userinfo['mysqls']}" data-assigned="{$userinfo['mysqls_used']}">
<canvas id="mysqls-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['mysqls']}<br />
<small>
@@ -82,7 +82,7 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="emails" class="circular" used="{$overview['emails_used']}" available="{$userinfo['emails']}" assigned="{$userinfo['emails_used']}">
<input type="hidden" id="emails" class="circular" data-used="{$overview['emails_used']}" data-available="{$userinfo['emails']}" data-assigned="{$userinfo['emails_used']}">
<canvas id="emails-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['emails']}<br />
<small>
@@ -95,7 +95,7 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="email_accounts" class="circular" used="{$overview['email_accounts_used']}" available="{$userinfo['email_accounts']}" assigned="{$userinfo['email_accounts_used']}">
<input type="hidden" id="email_accounts" class="circular" data-used="{$overview['email_accounts_used']}" data-available="{$userinfo['email_accounts']}" data-assigned="{$userinfo['email_accounts_used']}">
<canvas id="email_accounts-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['accounts']}<br />
<small>
@@ -108,7 +108,7 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="email_forwarders" class="circular" used="{$overview['email_forwarders_used']}" available="{$userinfo['email_forwarders']}" assigned="{$userinfo['email_forwarders_used']}">
<input type="hidden" id="email_forwarders" class="circular" data-used="{$overview['email_forwarders_used']}" data-available="{$userinfo['email_forwarders']}" data-assigned="{$userinfo['email_forwarders_used']}">
<canvas id="email_forwarders-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['forwarders']}<br />
<small>
@@ -122,7 +122,7 @@ $header
<if $settings['system']['mail_quota_enabled'] == 1>
<div class="canvasbox">
<input type="hidden" id="email_quota" class="circular" used="{$overview['email_quota_used']}" available="{$userinfo['email_quota']}" assigned="{$userinfo['email_quota_used']}">
<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/>
{$lng['customer']['email_quota']}<br />
<small>
@@ -137,7 +137,7 @@ $header
<if $settings['autoresponder']['autoresponder_active'] == 1>
<div class="canvasbox">
<input type="hidden" id="email_autoresponder" class="circular" used="{$overview['email_autoresponder_used']}" available="{$userinfo['email_autoresponder']}" assigned="{$userinfo['email_autoresponder_used']}">
<input type="hidden" id="email_autoresponder" class="circular" data-used="{$overview['email_autoresponder_used']}" data-available="{$userinfo['email_autoresponder']}" data-assigned="{$userinfo['email_autoresponder_used']}">
<canvas id="email_autoresponder-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['autoresponder']}<br />
<small>
@@ -152,7 +152,7 @@ $header
<if (int)$settings['aps']['aps_active'] == 1>
<div class="canvasbox">
<input type="hidden" id="aps_packages" class="circular" used="{$overview['aps_packages_used']}" available="{$userinfo['aps_packages']}" assigned="{$userinfo['aps_packages_used']}">
<input type="hidden" id="aps_packages" class="circular" data-used="{$overview['aps_packages_used']}" data-available="{$userinfo['aps_packages']}" data-assigned="{$userinfo['aps_packages_used']}">
<canvas id="aps_packages-canvas" width="120" height="76"></canvas><br/>
{$lng['aps']['numberofapspackages']}<br />
<small>
@@ -166,7 +166,7 @@ $header
</if>
<div class="canvasbox">
<input type="hidden" id="ftps" class="circular" used="{$overview['ftps_used']}" available="{$userinfo['ftps']}" assigned="{$userinfo['ftps_used']}">
<input type="hidden" id="ftps" class="circular" data-used="{$overview['ftps_used']}" data-available="{$userinfo['ftps']}" data-assigned="{$userinfo['ftps_used']}">
<canvas id="ftps-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['ftps']}<br />
<small>
@@ -180,7 +180,7 @@ $header
<if $settings['ticket']['enabled'] == 1>
<div class="canvasbox">
<input type="hidden" id="tickets" class="circular" used="{$overview['tickets_used']}" available="{$userinfo['tickets']}" assigned="{$userinfo['tickets_used']}">
<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/>
{$lng['customer']['tickets']}<br />
<small>

5
templates/Sparkle/assets/css/main.css vendored
View File

@@ -827,8 +827,8 @@ select[multiple="multiple"] {
/* PROGRESS BAR */
.progress {
height:15px;
width: 200px;
margin:2px 0 2px 0;
width: 150px;
margin:2px 0 2px 10px;
overflow:hidden;
background-color:#f7f7f7;
-webkit-border-radius:3px;
@@ -838,6 +838,7 @@ select[multiple="multiple"] {
-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);
box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);
text-align: center;
color: #999;
}
.progress .bar {
width:1px;

6
templates/Sparkle/assets/js/circular.js vendored
View File

@@ -46,9 +46,9 @@ $(document).ready(function() {
$(".circular").each(function(index, element) {
var canvas = "#" + $(element).attr("id") + "-canvas";
var used = parseFloat($(element).attr("used"));
var available = $(element).attr("available");
var assigned = parseFloat($(element).attr("assigned"));
var used = parseFloat($(element).data("used"));
var available = $(element).data("available");
var assigned = parseFloat($(element).data("assigned"));
var usedD, usedP, assignedP, assignedD;
// Draw basic circle

24
templates/Sparkle/customer/index/index.tpl vendored
View File

@@ -8,7 +8,7 @@ $header
<section class="dboardcanvas" id="statsbox">
<if $userinfo['subdomains'] != '0'>
<div class="canvasbox">
<input type="hidden" id="subdomains" class="circular" used="{$userinfo['subdomains_used']}" available="{$userinfo['subdomains']}">
<input type="hidden" id="subdomains" class="circular" data-used="{$userinfo['subdomains_used']}" data-available="{$userinfo['subdomains']}">
<canvas id="subdomains-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['subdomains']}<br />
<small>
@@ -22,7 +22,7 @@ $header
<if $userinfo['diskspace'] != '0'>
<div class="canvasbox">
<input type="hidden" id="diskspace" class="circular" used="{$userinfo['diskspace_used']}" available="{$userinfo['diskspace']}">
<input type="hidden" id="diskspace" class="circular" data-used="{$userinfo['diskspace_used']}" data-available="{$userinfo['diskspace']}">
<canvas id="diskspace-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['diskspace']}<br />
<small>
@@ -36,7 +36,7 @@ $header
<if $userinfo['traffic'] != '0'>
<div class="canvasbox">
<input type="hidden" id="traffic" class="circular" used="{$userinfo['traffic_used']}" available="{$userinfo['traffic']}">
<input type="hidden" id="traffic" class="circular" data-used="{$userinfo['traffic_used']}" data-available="{$userinfo['traffic']}">
<canvas id="traffic-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['traffic']}<br />
<small>
@@ -50,7 +50,7 @@ $header
<if $userinfo['emails'] != '0'>
<div class="canvasbox">
<input type="hidden" id="emails" class="circular" used="{$userinfo['emails_used']}" available="{$userinfo['emails']}">
<input type="hidden" id="emails" class="circular" data-used="{$userinfo['emails_used']}" data-available="{$userinfo['emails']}">
<canvas id="emails-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['emails']}<br />
<small>
@@ -64,7 +64,7 @@ $header
<if $userinfo['email_accounts'] != '0'>
<div class="canvasbox">
<input type="hidden" id="email_accounts" class="circular" used="{$userinfo['email_accounts_used']}" available="{$userinfo['email_accounts']}">
<input type="hidden" id="email_accounts" class="circular" data-used="{$userinfo['email_accounts_used']}" data-available="{$userinfo['email_accounts']}">
<canvas id="email_accounts-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['accounts']}<br />
<small>
@@ -78,7 +78,7 @@ $header
<if $userinfo['email_forwarders'] != '0'>
<div class="canvasbox">
<input type="hidden" id="email_forwarders" class="circular" used="{$userinfo['email_forwarders_used']}" available="{$userinfo['email_forwarders']}">
<input type="hidden" id="email_forwarders" class="circular" data-used="{$userinfo['email_forwarders_used']}" data-available="{$userinfo['email_forwarders']}">
<canvas id="email_forwarders-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['forwarders']}<br />
<small>
@@ -92,7 +92,7 @@ $header
<if $settings['system']['mail_quota_enabled'] == 1 && $userinfo['email_quota'] != '0'>
<div class="canvasbox">
<input type="hidden" id="email_quota" class="circular" used="{$userinfo['email_quota_used']}" available="{$userinfo['email_quota']}">
<input type="hidden" id="email_quota" class="circular" data-used="{$userinfo['email_quota_used']}" data-available="{$userinfo['email_quota']}">
<canvas id="email_forwarders-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['email_quota']}<br />
<small>
@@ -106,7 +106,7 @@ $header
<if $settings['autoresponder']['autoresponder_active'] == 1 && $userinfo['email_autoresponder'] != '0'>
<div class="canvasbox">
<input type="hidden" id="email_autoresponder" class="circular" used="{$userinfo['email_autoresponder_used']}" available="{$userinfo['email_autoresponder']}">
<input type="hidden" id="email_autoresponder" class="circular" data-used="{$userinfo['email_autoresponder_used']}" data-available="{$userinfo['email_autoresponder']}">
<canvas id="email_autoresponder-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['autoresponder']}<br />
<small>
@@ -120,7 +120,7 @@ $header
<if $userinfo['mysqls'] != '0'>
<div class="canvasbox">
<input type="hidden" id="mysqls" class="circular" used="{$userinfo['mysqls_used']}" available="{$userinfo['mysqls']}">
<input type="hidden" id="mysqls" class="circular" data-used="{$userinfo['mysqls_used']}" data-available="{$userinfo['mysqls']}">
<canvas id="mysqls-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['mysqls']}<br />
<small>
@@ -134,7 +134,7 @@ $header
<if $userinfo['ftps'] != '0'>
<div class="canvasbox">
<input type="hidden" id="ftps" class="circular" used="{$userinfo['ftps_used']}" available="{$userinfo['ftps']}">
<input type="hidden" id="ftps" class="circular" data-used="{$userinfo['ftps_used']}" data-available="{$userinfo['ftps']}">
<canvas id="ftps-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['ftps']}<br />
<small>
@@ -148,7 +148,7 @@ $header
<if (int)$settings['aps']['aps_active'] == 1 && $userinfo['aps_packages'] != '0'>
<div class="canvasbox">
<input type="hidden" id="aps_packages" class="circular" used="{$userinfo['aps_packages_used']}" available="{$userinfo['aps_packages']}">
<input type="hidden" id="aps_packages" class="circular" data-used="{$userinfo['aps_packages_used']}" data-available="{$userinfo['aps_packages']}">
<canvas id="aps_packages-canvas" width="120" height="76"></canvas><br />
{$lng['aps']['numberofapspackages']}<br />
<small>
@@ -162,7 +162,7 @@ $header
<if (int)$settings['ticket']['enabled'] == 1 && $userinfo['tickets'] != '0'>
<div class="canvasbox">
<input type="hidden" id="tickets" class="circular" used="{$userinfo['tickets_used']}" available="{$userinfo['tickets']}">
<input type="hidden" id="tickets" class="circular" data-used="{$userinfo['tickets_used']}" data-available="{$userinfo['tickets']}">
<canvas id="tickets-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['tickets']}<br />
<small>

4
templates/Sparkle/header.tpl vendored
View File

@@ -43,7 +43,9 @@
<hgroup>
<h1>Froxlor Server Management Panel</h1>
</hgroup>
<img src="{$header_logo}" alt="Froxlor Server Management Panel" class="small" />
<a href="{$linker->getLink(array('section' => 'index'))}">
<img src="{$header_logo}" alt="Froxlor Server Management Panel" class="small" />
</a>
<div class="topheader_navigation">
<ul class="topheadernav">
<if $settings['ticket']['enabled'] == 1>