Merge pull request #18 from dannon/ui_pref_routing

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()

static/maps/mvc/user/user-preferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-preferences.js","sources":["../../../src/mvc/user/user-preferences.js"],"names":["define","Form","Ui","Model","Backbone","extend","initialize","options","user_id","Galaxy","user","id","this","set","information","title","description","url","icon","password","submit_title","communication","permissions","api_key","submit_icon","toolbox_filters","openids","onclick","window","location","href","root","logout","modal","show","body","buttons","Cancel","hide","Sign out","View","model","message","Message","setElement","render","self","config","$","getJSON","data","$preferences","addClass","append","$el","_","escape","email","$table","use_remote_user","_addLink","enable_communication_server","has_user_tool_filters","enable_openid","_templateFooter","empty","action","get","$row","_templateLink","$a","find","on","attr","nice_total_disk_usage","enable_quotas","quota","Forms","page","form_id","ajax","type","done","response","form","inputs","operations","submit","ButtonIcon","tooltip","submit_tooltip","_submit","back","history","fail","status","persistent","JSON","stringify","create","contentType","updated_values","matchModel","input","input_id","field_list","value","update","console","log","responseJSON","err_msg"],"mappings":"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"}
+{"version":3,"file":"user-preferences.js","sources":["../../../src/mvc/user/user-preferences.js"],"names":["define","Form","Ui","Model","Backbone","extend","initialize","options","user_id","Galaxy","user","id","this","set","information","title","description","url","icon","password","submit_title","communication","permissions","api_key","submit_icon","toolbox_filters","openids","onclick","window","location","href","root","logout","modal","show","body","buttons","Cancel","hide","Sign out","View","model","message","Message","setElement","render","self","config","$","getJSON","data","$preferences","addClass","append","$el","_","escape","email","$table","use_remote_user","_addLink","enable_communication_server","has_user_tool_filters","enable_openid","_templateFooter","empty","action","get","$row","_templateLink","$a","find","on","attr","nice_total_disk_usage","enable_quotas","quota","Forms","page","form_id","ajax","type","done","response","form","inputs","operations","submit","ButtonIcon","tooltip","submit_tooltip","_submit","back","history","fail","status","persistent","JSON","stringify","create","contentType","updated_values","matchModel","input","input_id","field_list","value","update","console","log","responseJSON","err_msg"],"mappings":"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"}