From 357e60c054b72fc04294fabde91ec2a3906abe99 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Tue, 1 Mar 2011 19:52:34 +0100
Subject: [PATCH] Reworked admin -> customerslist, fixes #619

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 .../admin/customers/customers_customer.tpl    | 38 ++++++++-----------
 templates/Froxlor/froxlor.css                 |  9 +++--
 templates/Froxlor/js/froxlor.js               | 13 ++++++-
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/templates/Froxlor/admin/customers/customers_customer.tpl b/templates/Froxlor/admin/customers/customers_customer.tpl
index 8ae17344..069e55d8 100644
--- a/templates/Froxlor/admin/customers/customers_customer.tpl
+++ b/templates/Froxlor/admin/customers/customers_customer.tpl
@@ -9,21 +9,8 @@
 		</if>
 		&nbsp;(<a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['customerid']}" rel="external">{$row['loginname']}</a> | {$row['adminname']})
 		</strong>
-	</td>
-	<td rowspan="2">
-		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}" style="text-decoration:none;">
-			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
-		</a>&nbsp;
-		<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}" style="text-decoration:none;">
-			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
-		</a>
-	</td>
-</tr>
-<tr>
-	<td>
-		<table class="overviewcustomerextras">
-		<tr>
-			<td style="width: 300px;">
+		<div>
+			<span class="overviewcustomerextras">
 				Webspace:&nbsp;
 				<if $row['diskspace'] != 'UL'>
 					<span class="progressBar" title="{$row['diskspace_used']} / {$row['diskspace']} MB">
@@ -39,8 +26,8 @@
 						<span class="greybar"><em style="left: 200px;">100%</em></span>
 					</span>
 				</if>
-			</td>
-			<td style="width: 300px;">
+			</span>
+			<span class="overviewcustomerextras">
 				Traffic:&nbsp;
 				<if $row['traffic'] != 'UL'>
 					<span class="progressBar" title="{$row['traffic_used']} / {$row['traffic']} GB">
@@ -56,11 +43,18 @@
 						<span class="greybar"><em style="left: 200px;">100%</em></span>
 					</span>
 				</if>
-			</td>
-			<td>
+			</span>
+			<span style="clear: both !important;">
 				{$last_login}
-			</td>
-		</tr>
-		</table>
+			</span>
+		</div>
+	</td>
+	<td>
+		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}" style="text-decoration:none;">
+			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
+		</a>&nbsp;
+		<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}" style="text-decoration:none;">
+			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
+		</a>
 	</td>
 </tr>
diff --git a/templates/Froxlor/froxlor.css b/templates/Froxlor/froxlor.css
index 7ca949ee..dee49fa6 100644
--- a/templates/Froxlor/froxlor.css
+++ b/templates/Froxlor/froxlor.css
@@ -502,10 +502,13 @@ table tbody td {
 	text-align: left;
 }
 
-.overviewcustomerextras,.overviewcustomerextras tbody td {
-	line-height: 11px;
+.overviewcustomerextras {
+	line-height: 15px;
 	font-size: 10px;
-	border: 0;
+	width: 300px; 
+	float: left;
+	padding-top: 8px;
+	padding-bottom: 12px;
 }
 
 td {
diff --git a/templates/Froxlor/js/froxlor.js b/templates/Froxlor/js/froxlor.js
index 1c229973..f5408a2c 100644
--- a/templates/Froxlor/js/froxlor.js
+++ b/templates/Froxlor/js/froxlor.js
@@ -14,7 +14,16 @@ $(document).ready(function(){
 			$(this).css("background-color", "#fff");
 		},
 		function() {
-			$(this).css("background-color", "#f8f8f8");
+			$(this).css("background-color", "#f5f5f5");
+		}
+		);
+	}
+	if($("table.bradiusodd").length != 0) {
+		$("table.bradiusodd tr").hover(function() {
+			$(this).css("background-color", "#fff");
+		},
+		function() {
+			$(this).css("background-color", "#f5f5f5");
 		}
 		);
 	}
@@ -24,7 +33,7 @@ $(document).ready(function(){
                         $(this).css("background-color", "#fff");
                 },
                 function() {
-                        $(this).css("background-color", "#f8f8f8");
+                        $(this).css("background-color", "#f5f5f5");
                 }
                 );
         }