49 files changed, 25 insertions, 23 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 77563570..495d1be1 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,9 +13,8 @@
 //= require backbone.marionette
 //= require backbone_rails_sync
 //= require backbone_datalink
-//= require backbone/cakeside
 //= require backbone-model-file-upload
-//= require_tree .
+//= require cakeside
 
 var initialize = function(){
   $(window).scroll(function(){
@@ -25,4 +24,3 @@ var initialize = function(){
   });
 };
 $(document).ready(initialize);
-$(document).on("page:load", initialize);
diff --git a/app/assets/javascripts/backbone/cakeside.js.coffee b/app/assets/javascripts/cakeside.js.coffee
index 6f468e52..7ed82c0e 100644
--- a/app/assets/javascripts/backbone/cakeside.js.coffee
+++ b/app/assets/javascripts/cakeside.js.coffee
@@ -4,6 +4,7 @@
 #= require_tree ./views
 #= require_tree ./controllers
 #= require_tree ./routers
+#= require_tree ./service
 
 window.CakeSide =
   Models: {}
diff --git a/app/assets/javascripts/backbone/controllers/cakes_controller.js.coffee b/app/assets/javascripts/controllers/cakes_controller.js.coffee
index 3167248b..3167248b 100644
--- a/app/assets/javascripts/backbone/controllers/cakes_controller.js.coffee
+++ b/app/assets/javascripts/controllers/cakes_controller.js.coffee
diff --git a/app/assets/javascripts/backbone/controllers/dashboard_controller.js.coffee b/app/assets/javascripts/controllers/dashboard_controller.js.coffee
index 23169914..23169914 100644
--- a/app/assets/javascripts/backbone/controllers/dashboard_controller.js.coffee
+++ b/app/assets/javascripts/controllers/dashboard_controller.js.coffee
diff --git a/app/assets/javascripts/backbone/controllers/profile_controller.js.coffee b/app/assets/javascripts/controllers/profile_controller.js.coffee
index c8577e2a..c8577e2a 100644
--- a/app/assets/javascripts/backbone/controllers/profile_controller.js.coffee
+++ b/app/assets/javascripts/controllers/profile_controller.js.coffee
diff --git a/app/assets/javascripts/backbone/controllers/tutorials_controller.js.coffee b/app/assets/javascripts/controllers/tutorials_controller.js.coffee
index 732bea3e..732bea3e 100644
--- a/app/assets/javascripts/backbone/controllers/tutorials_controller.js.coffee
+++ b/app/assets/javascripts/controllers/tutorials_controller.js.coffee
diff --git a/app/assets/javascripts/backbone/models/.gitkeep b/app/assets/javascripts/models/.gitkeep
index e69de29b..e69de29b 100644
--- a/app/assets/javascripts/backbone/models/.gitkeep
+++ b/app/assets/javascripts/models/.gitkeep
diff --git a/app/assets/javascripts/backbone/models/cake.js.coffee b/app/assets/javascripts/models/cake.js.coffee
index 7f925394..7f925394 100644
--- a/app/assets/javascripts/backbone/models/cake.js.coffee
+++ b/app/assets/javascripts/models/cake.js.coffee
diff --git a/app/assets/javascripts/backbone/models/category.js.coffee b/app/assets/javascripts/models/category.js.coffee
index 98437966..98437966 100644
--- a/app/assets/javascripts/backbone/models/category.js.coffee
+++ b/app/assets/javascripts/models/category.js.coffee
diff --git a/app/assets/javascripts/backbone/models/photo.js.coffee b/app/assets/javascripts/models/photo.js.coffee
index eb1cff76..eb1cff76 100644
--- a/app/assets/javascripts/backbone/models/photo.js.coffee
+++ b/app/assets/javascripts/models/photo.js.coffee
diff --git a/app/assets/javascripts/backbone/models/profile.js.coffee b/app/assets/javascripts/models/profile.js.coffee
index 189d83e4..189d83e4 100644
--- a/app/assets/javascripts/backbone/models/profile.js.coffee
+++ b/app/assets/javascripts/models/profile.js.coffee
diff --git a/app/assets/javascripts/backbone/models/tutorials.js.coffee b/app/assets/javascripts/models/tutorials.js.coffee
index 9e2e8a1f..9e2e8a1f 100644
--- a/app/assets/javascripts/backbone/models/tutorials.js.coffee
+++ b/app/assets/javascripts/models/tutorials.js.coffee
diff --git a/app/assets/javascripts/backbone/routers/.gitkeep b/app/assets/javascripts/routers/.gitkeep
index e69de29b..e69de29b 100644
--- a/app/assets/javascripts/backbone/routers/.gitkeep
+++ b/app/assets/javascripts/routers/.gitkeep
diff --git a/app/assets/javascripts/backbone/routers/cakes_router.js.coffee b/app/assets/javascripts/routers/cakes_router.js.coffee
index 5a0922ae..5a0922ae 100644
--- a/app/assets/javascripts/backbone/routers/cakes_router.js.coffee
+++ b/app/assets/javascripts/routers/cakes_router.js.coffee
diff --git a/app/assets/javascripts/backbone/routers/dashboard_router.js.coffee b/app/assets/javascripts/routers/dashboard_router.js.coffee
index 513b2f04..513b2f04 100644
--- a/app/assets/javascripts/backbone/routers/dashboard_router.js.coffee
+++ b/app/assets/javascripts/routers/dashboard_router.js.coffee
diff --git a/app/assets/javascripts/backbone/routers/profile_router.js.coffee b/app/assets/javascripts/routers/profile_router.js.coffee
index cf83d4ae..cf83d4ae 100644
--- a/app/assets/javascripts/backbone/routers/profile_router.js.coffee
+++ b/app/assets/javascripts/routers/profile_router.js.coffee
diff --git a/app/assets/javascripts/backbone/routers/tutorials_router.js.coffee b/app/assets/javascripts/routers/tutorials_router.js.coffee
index 9c942e88..9c942e88 100644
--- a/app/assets/javascripts/backbone/routers/tutorials_router.js.coffee
+++ b/app/assets/javascripts/routers/tutorials_router.js.coffee
diff --git a/app/assets/javascripts/backbone/templates/.gitkeep b/app/assets/javascripts/templates/.gitkeep
index e69de29b..e69de29b 100644
--- a/app/assets/javascripts/backbone/templates/.gitkeep
+++ b/app/assets/javascripts/templates/.gitkeep
diff --git a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs b/app/assets/javascripts/templates/cakes/cake.jst.ejs
index e9800ad5..e9800ad5 100644
--- a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
+++ b/app/assets/javascripts/templates/cakes/cake.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/cakes/delete_modal.jst.ejs b/app/assets/javascripts/templates/cakes/delete_modal.jst.ejs
index 370109d5..370109d5 100644
--- a/app/assets/javascripts/backbone/templates/cakes/delete_modal.jst.ejs
+++ b/app/assets/javascripts/templates/cakes/delete_modal.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/templates/cakes/edit.jst.ejs
index cab7fc92..cab7fc92 100644
--- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
+++ b/app/assets/javascripts/templates/cakes/edit.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs b/app/assets/javascripts/templates/cakes/new.jst.ejs
index cc26c43b..cc26c43b 100644
--- a/app/assets/javascripts/backbone/templates/cakes/new.jst.ejs
+++ b/app/assets/javascripts/templates/cakes/new.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/cakes/no_cakes.jst.ejs b/app/assets/javascripts/templates/cakes/no_cakes.jst.ejs
index 9d8787ba..9d8787ba 100644
--- a/app/assets/javascripts/backbone/templates/cakes/no_cakes.jst.ejs
+++ b/app/assets/javascripts/templates/cakes/no_cakes.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs b/app/assets/javascripts/templates/cakes/show.jst.ejs
index 45fb0cd8..45fb0cd8 100644
--- a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
+++ b/app/assets/javascripts/templates/cakes/show.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs b/app/assets/javascripts/templates/cakes/thumbnail.jst.ejs
index 7ae1bef3..7ae1bef3 100644
--- a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
+++ b/app/assets/javascripts/templates/cakes/thumbnail.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs b/app/assets/javascripts/templates/photos/new-modal.jst.ejs
index c138b423..c138b423 100644
--- a/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs
+++ b/app/assets/javascripts/templates/photos/new-modal.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/profiles/show.jst.ejs b/app/assets/javascripts/templates/profiles/show.jst.ejs
index 150073d8..150073d8 100644
--- a/app/assets/javascripts/backbone/templates/profiles/show.jst.ejs
+++ b/app/assets/javascripts/templates/profiles/show.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/tutorials/new.jst.ejs b/app/assets/javascripts/templates/tutorials/new.jst.ejs
index 965a62f1..965a62f1 100644
--- a/app/assets/javascripts/backbone/templates/tutorials/new.jst.ejs
+++ b/app/assets/javascripts/templates/tutorials/new.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/tutorials/no_tutorials.jst.ejs b/app/assets/javascripts/templates/tutorials/no_tutorials.jst.ejs
index ab9705b1..ab9705b1 100644
--- a/app/assets/javascripts/backbone/templates/tutorials/no_tutorials.jst.ejs
+++ b/app/assets/javascripts/templates/tutorials/no_tutorials.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/tutorials/show.jst.ejs b/app/assets/javascripts/templates/tutorials/show.jst.ejs
index 7dcbea00..7dcbea00 100644
--- a/app/assets/javascripts/backbone/templates/tutorials/show.jst.ejs
+++ b/app/assets/javascripts/templates/tutorials/show.jst.ejs
diff --git a/app/assets/javascripts/backbone/templates/tutorials/tutorial.jst.ejs b/app/assets/javascripts/templates/tutorials/tutorial.jst.ejs
index 255344d7..255344d7 100644
--- a/app/assets/javascripts/backbone/templates/tutorials/tutorial.jst.ejs
+++ b/app/assets/javascripts/templates/tutorials/tutorial.jst.ejs
diff --git a/app/assets/javascripts/backbone/views/.gitkeep b/app/assets/javascripts/views/.gitkeep
index e69de29b..e69de29b 100644
--- a/app/assets/javascripts/backbone/views/.gitkeep
+++ b/app/assets/javascripts/views/.gitkeep
diff --git a/app/assets/javascripts/backbone/views/cakes/cake_view.js.coffee b/app/assets/javascripts/views/cakes/cake_view.js.coffee
index f0faf97e..ac3394bb 100644
--- a/app/assets/javascripts/backbone/views/cakes/cake_view.js.coffee
+++ b/app/assets/javascripts/views/cakes/cake_view.js.coffee
@@ -1,7 +1,7 @@
 CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.CakeView extends Marionette.ItemView
-  template: JST["backbone/templates/cakes/cake"]
+  template: JST["templates/cakes/cake"]
   tagName: 'div'
   className: 'media'
   templateHelpers:
diff --git a/app/assets/javascripts/backbone/views/cakes/delete_cake_modal_view.js.coffee b/app/assets/javascripts/views/cakes/delete_cake_modal_view.js.coffee
index 85253924..45cc51fc 100644
--- a/app/assets/javascripts/backbone/views/cakes/delete_cake_modal_view.js.coffee
+++ b/app/assets/javascripts/views/cakes/delete_cake_modal_view.js.coffee
@@ -1,7 +1,7 @@
 CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.DeleteCakeModalView extends Marionette.ItemView
-  template: JST["backbone/templates/cakes/delete_modal"]
+  template: JST["templates/cakes/delete_modal"]
   ui:
     remove_button: "#remove-button"
     confirmation_textbox: '#confirmation-textbox'
diff --git a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee b/app/assets/javascripts/views/cakes/edit_view.js.coffee
index 84883bd3..2a92f47d 100644
--- a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee
+++ b/app/assets/javascripts/views/cakes/edit_view.js.coffee
@@ -1,8 +1,9 @@
-#= require backbone/views/cakes/thumbnail_view
+#= require views/cakes/thumbnail_view
+
 CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.EditView extends Marionette.CompositeView
-  template : JST["backbone/templates/cakes/edit"]
+  template : JST["templates/cakes/edit"]
   childView: CakeSide.Views.Cakes.ThumbnailView
   childViewContainer: '.card-columns'
   ui:
diff --git a/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee b/app/assets/javascripts/views/cakes/index_view.js.coffee
index 6d6d2f9a..0964e8bd 100644
--- a/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee
+++ b/app/assets/javascripts/views/cakes/index_view.js.coffee
@@ -1,4 +1,5 @@
-#= require backbone/views/cakes/no_cakes_view
+#= require views/cakes/no_cakes_view
+
 CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.IndexView extends Marionette.CollectionView
diff --git a/app/assets/javascripts/backbone/views/cakes/new_view.js.coffee b/app/assets/javascripts/views/cakes/new_view.js.coffee
index 321be655..bf7341a0 100644
--- a/app/assets/javascripts/backbone/views/cakes/new_view.js.coffee
+++ b/app/assets/javascripts/views/cakes/new_view.js.coffee
@@ -1,7 +1,7 @@
 CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.NewView extends Marionette.ItemView
-  template: JST["backbone/templates/cakes/new"]
+  template: JST["templates/cakes/new"]
   ui:
     name: "#cake_name"
     category: "#cake_category_id"
diff --git a/app/assets/javascripts/backbone/views/cakes/no_cakes_view.js.coffee b/app/assets/javascripts/views/cakes/no_cakes_view.js.coffee
index 278d7d37..f85172c2 100644
--- a/app/assets/javascripts/backbone/views/cakes/no_cakes_view.js.coffee
+++ b/app/assets/javascripts/views/cakes/no_cakes_view.js.coffee
@@ -1,5 +1,5 @@
 CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.NoCakesView extends Marionette.ItemView
-  template: JST["backbone/templates/cakes/no_cakes"]
+  template: JST["templates/cakes/no_cakes"]
   tagName: 'li'
diff --git a/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee b/app/assets/javascripts/views/cakes/show_view.js.coffee
index d225e93f..3f8df07d 100644
--- a/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee
+++ b/app/assets/javascripts/views/cakes/show_view.js.coffee
@@ -1,8 +1,9 @@
-#= require backbone/views/cakes/thumbnail_view
+#= require views/cakes/thumbnail_view
+
 CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.ShowView extends Marionette.CompositeView
-  template: JST["backbone/templates/cakes/show"]
+  template: JST["templates/cakes/show"]
   childView: CakeSide.Views.Cakes.ThumbnailView
   childViewContainer: '.card-columns'
 
diff --git a/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee b/app/assets/javascripts/views/cakes/thumbnail_view.js.coffee
index 085a8f11..a22e6e63 100644
--- a/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee
+++ b/app/assets/javascripts/views/cakes/thumbnail_view.js.coffee
@@ -1,7 +1,7 @@
 CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.ThumbnailView extends Marionette.ItemView
-  template: JST['backbone/templates/cakes/thumbnail']
+  template: JST['templates/cakes/thumbnail']
   tagName: 'div'
   className: 'card'
   modelEvents:
diff --git a/app/assets/javascripts/backbone/views/disqus_view.js.coffee b/app/assets/javascripts/views/disqus_view.js.coffee
index 1379691a..1379691a 100644
--- a/app/assets/javascripts/backbone/views/disqus_view.js.coffee
+++ b/app/assets/javascripts/views/disqus_view.js.coffee
diff --git a/app/assets/javascripts/backbone/views/error_view.js.coffee b/app/assets/javascripts/views/error_view.js.coffee
index 86f907e0..0d232fca 100644
--- a/app/assets/javascripts/backbone/views/error_view.js.coffee
+++ b/app/assets/javascripts/views/error_view.js.coffee
@@ -1,5 +1,3 @@
-CakeSide.Views.Cakes ||= {}
-
 class CakeSide.Views.ErrorView extends Backbone.View
   initialize: (options) ->
     @attributesWithErrors = options.attributesWithErrors
diff --git a/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee b/app/assets/javascripts/views/photos/new_modal_view.js.coffee
index b618ef16..deb9c281 100644
--- a/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee
+++ b/app/assets/javascripts/views/photos/new_modal_view.js.coffee
@@ -1,7 +1,7 @@
 CakeSide.Views.Photos ||= {}
 
 class CakeSide.Views.Photos.NewModalView extends Marionette.ItemView
-  template: JST["backbone/templates/photos/new-modal"]
+  template: JST["templates/photos/new-modal"]
   ui:
     watermark: '#watermark'
     upload_button: "#upload-photo-button"
diff --git a/app/assets/javascripts/backbone/views/profiles/show_view.js.coffee b/app/assets/javascripts/views/profiles/show_view.js.coffee
index d7f36ae5..545ac1e0 100644
--- a/app/assets/javascripts/backbone/views/profiles/show_view.js.coffee
+++ b/app/assets/javascripts/views/profiles/show_view.js.coffee
@@ -1,7 +1,7 @@
 CakeSide.Views.Profiles ||= {}
 
 class CakeSide.Views.Profiles.ShowView extends Marionette.ItemView
-  template: JST["backbone/templates/profiles/show"]
+  template: JST["templates/profiles/show"]
   ui:
     name: '#user_name'
     email: '#user_email'
diff --git a/app/assets/javascripts/backbone/views/tutorials/index_view.js.coffee b/app/assets/javascripts/views/tutorials/index_view.js.coffee
index 6cdce8db..764611ed 100644
--- a/app/assets/javascripts/backbone/views/tutorials/index_view.js.coffee
+++ b/app/assets/javascripts/views/tutorials/index_view.js.coffee
@@ -1,5 +1,6 @@
-#= require backbone/views/tutorials/no_tutorials_view
-#= require backbone/views/tutorials/tutorial_view
+#= require views/tutorials/no_tutorials_view
+#= require views/tutorials/tutorial_view
+
 CakeSide.Views.Tutorials ||= {}
 
 class CakeSide.Views.Tutorials.IndexView extends Marionette.CollectionView
diff --git a/app/assets/javascripts/backbone/views/tutorials/new_view.js.coffee b/app/assets/javascripts/views/tutorials/new_view.js.coffee
index e8ba976f..6aca51a7 100644
--- a/app/assets/javascripts/backbone/views/tutorials/new_view.js.coffee
+++ b/app/assets/javascripts/views/tutorials/new_view.js.coffee
@@ -1,6 +1,7 @@
 #= require service/embedly_service
+
 class CakeSide.Views.Tutorials.NewView extends Marionette.ItemView
-  template: JST['backbone/templates/tutorials/new']
+  template: JST['templates/tutorials/new']
   ui:
     url: '#tutorial_url'
     url_group: '#url-group'
diff --git a/app/assets/javascripts/backbone/views/tutorials/no_tutorials_view.js.coffee b/app/assets/javascripts/views/tutorials/no_tutorials_view.js.coffee
index 77b2e71c..979d52e9 100644
--- a/app/assets/javascripts/backbone/views/tutorials/no_tutorials_view.js.coffee
+++ b/app/assets/javascripts/views/tutorials/no_tutorials_view.js.coffee
@@ -1,5 +1,5 @@
 CakeSide.Views.Tutorials ||= {}
 
 class CakeSide.Views.Tutorials.NoTutorialsView extends Marionette.ItemView
-  template: JST['backbone/templates/tutorials/no_tutorials']
+  template: JST['templates/tutorials/no_tutorials']
   tagName: 'li'
diff --git a/app/assets/javascripts/backbone/views/tutorials/show_view.js.coffee b/app/assets/javascripts/views/tutorials/show_view.js.coffee
index 9f6ef782..544338d6 100644
--- a/app/assets/javascripts/backbone/views/tutorials/show_view.js.coffee
+++ b/app/assets/javascripts/views/tutorials/show_view.js.coffee
@@ -1,7 +1,7 @@
 CakeSide.Views.Tutorials ||= {}
 
 class CakeSide.Views.Tutorials.ShowView extends Marionette.ItemView
-  template: JST["backbone/templates/tutorials/show"]
+  template: JST["templates/tutorials/show"]
   templateHelpers:
     displayDate: (date) ->
       date
diff --git a/app/assets/javascripts/backbone/views/tutorials/tutorial_view.js.coffee b/app/assets/javascripts/views/tutorials/tutorial_view.js.coffee
index 2766b53e..6ec82e06 100644
--- a/app/assets/javascripts/backbone/views/tutorials/tutorial_view.js.coffee
+++ b/app/assets/javascripts/views/tutorials/tutorial_view.js.coffee
@@ -1,7 +1,7 @@
 CakeSide.Views.Tutorials ||= {}
 
 class CakeSide.Views.Tutorials.TutorialView extends Marionette.ItemView
-  template: JST['backbone/templates/tutorials/tutorial']
+  template: JST['templates/tutorials/tutorial']
   tagName: 'div'
   className: 'media'