casein 3.1.4 → 3.1.5

data/PUBLIC_VERSION.yml

@@ -1,4 +1,4 @@
 major: 3
 minor: 1
-patch: 4
+patch: 5
 build: 

data/app/helpers/casein/casein_helper.rb

@@ -153,7 +153,7 @@ module Casein
   	end
 	
   	def casein_hidden_field form, obj, attribute, options = {}
-  	  form.hidden_field(obj, attribute, strip_casein_options(options)).html_safe
+  	  form.hidden_field(attribute, strip_casein_options(options)).html_safe
   	end
 	
   protected

data/lib/generators/casein/scaffold/scaffold_generator.rb

@@ -18,6 +18,8 @@ module Casein
     end
   
     def generate_files
+      @plural_route = (plural_name != singular_name) ? plural_name : "#{plural_name}_index"
+      
       template 'controller.rb', "app/controllers/casein/#{plural_name}_controller.rb"
       template 'views/index.html.erb', "app/views/casein/#{plural_name}/index.html.erb"
       template 'views/show.html.erb', "app/views/casein/#{plural_name}/show.html.erb"
@@ -59,7 +61,7 @@ module Casein
     def add_to_navigation
       puts "   casein     adding #{plural_name} to left navigation bar"
       file_to_update = Rails.root + 'app/views/casein/layouts/_left_navigation.html.erb'
-      line_to_add = "<li id=\"visitSite\"><%= link_to \"#{plural_name.humanize.capitalize}\", casein_#{plural_name}_path %></li>"
+      line_to_add = "<li id=\"visitSite\"><%= link_to \"#{plural_name.humanize.capitalize}\", casein_#{@plural_route}_path %></li>"
       insert_sentinel = '<!-- SCAFFOLD_INSERT -->'
       gsub_add_once plural_name, file_to_update, line_to_add, insert_sentinel
     end

data/lib/generators/casein/scaffold/templates/controller.rb

@@ -27,7 +27,7 @@ module Casein
     
       if @<%= singular_name %>.save
         flash[:notice] = '<%= singular_name.humanize.capitalize %> created'
-        redirect_to casein_<%= plural_name %>_path
+        redirect_to casein_<%= @plural_route %>_path
       else
         flash.now[:warning] = 'There were problems when trying to create a new <%= singular_name.humanize.downcase %>'
         render :action => :new
@@ -41,7 +41,7 @@ module Casein
     
       if @<%= singular_name %>.update_attributes params[:<%= singular_name %>]
         flash[:notice] = '<%= singular_name.humanize.capitalize %> has been updated'
-        redirect_to casein_<%= plural_name %>_path
+        redirect_to casein_<%= @plural_route %>_path
       else
         flash.now[:warning] = 'There were problems when trying to update this <%= singular_name.humanize.downcase %>'
         render :action => :show
@@ -53,7 +53,7 @@ module Casein
 
       @<%= singular_name %>.destroy
       flash[:notice] = '<%= singular_name.humanize.capitalize %> has been deleted'
-      redirect_to casein_<%= plural_name %>_path
+      redirect_to casein_<%= @plural_route %>_path
     end
   
   end

data/lib/generators/casein/scaffold/templates/views/new.html.erb

@@ -2,17 +2,17 @@
 
 <h2>Add a new <%= singular_name.humanize.downcase %></h2>
 
-<%%= form_for @<%= file_name %>, :url => casein_<%= plural_name %>_path do |f| %>
+<%%= form_for @<%= file_name %>, :url => casein_<%= @plural_route %>_path do |f| %>
 	
 	<%%= render :partial => 'casein/<%= plural_name %>/form', :locals => { :f => f } %>
 	
 	<p class="submits">
-		<%%= link_to 'Cancel', casein_<%= plural_name %>_path, :class => 'cancel' %> or
+		<%%= link_to 'Cancel', casein_<%= @plural_route %>_path, :class => 'cancel' %> or
 		<%%= f.submit "Add new <%= singular_name.humanize.downcase %>", :class => "update" %>
 	</p>
 
 <%% end %>
 
 <%%= content_for :sidebar do %>
-	<li><%%= link_to "#{casein_show_icon "table"}Back to list".html_safe, casein_<%= plural_name %>_path %></li>
+	<li><%%= link_to "#{casein_show_icon "table"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
 <%% end %>

data/lib/generators/casein/scaffold/templates/views/show.html.erb

@@ -7,12 +7,12 @@
 	<%%= render :partial => 'casein/<%= plural_name %>/form', :locals => { :f => f } %>
 	
 	<p class="submits">
-	  <%%= link_to 'Cancel', casein_<%= plural_name %>_path, :class => 'cancel' %> or
+	  <%%= link_to 'Cancel', casein_<%= @plural_route %>_path, :class => 'cancel' %> or
 		<%%= f.submit "Save changes", :class => "update" %>
 	</p>
 
 <%% end %>
 
 <%%= content_for :sidebar do %>
-	<li><%%= link_to "#{casein_show_icon "table"}Back to list".html_safe, casein_<%= plural_name %>_path %></li>
+	<li><%%= link_to "#{casein_show_icon "table"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
 <%% end %>

data/lib/generators/casein/update/templates/public/casein/stylesheets/screen.css

@@ -22,6 +22,23 @@ img {
 	border: none;
 }
 
+a {
+	color: #333333;
+	text-decoration: underline;
+}
+
+a:hover {
+	color: #000000;
+}
+
+a:active {
+	color: #000000;
+}
+
+a:visited {
+	color: #000000;
+}
+
 .spacer {
 	width: 100%;
 	height: 150px;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: casein
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 3
   - 1
-  - 4
-  version: 3.1.4
+  - 5
+  version: 3.1.5
 platform: ruby
 authors: 
 - Russell Quinn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +02:00
+date: 2010-09-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency