From 8c6b0576af7003fb101dc79a03a7ad0ff1d013ea Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 22 Jun 2006 20:42:53 +0000
Subject: [PATCH] Merging changes from 1.1.x.x branch: [3157]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3158 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 app/webroot/css/cake.basic.css                | 274 ------------------
 app/webroot/css/cake.forms.css                | 273 -----------------
 .../webroot/css/cake.generic.css              | 132 ++++++---
 cake/libs/model/datasources/dbo_source.php    |   6 +-
 .../libs/view/templates/layouts/default.thtml |  63 ++--
 cake/libs/view/templates/pages/home.thtml     |   6 +-
 .../skel/views/layouts/default.thtml          |   3 +-
 .../skel/webroot/css/cake.generic.css         | 223 ++++++++++++++
 .../skel/webroot/css/generic.forms.css        | 274 ------------------
 9 files changed, 335 insertions(+), 919 deletions(-)
 delete mode 100644 app/webroot/css/cake.basic.css
 delete mode 100644 app/webroot/css/cake.forms.css
 rename cake/scripts/templates/skel/webroot/css/generic.basic.css => app/webroot/css/cake.generic.css (61%)
 create mode 100644 cake/scripts/templates/skel/webroot/css/cake.generic.css
 delete mode 100644 cake/scripts/templates/skel/webroot/css/generic.forms.css

