shakes 0.8.0 → 0.8.1

data/README.md

@@ -253,8 +253,7 @@ wanted to change.
 
 TODO
 ----
-* Add validation error messages to forms
-* Style flash messages
+* Support associations
 * Support custom actions and views
 * Support nested resources
 * Support Rails 3

data/app/views/shakes/_form.html.erb

@@ -1,5 +1,5 @@
 <% form_for(@resource, :url => action_path(((action.eql? :new) ? :create : :update ), @resource)) do |form| %>
-  <fieldset class="fields">
+  <fieldset class="attributes">
     <ol>
     <%- form_attributes(action).each do |attribute| -%>
       <% content_tag :li, :class => ['attribute', attribute_type(attribute).to_s].join(' ') do -%>

data/app/views/shakes/edit.html.erb

@@ -8,7 +8,7 @@
   <div class="section">
     <h1>Related Links</h1>
     <ul class="links">
-    <%- links_to_actions([:show, :destroy, :index], @resource).each do |link| -%>
+    <%- links_to_actions([:show, :destroy, :index, :new], @resource).each do |link| -%>
       <%= content_tag :li, link%>
     <%- end -%>
     </ul>

data/app/views/shakes/form/_field.html.erb

@@ -1,2 +1,5 @@
 <%= form.label attribute, attribute_human_name(attribute).titleize %>
-<%= form.text_field attribute %>
+<%= form.text_field attribute %>
+<%- if resource.errors[attribute] -%>
+<%= content_tag :p, [*resource.errors[attribute]].join(' and '), :class => 'error' %>
+<%- end -%>

data/app/views/shakes/index.html.erb

@@ -9,7 +9,7 @@
         <%= content_tag :th, 'Actions', :class => 'actions' %>
       </tr>
     <%- @resources.each do |resource| -%>
-      <tr class="fields">
+      <tr class="attributes">
       <%- index_attributes.each do |attribute| -%>
         <%= content_tag :td, render_attribute(:index, attribute, resource),
             :class => ['field', attribute_type(attribute).to_s].join(' ') %>

data/app/views/shakes/show.html.erb

@@ -1,7 +1,7 @@
 <div class="article">
   <div class="section">
     <%= title "Show #{controller_human_name}", :h1 %>
-    <ol class="fields">
+    <ol class="attributes">
     <%- show_attributes.each do |attribute| -%>
       <% content_tag :li, :class => ['attribute', attribute_type(attribute).to_s].join(' ') do -%>
         <%= render_attribute :show, attribute, @resource %>
@@ -14,7 +14,7 @@
   <div class="section">
     <h1>Related Links</h1>
     <ul class="links">
-    <%- links_to_actions([:edit, :destroy, :index], @resource).each do |link| -%>
+    <%- links_to_actions([:edit, :destroy, :index, :new], @resource).each do |link| -%>
       <%= content_tag :li, link%>
     <%- end -%>
     </ul>

data/generators/shakes_layout/templates/shakes.css

@@ -1,54 +1,3 @@
-/* RESET.CSS */
-/* http://meyerweb.com/eric/tools/css/reset/ */
-/* v1.0 | 20080212 */
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	font-size: 100%;
-	vertical-align: baseline;
-	background: transparent;
-}
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
-}
-/* remember to highlight inserts somehow! */
-ins {
-	text-decoration: none;
-}
-del {
-	text-decoration: line-through;
-}
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-
 /* SHAKES.CSS */
 /* General */
 body {
@@ -56,6 +5,7 @@ body {
 	color: #666;
 	font-family: Tahoma,Arial,Helvetica,sans-serif;
 	font-size: 100%;
+	line-height: 1;
 	margin: 1em auto;
 	width: 960px;
 }
@@ -63,6 +13,11 @@ a {
 	color: #000;
 	font-weight: bold;
 }
+fieldset, li, ol, ul {
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
 h1,h2,h3,h4,h5,h6 {
 	margin: 1em 0em;
 }
@@ -73,8 +28,12 @@ h1,h2,h3,h4,h5,h6,label,th {
 	margin: 0em 0em 1em 0em;
 	text-align: inherit;
 }
+ol, ul {
+	list-style: none;
+}
 td, th {
 	padding: 0.1em;
+	vertical-align: baseline;
 }
 
 /* Layout */
@@ -121,6 +80,30 @@ body > div.nav li {
 	margin-right: 2em;
 }
 
+/* Flash */
+p.flash {
+	background-color: #eee;
+	border: solid #666 1px;
+	padding: 1em;
+	color: #666;
+	text-align: center;
+}
+p#flash_error {
+	background-color: #fee;
+	border: solid #600 1px;
+	color: #600;
+}
+p#flash_notice {
+	background-color: #efe;
+	border: solid #060 1px;
+	color: #060;
+}
+p#flash_warning {
+	background-color: #ffe;
+	border: solid #660 1px;
+	color: #660;
+}
+
 /* Article */
 body > div.article > div.section {
 	margin: 0em 0em 1em 0em;
@@ -146,19 +129,26 @@ body > div.article h6 {
 body > div.article li {
 	margin: 0.5em 0em;
 }
+body > div.article fieldset.attributes li {
+	margin: 1em 0em;
+}
 body > div.article tr.headers th {
 	border-bottom: solid #060 2px;
 }
-body > div.article fieldset.fields > ol li, body > div.article ol.fields li {
+body > div.article fieldset.attributes > ol li, body > div.article ol.attributes li {
 	clear: both;
 }
-body > div.article fieldset.fields > ol label, body > div.article ol.fields label {
+body > div.article fieldset.attributes > ol label, body > div.article ol.attributes label {
 	float: left;
 	width: 160px;
 }
-body > div.article fieldset.buttons > ol li, body > div.article ol.fields div {
+body > div.article fieldset.buttons > ol li, body > div.article ol.attributes div {
 	padding-left: 160px;
 }
+body > div.article fieldset.attributes > ol li p.error {
+	color: #600;
+	margin: 0.25em 0em;
+}
 
 /* Aside */
 body > div.aside > div.section {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shakes
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Jason Stahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -05:00
+date: 2010-05-28 00:00:00 -05:00
 default_executable: 
 dependencies: []