attempt at merge

1 files changed, 13 insertions, 1 deletions

diff --git a/public/assets/js/lib/router.js b/public/assets/js/lib/router.js
index b6eff73..ebdfa78 100644
--- a/public/assets/js/lib/router.js
+++ b/public/assets/js/lib/router.js
@@ -22,7 +22,9 @@ var SiteRouter = Router.extend({
 		"/mail/compose/:username": 'compose',
 		"/mail/read/:id":          'message',
 		"/mail/reply/:id":         'compose',
-		"/profile":                'profile',
+    "/users":                  'users',
+    "/users/all":              'usersAll',
+    "/profile":                'profile',
 		"/profile/:username":      'profile',
 		"/profile/:username/edit": 'editProfile',
     "/adminz":                 'adminz',
@@ -85,6 +87,16 @@ var SiteRouter = Router.extend({
     app.view.load(keyword || "")
   },
   
+  users: function(username){
+    app.view = new UsersView ()
+    app.view.load()
+  },
+
+  usersAll: function(username){
+    app.view = new UsersView ({ all: true })
+    app.view.load()
+  },
+  
   profile: function(username){
     app.view = new ProfileView ()
     app.view.load(username || auth.user.username)