shakes 0.4.3 → 0.4.4

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

@@ -1,9 +1,9 @@
 <%- unless Shakes::Helpers::ViewsHelper::Configuration.use_formtastic -%>
 <% form_for(@resource, :url => shakes_path_for(((action.eql? :new) ? :create : :update ), @resource)) do |form| %>
-  <fieldset class="inputs">
+  <fieldset class="fields">
     <ol>
     <%- shakes_fields_for(action).each do |field| -%>
-      <% content_tag :li, :class => shakes_field_type_for(field).to_s do -%>
+      <% content_tag :li, :class => ['field', shakes_field_type_for(field).to_s].join(' ') do -%>
         <%= shakes_render_field field, action, @resource, form %>
       <%- end %>
     <%- end -%>

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

@@ -1,3 +1,16 @@
-<h1>Editing <%= shakes_human_name %></h1>
-<%= render :partial => 'shakes/form', :locals => { :action => :edit } %>
-<%= content_tag :p, shakes_link_to_for([:show, :index], @resource), :class => 'actions' %>
+<div class="article">
+  <div class="section">
+    <%= title "Edit #{shakes_human_name}", :h1 %>
+    <%= render :partial => 'shakes/form', :locals => { :action => :edit } %>
+  </div>
+</div>
+<div class="aside">
+  <div class="section">
+    <h1>Related Links</h1>
+    <ul class="links">
+    <%- shakes_link_to_for([:show, :destroy, :index], @resource).each do |link| -%>
+      <%= content_tag :li, link%>
+    <%- end -%>
+    </ul>
+  </div>
+</div>

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

@@ -1 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %> <%= form.check_box field %>
+<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
+<%= form.check_box field %>

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

@@ -1 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %> <%= form.date_select field %>
+<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
+<%= form.date_select field %>

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

@@ -1 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %> <%= form.datetime_select field %>
+<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
+<%= form.datetime_select field %>

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

@@ -1 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %> <%= form.text_field field %>
+<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
+<%= form.text_field field %>

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

@@ -1 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %> <%= form.text_area field %>
+<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
+<%= form.text_area field, :rows => 10 %>

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

@@ -1 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %> <%= form.time_select field %>
+<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
+<%= form.time_select field %>

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

@@ -1,18 +1,32 @@
-<h1>Listing <%= shakes_human_name.pluralize %></h1>
-<table>
-  <tr>
-  <%- shakes_fields_for(:index).each do |field| -%>
-    <%= content_tag :th, shakes_human_attribute_name_for(field).titleize, :class => shakes_field_type_for(field).to_s %>
-  <%- end -%>
-    <%= content_tag :th, 'Actions', :class => 'actions' %>
-  </tr>
-  <%- @resources.each do |resource| -%>
-    <tr>
-    <%- shakes_fields_for(:index).each do |field| -%>
-      <%= content_tag :td, shakes_render_field(field, :index, resource), :class => shakes_field_type_for(field).to_s %>
+<div class="article">
+  <div class="section">
+    <%= title "List #{shakes_human_name.pluralize}", :h1 %>
+    <table class="collection">
+      <tr class="headers">
+      <%- shakes_fields_for(:index).each do |field| -%>
+        <%= content_tag :th, shakes_human_attribute_name_for(field).titleize %>
+      <%- end -%>
+        <%= content_tag :th, 'Actions', :class => 'actions' %>
+      </tr>
+    <%- @resources.each do |resource| -%>
+      <tr class="fields">
+      <%- shakes_fields_for(:index).each do |field| -%>
+        <%= content_tag :td, shakes_render_field(field, :index, resource),
+            :class => ['field', shakes_field_type_for(field).to_s].join(' ') %>
+      <%- end -%>
+        <%= content_tag :td, shakes_link_to_for([:show, :edit, :destroy], resource, :short_name => true).join(' | '), :class => 'actions' %>
+      </tr>
     <%- end -%>
