Commit 76862b73

@@ -4,7 +4,6 @@ class CakeSide.Models.Cake extends Backbone.Model
   defaults:
     id: null
     name: null
-    watermark: null
     story: null
     created_at: null
     updated_at: null

@@ -24,13 +24,6 @@
             </select>
           </div>
         </div>
-        <div class="control-group">
-          <label class="control-label" for="cake_watermark">Watermark</label>
-          <div class="controls">
-            <input class="input-xlarge" id="cake_watermark" maxlength="30" name="watermark" size="30" type="text" value="<%= cake.watermark %>"> on CakeSide.com
-            <a class="tooltip-item" data-placement="right" rel="tooltip" href="#" data-original-title="Watermark your name or company on each uploaded image" data-animation="true"><i class="icon-question-sign"></i></a>
-          </div>
-        </div>
         <div class="control-group">
           <label class="control-label" for="cake_story">Description</label>
           <div class="controls">

@@ -7,6 +7,13 @@
     <span class="btn btn-default btn-file">
       + Browse... <input id="photo-attachment" name="attachment" type="file" accept="image/*">
     </span>
+    <div class="control-group">
+      <label class="control-label" for="watermark">Watermark</label>
+      <div class="controls">
+        <input class="input-xlarge" id="watermark" maxlength="30" name="watermark" size="30" type="text" value=""> on CakeSide.com
+        <a class="tooltip-item" data-placement="right" rel="tooltip" href="#" data-original-title="Watermark your name or company on each uploaded image" data-animation="true"><i class="icon-question-sign"></i></a>
+      </div>
+    </div>
     <img id="preview-image" src="#" alt="your image" class="hide" />
   </form>
 </div>

@@ -7,7 +7,6 @@ class CakeSide.Views.Cakes.EditView extends Marionette.CompositeView
   childViewContainer: '.thumbnails'
   ui:
     name: "#cake_name"
-    watermark: "#cake_watermark"
     description: "#cake_story"
     category: "#cake_category_id"
     tags: "#cake_tags"
@@ -53,7 +52,6 @@ class CakeSide.Views.Cakes.EditView extends Marionette.CompositeView
   refreshStatus: ->
     @enableSaveButton()
     @model.set('name', @ui.name.val())
-    @model.set('watermark', @ui.watermark.val())
     @model.set('story', @ui.description.val())
     @model.set('category_id', @ui.category.val())
     @model.set('tags', @ui.tags.val())

@@ -44,7 +44,7 @@ module Api
       private
 
       def cake_params
-        params.require(:cake).permit(:name, :story, :watermark, :category_id, :tags)
+        params.require(:cake).permit(:name, :story, :category_id, :tags)
       end
     end
   end

@@ -58,6 +58,6 @@ class CreationsController < ApplicationController
   private
 
   def creation_params
-    params.require(:creation).permit(:name, :story, :watermark, :category_id)
+    params.require(:creation).permit(:name, :story, :category_id)
   end
 end

@@ -62,8 +62,8 @@ class User < ActiveRecord::Base
     favorites.includes(:creation).map {|f| f.creation }
   end
 
-  def create_cake(name:, description: nil, category:, watermark: nil)
-    creations.create(name: name, story: description, category_id: category.id, watermark: watermark)
+  def create_cake(name:, description: nil, category:)
+    creations.create(name: name, story: description, category_id: category.id)
   end
 
   class << self

@@ -6,7 +6,7 @@ class CreateCakeCommand
   end
 
   def run(attributes, tags)
-    cake = @current_user.create_cake(name: attributes[:name], description: attributes[:story], category: Category.find(attributes[:category_id]), watermark: attributes[:watermark])
+    cake = @current_user.create_cake(name: attributes[:name], description: attributes[:story], category: Category.find(attributes[:category_id]))
     @current_user.tag(cake, with: tags, on: :tags)
 
     if cake.save

@@ -2,7 +2,6 @@ json.id cake.id
 json.name cake.name
 json.slug cake.to_param
 json.story cake.story
-json.watermark cake.watermark
 json.category do
   json.id cake.category.id
   json.name cake.category.name

@@ -16,13 +16,6 @@
         <%= f.text_field :name, :class => "input-xxlarge" %>
       </div>
     </div>
-    <div class="control-group">
-      <%= f.label :watermark, :class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :watermark, :class => "input-xlarge", :maxlength=> 30 %> on CakeSide.com
-        <a class="tooltip-item" data-placement="right" rel="tooltip" href="#" data-original-title="Watermark your name or company on each uploaded image" data-animation="true"><i class="icon-question-sign"></i></a>
-      </div>
-    </div>
     <div class="control-group">
       <%= f.label :story, "Description", :class=> "control-label" %>
       <div class="controls">

@@ -51,7 +51,6 @@ describe CreationsController do
           post :create, creation: {
             name: 'stone',
             story: 'morning glory',
-            watermark: "watery",
             category_id: category.id
           }, creation_tags: 'cake'
         end
@@ -60,7 +59,6 @@ describe CreationsController do
           assigns(:creation).should_not be_nil
           assigns(:creation).name.should == 'stone'
           assigns(:creation).story.should == 'morning glory'
-          assigns(:creation).watermark.should == 'watery'
         end
 
         it "redirects to the created creation" do