Second Display Image finished

app/controllers/origami/second_display_controller.rb

@@ -1,7 +1,10 @@
 class Origami::SecondDisplayController < BaseOrigamiController
 
   def index
+    @display_images = DisplayImage.all
+  end
 
+  def show
   end
 
   def customer_view

app/models/display_image.rb

@@ -1,5 +1,3 @@
 class DisplayImage < ApplicationRecord
-	#mount_uploader :image, DisplayImageUploader
     belongs_to :shop
-
 end

app/uploaders/display_image_uploader.rb

@@ -1,59 +0,0 @@
-class DisplayImageUploader < CarrierWave::Uploader::Base
-
-  # Include RMagick or MiniMagick support:
-  # include CarrierWave::RMagick
-  include CarrierWave::MiniMagick
-
-  # Choose what kind of storage to use for this uploader:
-  storage :file
-  # storage :fog
-
-  # def root
-  #   Rails.root.join 'public/'
-  # end
-
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
-  def store_dir
-    #"image/image"
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-  end
-
-  # def cache_dir
-  #   '/tmp/images'
-  # end
-
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url(*args)
-  #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
-  #
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
-  # Process files as they are uploaded:
-  # process scale: [200, 300]
-  process :resize_to_fit => [200, 150]
-  #
-  # def scale(width, height)
-  #   # do something
-  # end
-
-  # Create different versions of your uploaded files:
-  # version :thumb do
-  #   process resize_to_fit: [50, 50]
-  # end
-
-  # Add a white list of extensions which are allowed to be uploaded.
-  # For images you might use something like this:
-  def extension_whitelist
-    %w(jpg jpeg gif png)
-  end
-
-  # Override the filename of the uploaded files:
-  # Avoid using model.id or version_name here, see uploader/store.rb for details.
-  # def filename
-  #   "something.jpg" if original_filename
-  # end	
-
-end

app/views/origami/second_display/_second_display.html.erb

@@ -54,7 +54,14 @@
     
   </div>
   <div class="col-lg-6 col-md-6 col-sm-6">
-    <%= image_tag("slider/s2.jpg", :alt => "rss feed") %>
+    <div id="wowslider-container" style="max-width: 100%;">
+      <div class="ws_images full_screen">
+        <% @display_images.each do |p| %>
+          <%= image_tag "#{p.image}", :alt => "rss feed"%>
+          <% break %>
+        <% end %>
+      </div>
+    </div>
   </div>
 </div>
 

app/views/origami/second_display/_slider.html.erb

@@ -6,9 +6,11 @@
  		<div id="wowslider-container" style="max-width: 100%;">
 			<div class="ws_images full_screen">
 				<ul>
-					<li><%= image_tag("slider/s1.jpg", :alt => "rss feed") %></li>
+					<% @display_images.each do |p| %>
-					<li><%= image_tag("slider/s2.jpg", :alt => "rss feed") %></li>
+						<li>
-					<li><%= image_tag("slider/s4.jpg", :alt => "rss feed") %></li>
+		                	<%= image_tag "#{p.image}", :alt => "rss feed"%>
+		                </li>	
+		            <% end %>
 				</ul>
 			</div>
 			<div class="ws_bullets"></div>