diff --git a/app/webroot/css/cake.basic.css b/app/webroot/css/cake.basic.css
deleted file mode 100644
index d92680c6f..000000000
--- a/app/webroot/css/cake.basic.css
+++ /dev/null
@@ -1,274 +0,0 @@
-*{
-margin:0;
-padding:0;
-}
-
-body{
-font-family:verdana,helvetica,arial,sans-serif;
-font-size:12px;
-text-align:center;
-color:#fff;  
-background:#003d4c;
-}
-
-/*
-*  General Style Info
-*/
-
-a{  
-color:#003d4c;
-text-decoration:underline;
-}
-a:hover{  
-color:#003d4c;
-text-decoration:none;
-}
-
-a img{ 
-border:none;
-}
-
-h1, h2,h3{
-font-family:'Gill Sans';
-font-size:28px;
-font-weight:normal;
-}
-h1{
-padding:0.5em 0; 
-color:#003d4c;
-}
-em {
- font-size: 12px;
-}
-h2{      
-padding-top:0.15em;  
-margin:0.3em 0;
-color:#e32;
-}
-
-h3{ 
-font-size:18px;  
-padding-top:0.5em; 
-color:#003d4c;
-}
-
-h4{
-color:#ff9966;
-font-size:20px; 
-padding-top:0.5em;
-font-weight:normal;
-}
-
-blockquote{
-padding: 10px;
-padding-left: 20px;
-padding-right: 20px;
-}
-
-#content ol, #content ul{
-margin:0 1em;
-padding:0 2em;
-}
-
-/*
-*  Layout
-*/ 
-
-#container{ 
-text-align:left; 
-margin-left:0px;  
-min-width: 960px;
-}
-
-#header{
-height:200px;
-background:#003d4c;
-}
-
-#header h1{
-color:#fff;
-font-family: 'Gill Sans';
-font-size: 45px;
-font-weight:normal;
-}
-
-#header h1.logo {  
-float:left;
-}     
-
-#header h1.logo a{ 
-display:block;
-width:226px;
-height:176px; 
-background: transparent url('images/logo.gif') no-repeat top;    
-}
-
-#header h1.logo a:hover{
-background:url('images/logo.gif') no-repeat bottom;     
-}
-
-#content{   
-width: auto;
-min-width: 860px;           
-min-height: 720px;
-padding:15px 20px 50px 20px;   
-margin: 0px 10px 0px 40px;
-color:#333;   
-background:#fff ;  
-border-right: 6px solid #222;
-}
-
-/*
-*  Navigation
-*/
-#navigation{
-float:left;
-height: 146px;  
-width:710px;
-background:#003d4c url(images/nav_bg.gif) no-repeat;    
-padding-left: 20px;
-} 
-#navigation ul{
-
-}
-
-#navigation ul li{
-list-style-type:none;
-display:inline;
-}
-
-#navigation ul li a{
-font-weight:bold;
-display:block;
-float:left;
-color:#000;
-}
-
-#navigation ul li a span{
-display:block; 
-margin-right:12px; 
-padding:10px 6px 9px 9px; 
-} 
-
-#navigation ul li.active a span{
-padding:10px 6px 9px 9px; 
-} 
-
-
-
-#navigation ul li a:hover, #navigation ul li.active a{
-background:url(images/nav_item_bg.gif) no-repeat bottom right; 
-} 
-
-#navigation ul li a:hover span,  #navigation ul li.active a span{
-background:url(images/nav_item_bg.gif) no-repeat bottom left; 
-}                      
-
-#footer {  
-    color: #fff;
-    background-color: #003d4c;
-    padding: 4px 10px;
-    text-align: right; 
-}
-#footer a{  
-    color: #fff;
-} 
-.left {  
-    float:left;
-}
-.right {  
-    float:right;
-}      
-.clear {
-    clear:both;
-    height: 0px;
-    line-height: 0px;
-}                          
-
-     
-/* tables */
-
-table {  
-  width: 100%;   
-  border: 1px solid #003d4c; 
-  color:#333; 
-  background-color: #fff;
-  clear:both;    
-  padding: 0;
-  margin: 0 0 2em 0;
-  white-space: normal;
-}
-th {
-  background-color: #ccc;
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #003d4c;
-  border-bottom: 1px solid #003d4c;
-  text-align: center;
-  padding:1px;
-}
-table tr td {
-  border-right: 1px solid #ccc;
-  padding:4px 4px;
-  vertical-align:top;
-  text-align: center;
-}
-table tr.altRow td {
-  background: #f4f4f4;
-}
-
-/* scaffold show */
-
-
-div.related {
-  clear:both;
-  display:block;
-}
-dl {
-  line-height:2em;
-  margin:1em; 
-  float:left;
-  width: 400px;
-}
-dt {
-  font-weight: bold;
-  vertical-align:top;
-}
-dd {
-  margin-left:10em;
-  margin-top:-2em;
-  vertical-align:top;
-}
-
-/* notices and errors */
-p.error, error_message {
-  color: #e32000;
-  font-size: 18px;
-  background-color: #fff;
-  margin: 8px 4px;
-}
-p.error em {
-  font-size: 18px;
-  color: #003d4c;
-}   
-
-.notice { 
-  color: #656565;
-  font-size: 14px;
-  background-color: #f4f4f4;  
-  padding: 4px;
-  display:block;
-}
-
-.tip {
-  color: #e32000;
-  background-color: #ddd;
-}
-
-
-/* action links */   
-ul.actions {
-      float:left;
-      margin-left: 10px;
-      width: 200px;
-}
\ No newline at end of file
diff --git a/app/webroot/css/cake.forms.css b/app/webroot/css/cake.forms.css
deleted file mode 100644
index 63eff05e0..000000000
--- a/app/webroot/css/cake.forms.css
+++ /dev/null
@@ -1,273 +0,0 @@
-/* form.css */
-
-form {
-  margin: 0 4px;
-  font-size: 120%;
-  border-width: 0px 0px 0px 0px;
-  border-style: solid;
-  border-color: #DB8101;
-}
-
-form fieldset {
-  font-size: 100%;
-  border-color: #000000;
-  border-width: 1px 0px 0px 0px;
-  border-style: solid none none none;
-  padding: 10px;
-}
-
-form fieldset legend {
-  font-size: 150%;
-  font-weight: normal;
-  color: #000;
-  padding: 0px 5px;
-}
-
-label {
-  font-size: 150%;
-}
-
-label u {
-  font-style: normal;
-  text-decoration: underline;
-}
-
-input, select, textarea {
-  font-family: Tahoma, Arial, sans-serif;
-  font-size: 100%;
-  color: #000;
-}
-
-textarea {
-  overflow: auto;
-}
-
-form div {
-  clear: left;
-  display: block;
-  margin: 5px 0px 0px 0px;
-  padding: 1px 3px;
-}
-
-form fieldset div.notes {
-  float: right;
-  width: 158px;
-  height: auto;
-  margin: 0px 0px 10px 10px;
-  padding: 5px;
-  border: 1px solid #666;
-  background-color: #ffffe1;
-  color: #666;
-  font-size: 88%;
-}
-
-form fieldset div.notes h4 {
-  background-image: url(/images/icon_info.gif);
-  background-repeat: no-repeat;
-  background-position: top left;
-  padding: 3px 0px 3px 27px;
-  border-width: 0px 0px 1px 0px;
-  border-style: solid;
-  border-color: #666;
-  color: #666;
-  font-size: 110%;
-}
-
-form fieldset div.notes p {
-  margin: 0em 0em 1.2em 0em;
-  color: #666;
-}
-
-form fieldset div.notes p.last {
-  margin: 0em;
-}
-
-form div fieldset {
-  clear: none;
-  border-width: 0px 1px 0px 1px;
-  border-style: solid;
-  border-color: #666;
-  margin: 0px 0px 0px 142px;
-  padding: 0px 5px 5px 5px;
-}
-
-form div fieldset legend {
-  font-size: 100%;
-  padding: 0px 3px 0px 9px;
-}
-
-form div.required fieldset legend {
-  font-weight: bold;
-}
-
-form div label {
-  display: block;
-  float: left;
-  width: 200px;
-  background-color: #f4f4f4;
-  font-size: 16px;
-  padding: 3px 5px;
-  margin: 0px 0px 5px 0px;
-  text-align: right;
-}
-
-form div.optional label, label.optional {
-  font-weight: normal;
-}
-
-form div.required label, label.required {
-  font-weight: bold;
-}
-
-form div label.labelCheckbox, form div label.labelRadio {
-  float: none;
-  display: block;
-  margin: 0px 0px 5px 142px;
-  text-align: left;
-}
-
-form div fieldset label.labelCheckbox, form div fieldset label.labelRadio {
-  margin: 0px 0px 5px 0px;
-}
-
-form div input, form div select, form div textarea {
-  padding: 1px 3px;
-  margin: 0px 0px 0px 0px;
-}
-
-form div input.inputFile {
-  width: 211px;
-}
-
-form div select.selectOne, form div select.selectMultiple {
-  width: 211px;
-  padding: 1px 3px;
-}
-
-form div input.inputCheckbox, form div input.inputRadio, input.inputCheckbox, input.inputRadio {
-  display: inline;
-  height: 14px;
-  width: 14px;
-  background-color: transparent;
-  border-width: 0px;
-}
-
-form div.submit {
-  padding: 0px 0px 0px 140px;
-  clear:both;
-  display:block;
-}
-
-div.submit input {
-  padding: 2px 12px;
-  color: #DB8101;
-  background-color:#ccc;
-  text-decoration: none;
-  border: 1px solid #666;
-  font-size: 14px;
-  font-weight: bold;
-  text-align:center;
-  text-decoration: none;
-  width: auto;
-}
-div.submit input:hover {
-  padding: 2px 12px;
-  color: #fff;
-  background-color:#DB8101;
-  text-decoration: none;
-  border: 1px solid #666;
-  font-size: 14px;
-  font-weight: bold;
-  text-align:center;
-  text-decoration: none;
-  width: auto;
-}
-
-form div.submit div input.inputSubmit, form div.submit div input.inputButton {
-  float: right;
-  margin: 0px 0px 0px 5px;
-}
-
-form div small {
-  display: block;
-  margin: 0px 0px 5px 142px;
-  padding: 1px 3px;
-  font-size: 88%;
-}
-
-/* form.import.css */
-
-form fieldset legend {
-  line-height: 150%;
-}
-
-form input, form select, form textarea {
-  background-color: #fff;
-}
-
-div.optional label:before {
-  content: '';
-}
-
-div.required label:before {
-  content: '';
-}
-
-form div label.labelCheckbox, form div label.labelRadio, label.labelCheckbox, label.labelRadio {
-  display: block;
-  width: 190px;
-  padding: 4px 0px 0px 18px;
-  text-indent: -18px;
-  line-height: 120%;
-}
-
-form div label.labelCheckbox input.inputCheckbox, form div label.labelRadio input.inputRadio, label.labelCheckbox input.inputCheckbox, label.labelRadio input.inputRadio {
-  margin: 0;
-}
-
-form div fieldset input.inputText, form div fieldset input.inputPassword, form div fieldset input.inputFile, form div fieldset textarea.inputTextarea {
-  width: 160px;
-  margin: 0px 0px 0px 18px;
-}
-
-form div label.compact {
-  display: inline;
-  width: auto;
-  padding: 4px 10px 0px 0px;
-  text-indent: 0px;
-  margin: 0;
-}
-
-form div.wide label {
-  float: none;
-  display: block;
-}
-
-form div label.wide {
-  width: 348px;
-}
-
-form div.wide input.inputText, form div.wide input.inputPassword, form div.wide input.inputFile, form div.wide select, form div.wide textarea {
-  width: 344px;
-  margin: 0;
-}
-
-form div.notes p, form div small {
-  line-height: 125%;
-}
-
-form div.wide small {
-  margin: 0px 0px 5px 0px;
-}
-
-div.date select {
-  width:auto;
-}
-
-select.autoWidth {
-  width:auto;
-}
-
-option {
-	padding-left:1em;
-}   
diff --git a/cake/scripts/templates/skel/webroot/css/generic.basic.css b/app/webroot/css/cake.generic.css
similarity index 61%
rename from cake/scripts/templates/skel/webroot/css/generic.basic.css
rename to app/webroot/css/cake.generic.css
index e45be4c23..3ee5b1d5a 100644
--- a/cake/scripts/templates/skel/webroot/css/generic.basic.css
+++ b/app/webroot/css/cake.generic.css
@@ -4,12 +4,10 @@ padding:0;
 }
 
 body{
-font-family:verdana,helvetica,arial,sans-serif;
-font-size:12px;
+font-family:"frutiger linotype","lucida grande",helvetica,arial,sans-serif;
+font-size:76%;
 text-align:center;
 color:#333;
-background:#003d4c;
-line-height: 18px;
 }
 
 /*
@@ -29,40 +27,36 @@ a img{
 border:none;
 }
 
-h1, h2, h3, h4{
-font-family:'Gill Sans';
+h1, h2, h3, h4{  
 font-weight:normal;
 }
 
-h1{
-font-size:28px;
-padding:0.5em 0;
-color:#003d4c;
+h1{ 
+color: #003d4c;
+padding:0.3em 0;
 }
 
+h2{ 
+color:#c6c65b;
+padding-top: 1em;
+margin:0.3em 0;
+}
+
+h3{
+color:#c6c65b;
+padding-top:0.5em;
+}
+
+h4{
+color:#c6c65b;
+padding-top:0.5em;
+font-weight:normal;
+}  
+
 em {
  font-size: 12px;
 }
 
-h2{
-font-size:24px;
-padding-top:0.15em;
-margin:0.3em 0;
-color:#e32000;
-}
-
-h3{
-font-size:18px;
-padding-top:0.5em;
-color:#003d4c;
-}
-
-h4{
-color:#ff9966;
-font-size:16px;
-padding-top:0.5em;
-font-weight:normal;
-}
 ul, li {
 margin: 0 12px;
 }
@@ -76,34 +70,26 @@ text-align:left;
 }
 
 #header{
-background:#003d4c;
 padding: 4px 20px;
 }
 
-#header h1{
-color:#fff;
-font-family: 'Gill Sans';
-font-size: 45px;
-font-weight:normal;
-}
-
-
 #content{
 padding: 10px 40px;  
 background-color: #fff;
-color: #333;
+color: #333; 
+line-height: 18px;
 }
 #footer{
 padding: 6px 10px;
-background:#003d4c;
 text-align: right;
 }
 
 /* tables */
