diff --git a/Gemfile b/Gemfile index 8b200243..720459f0 100644 --- a/Gemfile +++ b/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' diff --git a/app/assets/javascripts/locomotive.js b/app/assets/javascripts/locomotive.js index 80a27763..3e736189 100644 --- a/app/assets/javascripts/locomotive.js +++ b/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() { diff --git a/app/assets/stylesheets/locomotive.css b/app/assets/stylesheets/locomotive.css index 8c160d89..3f715097 100644 --- a/app/assets/stylesheets/locomotive.css +++ b/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 ../../../vendor/assets/stylesheets/blueprint/screen.css - *= require_tree ../../../vendor/assets/stylesheets/jquery + *= require locomotive/blueprint/screen.css + *= require locomotive/jquery *= require formtastic *= require codemirror - *= require codemirror/themes/default - *= require ../../../vendor/assets/stylesheets/toggle.css - *= require ../../../vendor/assets/stylesheets/liquid_mode.css + *= require codemirror/themes/default + *= require locomotive/toggle.css + *= require locomotive/liquid_mode.css *= require_tree ./locomotive */ diff --git a/app/assets/stylesheets/locomotive/ie.css b/app/assets/stylesheets/locomotive/ie.css deleted file mode 100644 index 3dfd9525..00000000 --- a/app/assets/stylesheets/locomotive/ie.css +++ /dev/null @@ -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 -*/ diff --git a/app/assets/stylesheets/locomotive/not_logged_in.css b/app/assets/stylesheets/locomotive/not_logged_in.css index 4a7a8db3..9aa4754d 100644 --- a/app/assets/stylesheets/locomotive/not_logged_in.css +++ b/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 */ \ No newline at end of file diff --git a/app/views/locomotive/shared/_head.html.haml b/app/views/locomotive/shared/_head.html.haml index 47fa82d0..473a386f 100644 --- a/app/views/locomotive/shared/_head.html.haml +++ b/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}'; diff --git a/lib/generators/locomotive/install/templates/locomotive.rb b/lib/generators/locomotive/install/templates/locomotive.rb index c443d8a9..1445da84 100644 --- a/lib/generators/locomotive/install/templates/locomotive.rb +++ b/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) diff --git a/lib/locomotive/configuration.rb b/lib/locomotive/configuration.rb index f9614c20..f5dfe206 100644 --- a/lib/locomotive/configuration.rb +++ b/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, diff --git a/spec/dummy/config/initializers/locomotive.rb b/spec/dummy/config/initializers/locomotive.rb index 12b82e07..7bd49141 100644 --- a/spec/dummy/config/initializers/locomotive.rb +++ b/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) diff --git a/vendor/assets/javascripts/ICanHandlebarz.js b/vendor/assets/javascripts/locomotive/ICanHandlebarz.js similarity index 100% rename from vendor/assets/javascripts/ICanHandlebarz.js rename to vendor/assets/javascripts/locomotive/ICanHandlebarz.js diff --git a/vendor/assets/javascripts/backbone.modelbinding.js b/vendor/assets/javascripts/locomotive/backbone.modelbinding.js similarity index 100% rename from vendor/assets/javascripts/backbone.modelbinding.js rename to vendor/assets/javascripts/locomotive/backbone.modelbinding.js diff --git a/vendor/assets/javascripts/backbone.sync.js b/vendor/assets/javascripts/locomotive/backbone.sync.js similarity index 100% rename from vendor/assets/javascripts/backbone.sync.js rename to vendor/assets/javascripts/locomotive/backbone.sync.js diff --git a/vendor/assets/javascripts/cookies.js b/vendor/assets/javascripts/locomotive/cookies.js similarity index 100% rename from vendor/assets/javascripts/cookies.js rename to vendor/assets/javascripts/locomotive/cookies.js diff --git a/vendor/assets/javascripts/datepicker_fr.js b/vendor/assets/javascripts/locomotive/datepicker_fr.js similarity index 100% rename from vendor/assets/javascripts/datepicker_fr.js rename to vendor/assets/javascripts/locomotive/datepicker_fr.js diff --git a/vendor/assets/javascripts/editable_field.js b/vendor/assets/javascripts/locomotive/editable_field.js similarity index 100% rename from vendor/assets/javascripts/editable_field.js rename to vendor/assets/javascripts/locomotive/editable_field.js diff --git a/vendor/assets/javascripts/growl.js b/vendor/assets/javascripts/locomotive/growl.js similarity index 100% rename from vendor/assets/javascripts/growl.js rename to vendor/assets/javascripts/locomotive/growl.js diff --git a/vendor/assets/javascripts/handlebars.js b/vendor/assets/javascripts/locomotive/handlebars.js similarity index 100% rename from vendor/assets/javascripts/handlebars.js rename to vendor/assets/javascripts/locomotive/handlebars.js diff --git a/vendor/assets/javascripts/liquid_mode.js b/vendor/assets/javascripts/locomotive/liquid_mode.js similarity index 100% rename from vendor/assets/javascripts/liquid_mode.js rename to vendor/assets/javascripts/locomotive/liquid_mode.js diff --git a/vendor/assets/javascripts/menu_toggler.js b/vendor/assets/javascripts/locomotive/menu_toggler.js similarity index 100% rename from vendor/assets/javascripts/menu_toggler.js rename to vendor/assets/javascripts/locomotive/menu_toggler.js diff --git a/vendor/assets/javascripts/slugify.js b/vendor/assets/javascripts/locomotive/slugify.js similarity index 100% rename from vendor/assets/javascripts/slugify.js rename to vendor/assets/javascripts/locomotive/slugify.js diff --git a/vendor/assets/javascripts/smartupdater.js b/vendor/assets/javascripts/locomotive/smartupdater.js similarity index 100% rename from vendor/assets/javascripts/smartupdater.js rename to vendor/assets/javascripts/locomotive/smartupdater.js diff --git a/vendor/assets/javascripts/subscribe.js b/vendor/assets/javascripts/locomotive/subscribe.js similarity index 100% rename from vendor/assets/javascripts/subscribe.js rename to vendor/assets/javascripts/locomotive/subscribe.js diff --git a/vendor/assets/javascripts/toggle.js b/vendor/assets/javascripts/locomotive/toggle.js similarity index 100% rename from vendor/assets/javascripts/toggle.js rename to vendor/assets/javascripts/locomotive/toggle.js diff --git a/vendor/assets/javascripts/toggle/toggle_handle-bg.png b/vendor/assets/javascripts/locomotive/toggle/toggle_handle-bg.png similarity index 100% rename from vendor/assets/javascripts/toggle/toggle_handle-bg.png rename to vendor/assets/javascripts/locomotive/toggle/toggle_handle-bg.png diff --git a/vendor/assets/javascripts/toggle/toggle_handle_left-bg.png b/vendor/assets/javascripts/locomotive/toggle/toggle_handle_left-bg.png similarity index 100% rename from vendor/assets/javascripts/toggle/toggle_handle_left-bg.png rename to vendor/assets/javascripts/locomotive/toggle/toggle_handle_left-bg.png diff --git a/vendor/assets/javascripts/toggle/toggle_handle_right-bg.png b/vendor/assets/javascripts/locomotive/toggle/toggle_handle_right-bg.png similarity index 100% rename from vendor/assets/javascripts/toggle/toggle_handle_right-bg.png rename to vendor/assets/javascripts/locomotive/toggle/toggle_handle_right-bg.png diff --git a/vendor/assets/javascripts/toggle/toggle_shadow-bg.png b/vendor/assets/javascripts/locomotive/toggle/toggle_shadow-bg.png similarity index 100% rename from vendor/assets/javascripts/toggle/toggle_shadow-bg.png rename to vendor/assets/javascripts/locomotive/toggle/toggle_shadow-bg.png diff --git a/vendor/assets/javascripts/locomotive/vendor.js b/vendor/assets/javascripts/locomotive/vendor.js new file mode 100644 index 00000000..2becd765 --- /dev/null +++ b/vendor/assets/javascripts/locomotive/vendor.js @@ -0,0 +1 @@ +//= require_tree . \ No newline at end of file diff --git a/vendor/assets/stylesheets/blueprint/ie.css b/vendor/assets/stylesheets/locomotive/blueprint/ie.css similarity index 100% rename from vendor/assets/stylesheets/blueprint/ie.css rename to vendor/assets/stylesheets/locomotive/blueprint/ie.css diff --git a/vendor/assets/stylesheets/blueprint/print.css b/vendor/assets/stylesheets/locomotive/blueprint/print.css similarity index 100% rename from vendor/assets/stylesheets/blueprint/print.css rename to vendor/assets/stylesheets/locomotive/blueprint/print.css diff --git a/vendor/assets/stylesheets/blueprint/screen.css b/vendor/assets/stylesheets/locomotive/blueprint/screen.css similarity index 100% rename from vendor/assets/stylesheets/blueprint/screen.css rename to vendor/assets/stylesheets/locomotive/blueprint/screen.css diff --git a/vendor/assets/stylesheets/locomotive/jquery.css b/vendor/assets/stylesheets/locomotive/jquery.css new file mode 100644 index 00000000..aae875e5 --- /dev/null +++ b/vendor/assets/stylesheets/locomotive/jquery.css @@ -0,0 +1,3 @@ +/* + *= require_tree ./jquery +*/ \ No newline at end of file diff --git a/vendor/assets/stylesheets/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-bg_flat_75_ffffff_40x100.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-bg_glass_65_ffffff_1x400.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-bg_glass_75_dadada_1x400.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-bg_glass_75_dadada_1x400.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_75_dadada_1x400.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-bg_glass_95_fef1ec_1x400.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-icons_222222_256x240.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_222222_256x240.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-icons_222222_256x240.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_222222_256x240.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-icons_2e83ff_256x240.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-icons_2e83ff_256x240.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_2e83ff_256x240.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-icons_454545_256x240.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_454545_256x240.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-icons_454545_256x240.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_454545_256x240.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-icons_888888_256x240.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_888888_256x240.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-icons_888888_256x240.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_888888_256x240.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-icons_cd0a0a_256x240.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-icons_cd0a0a_256x240.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_cd0a0a_256x240.png diff --git a/vendor/assets/stylesheets/jquery/images/ui-icons_ffffff_256x240.png b/vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_ffffff_256x240.png similarity index 100% rename from vendor/assets/stylesheets/jquery/images/ui-icons_ffffff_256x240.png rename to vendor/assets/stylesheets/locomotive/jquery/images/ui-icons_ffffff_256x240.png diff --git a/vendor/assets/stylesheets/jquery/ui.css b/vendor/assets/stylesheets/locomotive/jquery/ui.css similarity index 100% rename from vendor/assets/stylesheets/jquery/ui.css rename to vendor/assets/stylesheets/locomotive/jquery/ui.css diff --git a/vendor/assets/stylesheets/liquid_mode.css b/vendor/assets/stylesheets/locomotive/liquid_mode.css similarity index 100% rename from vendor/assets/stylesheets/liquid_mode.css rename to vendor/assets/stylesheets/locomotive/liquid_mode.css diff --git a/vendor/assets/stylesheets/toggle.scss b/vendor/assets/stylesheets/locomotive/toggle.scss similarity index 100% rename from vendor/assets/stylesheets/toggle.scss rename to vendor/assets/stylesheets/locomotive/toggle.scss