diff options
3 files changed, 21 insertions, 11 deletions
diff --git a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs index bae4b5cf..e3eae71b 100644 --- a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs +++ b/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs @@ -1,9 +1,19 @@ -<div class="thumbnail"> - <% if(hasImage()) { %> - <a href="#cakes/<%= id %>"><img src="<%= randomPhoto().thumb_url %>" /></a> - <% } %> - <div class="caption"> - <h4><a href="#cakes/<%= id %>"><%= shrink(name) %></a></h4> +<% if(hasImage()) { %> + <% photo = randomPhoto() %> + <a href="#cakes/<%= id %>" class="pull-left"> + <img class="media-object" data-src="<%= photo.thumb_url %>" alt="64x64" style="width: 64px; height: 64px;" src="<%= photo.thumb_url %>"> + </a> +<% } %> + <div class="media-body"> + <h4 class="media-heading"><%= name %></h4> + <%= story %> + <p> + <a href="#cakes/<%= id %>/edit"> + <i class="icon-edit"> edit</i> + </a> + <a href="<%= Routes.creation_favorites_path(id) %>"> + <i class="icon-heart"> fanclub </i> + </a> <span class="badge badge-warning"><i class="icon-comments"> <a href="/creations/<%= id %>#disqus_thread" data-disqus-identifier="c-<%= id %>"></a></i></span> + </p> </div> -</div> diff --git a/app/assets/javascripts/backbone/views/cakes/cake_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/cake_view.js.coffee index a7a82c43..f0faf97e 100644 --- a/app/assets/javascripts/backbone/views/cakes/cake_view.js.coffee +++ b/app/assets/javascripts/backbone/views/cakes/cake_view.js.coffee @@ -2,8 +2,8 @@ CakeSide.Views.Cakes ||= {} class CakeSide.Views.Cakes.CakeView extends Marionette.ItemView template: JST["backbone/templates/cakes/cake"] - tagName: 'li' - className: 'span2' + tagName: 'div' + className: 'media' templateHelpers: randomPhoto: -> @photos[Math.floor(Math.random()*@photos.length)] diff --git a/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee index b410fb06..6d6d2f9a 100644 --- a/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee +++ b/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee @@ -4,5 +4,5 @@ CakeSide.Views.Cakes ||= {} class CakeSide.Views.Cakes.IndexView extends Marionette.CollectionView childView: CakeSide.Views.Cakes.CakeView emptyView: CakeSide.Views.Cakes.NoCakesView - className: 'thumbnails' - tagName: 'ul' + className: '' + tagName: 'div' |