-      <%= content_tag :td, shakes_link_to_for([:show, :edit, :destroy], resource), :class => 'actions' %>
-    </tr>
-  <%- end -%>
-</table>
-<%= content_tag :p, shakes_link_to_for([:new]), :class => 'actions' %>
+    </table>
+  </div>
+</div>
+<div class="aside">
+  <div class="section">
+    <h1>Related Links</h1>
+    <ul class="links">
+    <%- shakes_link_to_for([:new], @resource).each do |link| -%>
+      <%= content_tag :li, link%>
+    <%- end -%>
+    </ul>
+  </div>
+</div>

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

@@ -1 +1 @@
-<%= resource[field].length > 255 ? content_tag(:span, shakedown("#{resource[field][0,252]}..."), :title => h(resource[field])) : shakedown(resource[field]) %>
+<%= resource[field].length > 255 ? shakedown("#{resource[field][0,252]}...") : shakedown(resource[field]) %>

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

@@ -1,3 +1,16 @@
-<h1>New <%= shakes_human_name %></h1>
-<%= render :partial => 'shakes/form', :locals => { :action => :new } %>
-<%= content_tag :p, shakes_link_to_for([:index], @resource), :class => 'actions' %>
+<div class="article">
+  <div class="section">
+    <%= title "New #{shakes_human_name}", :h1 %>
+    <%= render :partial => 'shakes/form', :locals => { :action => :new } %>
+  </div>
+</div>
+<div class="aside">
+  <div class="section">
+    <h1>Related Links</h1>
+    <ul class="links">
+    <%- shakes_link_to_for([:index], @resource).each do |link| -%>
+      <%= content_tag :li, link%>
+    <%- end -%>
+    </ul>
+  </div>
+</div>

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

@@ -1,9 +1,22 @@
-<h1>Showing <%= shakes_human_name %></h1>
-<ol class="fields">
-<%- shakes_fields_for(:show).each do |field| -%>
-<% content_tag :li, :class => shakes_field_type_for(field).to_s do -%>
-  <%= shakes_render_field field, :show, @resource %>
-<%- end %>
-<%- end -%>
-</ol>
-<%= content_tag :p, shakes_link_to_for([:edit, :index], @resource), :class => 'actions' %>
+<div class="article">
+  <div class="section">
+    <%= title "Show #{shakes_human_name}", :h1 %>
+    <ol class="fields">
+    <%- shakes_fields_for(:show).each do |field| -%>
+      <% content_tag :li, :class => ['field', shakes_field_type_for(field).to_s].join(' ') do -%>
+        <%= shakes_render_field field, :show, @resource %>
+      <%- end %>
+    <%- end -%>
+    </ol>
+  </div>
+</div>
+<div class="aside">
+  <div class="section">
+    <h1>Related Links</h1>
+    <ul class="links">
+    <%- shakes_link_to_for([:edit, :destroy, :index], @resource).each do |link| -%>
+      <%= content_tag :li, link%>
+    <%- end -%>
+    </ul>
+  </div>
+</div>

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

@@ -1,2 +1,2 @@
 <%= content_tag :label, shakes_human_attribute_name_for(field).titleize %>
-<%= content_tag :span, h(resource[field]) %>
+<%= content_tag :span, h(resource[field]) %>

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

@@ -1,2 +1,2 @@
 <%= content_tag :label, shakes_human_attribute_name_for(field).titleize %>
-<%= content_tag :div, shakedown(resource[field]) %>
+<%= content_tag :div, shakedown(resource[field]) %>

data/generators/shakes_layout/templates/layout.html.erb

@@ -1,17 +1,36 @@
 <!DOCTYPE html>
 
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-  <title><%%= "#{controller.controller_name}##{controller.action_name}" %> - <%= file_name.titleize %></title>
-  <%%= shakes_stylesheet_link_tag %>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <title><%%= [title, '<%= file_name.titleize %>'].compact.join(' - ') %></title>
+  <%%= shakes_stylesheet_link_tags %>
   <%%= stylesheet_link_tag '<%= file_name %>' %>
   <%%= yield :head %>
 </head>
 <body>
