merge master

1 files changed, 13 insertions, 9 deletions

diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index 4ff3581..d07810e 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -36,11 +36,18 @@ var SiteRouter = Router.extend({
 		"/project":             'projectPicker',
 		"/project/new":         'newProject',
 		"/project/new/:layout": 'projectNewWithLayout',
-		"/project/:name":       'project',
+		"/project/:name":       'projectViewer',
+		"/project/:name/edit":  'projectEditor',
 		"/project/:name/view":  'projectViewer',
 		
 		"/test/wallpaper":      'testWallpaper',
 	},
+	
+	mobileRoutes: {
+		"/":                    'home',
+		"/profile":             'profile',
+		"/project/:name":       'projectViewer',
+	},
 
 	initialize: function(){
 		this.signUpModal = new SignUpModal()
@@ -56,6 +63,11 @@ var SiteRouter = Router.extend({
 		
 		this.route()
 		
+		if (is_mobile) {
+			$(".topLinks").hide()
+			$(".share").hide()
+		}
+		
 		$("body").removeClass("loading")
 	},
 
@@ -123,14 +135,6 @@ var SiteRouter = Router.extend({
 		this.readerView.load(name)
 	},
 
-/*
-	editProject: function(e){
-		e && e.preventDefault()
-		window.history.pushState(null, document.title, "/project/edit")	
-		this.editProjectModal.load()
-	},
-*/
-
 	signup: function(e){
 		e && e.preventDefault()
 		window.history.pushState(null, document.title, "/signup")