small typo in the index page of the content types + merge Gemfile as well as the gemspec

app/views/admin/asset_collections/edit.html.haml

@@ -7,6 +7,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
   
+- content_for :actions do
+  = render 'admin/shared/actions/assets'
+
 %p!= t('.help')
 
 - content_for :buttons do

app/views/admin/asset_collections/index.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
   
+- content_for :actions do
+  = render 'admin/shared/actions/assets'
+
 %p!= t('.help')
 
 %p.no-items!= t('.no_items', :url => new_admin_asset_collection_url)

app/views/admin/asset_collections/new.html.haml

@@ -6,6 +6,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
   
+- content_for :actions do
+  = render 'admin/shared/actions/assets'
+
 %p!= t('.help')
 
 = semantic_form_for @asset_collection, :url => admin_asset_collections_url do |f|

app/views/admin/assets/edit.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
   
+- content_for :actions do
+  = render 'admin/shared/actions/assets'
+
 - content_for :buttons do
   = admin_button_tag t('admin.asset_collections.edit.add_asset'), new_admin_asset_url(@asset_collection), :class => 'new'
 

app/views/admin/assets/new.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
   
+- content_for :actions do
+  = render 'admin/shared/actions/assets'
+
 %p!= t('.help')
 
 = semantic_form_for @asset, :url => admin_assets_url(@asset_collection), :html => { :multipart => true } do |form|

app/views/admin/content_types/edit.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
   
+- content_for :actions do
+  = render 'admin/shared/actions/contents'
+
 - content_for :buttons do
   = admin_button_tag :show_items, admin_contents_url(@content_type.slug), :class => 'show'
   = admin_button_tag :new_item, new_admin_content_url(@content_type.slug), :class => 'new'

app/views/admin/content_types/new.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
   
+- content_for :actions do
+  = render 'admin/shared/actions/contents'
+
 %p!= t('.help')
 
 = semantic_form_for @content_type, :url => admin_content_types_url do |f|

app/views/admin/contents/edit.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
   
+- content_for :actions do
+  = render 'admin/shared/actions/contents'
+
 - content_for :buttons do
   = admin_button_tag t('admin.contents.index.edit'), edit_admin_content_type_url(@content_type), :class => 'edit'
   = admin_button_tag t('admin.contents.index.new'), new_admin_content_url(@content_type.slug), :class => 'new'

app/views/admin/contents/index.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
 
+- content_for :actions do
+  = render 'admin/shared/actions/contents'
+
 - content_for :head do
   = include_javascripts :contents
 

app/views/admin/contents/new.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
   
+- content_for :actions do
+  = render 'admin/shared/actions/contents'
+
 - content_for :buttons do
   = admin_button_tag t('admin.contents.index.edit'), edit_admin_content_type_url(@content_type), :class => 'edit'
 

app/views/admin/custom_fields/_index.html.haml

@@ -3,7 +3,7 @@
 - ordered_custom_fields = form.object.send(:"ordered_#{collection_name}")
 - field_klass = "#{form.object.class.name}#{collection_name.classify}".gsub(/CustomField$/, 'Field').constantize
 
-= form.foldable_inputs :name => :custom_fields, :class => 'editable-list fields' do
+= form.foldable_inputs :name => defined?(form_name) ? form_name : :custom_fields, :class => 'editable-list fields' do
 
   %script{ :type => 'text/x-mustache-template', :name => 'template', :'data-base-input-name' => "#{form.object.class.name.underscore}[#{collection_name}_attributes]" }
     %li{ :class => "item {{behaviour_flag}} {{new_record_flag}} {{errors_flag}} {{required_flag}}" }

app/views/admin/layouts/application.html.haml

@@ -11,8 +11,13 @@
           = render 'admin/shared/menu'
 
           #submenu
+            %ul
               = yield :submenu
               
+            - if content_for? :actions
+              .action
+                = yield :actions
+
         #content
           .inner
             %h2!= title