+  <div class="header">
+    <%%= content_tag :h1, link_to('<%= file_name.titleize %>', root_path) %>
+    <%%= yield :header %>
+  </div>
+
+  <div class="nav">
+    <ul class="links">
+      <!-- Put your site navigation links here -->
+      <%%= yield :nav %>
+    </ul>
+  </div>
+  
+  <%%- unless flash.empty? -%>
+  <div class="section">
   <%%- flash.each do |name, message| -%>
-    <%%= content_tag :p, message, :id => "flash_#{name}" %>
+    <%%= content_tag :p, message, :id => "flash_#{name}", :class => 'flash' %>
+  <%%- end -%>
+  </div>
   <%%- end -%>
+
   <%%= yield %>
+
+  <div class="footer">&copy; <%= Date.today.year %></div>
 </body>
 </html>

data/generators/shakes_layout/templates/shakes.css

@@ -0,0 +1,207 @@
+/* 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 {
+	background-color: #fff;
+	color: #666;
+	font-family: Tahoma,Arial,Helvetica,sans-serif;
+	font-size: 100%;
+	margin: 1em auto;
+	width: 960px;
+}
+a {
+	color: #000;
+	font-weight: bold;
+}
+h1,h2,h3,h4,h5,h6 {
+	margin: 1em 0em;
+}
+h1,h2,h3,h4,h5,h6,label,th {
+	color: #060;
+	font-family: Georgia,Utopia,Palatino,'Palatino Linotype',serif;
+	font-weight: bold;
+	margin: 0em 0em 1em 0em;
+	text-align: inherit;
+}
+td, th {
+	padding: 0.1em;
+}
+
+/* Layout */
+body > div.header, body > div.nav, body > div.article, body > div.aside, body > div.footer {
+	padding: 0px 10px;
+	margin: 1em 0em;
+}
+body > div.article, body > div.aside {
+	float: left;
+}
+body > div.article {
+	width: 640px;
+}
+body > div.aside {
+	width: 280px;
+}
+body > div.footer {
+	clear: both;
+}
+
+/* Header */
+body > div.header h1 {
+	font-size: 200%;
+}
+body > div.header h2 {
+	font-size: 180%;
+}
+body > div.header h3 {
+	font-size: 160%;
+}
+body > div.header h4 {
+	font-size: 140%;
+}
+body > div.header h5 {
+	font-size: 120%;
+}
+body > div.header h6 {
+	font-size: 100%;
+}
+
+/* Nav */
+body > div.nav li {
+	display: inline;
+	margin-right: 2em;
+}
+
+/* Article */
+body > div.article > div.section {
+	margin: 0em 0em 1em 0em;
+}
+body > div.article h1 {
+	font-size: 180%;
+}
+body > div.article h2 {
+	font-size: 164%;
+}
+body > div.article h3 {
+	font-size: 148%;
+}
+body > div.article h4 {
+	font-size: 132%;
+}
+body > div.article h5 {
+	font-size: 116%;
+}
+body > div.article h6 {
+	font-size: 100%;
+}
+body > div.article li {
+	margin: 0.5em 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 {
+	clear: both;
+}
+body > div.article fieldset.fields > ol label, body > div.article ol.fields label {
+	float: left;
+	width: 160px;
+}
+body > div.article fieldset.buttons > ol li, body > div.article ol.fields div {
+	padding-left: 160px;
+}
+
+/* Aside */
+body > div.aside > div.section {
+	margin: 0em 0em 1em 0em;
+}
+body > div.aside h1 {
+	font-size: 160%;
+}
+body > div.aside h2 {
+	font-size: 148%;
+}
+body > div.aside h3 {
+	font-size: 136%;
+}
+body > div.aside h4 {
+	font-size: 124%;
+}
+body > div.aside h5 {
+	font-size: 112%;
+}
+body > div.aside h6 {
+	font-size: 100%;
+}
+body > div.aside li {
+	margin: 0.5em 0em;
+}
+
+/* Footer */
+body > div.footer h1 {
+	font-size: 140%;
+}
+body > div.footer h2 {
+	font-size: 132%;
+}
+body > div.footer h3 {
+	font-size: 124%;
+}
+body > div.footer h4 {
+	font-size: 116%;
+}
+body > div.footer h5 {
+	font-size: 108%;
+}
+body > div.footer h6 {
+	font-size: 100%;
+}

data/lib/shakes/helpers/views_helper.rb

@@ -7,6 +7,11 @@ module Shakes
         self.use_markdown = false
       end
       
+      def title(*args)
+        @shakes_title = args.shift if args.first.is_a? String
+        (args.empty?) ? @shakes_title : content_tag(args.shift, @shakes_title, (args.shift || {}))
+      end
+      
       def shakedown(content, options={})
         Configuration.use_markdown && options[:markdown] ? markdown(h(content)) : h(content)
       end
@@ -27,23 +32,26 @@ module Shakes
         controller.class.shakes_resource.human_name
       end
       
-      def shakes_link_to_for(actions=[], resource=nil)
-        links = []
+      def shakes_link_to_for(actions=[], *args)
+        resource  = (args.empty? or args.first.is_a? Hash) ? nil : args.shift
+        options   = (args.empty?) ? {} : args.shift
+        links     = []
+        options[:short_name] ||= false
         (actions.map { |action| action.to_sym }).each do |action|
           case action
           when :index
-            links << link_to("Back", shakes_path_for(:index)) if controller.respond_to? :index
+            links << link_to((options[:short_name] ? 'List' : "List all #{shakes_human_name.pluralize}"), shakes_path_for(:index)) if controller.respond_to? :index
           when :new
-            links << link_to("New #{shakes_human_name}", shakes_path_for(:new)) if controller.respond_to? :new
+            links << link_to((options[:short_name] ? 'New' : "Create a new #{shakes_human_name}"), shakes_path_for(:new)) if controller.respond_to? :new
           when :show
-            links << link_to('Show', shakes_path_for(:show, resource)) if controller.respond_to? :show
+            links << link_to((options[:short_name] ? 'Show' : "Show this #{shakes_human_name}"), shakes_path_for(:show, resource)) if controller.respond_to? :show
           when :edit
-            links << link_to('Edit', shakes_path_for(:edit, resource)) if controller.respond_to? :edit
+            links << link_to((options[:short_name] ? 'Edit' : "Edit this #{shakes_human_name}"), shakes_path_for(:edit, resource)) if controller.respond_to? :edit
           when :destroy
-            links << link_to('Destroy', shakes_path_for(:destroy, resource), :confirm => 'Are you sure?', :method => :delete) if controller.respond_to? :destroy
+            links << link_to((options[:short_name] ? 'Delete' : "Delete this #{shakes_human_name}"), shakes_path_for(:destroy, resource), :confirm => 'Are you sure?', :method => :delete) if controller.respond_to? :destroy
           end
         end
-        links.join(' | ')
+        links
       end
       
       def shakes_render_field(field, action, resource=nil, form=nil)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shakes
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Jason Stahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -05:00
+date: 2010-05-27 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -36,7 +36,6 @@ files:
 - app/views/shakes/form/_field.html.erb
 - app/views/shakes/form/_text.html.erb
 - app/views/shakes/form/_time.html.erb
-- app/views/shakes/form/_timestamp.html.erb
 - app/views/shakes/index/_field.html.erb
 - app/views/shakes/index/_text.html.erb
 - app/views/shakes/index.html.erb

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

@@ -1 +0,0 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %> <%= form.datetime_select field %>