Commit 43a2a255

mo k <mo@mokhan.ca>
2012-08-23 13:04:24
fix watermark bug. it needs to be displayed before the image upload in the form.
master
1 parent ef94898
Changed files (2)
app
uploaders
image_uploader.rb
views
creations
_form.html.erb
app/uploaders/image_uploader.rb
@@ -32,6 +32,8 @@ class ImageUploader < CarrierWave::Uploader::Base
   end
 
   def watermark
+    Rails.logger.info "watermarking..."
+    Rails.logger.info "name is #{model.name} caption is #{model.caption}"
     manipulate! do |image|
       gc = Magick::Draw.new
       gc.gravity = Magick::SouthEastGravity
app/views/creations/_form.html.erb
@@ -7,15 +7,15 @@
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :image, "Upload Main Image", :class => "control-label" %>
+      <%= f.label :caption, "Image Watermark", :class => "control-label" %>
       <div class="controls">
-        <%= f.file_field :image, :class => "input-file" %>
+        <%= f.text_field :caption, :class => "input-xlarge" %>
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :caption, :class => "control-label" %>
+      <%= f.label :image, "Upload Main Image", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :caption, :class => "input-xlarge" %>
+        <%= f.file_field :image, :class => "input-file" %>
       </div>
     </div>
     <div class="control-group">