Updating bake templates and default css file.

cakephp · Dec 29, 2009 · b0a50e1 · b0a50e1
1 parent 1216884
commit b0a50e1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 33 deletions.
diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
@@ -183,17 +183,15 @@ td.actions a {
 div.paging {
 	background:#fff;
 	color: #ccc;
-	margin-bottom: 2em;
+	margin-top: 1em;
 	clear:both;
 }
-div.paging div.disabled {
+div.paging span.disabled {
 	color: #ddd;
 	display: inline;
 }
-div.paging span {
-}
 div.paging span.current {
-	color: #000;
+	color: #993;
 }
 div.paging span a {
 }

diff --git a/cake/console/templates/default/views/index.ctp b/cake/console/templates/default/views/index.ctp
@@ -18,30 +18,23 @@
  */
 ?>
 <div class="<?php echo $pluralVar;?> index">
-<h2><?php echo "<?php __('{$pluralHumanName}');?>";?></h2>
-<p>
-<?php echo "<?php
-echo \$this->Paginator->counter(array(
-'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
-));
-?>";?>
-</p>
-<table cellpadding="0" cellspacing="0">
-<tr>
-<?php  foreach ($fields as $field):?>
-	<th><?php echo "<?php echo \$this->Paginator->sort('{$field}');?>";?></th>
-<?php endforeach;?>
-	<th class="actions"><?php echo "<?php __('Actions');?>";?></th>
-</tr>
-<?php
-echo "<?php
-\$i = 0;
-foreach (\${$pluralVar} as \${$singularVar}):
-	\$class = null;
-	if (\$i++ % 2 == 0) {
-		\$class = ' class=\"altrow\"';
-	}
-?>\n";
+	<h2><?php echo "<?php __('{$pluralHumanName}');?>";?></h2>
+	<table cellpadding="0" cellspacing="0">
+	<tr>
+	<?php  foreach ($fields as $field):?>
+		<th><?php echo "<?php echo \$this->Paginator->sort('{$field}');?>";?></th>
+	<?php endforeach;?>
+		<th class="actions"><?php echo "<?php __('Actions');?>";?></th>
+	</tr>
+	<?php
+	echo "<?php
+	\$i = 0;
+	foreach (\${$pluralVar} as \${$singularVar}):
+		\$class = null;
+		if (\$i++ % 2 == 0) {
+			\$class = ' class=\"altrow\"';
+		}
+	?>\n";
 	echo "\t<tr<?php echo \$class;?>>\n";
 		foreach ($fields as $field) {
 			$isKey = false;
@@ -66,12 +59,20 @@ foreach (\${$pluralVar} as \${$singularVar}):
 		echo "\t\t</td>\n";
 	echo "\t</tr>\n";
 
-echo "<?php endforeach; ?>\n";
-?>
-</table>
+	echo "<?php endforeach; ?>\n";
+	?>
+	</table>
+	<p>
+	<?php echo "<?php
+	echo \$this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>";?>
+	</p>
+
 	<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->numbers();?>\n"?> |
 	<?php echo "\t<?php echo \$this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>\n";?>
 	</div>
 </div>