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

Merge pull request #138 from BNoiZe/master

Browse Source 
Updated translations, more information in dashboard (part 2/2), minor bugfixes...
This commit is contained in:
Michael Kaufmann
2013-10-27 10:50:30 -07:00
parent b618e86512 09b50b2b48
commit 2368267bb8
5 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lng/english.lng.php
View File

@@ -59,15 +59,15 @@ $lng['customer']['zipcode'] = 'Zipcode';
$lng['customer']['city'] = 'City';
$lng['customer']['phone'] = 'Phone';
$lng['customer']['fax'] = 'Fax';
$lng['customer']['email'] = 'email';
$lng['customer']['email'] = 'Email';
$lng['customer']['customernumber'] = 'Customer ID';
$lng['customer']['diskspace'] = 'Webspace (MB)';
$lng['customer']['traffic'] = 'Traffic (GB)';
$lng['customer']['mysqls'] = 'MySQL-databases';
$lng['customer']['emails'] = 'email-Addresses';
$lng['customer']['accounts'] = 'email-Accounts';
$lng['customer']['forwarders'] = 'email-Forwarders';
$lng['customer']['ftps'] = 'FTP-Accounts';
$lng['customer']['emails'] = 'Email-addresses';
$lng['customer']['accounts'] = 'Email-accounts';
$lng['customer']['forwarders'] = 'Email-forwarders';
$lng['customer']['ftps'] = 'FTP-accounts';
$lng['customer']['subdomains'] = 'Subdomains';
$lng['customer']['domains'] = 'Domains';
$lng['customer']['unlimited'] = '∞';
@@ -79,9 +79,9 @@ $lng['customer']['unlimited'] = '∞';
$lng['menue']['main']['main'] = 'Main';
$lng['menue']['main']['changepassword'] = 'Change password';
$lng['menue']['main']['changelanguage'] = 'Change language';
$lng['menue']['email']['email'] = 'E-mail';
$lng['menue']['email']['email'] = 'Email';
$lng['menue']['email']['emails'] = 'Addresses';
$lng['menue']['email']['webmail'] = 'webmail';
$lng['menue']['email']['webmail'] = 'Webmail';
$lng['menue']['mysql']['mysql'] = 'MySQL';
$lng['menue']['mysql']['databases'] = 'Databases';
$lng['menue']['mysql']['phpmyadmin'] = 'phpMyAdmin';
@@ -128,10 +128,10 @@ $lng['domains']['noaliasdomain'] = 'No alias domain';
* E-mails
*/
$lng['emails']['description'] = 'Here you can create and change your e-mail addresses.<br />An account is like your letterbox in front of your house. If someone sends you an email, it will be dropped into the account.<br /><br />To download your emails use the following settings in your mailprogram: (The data in <i>italics</i> has to be changed to the equivalents you typed in!)<br />Hostname: <b><i>domainname</i></b><br />Username: <b><i>account name / e-mail address</i></b><br />password: <b><i>the password you\'ve chosen</i></b>';
$lng['emails']['emailaddress'] = 'E-mail-address';
$lng['emails']['emails_add'] = 'Create e-mail-address';
$lng['emails']['emails_edit'] = 'Edit e-mail-address';
$lng['emails']['description'] = 'Here you can create and change your email addresses.<br />An account is like your letterbox in front of your house. If someone sends you an email, it will be dropped into the account.<br /><br />To download your emails use the following settings in your mailprogram: (The data in <i>italics</i> has to be changed to the equivalents you typed in!)<br />Hostname: <b><i>domainname</i></b><br />Username: <b><i>account name / e-mail address</i></b><br />password: <b><i>the password you\'ve chosen</i></b>';
$lng['emails']['emailaddress'] = 'Email-address';
$lng['emails']['emails_add'] = 'Create email-address';
$lng['emails']['emails_edit'] = 'Edit email-address';
$lng['emails']['catchall'] = 'Catchall';
$lng['emails']['iscatchall'] = 'Define as catchall-address?';
$lng['emails']['account'] = 'Account';
@@ -146,8 +146,8 @@ $lng['emails']['forwarder_add'] = 'Create forwarder';
* FTP
*/
$lng['ftp']['description'] = 'Here you can create and change your FTP accounts.<br />The changes are made instantly and the accounts can be used immediately.';
$lng['ftp']['account_add'] = 'Create Account';
$lng['ftp']['description'] = 'Here you can create and change your FTP-accounts.<br />The changes are made instantly and the accounts can be used immediately.';
$lng['ftp']['account_add'] = 'Create account';
/**
* MySQL
@@ -163,10 +163,10 @@ $lng['mysql']['database_create'] = 'Create database';
$lng['extras']['description'] = 'Here you can add some extras, for example directory protection.<br />The system will need some time to apply the new settings after every change.';
$lng['extras']['directoryprotection_add'] = 'Add directory protection';
$lng['extras']['view_directory'] = 'display directory content';
$lng['extras']['pathoptions_add'] = 'add path options';
$lng['extras']['directory_browsing'] = 'directory content browsing';
$lng['extras']['pathoptions_edit'] = 'edit path options';
$lng['extras']['view_directory'] = 'Display directory content';
$lng['extras']['pathoptions_add'] = 'Add path options';
$lng['extras']['directory_browsing'] = 'Directory content browsing';
$lng['extras']['pathoptions_edit'] = 'Edit path options';
$lng['extras']['error404path'] = '404';
$lng['extras']['error403path'] = '403';
$lng['extras']['error500path'] = '500';
@@ -202,9 +202,9 @@ $lng['error']['stringiswrong'] = 'Wrong Input in Field';
$lng['error']['newpasswordconfirmerror'] = 'New password and confirmation does not match';
$lng['error']['mydomain'] = '\'Domain\'';
$lng['error']['mydocumentroot'] = '\'Documentroot\'';
$lng['error']['loginnameexists'] = 'Login-Name %s already exists';
$lng['error']['emailiswrong'] = 'E-mail-Address %s contains invalid characters or is incomplete';
$lng['error']['loginnameiswrong'] = 'Login-Name %s contains invalid characters';
$lng['error']['loginnameexists'] = 'Loginname %s already exists';
$lng['error']['emailiswrong'] = 'Email-address %s contains invalid characters or is incomplete';
$lng['error']['loginnameiswrong'] = 'Loginname %s contains invalid characters';
$lng['error']['userpathcombinationdupe'] = 'Combination of username and path already exists';
$lng['error']['patherror'] = 'General Error! Path cannot be empty';
$lng['error']['errordocpathdupe'] = 'Option for path %s already exists';
@@ -220,10 +220,10 @@ $lng['error']['subdomainiswrong'] = 'The subdomain %s contains invalid character
$lng['error']['domaincantbeempty'] = 'The domain-name can not be empty.';
$lng['error']['domainexistalready'] = 'The domain %s already exists.';
$lng['error']['domainisaliasorothercustomer'] = 'The selected alias domain is either itself an alias domain, has a different ip/port combination or belongs to another customer.';
$lng['error']['emailexistalready'] = 'The e-mail-Address %s already exists.';
$lng['error']['emailexistalready'] = 'The email-address %s already exists.';
$lng['error']['maindomainnonexist'] = 'The main-domain %s does not exist.';
$lng['error']['destinationnonexist'] = 'Please create your forwarder in the field \'Destination\'.';
$lng['error']['destinationalreadyexistasmail'] = 'The forwarder to %s already exists as active e-mail-address.';
$lng['error']['destinationalreadyexistasmail'] = 'The forwarder to %s already exists as active email-address.';
$lng['error']['destinationalreadyexist'] = 'You have already defined a forwarder to %s .';
$lng['error']['destinationiswrong'] = 'The forwarder %s contains invalid character(s) or is incomplete.';
$lng['error']['ticketnotaccessible'] = 'You cannot access this ticket.';
@@ -244,7 +244,7 @@ $lng['question']['email_reallydelete_account'] = 'Do you really want to delete t
$lng['question']['email_reallydelete_forwarder'] = 'Do you really want to delete the forwarder %s?';
$lng['question']['extras_reallydelete'] = 'Do you really want to delete the directory protection for %s?';
$lng['question']['extras_reallydelete_pathoptions'] = 'Do you really want to delete the path options for %s?';
$lng['question']['ftp_reallydelete'] = 'Do you really want to delete the FTP account %s?';
$lng['question']['ftp_reallydelete'] = 'Do you really want to delete the FTP-account %s?';
$lng['question']['mysql_reallydelete'] = 'Do you really want to delete the database %s? This cannot be undone!';
$lng['question']['admin_configs_reallyrebuild'] = 'Do you really want to rebuild all config files?';
$lng['question']['admin_customer_alsoremovefiles'] = 'Remove user files too?';
@@ -270,7 +270,7 @@ $lng['admin']['systemdetails'] = 'System details';
$lng['admin']['froxlordetails'] = 'Froxlor details';
$lng['admin']['installedversion'] = 'Installed version';
$lng['admin']['latestversion'] = 'Latest version';
$lng['admin']['lookfornewversion']['clickhere'] = 'search via webservice';
$lng['admin']['lookfornewversion']['clickhere'] = 'Search via webservice';
$lng['admin']['lookfornewversion']['error'] = 'Error while reading';
$lng['admin']['resources'] = 'Resources';
$lng['admin']['customer'] = 'Customer';
@@ -280,7 +280,7 @@ $lng['admin']['customer_edit'] = 'Edit customer';
$lng['admin']['domains'] = 'Domains';
$lng['admin']['domain_add'] = 'Create domain';
$lng['admin']['domain_edit'] = 'Edit domain';
$lng['admin']['subdomainforemail'] = 'Subdomains as emaildomains';
$lng['admin']['subdomainforemail'] = 'Subdomains as email-domains';
$lng['admin']['admin'] = 'Admin';
$lng['admin']['admins'] = 'Admins';
$lng['admin']['admin_add'] = 'Create admin';
@@ -302,11 +302,11 @@ $lng['admin']['configfiles']['serverconfiguration'] = 'Configuration';
$lng['admin']['configfiles']['files'] = '<b>Configfiles:</b> Please change the following files or create them with<br />the following content if they do not exist.<br /><b>Please note:</b> The MySQL-password has not been replaced for security reasons.<br />Please replace "MYSQL_PASSWORD" on your own. If you forgot your MySQL-password<br />you\'ll find it in "lib/userdata.inc.php".';
$lng['admin']['configfiles']['commands'] = '<b>Commands:</b> Please execute the following commands in a shell.';
$lng['admin']['configfiles']['restart'] = '<b>Restart:</b> Please execute the following commands in a shell in order to reload the new configuration.';
$lng['admin']['templates']['templates'] = 'E-Mail-templates';
$lng['admin']['templates']['templates'] = 'Email-templates';
$lng['admin']['templates']['template_add'] = 'Add template';
$lng['admin']['templates']['template_edit'] = 'Edit template';
$lng['admin']['templates']['action'] = 'Action';
$lng['admin']['templates']['email'] = 'E-mail & file templates';
$lng['admin']['templates']['email'] = 'Email & file templates';
$lng['admin']['templates']['subject'] = 'Subject';
$lng['admin']['templates']['mailbody'] = 'Mail body';
$lng['admin']['templates']['createcustomer'] = 'Welcome mail for new customers';
@@ -337,7 +337,7 @@ $lng['serversettings']['documentroot_prefix']['title'] = 'Home directory';
$lng['serversettings']['documentroot_prefix']['description'] = 'Where should all home directories be stored?';
$lng['serversettings']['logfiles_directory']['title'] = 'Logfiles directory';
$lng['serversettings']['logfiles_directory']['description'] = 'Where should all log files be stored?';
$lng['serversettings']['ipaddress']['title'] = 'IP-Address';
$lng['serversettings']['ipaddress']['title'] = 'IP-address';
$lng['serversettings']['ipaddress']['description'] = 'What\'s the IP-address of this server?';
$lng['serversettings']['hostname']['title'] = 'Hostname';
$lng['serversettings']['hostname']['description'] = 'What\'s the Hostname of this server?';
@@ -355,7 +355,7 @@ $lng['serversettings']['vmail_uid']['title'] = 'Mails-UID';
$lng['serversettings']['vmail_uid']['description'] = 'Which UserID should mails have?';
$lng['serversettings']['vmail_gid']['title'] = 'Mails-GID';
$lng['serversettings']['vmail_gid']['description'] = 'Which GroupID should mails have?';
$lng['serversettings']['vmail_homedir']['title'] = 'Mails-Homedir';
$lng['serversettings']['vmail_homedir']['title'] = 'Mails-homedir';
$lng['serversettings']['vmail_homedir']['description'] = 'Where should all mails be stored?';
$lng['serversettings']['adminmail']['title'] = 'Sender';
$lng['serversettings']['adminmail']['description'] = 'What\'s the sender address for emails sent from the Panel?';
@@ -523,7 +523,7 @@ $lng['admin']['configfiles']['http'] = 'Webserver (HTTP)';
$lng['admin']['configfiles']['dns'] = 'Nameserver (DNS)';
$lng['admin']['configfiles']['mail'] = 'Mailserver (IMAP/POP3)';
$lng['admin']['configfiles']['smtp'] = 'Mailserver (SMTP)';
$lng['admin']['configfiles']['ftp'] = 'FTP-Server';
$lng['admin']['configfiles']['ftp'] = 'FTP-server';
$lng['admin']['configfiles']['etc'] = 'Others (System)';
$lng['admin']['configfiles']['choosedistribution'] = '-- Choose a distribution --';
$lng['admin']['configfiles']['chooseservice'] = '-- Choose a service --';
@@ -1974,4 +1974,5 @@ $lng['serversettings']['ssl']['ssl_cipher_list']['description'] = 'This is a lis
$lng['panel']['dashboard'] = "Dashboard";
$lng['panel']['used'] = "used";
$lng['panel']['assigned'] = "assigned";
$lng['panel']['available'] = "available";
$lng['panel']['available'] = "available";
$lng['customer']['services'] = "Services";

3
lng/german.lng.php
View File

@@ -1694,4 +1694,5 @@ $lng['serversettings']['ssl']['ssl_cipher_list']['description'] = 'Dies ist eine
$lng['panel']['dashboard'] = "Dashboard";
$lng['panel']['used'] = "genutzt";
$lng['panel']['assigned'] = "zugewiesen";
$lng['panel']['available'] = "verfügbar";
$lng['panel']['available'] = "verfügbar";
$lng['customer']['services'] = "Dienste";

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

@@ -6,12 +6,11 @@ $header
</h2>
<div class="canvasitems" id="statsbox">
<div class="canvasbox">
<input type="hidden" id="customers" class="circular" used="{$overview['number_customers']}" available="{$userinfo['customers']}" assigned="{$userinfo['customers_used']}">
<input type="hidden" id="customers" class="circular" used="{$overview['number_customers']}" available="{$userinfo['customers']}">
<canvas id="customers-canvas" width="120" height="76"></canvas><br/>
{$lng['admin']['customers']}<br />
<small>
{$overview['number_customers']} {$lng['panel']['used']}<br />
{$userinfo['customers_used']} {$lng['panel']['assigned']}<br />
<if $userinfo['customers'] != '∞'>
{$userinfo['customers']} {$lng['panel']['available']}
</if>
@@ -19,12 +18,11 @@ $header
</div>
<div class="canvasbox">
<input type="hidden" id="domains" class="circular" used="{$overview['number_domains']}" available="{$userinfo['domains']}" assigned="{$userinfo['domains_used']}">
<input type="hidden" id="domains" class="circular" used="{$overview['number_domains']}" available="{$userinfo['domains']}">
<canvas id="domains-canvas" width="120" height="76"></canvas><br/>
{$lng['customer']['domains']}<br />
<small>
{$overview['number_domains']} {$lng['panel']['used']}<br />
{$userinfo['domains_used']} {$lng['panel']['assigned']}<br />
<if $userinfo['domains'] != '∞'>
{$userinfo['domains']} {$lng['panel']['available']}
</if>

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

@@ -87,6 +87,7 @@ $(document).ready(function() {
usedP = Math.round(100 / available * used);
usedD = 270 * usedP / 100;
circularCircle(canvas, 42, 0, usedD, 4, usedColor);
circularText(canvas, 60, 42, 22, usedP + "%");
} else if (available == "∞") {
circularCircle(canvas, 40, 0, 270, 8, unliColor);
circularText(canvas, 60, 42, 26, "∞")

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

@@ -181,13 +181,17 @@ $header
<th colspan="2">{$lng['index']['accountdetails']}</th>
</tr>
<tr>
<td>{$lng['login']['username']}</td>
<td>{$lng['login']['username']}:</td>
<td>{$userinfo['loginname']}</td>
</tr>
<tr>
<td>{$lng['customer']['domains']}</td>
<td>{$lng['customer']['domains']}:</td>
<td>$domains</td>
</tr>
<tr>
<td>{$lng['customer']['services']}:</td>
<td>$services_enabled</td>
</tr>
<tr>
<th colspan="2">{$lng['index']['customerdetails']}</th>
</tr>