stuff works for 3.0
Oleg
committed Jun 03, 2011
commit b8fd1a46ad16f6807e7c6e5e154036dbba0b20b5
Showing 4
changed files with
43 additions
and 36 deletions
app/views/layouts/cms_admin/_head.html.erb
+29
-9
| @@ | @@ -4,15 +4,35 @@ |
| <%= csrf_meta_tag %> | |
| <meta name="cms-admin-path" content="<%= ComfortableMexicanSofa.config.admin_route_prefix %>" /> | |
| - | |
| - | <%= stylesheet_link_tag 'comfortable_mexican_sofa/application' %> |
| - | <%= javascript_include_tag 'comfortable_mexican_sofa/application' %> |
| - | |
| - | <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack.js' %> |
| - | <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js' %> |
| - | |
| - | <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.js' %> |
| - | <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.html5.js' %> |
| + | <% if ComfortableMexicanSofa.asset_pipeline_enabled? %> |
| + | |
| + | <%= stylesheet_link_tag 'comfortable_mexican_sofa/application' %> |
| + | <%= javascript_include_tag 'comfortable_mexican_sofa/application' %> |
| + | <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack.js' %> |
| + | <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js' %> |
| + | <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.js' %> |
| + | <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.html5.js' %> |
| + | |
| + | <% else %> |
| + | |
| + | <%= stylesheet_link_tag 'comfortable_mexican_sofa/reset', |
| + | 'comfortable_mexican_sofa/structure', |
| + | 'comfortable_mexican_sofa/typography', |
| + | 'comfortable_mexican_sofa/form', |
| + | 'comfortable_mexican_sofa/content', |
| + | 'comfortable_mexican_sofa/widgets', |
| + | 'comfortable_mexican_sofa/codemirror' %> |
| + | <%= javascript_include_tag 'comfortable_mexican_sofa/jquery', |
| + | 'comfortable_mexican_sofa/jquery_ui', |
| + | 'comfortable_mexican_sofa/rails', |
| + | 'comfortable_mexican_sofa/codemirror/codemirror', |
| + | 'comfortable_mexican_sofa/plupload/plupload', |
| + | 'comfortable_mexican_sofa/plupload/plupload.html5', |
| + | 'comfortable_mexican_sofa/application' %> |
| + | <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack', |
| + | 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms' %> |
| + | |
| + | <% end %> |
| <%= yield :head %> | |
| <%= cms_hook :html_head %> | |
comfortable_mexican_sofa.rb b/lib/comfortable_mexican_sofa.rb
+5
-0
| @@ | @@ -43,5 +43,10 @@ module ComfortableMexicanSofa |
| end | |
| alias :config :configuration | |
| + | # Checking if Rails3.1+ asset pipeline is enabled |
| + | def asset_pipeline_enabled? |
| + | Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1 && Rails.configuration.assets.enabled |
| + | end |
| + | |
| end | |
| end | |
| \ No newline at end of file | |
comfortable_mexican_sofa/view_methods.rb b/lib/comfortable_mexican_sofa/view_methods.rb
+0
-23
| @@ | @@ -40,26 +40,3 @@ module ComfortableMexicanSofa::ViewMethods |
| end | |
| ActionView::Base.send :include, ComfortableMexicanSofa::ViewMethods | |
| - | |
| - | ActionView::Helpers::AssetTagHelper.register_javascript_expansion :cms => [ |
| - | 'comfortable_mexican_sofa/jquery', |
| - | 'comfortable_mexican_sofa/jquery-ui/jquery-ui', |
| - | 'comfortable_mexican_sofa/rails', |
| - | 'comfortable_mexican_sofa/plupload/plupload.min', |
| - | 'comfortable_mexican_sofa/plupload/plupload.html5.min', |
| - | 'comfortable_mexican_sofa/codemirror/codemirror.js', |
| - | 'comfortable_mexican_sofa/cms' |
| - | ] |
| - | ActionView::Helpers::AssetTagHelper.register_javascript_expansion :tiny_mce => [ |
| - | 'comfortable_mexican_sofa/tiny_mce/tiny_mce', |
| - | 'comfortable_mexican_sofa/tiny_mce/jquery.tinymce' |
| - | ] |
| - | |
| - | ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :cms => [ |
| - | 'comfortable_mexican_sofa/reset', |
| - | 'comfortable_mexican_sofa/structure', |
| - | 'comfortable_mexican_sofa/typography', |
| - | 'comfortable_mexican_sofa/form', |
| - | 'comfortable_mexican_sofa/content', |
| - | '/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui' |
| - | ] |
| \ No newline at end of file | |
generators/cms_generator.rb b/lib/generators/cms_generator.rb
+9
-4
| @@ | @@ -23,10 +23,15 @@ class CmsGenerator < Rails::Generators::Base |
| end | |
| def generate_public_assets | |
| - | return if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1 && Rails.configuration.assets.enabled |
| - | directory 'app/assets/stylesheets/comfortable_mexican_sofa', 'public/stylesheets/comfortable_mexican_sofa' |
| - | directory 'app/assets/javascripts/comfortable_mexican_sofa', 'public/javascripts/comfortable_mexican_sofa' |
| - | directory 'app/assets/images/comfortable_mexican_sofa', 'public/images/comfortable_mexican_sofa' |
| + | return if ComfortableMexicanSofa.asset_pipeline_enabled? |
| + | directory 'app/assets/stylesheets/comfortable_mexican_sofa', 'public/stylesheets/comfortable_mexican_sofa' |
| + | directory 'app/assets/javascripts/comfortable_mexican_sofa', 'public/javascripts/comfortable_mexican_sofa' |
| + | directory 'app/assets/images/comfortable_mexican_sofa', 'public/images/comfortable_mexican_sofa' |
| + | |
| + | gsub_file 'public/stylesheets/comfortable_mexican_sofa/content.css', |
| + | '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/' |
| + | gsub_file 'public/stylesheets/comfortable_mexican_sofa/widgets.css', |
| + | '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/' |
| end | |
| def generate_cms_seeds | |