diff --git a/controllers/customers_controller.php b/controllers/customers_controller.php index ec8b1add..70cfd1e5 100755 --- a/controllers/customers_controller.php +++ b/controllers/customers_controller.php @@ -32,7 +32,7 @@ class CustomersController extends AppController { $this->set('customer', $this->Customer->read(null, $id)); $this->set('addresses', $this->Customer->Address->findAllByCustomerId($id)); $this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.customer_id' => $id))); - $this->set('contacts', $this->Customer->Contact->findAllByCustomerId($id)); + $this->set('contacts', $this->Customer->Contact->find('all', array('conditions' => array('customer_id' => $id), 'order' => 'Contact.last_name ASC'))); $statuses = $this->Customer->Enquiry->Status->find('all'); $status_list = array(); foreach ($statuses as $status) { diff --git a/views/industries/.add.ctp.swp b/views/industries/.add.ctp.swp deleted file mode 100644 index 545deaff..00000000 Binary files a/views/industries/.add.ctp.swp and /dev/null differ diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css index 215e5a27..6d94a2d8 100755 --- a/webroot/css/quotenik.css +++ b/webroot/css/quotenik.css @@ -119,10 +119,10 @@ ul.principle-emails { #header{ - /* background: #E9E9E9 url(../img/top-gradient2.png) repeat-x bottom; - //background: #7bf47b url(../img/gradient-green2.png) repeat-x bottom; */ - background: #6BBA70; - padding-bottom: 2%; + /* background: #E9E9E9 url(../img/top-gradient2.png) repeat-x bottom; */ + background: #7bf47b url(../img/gradient-blue4.png) repeat-x bottom; + /* background: #6BBA70; */ + padding-bottom: 2%; } #header h1 { /* background: #003d4c url('../img/cmclogo.png') no-repeat left; */ @@ -167,7 +167,7 @@ ul.principle-emails { #nav h3 { font-size: 120%; font-weight: bold; - color:#000000; + color:#FFFFFF; /* background: #E9E9E9; */ padding-left: 0.1em; padding-top: 0; @@ -178,7 +178,7 @@ ul.principle-emails { #nav h3 a{ font-size: 120%; font-weight: bold; - color:#000000; + color:#FFFFFF; width: 100%; /* background: #E9E9E9; */ text-decoration:none; @@ -225,12 +225,13 @@ ul.principle-emails { } #nav li ul a { - background: #6BBA70; - color: #000000; + background: #4687c3; + color: #FFFFFF; } #nav li ul a:hover { - background:#90EE90; + background:#5d9cd7; + } diff --git a/webroot/img/gradient-blue4.png b/webroot/img/gradient-blue4.png new file mode 100644 index 00000000..a591234c Binary files /dev/null and b/webroot/img/gradient-blue4.png differ