Merged in mocheen/cakeside/new-menu (pull request #79)

fluid layout

6 files changed, 20 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 26768845..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">
-  <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="row-fluid">
+  <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/new.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs
index e287b070..b878ab0b 100644
--- a/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row-fluid">
   <div class="span12">
     <h1>Share cake</h1>
     <hr />
diff --git a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
index b845b91a..91e12dc0 100644
--- a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row-fluid">
   <div class="span12">
     <p>
     <a href="#cakes/<%= id %>/edit" class="btn">
@@ -16,7 +16,7 @@
     </p>
   </div>
 </div>
-<div class="row">
+<div class="row-fluid">
   <div class="span6">
     <% if (hasImage()) { %>
     <% random_photo = randomPhoto()%>
@@ -45,12 +45,12 @@
     <p><%= story %></p>
   </div>
 </div>
-<div class="row">
+<div class="row-fluid">
   <div class="span12">
     <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 a5483c3c..66533081 100644
--- a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
@@ -1,11 +1,11 @@
-<li class="span2">
+<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>
   <% } %>
-</li>
+</div>
diff --git a/app/assets/javascripts/backbone/templates/photos/show.jst.ejs b/app/assets/javascripts/backbone/templates/photos/show.jst.ejs
index 91423b50..c3248267 100644
--- a/app/assets/javascripts/backbone/templates/photos/show.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/photos/show.jst.ejs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row-fluid">
   <div class="span12">
     <p><a href="#cakes/<%= cake_id %>">back</a></p>
     <a href="#cakes/<%= cake_id %>/photos/<%= id %>">
@@ -6,7 +6,7 @@
     </a>
   </div>
 </div>
-<div class="row">
+<div class="row-fluid">
   <div class="span12">
     <ul class="thumbnails">
     </ul>
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 1a534bac..5e772232 100644
--- a/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee
@@ -2,6 +2,8 @@ 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'