diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
index 61aadff21..1def50aa7 100644
--- a/app/webroot/css/cake.generic.css
+++ b/app/webroot/css/cake.generic.css
@@ -128,7 +128,6 @@ div.actions h3 {
/** Tables **/
table {
- background: #fff;
border-right:0;
clear: both;
color: #333;
@@ -153,16 +152,12 @@ th a.desc:after {
content: ' ⇡';
}
table tr td {
- background: #fff;
padding: 6px;
text-align: left;
vertical-align: top;
border-bottom:1px solid #ddd;
}
-table tr:nth-child(2n) td {
- background: #f5f5f5;
-}
-table .altrow td {
+table tr:nth-child(even) {
background: #f5f5f5;
}
td.actions {
@@ -208,9 +203,11 @@ dl {
margin: 0em 0em;
width: 60%;
}
-dl .altrow {
+dl dd:nth-child(4n+2),
+dl dt:nth-child(4n+1) {
background: #f4f4f4;
}
+
dt {
font-weight: bold;
padding-left: 4px;
diff --git a/lib/Cake/View/Scaffolds/index.ctp b/lib/Cake/View/Scaffolds/index.ctp
index 871559059..c9c3a084e 100644
--- a/lib/Cake/View/Scaffolds/index.ctp
+++ b/lib/Cake/View/Scaffolds/index.ctp
@@ -28,11 +28,7 @@
";
+ echo "
";
foreach ($scaffoldFields as $_field) {
$isKey = false;
if (!empty($associations['belongsTo'])) {
@@ -93,4 +89,4 @@ endforeach;
}
?>
-
\ No newline at end of file
+
diff --git a/lib/Cake/View/Scaffolds/view.ctp b/lib/Cake/View/Scaffolds/view.ctp
index 63fdad3d6..d18e70661 100644
--- a/lib/Cake/View/Scaffolds/view.ctp
+++ b/lib/Cake/View/Scaffolds/view.ctp
@@ -22,24 +22,20 @@
$_details) {
if ($_field === $_details['foreignKey']) {
$isKey = true;
- echo "\t\t" . Inflector::humanize($_alias) . "\n";
- echo "\t\t\n\t\t\t" . $this->Html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . "\n\t\t \n";
+ echo "\t\t" . Inflector::humanize($_alias) . "\n";
+ echo "\t\t\n\t\t\t" . $this->Html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . "\n\t\t \n";
break;
}
}
}
if ($isKey !== true) {
- echo "\t\t" . Inflector::humanize($_field) . "\n";
- echo "\t\t" . h(${$singularVar}[$modelClass][$_field]) . " \n";
+ echo "\t\t" . Inflector::humanize($_field) . "\n";
+ echo "\t\t" . h(${$singularVar}[$modelClass][$_field]) . " \n";
}
}
?>
@@ -78,12 +74,8 @@ foreach ($associations['hasOne'] as $_alias => $_details): ?>
$i = 0;
$otherFields = array_keys(${$singularVar}[$_alias]);
foreach ($otherFields as $_field) {
- $class = null;
- if ($i++ % 2 == 0) {
- $class = ' class="altrow"';
- }
- echo "\t\t" . Inflector::humanize($_field) . "\n";
- echo "\t\t\n\t" . ${$singularVar}[$_alias][$_field] . "\n \n";
+ echo "\t\t" . Inflector::humanize($_field) . "\n";
+ echo "\t\t\n\t" . ${$singularVar}[$_alias][$_field] . "\n \n";
}
?>
@@ -129,11 +121,7 @@ $otherSingularVar = Inflector::variable($_alias);
\n";
+ echo "\t\t
\n";
foreach ($otherFields as $_field) {
echo "\t\t\t" . ${$otherSingularVar}[$_field] . " | \n";
@@ -155,4 +143,4 @@ $otherSingularVar = Inflector::variable($_alias);
-
\ No newline at end of file
+