Commit 842ba08e
Changed files (10)
app
assets
javascripts
backbone
templates
views
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>
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>
app/assets/javascripts/backbone/templates/cakes/no_cakes.jst.ejs
@@ -1,1 +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>
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>
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>
<% } %>
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>
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>
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.')
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()
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)})