-
 table {
   width: 100%;
-  border: 1px solid #003d4c;
+  border-top: 1px solid #ccc; 
+  border-left: 1px solid #ccc; 
+  border-bottom: 1px solid #ccc;
   color:#333;
   background-color: #fff;
   clear:both;
@@ -112,7 +98,7 @@ table {
   white-space: normal;
 }
 th {
-  background-color: #ccc;
+  background-color: #e2e2e2;
   border-top: 1px solid #fff;
   border-left: 1px solid #fff;
   border-right: 1px solid #003d4c;
@@ -121,7 +107,7 @@ th {
   padding:1px;
 }
 table tr td {
-  border-right: 1px solid #ccc;
+  border-right: 1px solid #ddd;
   padding:4px 4px;
   vertical-align:top;
   text-align: center;
@@ -129,6 +115,12 @@ table tr td {
 table tr.altRow td {
   background: #f4f4f4;
 }
+#cakeSqlLog td { 
+ text-align: left;
+ padding: 4px 8px;
+ background: #fff;
+ border-bottom: 2px solid #ccc;   
+}
 
 /* scaffold show */
 
@@ -139,7 +131,7 @@ div.related {
 }
 dl {
   line-height:2em;
-  margin:1em;
+  margin:0em 1em;
   float:left;
   width: 400px;
 }
@@ -154,13 +146,22 @@ dd {
 }
 
 /* notices and errors */
-p.error, error_message {
-  color: #e32000;
+
+#flashMessage{
+color:#300;
+background:#ffe;
+border:1px solid #060;
+margin:10px;
+padding:10px;
+}
+
+.error, error_message {
+  color:#900;
   font-size: 18px;
   background-color: #fff;
   margin: 8px 4px;
 }
-p.error em {
+.error em {
   font-size: 18px;
   color: #003d4c;
 }   
@@ -176,6 +177,38 @@ p.error em {
 .tip {
   color: #e32000;
   background-color: #ddd;
+} 
+ 
+form div{ 
+vertical-align: text-top; 
+margin-left: 2em;
+margin-bottom:1em;
+} 
+label { 
+display: block;
+float:left;
+width: 140px;
+}
+input,textarea {
+clear: both;
+display:block;
+} 
+select {
+vertical-align: text-top;
+}
+.required{
+color:#222;
+font-weight:bold;
+}
+
+.optional{
+color:#666;
+}
+ 
+.submit {   
+  clear: both;
+  margin-top: 18px;
+  margin-left: 140px;   
 }
 
 
@@ -184,4 +217,7 @@ ul.actions {
   float:left;
   margin-left: 10px;
   width: 200px;
+} 
+ul.actions li {
+  margin-top: 4px;
 }
\ No newline at end of file
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 328e98bd4..036488589 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -341,11 +341,11 @@ class DboSource extends DataSource {
 		}
 
 		if ($this->_queriesCnt > 1) {
-			$text = 'queries';
+				$text = 'queries';
 		} else {
-			$text = 'query';
+				$text = 'query';
 		}
-		print ("<table id=\"cakeSqlLog\" border = \"0\">\n<caption>{$this->_queriesCnt} {$text} took {$this->_queriesTime} ms</caption>\n");
+		print ("<table id=\"cakeSqlLog\" cellspacing=\"0\" border = \"0\">\n<caption>{$this->_queriesCnt} {$text} took {$this->_queriesTime} ms</caption>\n");
 		print ("<thead>\n<tr><th>Nr</th><th>Query</th><th>Error</th><th>Affected</th><th>Num. rows</th><th>Took (ms)</th></tr>\n</thead>\n<tbody>\n");
 
 		foreach($log as $k => $i) {
diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml
index b1df771bb..e11243f96 100644
--- a/cake/libs/view/templates/layouts/default.thtml
+++ b/cake/libs/view/templates/layouts/default.thtml
@@ -28,51 +28,30 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>CakePHP : The PHP Rapid Development Framework :: <?php echo $title_for_layout?></title>
-<link rel="shortcut icon" href="<?php echo $html->url('/favicon.ico');?>" type="image/x-icon" />
-<?php echo $html->charset('UTF-8')?>
-<?php echo $html->css('cake.basic', 'stylesheet', array("media"=>"all" ));?>
-<?php echo $html->css('cake.forms', 'stylesheet', array("media"=>"all" ));?>
+<title>CakePHP : <?php echo $title_for_layout;?></title>
+<link rel="shortcut icon" href="<?php echo $html->url('/favicon.ico')?>" type="image/x-icon" />
+<?php echo $html->css('cake.generic');?>
 </head>
-<body class="main">
-  <div id="container">
+<body>
+	<div id="container">
 		<div id="header">
-			<h1 class="logo">
-				<a href="http://cakephp.org"></a>
-			</h1>
-			<div id="navigation">
-				<ul>
-					<li class="active"><a href="http://cakephp.org"><span>Home</span></a></li>
-					<li><a href="http://cakephp.org/downloads/"><span>Downloads</span></a></li>
-					<!--<li><a href="#"><span>Screencasts coming soon!</span></a></li>-->
-					<li><a href="http://manual.cakephp.org"><span>Manual</span></a></li>
-					<li><a href="http://api.cakephp.org/"><span>API</span></a></li>
-					<li><a href="http://bakery.cakephp.org"><span>Bakery</span></a></li>
-					<li><a href="https://trac.cakephp.org"><span>Trac</span></a></li>
-					<li><a href="http://cakeforge.org"><span>CakeForge</span></a></li>
-				</ul>
-			</div> <!-- #navigation -->
-		</div> <!-- #header -->
+			<h1>CakePHP Rapid Development</h1>
+		</div>
 		<div id="content">
-				<?php if ($this->controller->Session->check('Message.flash')) $this->controller->Session->flash(); ?>
-				<?php echo $content_for_layout?>
-				<div class="clear"></div>
-		</div> <!-- #content -->
+			<?php if ($this->controller->Session->check('Message.flash'))
+					{
+						$this->controller->Session->flash();
+					}
+					echo $content_for_layout;
+			?>
+		</div>
 		<div id="footer">
-			<p>
-				CakePHP : <a href="http://www.cakefoundation.org/pages/copyright/">&copy; 2006 Cake Software Foundation, Inc.</a>
-			</p>
-				<a href="http://www.w3c.org/" target="_new">
-					<?php echo $html->image('w3c_css.png', array('alt'=>"valid css", 'border'=>"0"))?>
-				</a>
-				<a href="http://www.w3c.org/" target="_new">
-					<?php echo $html->image('w3c_xhtml10.png', array('alt'=>"valid xhtml", 'border'=>"0"))?>
-				</a>
-				<a href="http://www.cakephp.org/" target="_new">
-					<?php echo $html->image('cake.power.png', array('alt'=>"CakePHP : Rapid Development Framework", 'border'=>"0"))?>
-				</a>
-			</div>
-			<?php echo $cakeDebug;?>
-	</div> <!-- #container -->
+			&nbsp;
+			<a href="http://www.cakephp.org/" target="_new">
+				<?php echo $html->image('cake.power.png', array('alt'=>"CakePHP : Rapid Development Framework", 'border'=>"0"));?>
+			</a>
+		</div>
+	</div>
+	<?php echo $cakeDebug?>
 </body>
 </html>
\ No newline at end of file
diff --git a/cake/libs/view/templates/pages/home.thtml b/cake/libs/view/templates/pages/home.thtml
index 1f11e8d4d..e76c89522 100644
--- a/cake/libs/view/templates/pages/home.thtml
+++ b/cake/libs/view/templates/pages/home.thtml
@@ -28,11 +28,11 @@
  * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 ?>
-<p style="background:#DBA941;padding:4px;font-size: 16px;">Your database configuration file is <?php echo  file_exists(CONFIGS.'database.php') ?' present.' . $filePresent = ' ' : ' not present.'; ?></p>
+<p class="notice">Your database configuration file is <?php echo  file_exists(CONFIGS.'database.php') ?' present.' . $filePresent = ' ' : ' not present.'; ?></p>
 <?php if (!empty($filePresent)):?>
 <?php $db = ConnectionManager::getInstance(); ?>
 <?php $connected = $db->getDataSource('default'); ?>
-<p style="background:#DBA941;padding:4px;font-size: 16px;">Cake<?php echo $connected->isConnected() ? ' is able to' : ' is not able to';?> connect to the database.</p>
+<p class="notice">Cake<?php echo $connected->isConnected() ? ' is able to' : ' is not able to';?> connect to the database.</p>
 <br />
 <?php endif; ?>     
 <h2>CakePHP release information is on CakeForge</h2>
@@ -42,7 +42,7 @@
 <p>
 To change the content of this page, create: /app/views/pages/home.thtml.<br />
 To change its layout, create: /app/views/layouts/default.thtml.<br />
-<a href="http://wiki.cakephp.org/tutorials:sample_layout">See the wiki for more info</a><br />
+<a href="http://manual.cakephp.org/">See the views section of the manual for more info</a><br />
 You can also add some CSS styles for your pages at: app/webroot/css/.
 </p>
 <h2>More about Cake</h2>
diff --git a/cake/scripts/templates/skel/views/layouts/default.thtml b/cake/scripts/templates/skel/views/layouts/default.thtml
index e014c0d46..cddea0be0 100644
--- a/cake/scripts/templates/skel/views/layouts/default.thtml
+++ b/cake/scripts/templates/skel/views/layouts/default.thtml
@@ -3,8 +3,7 @@
 <head>
 <title>CakePHP : <?php echo $title_for_layout;?></title>
 <link rel="shortcut icon" href="<?php echo $html->url('/favicon.ico')?>" type="image/x-icon" />
-<?php echo $html->css('generic.basic');?>
-<?php echo $html->css('generic.forms');?>
+<?php echo $html->css('cake.generic');?>
 </head>
 <body>
 	<div id="container">
diff --git a/cake/scripts/templates/skel/webroot/css/cake.generic.css b/cake/scripts/templates/skel/webroot/css/cake.generic.css
new file mode 100644
index 000000000..3ee5b1d5a
--- /dev/null
+++ b/cake/scripts/templates/skel/webroot/css/cake.generic.css
@@ -0,0 +1,223 @@
+*{
+margin:0;
+padding:0;
+}
+
+body{
+font-family:"frutiger linotype","lucida grande",helvetica,arial,sans-serif;
+font-size:76%;
+text-align:center;
+color:#333;
+}
+
+/*
+*  General Style Info
+*/
+
+a{
+color:#003d4c;
+text-decoration:underline;
+}
+a:hover{
+color:#003d4c;
+text-decoration:none;
+}
+
+a img{
+border:none;
+}
+
+h1, h2, h3, h4{  
+font-weight:normal;
+}
+
+h1{ 
+color: #003d4c;
+padding:0.3em 0;
+}
+
+h2{ 
+color:#c6c65b;
+padding-top: 1em;
+margin:0.3em 0;
+}
+
+h3{
+color:#c6c65b;
+padding-top:0.5em;
+}
+
+h4{
+color:#c6c65b;
+padding-top:0.5em;
+font-weight:normal;
+}  
+
+em {
+ font-size: 12px;
+}
+
+ul, li {
+margin: 0 12px;
+}
+
+/*
+*  Layout
+*/
+
+#container{
+text-align:left;
+}
+
+#header{
+padding: 4px 20px;
+}
+
+#content{
+padding: 10px 40px;  
+background-color: #fff;
+color: #333; 
+line-height: 18px;
+}
+#footer{
+padding: 6px 10px;
+text-align: right;
+}
+
+/* tables */
+table {
+  width: 100%;
+  border-top: 1px solid #ccc; 
+  border-left: 1px solid #ccc; 
+  border-bottom: 1px solid #ccc;
+  color:#333;
+  background-color: #fff;
+  clear:both;
+  padding: 0;
+  margin: 0 0 2em 0;
+  white-space: normal;
+}
+th {
+  background-color: #e2e2e2;
+  border-top: 1px solid #fff;
+  border-left: 1px solid #fff;
+  border-right: 1px solid #003d4c;
+  border-bottom: 1px solid #003d4c;
+  text-align: center;
+  padding:1px;
+}
+table tr td {
+  border-right: 1px solid #ddd;
+  padding:4px 4px;
+  vertical-align:top;
+  text-align: center;
+}
+table tr.altRow td {
+  background: #f4f4f4;
+}
+#cakeSqlLog td { 
+ text-align: left;
+ padding: 4px 8px;
+ background: #fff;
+ border-bottom: 2px solid #ccc;   
+}
+
+/* scaffold show */
+
+
+div.related {
+  clear:both;
+  display:block;
+}
+dl {
+  line-height:2em;
+  margin:0em 1em;
+  float:left;
+  width: 400px;
+}
+dt {
+  font-weight: bold;
+  vertical-align:top;
+}
+dd {
+  margin-left:10em;
+  margin-top:-2em;
+  vertical-align:top;
+}
+
+/* notices and errors */
+
+#flashMessage{
+color:#300;
+background:#ffe;
+border:1px solid #060;
+margin:10px;
+padding:10px;
+}
+
+.error, error_message {
+  color:#900;
+  font-size: 18px;
+  background-color: #fff;
+  margin: 8px 4px;
+}
+.error em {
+  font-size: 18px;
+  color: #003d4c;
+}   
+
+.notice { 
+  color: #656565;
+  font-size: 14px;
+  background-color: #f4f4f4;  
+  padding: 4px;
+  display:block;
+}
+
+.tip {
+  color: #e32000;
+  background-color: #ddd;
+} 
+ 
+form div{ 
+vertical-align: text-top; 
+margin-left: 2em;
+margin-bottom:1em;
+} 
+label { 
+display: block;
+float:left;
+width: 140px;
+}
+input,textarea {
+clear: both;
+display:block;
+} 
+select {
+vertical-align: text-top;
+}
+.required{
+color:#222;
+font-weight:bold;
+}
+
+.optional{
+color:#666;
+}
+ 
+.submit {   
+  clear: both;
+  margin-top: 18px;
+  margin-left: 140px;   
+}
+
+
+/* action links */
+ul.actions {
+  float:left;
+  margin-left: 10px;
+  width: 200px;
+} 
+ul.actions li {
+  margin-top: 4px;
+}
\ No newline at end of file
diff --git a/cake/scripts/templates/skel/webroot/css/generic.forms.css b/cake/scripts/templates/skel/webroot/css/generic.forms.css
deleted file mode 100644
index 22cd4bd78..000000000
--- a/cake/scripts/templates/skel/webroot/css/generic.forms.css
+++ /dev/null
@@ -1,274 +0,0 @@
-/* form.css */
-
-form {
-  margin: 0 4px;
-  font-size: 120%;
-  border-width: 0px 0px 0px 0px;
-  border-style: solid;
-  border-color: #DB8101;
-}
-
-form fieldset {
-  font-size: 100%;
-  border-color: #000000;
-  border-width: 1px 0px 0px 0px;
-  border-style: solid none none none;
-  padding: 10px;
-}
-
-form fieldset legend {
-  font-size: 150%;
-  font-weight: normal;
-  color: #000;
-  padding: 0px 5px;
-}
-
-label {
-  font-size: 150%;
-}
-
-label u {
-  font-style: normal;
-  text-decoration: underline;
-}
-
-input, select, textarea {
-  font-family: Tahoma, Arial, sans-serif;
-  font-size: 100%;
-  color: #000;
-}
-
-textarea {
-  overflow: auto;
-}
-
-form div {
-  clear: left;
-  display: block;
-  margin: 5px 0px 0px 0px;
-  padding: 1px 3px;
-}
-
-form fieldset div.notes {
-  float: right;
-  width: 158px;
-  height: auto;
-  margin: 0px 0px 10px 10px;
-  padding: 5px;
-  border: 1px solid #666;
-  background-color: #ffffe1;
-  color: #666;
-  font-size: 88%;
-}
-
-form fieldset div.notes h4 {
-  background-image: url(/images/icon_info.gif);
-  background-repeat: no-repeat;
-  background-position: top left;
-  padding: 3px 0px 3px 27px;
-  border-width: 0px 0px 1px 0px;
-  border-style: solid;
-  border-color: #666;
-  color: #666;
-  font-size: 110%;
-}
-
-form fieldset div.notes p {
-  margin: 0em 0em 1.2em 0em;
-  color: #666;
-}
-
-form fieldset div.notes p.last {
-  margin: 0em;
-}
-
-form div fieldset {
-  clear: none;
-  border-width: 0px 1px 0px 1px;
-  border-style: solid;
-  border-color: #666;
-  margin: 0px 0px 0px 142px;
-  padding: 0px 5px 5px 5px;
-}
-
-form div fieldset legend {
-  font-size: 100%;
-  padding: 0px 3px 0px 9px;
-}
-
-form div.required fieldset legend {
-  font-weight: bold;
-}
-
-form div label {
-  display: block;
-  float: left;
-  width: 200px;
-  background-color: #f4f4f4;
-  font-size: 16px;
-  padding: 3px 5px;
-  margin: 0px 0px 5px 0px;
-  text-align: right;
-}
-
-form div.optional label, label.optional {
-  font-weight: normal;
-}
-
-form div.required label, label.required {
-  font-weight: bold;
-}
-
-form div label.labelCheckbox, form div label.labelRadio {
-  float: none;
-  display: block;
-  margin: 0px 0px 5px 142px;
-  text-align: left;
-}
-
-form div fieldset label.labelCheckbox, form div fieldset label.labelRadio {
-  margin: 0px 0px 5px 0px;
-}
-
-
-form div input, form div select, form div textarea {
-  padding: 1px 3px;
-  margin: 0px 0px 0px 0px;
-}
-
-form div input.inputFile {
-  width: 211px;
-}
-
-form div select.selectOne, form div select.selectMultiple {
-  width: 211px;
-  padding: 1px 3px;
-}
-
-form div input.inputCheckbox, form div input.inputRadio, input.inputCheckbox, input.inputRadio {
-  display: inline;
-  height: 14px;
-  width: 14px;
-  background-color: transparent;
-  border-width: 0px;
-}
-
-form div.submit {
-  padding: 0px 0px 0px 140px;
-  clear:both;
-  display:block;
-}
-
-div.submit input {
-  padding: 2px 12px;
-  color: #DB8101;
-  background-color:#ccc;
-  text-decoration: none;
-  border: 1px solid #666;
-  font-size: 14px;
-  font-weight: bold;
-  text-align:center;
-  text-decoration: none;
-  width: auto;
-}
-div.submit input:hover {
-  padding: 2px 12px;
-  color: #fff;
-  background-color:#DB8101;
-  text-decoration: none;
-  border: 1px solid #666;
-  font-size: 14px;
-  font-weight: bold;
-  text-align:center;
-  text-decoration: none;
-  width: auto;
-}
-
-form div.submit div input.inputSubmit, form div.submit div input.inputButton {
-  float: right;
-  margin: 0px 0px 0px 5px;
-}
-
-form div small {
-  display: block;
-  margin: 0px 0px 5px 142px;
-  padding: 1px 3px;
-  font-size: 88%;
-}
-
-/* form.import.css */
-
-form fieldset legend {
-  line-height: 150%;
-}
-
-form input, form select, form textarea {
-  background-color: #fff;
-}
-
-div.optional label:before {
-  content: '';
-}
-
-div.required label:before {
-  content: '';
-}
-
-form div label.labelCheckbox, form div label.labelRadio, label.labelCheckbox, label.labelRadio {
-  display: block;
-  width: 190px;
-  padding: 4px 0px 0px 18px;
-  text-indent: -18px;
-  line-height: 120%;
-}
-
-form div label.labelCheckbox input.inputCheckbox, form div label.labelRadio input.inputRadio, label.labelCheckbox input.inputCheckbox, label.labelRadio input.inputRadio {
-  margin: 0;
-}
-
-form div fieldset input.inputText, form div fieldset input.inputPassword, form div fieldset input.inputFile, form div fieldset textarea.inputTextarea {
-  width: 160px;
-  margin: 0px 0px 0px 18px;
-}
-
-form div label.compact {
-  display: inline;
-  width: auto;
-  padding: 4px 10px 0px 0px;
-  text-indent: 0px;
-  margin: 0;
-}
-
-form div.wide label {
-  float: none;
-  display: block;
-}
-
-form div label.wide {
-  width: 348px;
-}
-
-form div.wide input.inputText, form div.wide input.inputPassword, form div.wide input.inputFile, form div.wide select, form div.wide textarea {
-  width: 344px;
-  margin: 0;
-}
-
-form div.notes p, form div small {
-  line-height: 125%;
-}
-
-form div.wide small {
-  margin: 0px 0px 5px 0px;
-}
-
-div.date select {
-  width:auto;
-}
-
-select.autoWidth {
-  width:auto;
-}
-
-option {
-	padding-left:1em;
-}
\ No newline at end of file