app/views/admin/pages/edit.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
   
+- content_for :actions do
+  = render 'admin/shared/actions/contents'
+
 - content_for :buttons do
   = admin_button_tag :show, "/#{@page.fullpath}", :class => 'show'
 

app/views/admin/pages/index.html.haml

@@ -6,6 +6,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
   
+- content_for :actions do
+  = render 'admin/shared/actions/contents'
+
 - content_for :buttons do
   = admin_button_tag :new, new_admin_page_url, :class => 'new'
 

app/views/admin/pages/new.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
   
+- content_for :actions do
+  = render 'admin/shared/actions/contents'
+
 %p!= t('.help')
 
 = semantic_form_for @page, :url => admin_pages_url do |form|

app/views/admin/shared/actions/_assets.html.haml

@@ -0,0 +1 @@
+= link_to content_tag(:span, t('admin.asset_collections.index.new')), new_admin_asset_collection_url

app/views/admin/shared/actions/_contents.html.haml

@@ -0,0 +1 @@
+= link_to content_tag(:em) + content_tag(:span, t('admin.content_types.index.new')), new_admin_content_type_url

app/views/admin/shared/menu/_assets.html.haml

@@ -1,7 +1,3 @@
-%ul
-  - @asset_collections.each do |c|
+- @asset_collections.each do |c|
   %li
     = link_to content_tag(:span, truncate(c.name, :length => 20)), edit_admin_asset_collection_url(c), :class => "#{'on' if @asset_collection.id == c.id}"
-
-.action
-  = link_to content_tag(:span, t('admin.asset_collections.index.new')), new_admin_asset_collection_url

app/views/admin/shared/menu/_contents.html.haml

@@ -1,5 +1,4 @@
-%ul
-  = admin_submenu_item 'pages', admin_pages_url do
+= admin_submenu_item 'pages', admin_pages_url do
   .header
     %p= link_to t('admin.pages.index.new'), new_admin_page_url
   .inner
@@ -10,7 +9,7 @@
           = link_to truncate(page.title, :length => 25), edit_admin_page_url(page)
           %span= time_ago_in_words(page.updated_at)
 
-  - each_content_type_menu_item do |content_type|
+- each_content_type_menu_item do |content_type|
   .header
     %p= link_to t('admin.contents.index.new'), new_admin_content_url(content_type.slug)
   .inner
@@ -21,12 +20,9 @@
           = link_to truncate(content.send(content_type.highlighted_field_name).to_s, :length => 20), edit_admin_content_path(content_type.slug, content)
           %span= time_ago_in_words(content.updated_at)
 
-  - other_content_types do |content_types|
+- other_content_types do |content_types|
   .inner
     %ul.big-links
       - content_types.each do |content_type|
         %li
           = link_to truncate(content_type.name, :length => 20), admin_contents_url(content_type.slug)
-
-.action
-  = link_to content_tag(:em) + content_tag(:span, t('admin.content_types.index.new')), new_admin_content_type_url

app/views/admin/shared/menu/_settings.html.haml

@@ -1,5 +1,4 @@
-%ul
-  = admin_submenu_item 'site', edit_admin_current_site_url
-  / = admin_submenu_item 'snippets', admin_snippets_url
-  = admin_submenu_item 'theme_assets', admin_theme_assets_url
-  = admin_submenu_item 'account', edit_admin_my_account_url
+= admin_submenu_item 'site', edit_admin_current_site_url
+/ = admin_submenu_item 'snippets', admin_snippets_url
+= admin_submenu_item 'theme_assets', admin_theme_assets_url
+= admin_submenu_item 'account', edit_admin_my_account_url

locomotive_cms.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "nowarning"
 
-  s.add_dependency "rails", ">= 3.0.5"
+  s.add_dependency "rails", ">= 3.0.6"
   s.add_dependency "warden"
   s.add_dependency "devise", "1.1.3"
   s.add_dependency "mongoid", "2.0.0.rc.7"