Commit 6f85e0e2

@@ -40,7 +40,7 @@ class ImageUploader < CarrierWave::Uploader::Base
       gc.font_weight = Magick::BoldWeight
       gc.stroke = 'none'
       mark = Magick::Image.new(image.columns, image.rows)
-      gc.annotate(mark, 0, 0, 25, 25, "#{model.watermark}\non CakeSide.com")
+      gc.annotate(mark, 0, 0, 25, 25, "#{model.watermark} @CakeSide.com")
       mark = mark.shade(true, 310, 30)
       image.composite!(mark, Magick::SouthEastGravity, Magick::HardLightCompositeOp)
     end

@@ -1,3 +1,10 @@
+<% content_for :javascript do %>
+  <script type="text/javascript" charset="utf-8">
+    $(function(){
+      $('.tooltip-item').tooltip();
+    });
+  </script>
+<% end %>
 <%= form_for(@creation, :html => {:multipart => true, :class => "form-horizontal"}) do |f| %>
   <fieldset>
     <div class="control-group">
@@ -9,7 +16,8 @@
     <div class="control-group">
       <%= f.label :watermark, "Image Watermark", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :watermark, :class => "input-xlarge", :maxlength=> 20 %>
+        <%= f.text_field :watermark, :class => "input-medium", :maxlength=> 20 %> @CakeSide.com
+        <a class="tooltip-item" data-placement="right" rel="tooltip" href="#" data-original-title="Adds a custom watermark to your image" data-animation="true">?</a>
       </div>
     </div>
     <div class="control-group">

@@ -28,6 +28,7 @@
     <%= render "shared/footer" %>
     <%= render "shared/uservoice_feedback"%>
     <%= render "shared/chrome_frame"%>
+    <%= yield :javascript %>
     <%= render "shared/google_analytics" %>
   </body>
 </html>