From e4d600b8d0dd9b4ffe978522bb577a5b95a6c93d Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 30 Jul 2012 18:14:25 +1000
Subject: [PATCH] Updated Table to use new css layout

---
 application/classes/controller/affiliate/account.php | 3 +--
 application/classes/lnapp/table.php                  | 3 +--
 application/views/table/list_body.php                | 2 +-
 application/views/table/list_head.php                | 4 ++--
 application/views/table/select_body.php              | 2 +-
 application/views/table/select_foot.php              | 6 +++---
 application/views/table/select_head.php              | 4 ++--
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/application/classes/controller/affiliate/account.php b/application/classes/controller/affiliate/account.php
index 9e890d6e..5224eee1 100644
--- a/application/classes/controller/affiliate/account.php
+++ b/application/classes/controller/affiliate/account.php
@@ -19,11 +19,10 @@ class Controller_Affiliate_Account extends Controller_TemplateDefault_Affiliate
 	 * Show a list of accounts
 	 */
 	public function action_list() {
-
 		Block::add(array(
 			'title'=>_('Customer List'),
 			'body'=>Table::display(
-				$this->filter(ORM::factory('account')->list_active(),$this->ao->affiliate->id,'sortkey(TRUE)');
+				$this->filter(ORM::factory('account')->list_active(),$this->ao->affiliate->id,'sortkey(TRUE)'),
 				25,
 				array(
 					'id'=>array('label'=>'ID','url'=>'user/account/view/'),
diff --git a/application/classes/lnapp/table.php b/application/classes/lnapp/table.php
index c5b52e83..ca9017e4 100644
--- a/application/classes/lnapp/table.php
+++ b/application/classes/lnapp/table.php
@@ -221,8 +221,7 @@ $(document).ready(function() {
 					$td[$col]['value'] = Table::resolve($do,$col);
 
 				$output .= View::factory($view.'_body')
-					->set('td',$td)
-					->set('trc',$i%2 ? 'odd' : 'even');
+					->set('td',$td);
 
 			} elseif (isset($option['show_other']) AND ($col=$option['show_other'])) {
 				$other += Table::resolve($do,$col);
diff --git a/application/views/table/list_body.php b/application/views/table/list_body.php
index 0deec12a..0474968f 100644
--- a/application/views/table/list_body.php
+++ b/application/views/table/list_body.php
@@ -1,4 +1,4 @@
-	<tr class="<?php echo $trc; ?>">
+	<tr class="list-data">
 		<?php foreach ($td as $col => $details) { ?>
 		<td class="<?php echo $details['class']; ?>">
 			<?php echo $details['url'] ? sprintf(HTML::anchor($details['url'].$details['value'],$details['value'])) : $details['value']; ?>
diff --git a/application/views/table/list_head.php b/application/views/table/list_head.php
index ab06c3c8..70d3ca3b 100644
--- a/application/views/table/list_head.php
+++ b/application/views/table/list_head.php
@@ -1,2 +1,2 @@
-<table class="box-left" border="0" id="list-table">
-	<tr class="head"><td class="head"><?php echo implode('</td><td class="head">',$th); ?></td></tr>
+<table class="list-box-left" border="0" id="list-table">
+	<tr class="list-head"><th><?php echo implode('</th><th>',$th); ?></th></tr>
diff --git a/application/views/table/select_body.php b/application/views/table/select_body.php
index 8110a45b..31cf6e0f 100644
--- a/application/views/table/select_body.php
+++ b/application/views/table/select_body.php
@@ -1,4 +1,4 @@
-	<tr class="<?php echo $trc; ?>">
+	<tr class="list-data">
 		<td><?php echo Form::checkbox('id[]',$td['id']['value']); ?></td>
 		<?php foreach ($td as $col => $details) { ?>
 		<td class="<?php echo $details['class']; ?>">
diff --git a/application/views/table/select_foot.php b/application/views/table/select_foot.php
index 205f5e04..c5a0a0c5 100644
--- a/application/views/table/select_foot.php
+++ b/application/views/table/select_foot.php
@@ -2,7 +2,7 @@
 <div style="text-align: center;" id="select-menu">
 	<br/>
 	<?php echo $button; ?>
-	<input type="button" name="Submit" value="Select All"  class="form_button" id="all_on" />
-	<input type="button" name="Submit" value="Deselect All" class="form_button" id="all_off" />
-	<input type="button" name="Submit" value="Toggle Select" class="form_button" id="toggle" />
+	<button type="submit" name="Submit" class="form_button" id="all_on">Select All</button>
+	<button type="submit" name="Submit" class="form_button" id="all_off">Deselect All</button>
+	<button type="submit" name="Submit" class="form_button" id="toggle">Toggle Select</button>
 </div>
diff --git a/application/views/table/select_head.php b/application/views/table/select_head.php
index a64ac769..6f1b2fe6 100644
--- a/application/views/table/select_head.php
+++ b/application/views/table/select_head.php
@@ -1,2 +1,2 @@
-<table class="box-full" border="0" id="select-table">
-	<tr class="head"><td style="width: 25px;">&nbsp;</td><td class="head"><?php echo implode('</td><td class="head">',$th); ?></td></tr>
+<table class="list-box-left" border="0" id="select-table">
+	<tr class="list-head"><th>&nbsp;</th><th><?php echo implode('</th><th>',$th); ?></th></tr>