locomotive_cms 0.0.3.3 → 0.0.4.beta1

data/app/views/admin/shared/_footer.html.haml

@@ -1,2 +1,2 @@
 %p.tcenter
-  = t('.who_is_behind', :development => nocoffee_tag)
+  != t('.who_is_behind', :development => nocoffee_tag)

data/app/views/admin/shared/_form_actions.html.haml

@@ -6,10 +6,10 @@
       - elsif defined?(delete_button)
         = delete_button
        
-      
+
   .span-12.last
     %p
       %button.button.light{ :type => 'submit' }
         %span= button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label
-        
+
   .clear

data/app/views/admin/shared/_head.html.haml

@@ -7,10 +7,10 @@
 = stylesheet_link_tag 'admin/blueprint/screen', :media => 'screen'
 / [if IE]
   = stylesheet_link_tag 'admin/blueprint/ie', :media => 'screen'
-  
-= stylesheet_link_tag 'admin/layout', 'admin/jquery/ui', 'admin/plugins/toggle', 'admin/menu', 'admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production? && !Locomotive.heroku?
 
-= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/subscribe', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku?
+= stylesheet_link_tag 'admin/layout', 'admin/jquery/ui', 'admin/plugins/toggle', 'admin/plugins/selectmenu', 'admin/menu', 'admin/plugins/toggle','admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production? && !Locomotive.heroku?
+
+= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/subscribe', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/plugins/selectmenu', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku?
 
 %script{ :type => 'text/javascript' }
   = find_and_preserve(growl_message)

data/app/views/admin/shared/_header.html.haml

@@ -1,7 +1,14 @@
-%h1= link_to current_site.name, '#'
+%h1
+  - if current_admin.sites.size > 1
+    = form_tag new_admin_cross_domain_session_url, :method => 'get' do
+      = select_tag 'target_id', options_for_select(current_admin.sites.collect { |site| [truncate(site.name, :length => 32), site.id] }, current_site.id), :id => 'site-selector'
+      = submit_tag 'Switch', :style => 'display: none'
+  - else
+    = link_to current_site.name, admin_root_url, :class => 'single'
+
 
 #global-actions-bar
-  = t('.welcome', :name => link_to(current_admin.name, edit_admin_my_account_url))
+  != t('.welcome', :name => link_to(current_admin.name, edit_admin_my_account_url))
   %span= '|'
   = link_to t('.see'), main_site_url
   %span= '|'

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

@@ -3,7 +3,7 @@
     .header
       %p= link_to t('admin.pages.index.new'), new_admin_page_url
     .inner
-      %h2= t('admin.pages.index.lastest_items')
+      %h2!= t('admin.pages.index.lastest_items')
       %ul
         - current_site.pages.latest_updated.each do |page|
           %li
@@ -16,12 +16,12 @@
       .header
         %p= link_to t('admin.contents.index.new'), new_admin_content_url(content_type.slug)
       .inner
-        %h2= t('admin.contents.index.lastest_items')
+        %h2!= t('admin.contents.index.lastest_items')
         %ul
           - content_type.contents.latest_updated.each do |content|
             %li
               = link_to truncate(content.send(content_type.highlighted_field_name), :length => 30), edit_admin_content_path(content_type.slug, content)
               %span= time_ago_in_words(content.updated_at)
-        
+
 .action
   = link_to content_tag(:span, t('admin.content_types.index.new')), new_admin_content_type_url

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

@@ -1,6 +1,5 @@
 %ul
   = admin_submenu_item 'site', edit_admin_current_site_url
-  = admin_submenu_item 'layouts', admin_layouts_url
-  = admin_submenu_item 'snippets', admin_snippets_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

data/app/views/admin/sitemaps/show.xml.builder

@@ -8,9 +8,19 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
 
   @pages.each do |page|
     if not page.index_or_not_found?
-      xml.url do
-        xml.loc page_main_url(page)
-        xml.priority 0.9
+      if page.templatized?
+
+        page.content_type.contents.visible.each do |c|
+          xml.url do
+            xml.loc page_main_url(page, c)
+            xml.priority 0.9
+          end
+        end
+      else
+        xml.url do
+          xml.loc page_main_url(page)
+          xml.priority 0.9
+        end
       end
     end
   end

data/app/views/admin/sites/_form.html.haml

