Merge branch 'fix-5961' into 'develop'

Fix for database quota view, updates ispconfig.css version Closes #5961

Closes #5961

See merge request ispconfig/ispconfig3!1351

Author: Marius Burkard

interface/web/sites/database_quota_stats.php

@@ -76,7 +76,7 @@ function prepareDataRow($rec) {
 				$rec['percentage'] = '';
 				$rec['progressbar'] = -1;
 			} else {
-				if ($rec['used'] > 0 ) $rec['percentage'] = round(100 * intval($rec['used']) / ( intval($rec['quota'])*1024*1024) ).'%';
+				if ($rec['used'] > 0 ) $rec['percentage'] = round(100 * intval($rec['used']) / ( intval($rec['quota'])*1024*1024) );
 				$rec['quota'] .= ' MB';
 			}
 
@@ -94,7 +94,7 @@ function prepareDataRow($rec) {
 			$rec['quota'] = $rec['database_quota'];
 		}
 		$rec['id'] = $rec[$this->idx_key];
-
+		$rec['progressbar_value'] = $rec['percentage'] >= 100 ? 100 : $rec['percentage'];
 		return $rec;
 	}
 

interface/web/sites/templates/database_quota_stats_list.htm

@@ -36,8 +36,8 @@ <h1><tmpl_var name="list_head_txt"></h1>
 							<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client"}</a></td>
 							<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="used"}</a></td>
 							<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="quota"}</a></td>
-							<td colspan="2">{tmpl_if name="progressbar" op="!=" value="-1"}<div class="progress" style="height: 20px">
-								<div class='progress-bar-striped progress-bar-{tmpl_if name="percentage" op="<" value="50"}success{tmpl_elseif name="percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role="progressbar" style="width: {tmpl_var name="progressbar"}%;" aria-valuenow="{tmpl_var name="percentage"}" aria-valuemin="0" aria-valuemax="100"><span>{tmpl_var name="percentage"}</span></div>
+							<td colspan="2">{tmpl_if name="progressbar" op="!=" value="-1"}<div class="progress">
+								<div class='progress-bar-striped progress-bar-{tmpl_if name="percentage" op="<" value="50"}success{tmpl_elseif name="percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role="progressbar" style="width: {tmpl_var name="progressbar_value"}%;" aria-valuenow="{tmpl_var name="percentage"}" aria-valuemin="0" aria-valuemax="100"><span>{tmpl_var name="percentage"}%</span></div>
 						</div>{/tmpl_if}
 </td>
 

interface/web/themes/default/assets/stylesheets/ispconfig.css

@@ -290,7 +290,7 @@ body {
 .progress-bar-danger, .progress-bar-warning, .progress-bar-success {
     text-align: center;
     color: white;
-    display: list-item;
+    height: 100%;
 }
 
 .progress span {

interface/web/themes/default/templates/main.tpl.htm

@@ -22,7 +22,7 @@
 
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap.min.css' />
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/fonts.min.css' />
-  <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/ispconfig.css?ver=3.2' />
+  <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/ispconfig.css?ver=3.2.2' />
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/pushy.min.css' />
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap-datetimepicker.min.css' />
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/responsive.min.css' />