From 6678f7a584150649eb6ea1aafc186473beaece59 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Fri, 17 Jul 2009 14:35:52 +1000 Subject: [PATCH] Changed Color Scheme. Fixed Contact sorting. No SQL changes --- controllers/customers_controller.php | 2 +- views/industries/.add.ctp.swp | Bin 12288 -> 0 bytes webroot/css/quotenik.css | 19 ++++++++++--------- webroot/img/gradient-blue4.png | Bin 0 -> 498 bytes 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 views/industries/.add.ctp.swp create mode 100644 webroot/img/gradient-blue4.png 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 545deaffe013551b9a3c6dc06dc0ae5296dac866..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2KX21O7>BQH1qu}mAc4g7k7@^+xGe*Sx{eTHD1r(J!BVQou`kW3j_um#gb1-B zBnBoXK#Xh*j4VhXnE4EdPXPn`E_Ry=N&{6{s@Kw^DE9eYzt8==Bv+rgvv`AFsLV1P zql~?px_j;FrxWb)1Y>J%66n)|jxdtRpfUQo)pirB)9G02S)@cL*JdkomK(=bTZ&F< z$b2fx!kc)hJ&aVdv*&XC}tS`0-=62j4>@$N(8217v^< zkO4A42FL&z*jENrJj8yWqXS?H3>Dym4l+On$N(8217v^S0;01UN9)ficfe@^MGB^j$fRo_+5yrlOuizQ5Kp9Md zk0XqI0Pn#&@CG~qk3a$fFbbX?#$4bfp64u>0H=X|zIE^!&_M>s02v?yWPl8i0Wv@a z{)YkE@@3m$!?u+L_!zbW>Dbk{8FS$^BR<(wt)T1#GF&rjHPcuU9exEnSfiFmjA^ct zOq8a%nwO7qoT92-&uekzp1@SQzC zO7cMFcgQf#lxf7h#i>ajc8UfYXg_K zQQ6jCZ?=`bz^!xid)?s)?V@;|3p`bS>3@%kmk6wa*#XIxEQCPvFzT A%>V!Z 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 0000000000000000000000000000000000000000..a591234ce2be35bf7f72d34b1c20d56781e3b186 GIT binary patch literal 498 zcmVPx#32;bRa{vGf6951U69E94oEQKA00(qQO+^RU2N47yECV&`FaQ7m8FWQhbVF}# zZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0bfZ(K~y-)b(A|+1u+amuX0jSP*PG+ zb65mhV__^z6plYLyf;-cj%`U+qVJzyfkCih72m3r%~Ea0tcUfClu;gMCf}{+GLhLtSoyg9fa5R{3G&fESRvnU}Pj<}$0n|P0M6H^Fro45s z;kZx-(=4Dtd-%Z9Z#ufA-x`h+LCJX;uo}*-Y4f?{grW&lNrCC>rcgex(|qBet-*Vh zTTxEIb3VGw$DV?moH=@HNY(N>fhABqyns(lv9ANpj>mjgU-R$M{jLTzqN>-@4-#$@m7^7F7D-aEbnPXHwi5H+#Vr;!UsXyx~XG#ffcIh($07*qoM6N<$f;f-MmH+?% literal 0 HcmV?d00001