From 1216884a308572f96bf93e82aec8275df98a7bfe Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 17 Dec 2009 01:02:20 -0500
Subject: [PATCH] Starting work on bake template redesign.

---
 app/webroot/css/cake.generic.css              | 27 ++++++++++++++-----
 cake/console/templates/default/views/form.ctp |  1 +
 .../console/templates/default/views/index.ctp | 11 ++++----
 cake/console/templates/default/views/view.ctp |  1 +
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
index 77ca75e80..8136c5f22 100644
--- a/app/webroot/css/cake.generic.css
+++ b/app/webroot/css/cake.generic.css
@@ -45,31 +45,27 @@ a img {
 }
 h1, h2, h3, h4 {
 	font-weight: normal;
+	margin-bottom:0.5em;
 }
 h1 {
 	background:#fff;
 	color: #003d4c;
 	font-size: 100%;
-	margin: 0.1em 0;
 }
 h2 {
 	background:#fff;
 	color: #e32;
 	font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
 	font-size: 190%;
-	margin: 0.3em 0;
-	padding-top: 0.8em;
 }
 h3 {
 	color: #993;
 	font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
 	font-size: 165%;
-	padding-top: 1.5em;
 }
 h4 {
 	color: #993;
 	font-weight: normal;
-	padding-top: 0.5em;
 }
 ul, li {
 	margin: 0 12px;
@@ -112,6 +108,24 @@ ul, li {
 	text-align: right;
 }
 
+div.form,
+div.index,
+div.view {
+	float:right;
+	width:81%;
+	border-left:1px solid #666;
+	padding:10px 2%;
+}
+div.actions {
+	float:left;
+	width:9.5%;
+	padding:10px 2%;
+}
+div.actions h3 {
+	padding-top:0;
+}
+
+
 /* Tables */
 table {
 	background: #fff;
@@ -170,6 +184,7 @@ div.paging {
 	background:#fff;
 	color: #ccc;
 	margin-bottom: 2em;
+	clear:both;
 }
 div.paging div.disabled {
 	color: #ddd;
@@ -212,7 +227,7 @@ form {
 }
 fieldset {
 	border: 1px solid #ccc;
-	margin-top: 30px;
+	margin-bottom: 1em;
 	padding: 16px 20px;
 }
 fieldset legend {
diff --git a/cake/console/templates/default/views/form.ctp b/cake/console/templates/default/views/form.ctp
index a86f034cc..4438f9487 100644
--- a/cake/console/templates/default/views/form.ctp
+++ b/cake/console/templates/default/views/form.ctp
@@ -43,6 +43,7 @@
 ?>
 </div>
 <div class="actions">
+	<h3><?php __('Actions'); ?></h3>
 	<ul>
 <?php if ($action != 'add'):?>
 		<li><?php echo "<?php echo \$this->Html->link(__('Delete', true), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, sprintf(__('Are you sure you want to delete # %s?', true), \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>";?></li>
diff --git a/cake/console/templates/default/views/index.ctp b/cake/console/templates/default/views/index.ctp
index a539c57e5..a1ddce926 100644
--- a/cake/console/templates/default/views/index.ctp
+++ b/cake/console/templates/default/views/index.ctp
@@ -69,13 +69,14 @@ foreach (\${$pluralVar} as \${$singularVar}):
 echo "<?php endforeach; ?>\n";
 ?>
 </table>
-</div>
-<div class="paging">
-<?php echo "\t<?php echo \$this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>\n";?>
- | <?php echo "\t<?php echo \$this->Paginator->numbers();?>\n"?>
-<?php echo "\t<?php echo \$this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>\n";?>
+	<div class="paging">
+	<?php echo "\t<?php echo \$this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>\n";?>
+	 | <?php echo "\t<?php echo \$this->Paginator->numbers();?>\n"?>
+	<?php echo "\t<?php echo \$this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>\n";?>
+	</div>
 </div>
 <div class="actions">
+	<h3><?php __('Actions'); ?></h3>
 	<ul>
 		<li><?php echo "<?php echo \$this->Html->link(sprintf(__('New %s', true), __('{$singularHumanName}', true)), array('action' => 'add')); ?>";?></li>
 <?php
diff --git a/cake/console/templates/default/views/view.ctp b/cake/console/templates/default/views/view.ctp
index cc118e726..89077a433 100644
--- a/cake/console/templates/default/views/view.ctp
+++ b/cake/console/templates/default/views/view.ctp
@@ -42,6 +42,7 @@ foreach ($fields as $field) {
 	</dl>
 </div>
 <div class="actions">
+	<h3><?php __('Actions'); ?></h3>
 	<ul>
 <?php
 	echo "\t\t<li><?php echo \$this->Html->link(sprintf(__('Edit %s', true), __('{$singularHumanName}', true)), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";