diff options
| author | mo khan <mo@mokhan.ca> | 2014-07-05 17:32:53 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2014-07-05 17:32:53 -0600 |
| commit | 76862b73aaa4595f8313fed29c528b12bde55eb7 (patch) | |
| tree | a10e77d9a9f668acc8ba38d912782251e15d54fb /app/assets/javascripts | |
| parent | bd487422a0bc6e94d90686531de7b12a3fa12540 (diff) | |
remove usage of watermark from creations.
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/javascripts/backbone/models/cake.js.coffee b/app/assets/javascripts/backbone/models/cake.js.coffee index ce41d633..7f925394 100644 --- a/app/assets/javascripts/backbone/models/cake.js.coffee +++ b/app/assets/javascripts/backbone/models/cake.js.coffee @@ -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 diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs index 94843441..26768845 100644 --- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs +++ b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs @@ -25,13 +25,6 @@ </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"> <textarea class="input-xxlarge" id="cake_story" name="story" rows="3"><%= cake.story %></textarea> diff --git a/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs b/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs index 9731d94d..4927aca8 100644 --- a/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs +++ b/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs @@ -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> diff --git a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee index f127bb86..0cd5e8ac 100644 --- a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee +++ b/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee @@ -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()) |