namespace vendor assets

Gemfile

@@ -24,7 +24,6 @@ gem 'coffee-script',        '~> 2.2.0'
 gem 'uglifier',             '~> 1.0.4'
 gem 'jquery-rails',         '~> 1.0.16'
 gem 'rails-backbone',       '0.5.4'
-# gem 'handlebars-rails',     :git => 'git://github.com/yabawock/handlebars-rails.git'
 gem 'codemirror-rails'
 gem 'tinymce-rails'
 gem 'flash_cookie_session', '~> 1.1.1'

app/assets/javascripts/locomotive.js

@@ -16,7 +16,7 @@
 //= require codemirror/modes/javascript
 //= require codemirror/modes/xml
 //= require codemirror/modes/htmlmixed
-//= require_tree ../../../vendor/assets/javascripts
+//= require locomotive/vendor
 //= require ./locomotive/application
 
 $(document).ready(function() {

app/assets/stylesheets/locomotive.css

@@ -3,13 +3,12 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
-
+ *= require locomotive/blueprint/screen.css
- *= require ../../../vendor/assets/stylesheets/blueprint/screen.css
+ *= require locomotive/jquery
- *= require_tree ../../../vendor/assets/stylesheets/jquery
  *= require formtastic
  *= require codemirror
-  *= require codemirror/themes/default
+ *= require codemirror/themes/default
- *= require ../../../vendor/assets/stylesheets/toggle.css
+ *= require locomotive/toggle.css
- *= require ../../../vendor/assets/stylesheets/liquid_mode.css
+ *= require locomotive/liquid_mode.css
  *= require_tree ./locomotive
 */

app/assets/stylesheets/locomotive/ie.css

@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require ../../../../vendor/assets/stylesheets/blueprint/ie.css
-*/

app/assets/stylesheets/locomotive/not_logged_in.css

@@ -2,6 +2,6 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require ../../../../vendor/assets/stylesheets/blueprint/screen.css
+ *= require locomotive/blueprint/screen.css
  *= require ./simple.css
 */

app/views/locomotive/shared/_head.html.haml

@@ -10,9 +10,6 @@
 = stylesheet_link_tag     'locomotive', :media => 'screen'
 = javascript_include_tag  'locomotive'
 
-/ [if IE]
-  = stylesheet_link_tag 'locomotive/ie', :media => 'screen'
-
 %script{ :type => 'text/javascript' }
   :plain
     window.locale = '#{I18n.locale}';

lib/generators/locomotive/install/templates/locomotive.rb

@@ -46,7 +46,7 @@ Locomotive.configure do |config|
   # configure how many items we display in sub menu in the "Contents" section.
   # config.ui = {
   #   :lastest_entries_nb => 5,
-  #   :max_content_types  => 1
+  #   :max_content_types  => 4
   # }
 
   # default locale (for now, only en, de, fr, pt-BR and it are supported)

lib/locomotive/configuration.rb

@@ -18,7 +18,7 @@ module Locomotive
       :manage_manage_domains  => false,
       :ui                     => {
         :lastest_entries_nb   => 5,
-        :max_content_types    => 1 # TODO 4
+        :max_content_types    => 2
       },
       :rack_cache             => {
         :verbose     => true,

spec/dummy/config/initializers/locomotive.rb

@@ -47,7 +47,7 @@ Locomotive.configure do |config|
   # configure how many items we display in sub menu in the "Contents" section.
   # config.ui = {
   #   :lastest_entries_nb => 5,
-  #   :max_content_types  => 1
+  #   :max_content_types  => 4
   # }
 
   # default locale (for now, only en, de, fr, pt-BR and it are supported)

vendor/assets/javascripts/locomotive/vendor.js

@@ -0,0 +1 @@
+//= require_tree .

vendor/assets/stylesheets/locomotive/jquery.css

@@ -0,0 +1,3 @@
+/*
+ *= require_tree ./jquery
+*/