diff options
Diffstat (limited to 'app/assets/javascripts')
5 files changed, 14 insertions, 18 deletions
diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs index d1f26560..5f73d117 100644 --- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs +++ b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs @@ -34,8 +34,6 @@ <button id='save-button' type="submit" class="btn btn-primary">Publish</button> <a href="#cakes/<%= cake.id %>" class="btn btn-secondary">Cancel</a> </form> + <div class="card-columns"></div> </div> </div> -<div class="row"> - <ul class="thumbnails"></ul> -</div> diff --git a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs index 66533081..f704d65a 100644 --- a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs +++ b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs @@ -1,11 +1,9 @@ -<div class="thumbnail"> - <% if (uploading()) { %> - <div class="progress progress-striped active"> - <div class="bar" style="width: <%= percentComplete %>%;"></div> - </div> - <% } else { %> - <a href="#cakes/<%= cake_id %>/photos/<%= id %>"> - <img src="<%= thumb_url %>" /> - </a> - <% } %> -</div> +<% if (uploading()) { %> + <div class="progress progress-striped active"> + <div class="bar" style="width: <%= percentComplete %>%;"></div> + </div> +<% } else { %> + <a href="#cakes/<%= cake_id %>/photos/<%= id %>"> + <img src="<%= thumb_url %>" class="card-img-top" /> + </a> +<% } %> 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 c568ca95..84883bd3 100644 --- a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee +++ b/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee @@ -4,7 +4,7 @@ CakeSide.Views.Cakes ||= {} class CakeSide.Views.Cakes.EditView extends Marionette.CompositeView template : JST["backbone/templates/cakes/edit"] childView: CakeSide.Views.Cakes.ThumbnailView - childViewContainer: '.thumbnails' + childViewContainer: '.card-columns' ui: name: "#cake_name" description: "#cake_story" diff --git a/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee index d180b80a..d225e93f 100644 --- a/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee +++ b/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee @@ -4,7 +4,7 @@ CakeSide.Views.Cakes ||= {} class CakeSide.Views.Cakes.ShowView extends Marionette.CompositeView template: JST["backbone/templates/cakes/show"] childView: CakeSide.Views.Cakes.ThumbnailView - childViewContainer: '.thumbnails' + childViewContainer: '.card-columns' events: "click .add-photo": "launchAddPhoto" diff --git a/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee index 5e772232..085a8f11 100644 --- a/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee +++ b/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee @@ -2,8 +2,8 @@ CakeSide.Views.Cakes ||= {} class CakeSide.Views.Cakes.ThumbnailView extends Marionette.ItemView template: JST['backbone/templates/cakes/thumbnail'] - tagName: 'li' - className: 'span2' + tagName: 'div' + className: 'card' modelEvents: 'sync': 'render' 'change:percentComplete': 'render' |