fixed assets and print slide text

igmarin · Mar 28, 2012 · 75b5667 · 75b5667
1 parent 449dc41
commit 75b5667
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/helpers/spree/slideshow_types_helper.rb b/app/helpers/spree/slideshow_types_helper.rb
@@ -23,7 +23,7 @@ def slide_images(params)
         slides = Spree::Slide.where("slideshow_type_id = ?", slideshow.first.id).limit(max).sort_by { |slide| slide.position }
 
         slides.map do |slide|
-          content_tag(:li, raw(link_to(image_tag(slide.image.url(style.to_sym)), slide.url, { :title => slide.title })) + raw(content_tag(:div, content_tag(:strong, raw(slide.title)), :class => "text-holder")))
+          content_tag(:li, raw(link_to(image_tag(slide.image.url(style.to_sym)), slide.url, { :title => slide.title })) + raw(content_tag(:div, content_tag(:strong, raw(slide.title)) + content_tag(:p, raw(slide.content)), :class => "text-holder")))
         end.join
       else
         false

diff --git a/lib/generators/spree_multi_slideshow/install/install_generator.rb b/lib/generators/spree_multi_slideshow/install/install_generator.rb
@@ -9,7 +9,7 @@ def add_javascripts
 
       def add_stylesheets
         inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_multi_slideshow\n", :before => /\*\//, :verbose => true
-        #inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_multi_slideshow\n", :before => /\*\//, :verbose => true
+        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_multi_slideshow\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations