Commit b8dfe131

@@ -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:

@@ -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'

@@ -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:

@@ -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

@@ -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"

@@ -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'

@@ -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'
 

@@ -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:

@@ -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"

@@ -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'

@@ -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

@@ -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'

@@ -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'

@@ -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

@@ -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'
 

@@ -1,5 +1,3 @@
-CakeSide.Views.Cakes ||= {}
-
 class CakeSide.Views.ErrorView extends Backbone.View
   initialize: (options) ->
     @attributesWithErrors = options.attributesWithErrors

@@ -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);

@@ -4,6 +4,7 @@
 #= require_tree ./views
 #= require_tree ./controllers
 #= require_tree ./routers
+#= require_tree ./service
 
 window.CakeSide =
   Models: {}