diff options
| author | mo khan <mo@mokhan.ca> | 2014-08-23 13:50:21 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2014-08-23 13:50:21 -0600 |
| commit | 0bb438cd7d050f634fed3b449a69368126a0e9a4 (patch) | |
| tree | b284f22cd1e793653db3bdb8c88c961a88412d2d /app/assets/javascripts/backbone | |
| parent | 75d6792e329b6da2f6d5af2a176adcbaa83d1b8a (diff) | |
tweak the edit and show cakes pages in backbone templates.
Diffstat (limited to 'app/assets/javascripts/backbone')
4 files changed, 12 insertions, 9 deletions
diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs index 12b25732..d70e7f5f 100644 --- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs +++ b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs @@ -1,9 +1,5 @@ <div class="row-fluid"> - <div class="span2"> - <p> <a class="btn btn-primary add-photo">Add Photo...</a> </p> - <ul class="thumbnails"></ul> - </div> - <div class="span10"> + <div class="span12"> <h1><small>Edit</small> <%= cake.name %></h1> <hr /> <form id="edit-cake" name="cake" class="form-horizontal"> @@ -49,3 +45,7 @@ </form> </div> </div> +<div class="row-fluid"> + <p> <a class="btn btn-primary add-photo">Add Photo...</a> </p> + <ul class="thumbnails"></ul> +</div> diff --git a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs index 9998f5d7..91e12dc0 100644 --- a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs +++ b/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs @@ -50,7 +50,7 @@ <a class="btn add-photo">Add Photo</a> <a href="#cakes/<%= id %>/edit">(edit)</a> </div> - <div class="span12"> - <ul class="thumbnails"></ul> - </div> +</div> +<div class="row-fluid"> + <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 166d63bb..66533081 100644 --- a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs +++ b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs @@ -1,9 +1,11 @@ +<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 %>" class="thumbnail" /> + <img src="<%= thumb_url %>" /> </a> <% } %> +</div> 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 626eb702..5e772232 100644 --- a/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee +++ b/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee @@ -3,6 +3,7 @@ CakeSide.Views.Cakes ||= {} class CakeSide.Views.Cakes.ThumbnailView extends Marionette.ItemView template: JST['backbone/templates/cakes/thumbnail'] tagName: 'li' + className: 'span2' modelEvents: 'sync': 'render' 'change:percentComplete': 'render' |