bring in lightcontrol & wallpaper picker

1 files changed, 11 insertions, 11 deletions

diff --git a/public/assets/javascripts/ui/SiteRouter.js b/public/assets/javascripts/ui/SiteRouter.js
index 664cbb2..3bd783b 100644
--- a/public/assets/javascripts/ui/SiteRouter.js
+++ b/public/assets/javascripts/ui/SiteRouter.js
@@ -11,7 +11,7 @@ var SiteRouter = Router.extend({
 		"click [data-role='new-document-modal']": 'newDocument',
 		"click [data-role='edit-document-modal']": 'editDocument',
 		"click [data-role='delete-document-modal']": 'destroyDocument',
-		"click [data-role='show-layouts-modal']": 'pickLayout',
+		"click [data-role='show-layouts-modal']": 'layoutPicker',
 	},
 	
 	routes: {
@@ -22,13 +22,13 @@ var SiteRouter = Router.extend({
 		"/about/:name/edit":    'editDocument',
 		"/about/new":           'newDocument',
 
-		"/layout":              'pickLayout',
-		"/layout/:name":        'layouts',
+		"/layout":              'layoutPicker',
+		"/layout/:name":        'layoutEditor',
 
-		"/project":             'pickProject',
+		"/project":             'projectPicker',
 		"/project/new":         'newProject',
-		"/project/new/:layout": 'newProjectWithLayout',
-		"/project/:name":       'editor',
+		"/project/new/:layout": 'projectNewWithLayout',
+		"/project/:name":       'projectEditor',
 	},
 
 	initialize: function(){
@@ -47,7 +47,7 @@ var SiteRouter = Router.extend({
 	},
 
 
-	builder: function(e, name){
+	layoutEditor: function(e, name){
 		app.mode.builder = true
 		app.launch()
 
@@ -55,14 +55,14 @@ var SiteRouter = Router.extend({
 		this.builderView.load(name)
 	},
 	
-	pickLayout: function(e){
+	layoutPicker: function(e){
 		e && e.preventDefault()
 		window.history.pushState(null, document.title, "/layout")
 		this.layoutsModal.load()
 	},
 
 
-	pickProject: function(e){
+	projectPicker: function(e){
 		e && e.preventDefault()
 		window.history.pushState(null, document.title, "/project")
 		this.projectsModal.load()
@@ -74,7 +74,7 @@ var SiteRouter = Router.extend({
 		this.newProjectModal.load()
 	},
 
-	newProjectWithLayout: function(e, layout){
+	projectNewWithLayout: function(e, layout){
 		e && e.preventDefault()
 
 		app.mode.editor = true
@@ -87,7 +87,7 @@ var SiteRouter = Router.extend({
 		this.editorView.loadLayout(layout)
 	},
 
-	editor: function(e, layout){
+	projectEditor: function(e, layout){
 		app.mode.editor = true
 		app.launch()