@@ -5,7 +5,7 @@
   = f.input :name, :required => false
 
 = f.foldable_inputs :name => :access_points, :class => 'editable-list off' do
-  
+
   = f.custom_input :subdomain, :css => 'path' do
     %em
       http://
@@ -13,8 +13,8 @@
     \.
     %em
       = application_domain
-  
-  - @site.domains_without_subdomain.each_with_index do |name, index|  
+
+  - @site.domains_without_subdomain.each_with_index do |name, index|
     %li{ :class => "item added #{'last' if index == @site.domains.size - 1}"}
       %em
         http://
@@ -23,7 +23,7 @@
       = error_on_domain(@site, name)
       %span.actions
         = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')
-        
+
   %li.item.template
     %em
       http://
@@ -32,4 +32,4 @@
     %span.actions
       = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')
       %button{ :class => 'button light add', :type => 'button' }
-        %span= t('admin.buttons.new_item')
+        %span!= t('admin.buttons.new_item')

data/app/views/admin/sites/new.html.haml

@@ -3,10 +3,10 @@
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @site, :url => admin_sites_url do |form|
 
   = render 'form', :f => form
-  
+
   = render 'admin/shared/form_actions', :back_url => edit_admin_my_account_url, :button_label => :create

data/app/views/admin/snippets/_form.html.haml

@@ -1,11 +1,14 @@
 - content_for :head do
   = javascript_include_tag 'admin/plugins/codemirror/codemirror', 'admin/snippets.js'
+  = image_picker_include_tags
 
 = f.inputs :name => :information do
   = f.input :name
   = f.input :slug, :required => false
-  
+
 = f.inputs :name => :code do
-  = f.custom_input :value, :css => 'full', :with_label => false do
+  = f.custom_input :template, :css => 'full', :with_label => false do
     %code{ :class => 'html' }
-      = f.text_area :value
+      = f.text_area :template
+    .more
+      = link_to t('admin.image_picker.link'), admin_theme_assets_path, :id => 'image-picker-link'

data/app/views/admin/snippets/_snippet.html.haml

@@ -1,7 +1,8 @@
 %li
+  %em
   %strong= link_to snippet.name, edit_admin_snippet_path(snippet)
   .more
-    %span= t('.updated_at')
+    %span!= t('.updated_at')
     = l snippet.updated_at, :format => :short
-    
+
     = link_to image_tag('admin/list/icons/trash.png'), admin_snippet_path(snippet), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete

data/app/views/admin/snippets/edit.html.haml

@@ -6,10 +6,10 @@
 - content_for :buttons do
   = admin_button_tag t('admin.snippets.index.new'), new_admin_snippet_url, :class => 'new'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @snippet, :url => admin_snippet_url(@snippet), :html => { :class => 'save-with-shortcut' } do |form|
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => admin_snippets_url, :button_label => :update  
+  = render 'admin/shared/form_actions', :back_url => admin_theme_assets_url, :button_label => :update

data/app/views/admin/snippets/index.html.haml

@@ -6,10 +6,10 @@
 - content_for :buttons do
   = admin_button_tag :new, new_admin_snippet_url, :class => 'new'
 
-%p= t('.help')
+%p!= t('.help')
 
 - if @snippets.empty?
-  %p.no-items= t('.no_items', :url => new_admin_snippet_url)
+  %p.no-items!= t('.no_items', :url => new_admin_snippet_url)
 - else
   %ul#snippets-list.list
     = render @snippets

data/app/views/admin/snippets/new.html.haml

@@ -3,10 +3,10 @@
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @snippet, :url => admin_snippets_url do |form|
 
   = render 'form', :f => form
-  
-  = render 'admin/shared/form_actions', :back_url => admin_snippets_url, :button_label => :create
+
+  = render 'admin/shared/form_actions', :back_url => admin_theme_assets_url, :button_label => :create

data/app/views/admin/theme_assets/_asset.html.haml

@@ -1,12 +1,13 @@
-- per_row = local_assigns[:per_row] || 6
-- asset_counter = local_assigns[:asset_counter] || 0
 - edit = local_assigns.key?(:edit) ? edit : true
 
