User->Users

client/galaxy/scripts/apps/analysis.js

@@ -101,8 +101,8 @@ window.app = function app( options, bootstrapped ){
             // TODO: remove annoying 'root' from root urls
             '(/)root*' : 'home',
             '(/)tours(/)(:tour_id)' : 'show_tours',
-            '(/)users(/)' : 'show_users',
-            '(/)users(/)(:form_id)' : 'show_user_form',
+            '(/)user(/)' : 'show_user',
+            '(/)user(/)(:form_id)' : 'show_user_form',
         },
 
         show_tours : function( tour_id ){
@@ -113,7 +113,7 @@ window.app = function app( options, bootstrapped ){
             }
         },
 
-        show_users : function(){
+        show_user : function(){
             centerPanel.display( new UserPreferences.View() );
         },
 

client/galaxy/scripts/layout/menu.js

@@ -247,10 +247,10 @@ var Collection = Backbone.Collection.extend({
                         title   : 'Logged in as ' + Galaxy.user.get( 'email' )
                     },{
                         title   : 'Preferences',
-                        url     : 'users',
+                        url     : 'user',
                         target  : 'galaxy_main',
                         onclick : function() {
-                            window.location = Galaxy.root + 'users';
+                            window.location = Galaxy.root + 'user';
                         }
                     },{
                         title   : 'Custom Builds',

client/galaxy/scripts/mvc/user/user-preferences.js

@@ -123,7 +123,7 @@ define( [ 'mvc/form/form-view', 'mvc/ui/ui-misc' ], function( Form, Ui ) {
             if ( options.onclick ) {
                 $a.on( 'click', function() { options.onclick() } );
             } else {
-                $a.attr( 'href', Galaxy.root + 'users/' + action );
+                $a.attr( 'href', Galaxy.root + 'user/' + action );
             }
             this.$table.append( $row );
         },

lib/galaxy/webapps/galaxy/buildapp.py

@@ -64,16 +64,6 @@ def paste_app_factory( global_conf, **kwargs ):
     # Create the universe WSGI application
     webapp = GalaxyWebApplication( app, session_cookie='galaxysession', name='galaxy' )
 
-    # CLIENTSIDE ROUTES
-    # The following are routes that are handled completely on the clientside.
-    # The following routes don't bootstrap any information, simply provide the
-    # base analysis interface at which point the application takes over.
-
-    webapp.add_client_route( '/tours' )
-    webapp.add_client_route( '/tours/{tour_id}' )
-    webapp.add_client_route( '/users' )
-    webapp.add_client_route( '/users/{form_id}' )
-
     # STANDARD CONTROLLER ROUTES
     webapp.add_ui_controllers( 'galaxy.webapps.galaxy.controllers', app )
     # Force /history to go to view of current
@@ -111,6 +101,16 @@ def paste_app_factory( global_conf, **kwargs ):
     # isolation as well.
     populate_api_routes( webapp, app )
 
+    # CLIENTSIDE ROUTES
+    # The following are routes that are handled completely on the clientside.
+    # The following routes don't bootstrap any information, simply provide the
+    # base analysis interface at which point the application takes over.
+
+    webapp.add_client_route( '/tours' )
+    webapp.add_client_route( '/tours/{tour_id}' )
+    webapp.add_client_route( '/user' )
+    webapp.add_client_route( '/user/{form_id}' )
+
     # ==== Done
     # Indicate that all configuration settings have been provided
     webapp.finalize_config()