Merged in mocheen/cakeside/wide-layout (pull request #68)

update links and routes to new backbone pages.

15 files changed, 27 insertions, 29 deletions

diff --git a/app/assets/javascripts/backbone/cakeside.js.coffee b/app/assets/javascripts/backbone/cakeside.js.coffee
index 466df947..9fb71fb2 100644
--- a/app/assets/javascripts/backbone/cakeside.js.coffee
+++ b/app/assets/javascripts/backbone/cakeside.js.coffee
@@ -42,8 +42,7 @@ window.CakeSide =
       else
         photos = new CakeSide.Collections.PhotosCollection(cake_id: cake_id)
         @photos_cache[cake_id] = photos
-        photos.fetch(reset: true).done ->
-          console.log('done fetching.')
+        photos.fetch(reset: true)
         photos
 
     @cakes.fetch(reset: true).done ->
diff --git a/app/assets/javascripts/backbone/routers/cakes_router.js.coffee b/app/assets/javascripts/backbone/routers/cakes_router.js.coffee
index 0539c626..92b72dd0 100644
--- a/app/assets/javascripts/backbone/routers/cakes_router.js.coffee
+++ b/app/assets/javascripts/backbone/routers/cakes_router.js.coffee
@@ -1,12 +1,9 @@
 class CakeSide.Routers.CakesRouter extends Backbone.Router
   routes:
     "cakes/new": "newCake"
-    "cakes/index": "index"
     "cakes/:id/edit": "edit"
     "cakes/:id": "show"
-    "cakes/:id": "show"
-    "cakes/.*": "index"
-    ".*": "index"
+    "cakes": "index"
 
   index: ->
     CakeSide.Application.request('CommentView').hide()
@@ -16,6 +13,10 @@ class CakeSide.Routers.CakesRouter extends Backbone.Router
   show: (id) ->
     cake = CakeSide.Application.request('CakesRepository').get(id)
     @view = new CakeSide.Views.Cakes.ShowView(model: cake)
+    CakeSide.Application.request('CommentView').render
+      identifier: "c-#{cake.id}"
+      title: cake.get('name')
+      url: cake.public_url()
     $("#backbone-content").html(@view.render().el)
 
   newCake: ->
diff --git a/app/assets/javascripts/backbone/routers/photos_router.js.coffee b/app/assets/javascripts/backbone/routers/photos_router.js.coffee
index f8425f2f..f0e91db1 100644
--- a/app/assets/javascripts/backbone/routers/photos_router.js.coffee
+++ b/app/assets/javascripts/backbone/routers/photos_router.js.coffee
@@ -12,5 +12,10 @@ class CakeSide.Routers.PhotosRouter extends Backbone.Router
     @photos = CakeSide.Application.request('PhotosRepository', cake_id)
     photo = new CakeSide.Models.Photo({cake_id: cake_id, id: id})
     photo.fetch()
+    cake = CakeSide.Application.request('CakesRepository').get(cake_id)
     @view = new CakeSide.Views.Photos.ShowView(model: photo, collection: @photos)
+    CakeSide.Application.request('CommentView').render
+      identifier: "c-#{cake_id}"
+      title: cake.get('name')
+      url: cake.public_url()
     $("#backbone-content").html(@view.render().el)
diff --git a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
index 3dfc1cfc..e169ef84 100644
--- a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
@@ -1,9 +1,9 @@
 <div class="thumbnail">
   <% if(hasImage()) { %>
-    <a href="#/cakes/<%= id %>"><img src="<%= randomPhoto().thumb_url %>" /></a>
+    <a href="#cakes/<%= id %>"><img src="<%= randomPhoto().thumb_url %>" /></a>
   <% } %>
   <div class="caption">
-    <h3><a href="#/cakes/<%= id %>"><%= name %></a></h3>
+    <h3><a href="#cakes/<%= id %>"><%= name %></a></h3>
     <span class="badge badge-warning"><i class="icon-comments"> <a href="/creations/<%= id %>#disqus_thread" data-disqus-identifier="c-<%= id %>"></a></i></span>
   </div>
 </div>
diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
index b62819bf..fd0e9585 100644
--- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
@@ -54,7 +54,7 @@
         </div>
         <div class="form-actions">
           <button id='save-button' type="submit" class="btn btn-primary">Save</button>
-          <a href="#/cakes/<%= cake.id %>" class="btn">Cancel</a>
+          <a href="#cakes/<%= cake.id %>" class="btn">Cancel</a>
         </div>
       </fieldset>
     </form>
diff --git a/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs
index 92d33919..c3ef30ea 100644
--- a/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs
@@ -49,7 +49,7 @@
         </div>
         <div class="form-actions">
           <button id='save-button' type="submit" class="btn btn-primary">NEXT STEP</button>
-          <a href="#/cakes" class="btn">Cancel</a>
+          <a href="#cakes" class="btn">Cancel</a>
         </div>
       </fieldset>
     </form>
diff --git a/app/assets/javascripts/backbone/templates/cakes/no_cakes.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/no_cakes.jst.ejs
index 8988d795..9d8787ba 100644
--- a/app/assets/javascripts/backbone/templates/cakes/no_cakes.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/no_cakes.jst.ejs
@@ -1 +1 @@
-<p>You haven't shared any creations yet. <a href="#/cakes/new">Get Started</a></p>
+<p>You haven't shared any creations yet. <a href="#cakes/new">Get Started</a></p>
diff --git a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
index 0aa3b0da..b845b91a 100644
--- a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="span12">
     <p>
-    <a href="#/cakes/<%= id %>/edit" class="btn">
+    <a href="#cakes/<%= id %>/edit" class="btn">
       <i class="icon-edit"></i> <strong>Edit</strong>
     </a>
     <a class="btn add-photo">
@@ -20,13 +20,13 @@
   <div class="span6">
     <% if (hasImage()) { %>
     <% random_photo = randomPhoto()%>
-    <a href="#/cakes/<%= id %>/photos/<%= random_photo.id %>">
+    <a href="#cakes/<%= id %>/photos/<%= random_photo.id %>">
       <img class="thumbnail" src="<%= random_photo.large_url %>" alt="<%= name %>" />
     </a>
     <% } %>
   </div>
   <div class="span6">
-    <h1><a href="#/cakes/<%= id %>"><%= name %></a></h1>
+    <h1><a href="#cakes/<%= id %>"><%= name %></a></h1>
     <span> <i class="icon-tags"></i> </span>
     <% if (typeof(tags) === "string") { %>
       <% _.each(tags.split(','), function(tag){ %>
@@ -48,7 +48,7 @@
 <div class="row">
   <div class="span12">
     <a class="btn add-photo">Add Photo</a>
-    <a href="#/cakes/<%= id %>/edit">(edit)</a>
+    <a href="#cakes/<%= id %>/edit">(edit)</a>
   </div>
   <div class="span12">
     <ul class="thumbnails"></ul>
diff --git a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
index 2a6f90bb..a5483c3c 100644
--- a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
@@ -4,7 +4,7 @@
       <div class="bar" style="width: <%= percentComplete %>%;"></div>
     </div>
   <% } else { %>
-    <a href="#/cakes/<%= cake_id %>/photos/<%= id %>">
+    <a href="#cakes/<%= cake_id %>/photos/<%= id %>">
       <img src="<%= thumb_url %>" class="thumbnail" />
     </a>
   <% } %>
diff --git a/app/assets/javascripts/backbone/templates/photos/new.jst.ejs b/app/assets/javascripts/backbone/templates/photos/new.jst.ejs
index 5090c792..848c86fc 100644
--- a/app/assets/javascripts/backbone/templates/photos/new.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/photos/new.jst.ejs
@@ -10,7 +10,7 @@
     </div>
     <div class="form-actions">
       <button type="submit" class="btn btn-primary">Upload Photo</button>
-      <a href="#/cakes" class="btn">Cancel</a>
+      <a href="#cakes" class="btn">Cancel</a>
     </div>
   </fieldset>
 </form>
diff --git a/app/assets/javascripts/backbone/templates/photos/show.jst.ejs b/app/assets/javascripts/backbone/templates/photos/show.jst.ejs
index 2d5404a6..91423b50 100644
--- a/app/assets/javascripts/backbone/templates/photos/show.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/photos/show.jst.ejs
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="span12">
-    <p><a href="#/cakes/<%= cake_id %>">back</a></p>
-    <a href="#/cakes/<%= cake_id %>/photos/<%= id %>">
+    <p><a href="#cakes/<%= cake_id %>">back</a></p>
+    <a href="#cakes/<%= cake_id %>/photos/<%= id %>">
       <img src="<%= original_url %>" class="thumbnail" />
     </a>
   </div>
diff --git a/app/assets/javascripts/backbone/views/cakes/delete_cake_modal_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/delete_cake_modal_view.js.coffee
index 13208156..85253924 100644
--- a/app/assets/javascripts/backbone/views/cakes/delete_cake_modal_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/delete_cake_modal_view.js.coffee
@@ -25,7 +25,7 @@ class CakeSide.Views.Cakes.DeleteCakeModalView extends Marionette.ItemView
 
   successfullyDeleted: =>
     @closeDialog()
-    window.location.hash = "cakes/"
+    window.location.hash = "cakes"
 
   errorDeletingCake: (model, response, options) ->
     model.set('errorMessage', 'Could not delete cake.')
diff --git a/app/assets/javascripts/backbone/views/cakes/new_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/new_view.js.coffee
index 0b33dd4a..8dd2ee5a 100644
--- a/app/assets/javascripts/backbone/views/cakes/new_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/new_view.js.coffee
@@ -37,7 +37,7 @@ class CakeSide.Views.Cakes.NewView extends Marionette.ItemView
     @$('.tooltip-item').tooltip()
 
   savedSuccessfully: (cake) =>
-    window.location.hash = "/cakes/#{cake.id}"
+    window.location.hash = "cakes/#{cake.id}"
 
   couldNotSave: (cake, xhr) =>
     @enableSaveButton()
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 ce1f54d9..56b4f7c3 100644
--- a/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee
@@ -20,7 +20,6 @@ class CakeSide.Views.Cakes.ShowView extends Marionette.CompositeView
   constructor: (options) ->
     super(options)
     @collection = @model.photos()
-    @displayComments()
 
   launchAddPhoto: ->
     @displayModal(new CakeSide.Views.Photos.NewModalView(cake: @model))
@@ -31,9 +30,3 @@ class CakeSide.Views.Cakes.ShowView extends Marionette.CompositeView
   displayModal: (view) ->
     $("#modal").html(view.render().el)
     $("#modal").modal()
-
-  displayComments: ->
-    CakeSide.Application.request('CommentView').render
-      identifier: "c-#{@model.id}"
-      title: @model.get('name')
-      url: @model.public_url()
diff --git a/app/assets/javascripts/backbone/views/photos/new_view.js.coffee b/app/assets/javascripts/backbone/views/photos/new_view.js.coffee
index e53f3eaa..ebc6332a 100644
--- a/app/assets/javascripts/backbone/views/photos/new_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/photos/new_view.js.coffee
@@ -26,7 +26,7 @@ class CakeSide.Views.Photos.NewView extends Backbone.View
     @collection.create(@model.toJSON(),
       success: (photo) =>
         @model = photo
-        window.location.hash = "/#{@model.get('cake_id')}"
+        window.location.hash = "cakes/#{@model.get('cake_id')}"
 
       error: (photo, jqXHR) =>
         @model.set({errors: $.parseJSON(jqXHR.responseText)})