-%li{ :class => "#{asset.new_record? ? 'new-asset' : 'asset'} #{'last' if (asset_counter + 1) % per_row == 0}"}
-  %h4= link_to truncate(asset.slug, :length => 18), edit ? edit_admin_theme_asset_path(asset) : asset.source.url
-  .image
-    .inside
-      = vignette_tag(asset)
-  - if edit
-    .actions
-      = link_to image_tag('admin/list/icons/cross.png'), admin_theme_asset_path(asset), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete
+%li{ :class => "#{asset.new_record? ? 'new-asset' : 'asset'} #{'hidden' if asset.hidden?}" }
+  %em
+  %strong= link_to asset.local_path(!edit), edit ? edit_admin_theme_asset_path(asset) : asset.source.url, :'data-local-path' => asset.local_path
+  .more
+    %span.size= number_to_human_size(asset.size)
+    —
+    %span!= t('.updated_at')
+    %span.date= l asset.updated_at, :format => :short
+
+    - if edit
+      = link_to image_tag('admin/list/icons/trash.png'), admin_theme_asset_path(asset), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete

data/app/views/admin/theme_assets/_form.html.haml

@@ -1,39 +1,37 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/json2', 'admin/plugins/scrollTo', 'admin/plugins/codemirror/codemirror', 'admin/plugins/fancybox', 'admin/plugins/plupload/plupload.full.js', 'admin/theme_assets.js'
-  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
+  = javascript_include_tag 'admin/plugins/codemirror/codemirror', 'admin/theme_assets.js'
+  = image_picker_include_tags
 
 = f.hidden_field :performing_plain_text
 
-#file-selector{ :class => "selector #{'hidden' if @theme_asset.performing_plain_text?}" }
+#file-selector{ :class => "selector #{'hidden' if @theme_asset.stylesheet_or_javascript?}" }
   = f.inputs :name => :information do
     = f.input :source
 
-  - if @theme_asset.new_record? || !@theme_asset.image?
+  - if @theme_asset.new_record? || @theme_asset.stylesheet_or_javascript?
     %span.alt
-      = t('admin.theme_assets.form.choose_plain_text')
+      != t('admin.theme_assets.form.choose_plain_text')
 
 - if allow_plain_text_editing?(@theme_asset)
-  #text-selector{ :class => "selector #{'hidden' if !@theme_asset.performing_plain_text?}", :style => "#{'display: none' if !@theme_asset.performing_plain_text?}" }
+  #text-selector{ :class => "selector #{'hidden' if !@theme_asset.stylesheet_or_javascript?}", :style => "#{'display: none' if !@theme_asset.stylesheet_or_javascript?}" }
     = f.inputs :name => :code, :class => 'inputs code' do
-      
+
       - if @theme_asset.new_record?
-        = f.input :slug
-        
+        = f.input :plain_text_name
+
         = f.custom_input :content_type do
-          = f.select :content_type, ["stylesheet", "javascript"]
-          
+          = f.select :content_type, %w(stylesheet javascript)
+
       = f.custom_input :plain_text, :css => 'full', :with_label => false do
         %code{ :class => (@theme_asset.size && @theme_asset.size > 40000 ? 'nude' : (@theme_asset.content_type || 'stylesheet')) }
           = f.text_area :plain_text
         .more
-          = link_to t('.picker_link'), admin_theme_assets_path, :id => 'asset-picker-link'
-            
+          = link_to t('admin.image_picker.link'), admin_theme_assets_path, :id => 'image-picker-link'
+
     %span.alt
-      = t('admin.theme_assets.form.choose_file')
-      
-- if @theme_asset.image?
-  = f.foldable_inputs :name => "#{t('formtastic.titles.preview')} #{image_dimensions_and_size(@theme_asset)}", :class => 'preview' do
-    %li
-      .image
-        .inside
-          = image_tag(@theme_asset.source.url(:preview))
+      != t('admin.theme_assets.form.choose_file')
+
+= f.foldable_inputs :name => :options do
+  = f.input :folder
+  = f.custom_input :hidden, :css => 'toggle' do
+    = f.check_box :hidden

data/app/views/admin/theme_assets/edit.html.haml

@@ -6,7 +6,7 @@
 - content_for :buttons do
   = admin_button_tag t('admin.theme_assets.index.new'), new_admin_theme_asset_url, :class => 'new'
 
