Commit 1e06969c

@@ -21,6 +21,9 @@ class CakeSide.Models.Cake extends Backbone.Model
   public_url: ->
     "#{window.location.origin}/creations/#{@get('slug')}"
 
+  category_id: ->
+    @get('category_id') || @get('category').id
+
 class CakeSide.Collections.CakesCollection extends Backbone.Collection
   model: CakeSide.Models.Cake
   url: '/api/v1/cakes'

@@ -14,6 +14,16 @@
             <input class="input-xxlarge" id="cake_name" name="name" type="text" value="<%= cake.name %>" />
           </div>
         </div>
+        <div class="control-group">
+          <label class="control-label">Category</label>
+          <div class="controls">
+            <select id="cake_category_id" name="category_id">
+              <% _.each(categories, function(category) { %>
+                <option value="<%= category.id %>"><%= category.name %></option>
+              <% }); %>
+            </select>
+          </div>
+        </div>
         <div class="control-group">
           <label class="control-label" for="cake_watermark">Watermark</label>
           <div class="controls">
@@ -27,16 +37,6 @@
             <textarea class="input-xxlarge" id="cake_story" name="story" rows="3"><%= cake.story %></textarea>
           </div>
         </div>
-        <div class="control-group">
-          <label class="control-label">Category</label>
-          <div class="controls">
-            <select id="cake_category_id" name="category_id">
-              <% _.each(categories, function(category) { %>
-              <option value="<%= category.id %>"><%= category.name %></option>
-              <% }); %>
-            </select>
-          </div>
-        </div>
         <div class="control-group">
           <label for="cake_tags" class="control-label">Tags</label>
           <div class="controls">

@@ -10,19 +10,6 @@
             <input class="input-xxlarge" id="cake_name" name="name" type="text">
           </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"> 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">
-            <textarea class="input-xxlarge" id="cake_story" name="story" rows="3"></textarea>
-          </div>
-        </div>
         <div class="control-group">
           <label class="control-label">Category</label>
           <div class="controls">
@@ -33,20 +20,6 @@
             </select>
           </div>
         </div>
-        <div class="control-group">
-          <label for="cake_tags" class="control-label">Tags</label>
-          <div class="controls">
-            <input name="cake_tags" type="text" id="cake_tags" value="" class="input-xxlarge" autocomplete="off" />
-          </div>
-        </div>
-        <div class="control-group">
-          <div class="controls">
-            <label class="checkbox">
-              <input class="input-xxlarge" id="cake_is_restricted" type="checkbox" />
-              This cake is for adults only.
-            </label>
-          </div>
-        </div>
         <div class="form-actions">
           <button id='save-button' type="submit" class="btn btn-primary">Create</button>
           <a href="#cakes" class="btn">Cancel</a>

@@ -37,7 +37,7 @@ class CakeSide.Views.Cakes.EditView extends Marionette.CompositeView
     )
 
   onRender: ->
-    @$("#cake_category_id").val($("#cake_category_id option:first").val())
+    @$("#cake_category_id").val(@model.category_id())
     @$('#cake_tags').tagit({ availableTags: ALL_TAGS })
     @$('.tooltip-item').tooltip()
 

@@ -4,11 +4,7 @@ class CakeSide.Views.Cakes.NewView extends Marionette.ItemView
   template: JST["backbone/templates/cakes/new"]
   ui:
     name: "#cake_name"
-    watermark: "#cake_watermark"
-    description: "#cake_story"
     category: "#cake_category_id"
-    tags: "#cake_tags"
-    is_restricted: "#cake_is_restricted"
     save_button: '#save-button'
 
   modelEvents:
@@ -33,7 +29,6 @@ class CakeSide.Views.Cakes.NewView extends Marionette.ItemView
 
   onRender: ->
     @$("#cake_category_id").val($("#cake_category_id option:first").val())
-    @$('#cake_tags').tagit({ availableTags: ALL_TAGS })
     @$('.tooltip-item').tooltip()
     @model.isValid()
 
@@ -50,11 +45,7 @@ class CakeSide.Views.Cakes.NewView extends Marionette.ItemView
   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())
-    @model.set('is_restricted', @ui.is_restricted.val() == "" ? "true" : "false")
     @model.isValid()
 
   displayError: (model, error) ->