From 77eda644ff8a2abd34cd390f4b1bf45017b01d92 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Fri, 23 Jan 2009 13:43:39 +1100
Subject: [PATCH] MER changes

---
 views/elements/enquiry_table.ctp | 21 +++++++++++++++------
 webroot/css/quotenik.css         |  4 ++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/views/elements/enquiry_table.ctp b/views/elements/enquiry_table.ctp
index 35edd757..e11b3abd 100644
--- a/views/elements/enquiry_table.ctp
+++ b/views/elements/enquiry_table.ctp
@@ -8,6 +8,7 @@
 <tr>
 	<th><?php echo $paginator->sort('user_id');?></th>
 	<th><?php echo $paginator->sort('Date', 'created');?></th>
+	<th><?php echo $paginator->sort('principle_id');?></th>
 	<th><?php echo $paginator->sort('Enquiry Number', 'title');?></th>
 	<th><?php echo $paginator->sort('customer_id');?></th>
 	<th><?php echo $paginator->sort('contact_id');?></th>
@@ -15,7 +16,7 @@
 	<th><?php __('Phone No'); ?></th>
 	<th><?php echo $paginator->sort('state_id');?></th>
 	<th><?php echo $paginator->sort('country_id');?></th>
-	<th><?php echo $paginator->sort('principle_id');?></th>
+	
 	<th><?php echo $paginator->sort('status_id');?></th>
 	<th><?php echo $paginator->sort('comments');?></th>
 	<th class="actions"><?php __('Actions');?></th>
@@ -73,6 +74,9 @@ foreach ($enquiries as $enquiry):
 			<?php 
 			/* Change the date from MySQL DATETIME to a D M Y format */
 			echo date('j M Y',$time->toUnix($enquiry['Enquiry']['created'])); ?>
+		</td>
+		<td>
+			<?php echo $html->link($enquiry['Principle']['name'], array('controller'=> 'principles', 'action'=>'view', $enquiry['Principle']['id'])); ?>
 		</td>		
 		<td>
 			<?php echo $html->link($enquiry['Enquiry']['title'], array('controller'=>'enquiries', 'action'=>'view', $enquiry['Enquiry']['id'])); ?>
@@ -97,14 +101,19 @@ foreach ($enquiries as $enquiry):
 		<td>
 			<?php echo $html->link($enquiry['Country']['name'], array('controller'=> 'countries', 'action'=>'view', $enquiry['Country']['id'])); ?>
 		</td>
-		<td>
-			<?php echo $html->link($enquiry['Principle']['name'], array('controller'=> 'principles', 'action'=>'view', $enquiry['Principle']['id'])); ?>
-		</td>
+		
 		<td>
 			<?php echo $html->link($enquiry['Status']['name'], array('controller'=> 'statuses', 'action'=>'view', $enquiry['Status']['id'])); ?>
 		</td>
-		<td>
-			<?php echo $enquiry['Enquiry']['comments']; ?>
+		<td class = "comments">
+			<?php 
+			
+			$displayedComment = substr($enquiry['Enquiry']['comments'], 0, 260); 
+			echo $displayedComment;
+			if(strlen($enquiry['Enquiry']['comments']) > strlen($displayedComment) ) {
+				echo '.... '.$html->link('view full comment', array('controller'=>'enquiries', 'action'=>'view', $enquiry['Enquiry']['id']));
+			}
+			?>
 		</td>
 		<td class="actions">
 			<?php echo $html->link(__('View', true), array('controller'=>'enquiries','action'=>'view', $enquiry['Enquiry']['id'])); ?>
diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css
index c9bd47a6..5c117df1 100755
--- a/webroot/css/quotenik.css
+++ b/webroot/css/quotenik.css
@@ -322,6 +322,10 @@ table.mer tr td.posted {
 table.mer tr td.notposted {
 	background: #FFFFFF;
 }
+table.mer tr td.comments {
+	font-size: small;
+	text-align: left;
+}
 
 table.quotetable tr.mostrecent td {
 	background: #ADD8E6;