-%p= t('.help', :url => @theme_asset.source.url)
+%p!= t('.help', :url => @theme_asset.source.url)
 
 = semantic_form_for @theme_asset, :url => admin_theme_asset_url(@theme_asset), :html => { :multipart => true, :class => 'save-with-shortcut' } do |form|
 

data/app/views/admin/theme_assets/images.html.haml

@@ -1,15 +1,15 @@
 #theme-images.asset-picker
-  %h2= t('.title')
-  
+  %h2!= t('.title')
+
   .actions
     = admin_button_tag t('admin.theme_assets.index.new'), admin_theme_assets_url(:json), :class => 'button small add', :id => 'upload-link'
-  
-  - if @image_assets.empty?
-    %p.no-items= t('.no_items')
-
-  %ul.assets
-    = render 'asset', :asset => current_site.theme_assets.build, :edit => false
-    
-    = render :partial => 'asset', :collection => @image_assets, :locals => { :per_row => 3, :edit => false }
-    
+
+  - if @images.empty?
+    %p.no-items!= t('.no_items')
+
+  %ul.list.theme-assets
+    = render 'asset', :asset => current_site.theme_assets.build(:updated_at => Time.now, :local_path => 'images/new.jpg', :content_type => 'image'), :edit => false
+
+    = render :partial => 'asset', :collection => @images, :locals => { :edit => false }
+
     %li.clear

data/app/views/admin/theme_assets/index.html.haml

@@ -4,33 +4,48 @@
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
+  = admin_button_tag t('admin.theme_assets.index.all'), all_admin_theme_assets_url, :class => 'show'
+  = admin_button_tag t('admin.snippets.index.new'), new_admin_snippet_url, :class => 'new'
   = admin_button_tag :new, new_admin_theme_asset_url, :class => 'new'
 
-%p= t('.help')
+%p!= t('.help')
 
-%h3= t('.css_and_js')
-- if @non_image_assets.empty?
-  %p.no-items= t('.no_items', :url => new_admin_theme_asset_url)
+%h3!= t('.snippets')
+- if @snippets.empty?
+  %p.no-items!= t('.no_items', :url => new_admin_snippet_url)
 - else
-  %ul.assets
-    = render :partial => 'asset', :collection => @non_image_assets
-    %li.clear
-    
+  %ul.list.theme-assets
+    = render @snippets
+
+%br
+
+%h3!= t('.css_and_js')
+- if @js_and_css_assets.empty?
+  %p.no-items!= t('.no_items', :url => new_admin_theme_asset_url)
+- else
+  %ul.list.theme-assets
+    = render :partial => 'asset', :collection => @js_and_css_assets
+
 %br
 
-%h3= t('.images')
-- if @image_assets.empty?
-  %p.no-items= t('.no_items', :url => new_admin_theme_asset_url)
+%h3!= t('.images')
+- if @assets[:images].nil?
+  %p.no-items!= t('.no_items', :url => new_admin_theme_asset_url)
 - else
-  %ul.assets
-    = render :partial => 'asset', :collection => @image_assets
-    %li.clear
+  %ul.list.theme-assets
+    = render :partial => 'asset', :collection => @assets[:images]
+
+- if @assets[:fonts]
+  %br
 
+  %h3!= t('.fonts')
+  %ul.list.theme-assets
+    = render :partial => 'asset', :collection => @assets[:fonts]
 
-- if not @flash_assets.empty?
+- if @assets[:media]
   %br
 
-  %h3= t('.flash')
-  %ul.assets
-    = render :partial => 'asset', :collection => @flash_assets
-    %li.clear
+  %h3!= t('.media')
+  %ul.list.theme-assets
+    = render :partial => 'asset', :collection => @assets[:media]
+

data/app/views/admin/theme_assets/new.html.haml

@@ -3,10 +3,10 @@
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @theme_asset, :url => admin_theme_assets_url, :html => { :multipart => true } do |form|
 
   = render 'form', :f => form
-  
+
   = render 'admin/shared/form_actions', :back_url => admin_theme_assets_url, :button_label => :create

data/app/views/home/show.html.haml

@@ -1,4 +1,4 @@
 %h2 Locomotive rocks !!!
 
-%p 
-  = flash[:error]
+%p
+  = flash[:error]

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

@@ -9,19 +9,19 @@
         #header
           = render 'admin/shared/header'
           = render 'admin/shared/menu'
-      
+
           #submenu
             = yield :submenu
-                
+
         #content
           .inner
