From 25809ad0dd4f39c6fb996655eb2fc8a617fd7ad1 Mon Sep 17 00:00:00 2001
From: Andrew Chalkley
Date: Thu, 10 Jul 2008 16:07:14 +0100
Subject: [PATCH] Added paragraphs around anchors, removed inline style for notice and removed paragraph if notice isn't present. This makes novice users have well formated generated layouts.
---
.../components/scaffold/templates/layout.html.erb | 3 +--
.../components/scaffold/templates/style.css | 3 +++
.../scaffold/templates/view_edit.html.erb | 6 ++++--
.../scaffold/templates/view_new.html.erb | 4 +++-
.../scaffold/templates/view_show.html.erb | 6 ++++--
5 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb
index 5c1f304..cda7eb6 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb
@@ -9,8 +9,7 @@
-<%%= flash[:notice] %>
-
+<%%= content_tag(:p, flash[:notice],:id => "notice") unless flash[:notice].blank? %>
<%%= yield %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/style.css b/railties/lib/rails_generator/generators/components/scaffold/templates/style.css
index 093c209..53d7743 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/style.css
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/style.css
@@ -52,3 +52,6 @@ a:hover { color: #fff; background-color:#000; }
list-style: square;
}
+#notice {
+ color: green;
+}
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
index e289975..6f49ddb 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
@@ -14,5 +14,7 @@
<%% end %>
-<%%= link_to 'Show', @<%= singular_name %> %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+
+ <%%= link_to 'Show', @<%= singular_name %> %> |
+ <%%= link_to 'Back', <%= plural_name %>_path %>
+
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
index c47e811..48cdb7d 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
@@ -14,4 +14,6 @@
<%% end %>
-<%%= link_to 'Back', <%= plural_name %>_path %>
+
+ <%%= link_to 'Back', <%= plural_name %>_path %>
+
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
index 9b6b11b..14c2252 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
@@ -6,5 +6,7 @@
<% end -%>
-<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+
+ <%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+ <%%= link_to 'Back', <%= plural_name %>_path %>
+
\ No newline at end of file
--
1.5.5.1