Merge branch 'dashboard_progressbar_limits_fix' into 'master'

Dashboard limit dashlet bug since commit (3223915)

See merge request ispconfig/ispconfig3!753

Author: Till Brehm

interface/web/admin/lib/lang/nl_server_config.lng

@@ -289,4 +289,7 @@ $wb['nagios_password_txt'] = 'Nagios/Check_MK Password';
 $wb['nagios_url_error_regex'] = 'Invalid Nagios/Check_MK URL';
 $wb['nagios_url_note_txt'] = 'Check_MK is being autodetected. Placeholder:';
 $wb['mailinglist_manager_txt'] = 'Mailinglist Manager';
+$wb['backup_tmp_txt'] = 'Backup tijdelijke map voor zip';
+$wb['tmpdir_path_error_empty'] = 'tmp-dir map is leeg.';
+$wb['tmpdir_path_error_regex'] = 'Ongeldige tmp-dir map.';
 ?>

interface/web/dashboard/dashlets/limits.php

@@ -165,8 +165,11 @@ function show() {
 				}
 				else $usage = $this->_get_limit_usage($limit);
 				$percentage = ($value == '-1' || $value == 0 ? 0 : round(100 * $usage / $value));
-				$progressbar = $percentage > 100 ? 100 : $percentage;
-
+				if($value == $wb['unlimited_txt'] || $value == '-1') {
+					$progressbar = '-1';
+				} else {
+					$progressbar = $percentage > 100 ? 100 : $percentage;
+				}
 				$rows[] = array('field' => $field,
 					'field_txt' => $wb[$field.'_txt'],
 					'value' => $value_formatted,

interface/web/dashboard/lib/lang/nl_dashlet_limits.lng

@@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Aantal klanten';
 $wb['limit_database_txt'] = 'Aantal databases';
 $wb['limit_mailmailinglist_txt'] = 'Aantal mailing lijsten';
 $wb['limit_domain_txt'] = 'Aantal domeinen';
+$wb['limit_mailquota_txt'] = 'Toegewezen mailbox quota';
+$wb['limit_web_quota_txt'] = 'Toegewezen webquota';
+$wb['limit_database_quota_txt'] = 'Toegewezen databasequota';
 ?>