-            %h2= title
-        
+            %h2!= title
+
             #local-actions-bar
                
               = yield :buttons
-          
+
             = yield
-    
+
         #footer
           = render 'admin/shared/footer'

data/app/views/layouts/admin/{login.html.haml → box.html.haml}

@@ -3,11 +3,13 @@
 %html{ :xmlns => 'http://www.w3.org/1999/xhtml'  }
   %head
     %title= escape_once("#{Locomotive.config.name} — #{current_site.name}")
-    
-    = stylesheet_link_tag 'admin/blueprint/screen', 'admin/login', :media => 'screen', :cache => Rails.env.production? && !Locomotive.config.heroku
+
+    = javascript_include_tag 'admin/jquery'
+
+    = stylesheet_link_tag 'admin/blueprint/screen', 'admin/box', :media => 'screen', :cache => Rails.env.production? && !Locomotive.config.heroku
     / [if IE]
       = stylesheet_link_tag('admin/blueprint/ie', :media => 'screen')
-      
+
   %body
     #wrapper
       #light.container

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

@@ -4,4 +4,4 @@
   %head
   %body
     %h1 Welcome to Locomotive
-    = yield
+    = yield

data/config/application.rb

@@ -40,11 +40,13 @@ module Locomotive
     #   g.template_engine :erb
     #   g.test_framework  :test_unit, :fixture => true
     # end
-    
+
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters << :password
+
+    config.middleware.insert_after ::ActionDispatch::Static, '::Locomotive::Middlewares::Fonts', :path => %r{^/fonts}
   end
 end

data/config/cucumber.yml

@@ -1,8 +1,2 @@
-<%
-rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
-%>
-default: <%= std_opts %> features
-wip: --tags @wip:3 --wip features
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
+default: features --require features --format pretty --color --tags ~@wip
+wip: features  --require features --tags @wip

data/config/environments/development.rb

@@ -11,14 +11,15 @@ Locomotive::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
-  
+
+  config.active_support.deprecation = :log
+
   # config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-  
+
   # MockSmtp settings
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {

data/config/environments/production.rb

@@ -9,6 +9,15 @@ Locomotive::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
@@ -30,4 +39,10 @@ Locomotive::Application.configure do
 
   # Enable threaded mode
   # config.threadsafe!
-end
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  config.active_support.deprecation = :notify
+end

data/config/environments/test.rb

@@ -14,6 +14,9 @@ Locomotive::Application.configure do
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
 
@@ -26,8 +29,11 @@ Locomotive::Application.configure do
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
 end
 
 CarrierWave.configure do |config|
   config.storage = :file
-end
+end

data/config/initializers/devise.rb

@@ -63,7 +63,7 @@ Devise.setup do |config|
   # authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set
   # stretches above to 20 for default behavior) and :restful_authentication_sha1
   # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha1
+  config.encryptor = :sha1
 
   # ==> Configuration for :confirmable
   # The time you want give to your user to confirm his account. During this time
@@ -112,7 +112,7 @@ Devise.setup do |config|
 
   # ==> General configuration
   # Load and configure the ORM. Supports :active_record (default), :mongoid
-  # (requires mongo_ext installed) and :data_mapper (experimental).
+  # and :data_mapper (experimental).
   require 'active_support/core_ext/class/attribute'
   require 'devise/orm/mongoid'
 
@@ -121,12 +121,6 @@ Devise.setup do |config|
   # are using only default views.
   config.scoped_views = true
 
-  # By default, devise detects the role accessed based on the url. So whenever
-  # accessing "/users/sign_in", it knows you are accessing an User. This makes
-  # routes as "/sign_in" not possible, unless you tell Devise to use the default
-  # scope, setting true below.
-  config.use_default_scope = true
-
   # Configure the default scope used by Devise. By default it's the first devise
   # role declared in your routes.
   config.default_scope = :account
@@ -143,4 +137,4 @@ Devise.setup do |config|
   #   end
   #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
   # end
-end
+end

data/config/initializers/formtastic.rb

@@ -1,5 +1,5 @@
 require 'formtastic'
-
-Formtastic::SemanticFormHelper.builder = MiscFormBuilder
+require 'locomotive/misc_form_builder'
+Formtastic::SemanticFormHelper.builder = Locomotive::MiscFormBuilder
 Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true