diff --git a/lib/galaxy/web/controllers/user.py b/lib/galaxy/web/controllers/user.py index 211d6b941b3..5cc134c1350 100644 --- a/lib/galaxy/web/controllers/user.py +++ b/lib/galaxy/web/controllers/user.py @@ -10,26 +10,17 @@ from random import choice log = logging.getLogger( __name__ ) class User( BaseController ): + @web.expose def index( self, trans, **kwd ): - if trans.get_user(): - trans.response.send_redirect("/user/account") - return trans.fill_template('user_main.tmpl') + return trans.fill_template( '/user/index.mako', user=trans.get_user() ) - @web.expose - def account( self, trans, **kwd ): - msg = '' - user = trans.get_user() - if not user: - trans.response.send_redirect("/user/login") - return trans.fill_template('user_account.tmpl', user=user, history=trans.get_history(), msg=msg) - @web.expose def change_password(self, trans, old_pass='', new_pass='', conf_pass='', **kwd): old_pass_err = new_pass_err = conf_pass_err = '' user = trans.get_user() if not user: - trans.response.send_redirect( "/user/login" ) + trans.response.send_redirect( web.url_for( action='login' ) ) if trans.request.method == 'POST': if not user.check_password( old_pass ): old_pass_err = "Invalid password" @@ -44,7 +35,7 @@ class User( BaseController ): return trans.show_ok_message( "Password has been changed for " + user.email) # Generate input form return trans.show_form( - web.FormBuilder( "/user/change_password", "Change Password", submit_text="Submit" ) + web.FormBuilder( web.url_for() , "Change Password", submit_text="Submit" ) .add_password( "old_pass", "Old Password", value='', error=old_pass_err ) .add_password( "new_pass", "New Password", value='', error=new_pass_err ) .add_password( "conf_pass", "Confirm Password", value='', error=conf_pass_err ) ) @@ -54,7 +45,7 @@ class User( BaseController ): email_err = conf_email_err = pass_err = '' user = trans.get_user() if not user: - trans.response.send_redirect("/user/login") + trans.response.send_redirect( web.url_for( action='login' ) ) if trans.request.method == "POST": if not user.check_password( password ): pass_err = "Invalid password" @@ -72,7 +63,7 @@ class User( BaseController ): trans.log_event( "User change email" ) return trans.show_ok_message( "Email has been changed to: " + user.email, refresh_frames=['masthead', 'history'] ) return trans.show_form( - web.FormBuilder( "/user/change_email", "Change Email", submit_text="Submit" ) + web.FormBuilder( web.url_for(), "Change Email", submit_text="Submit" ) .add_text( "email", "Email", value=email, error=email_err ) .add_text( "conf_email", "Confirm Email", value='', error=conf_email_err ) .add_password( "password", "Password", value='', error=pass_err ) ) @@ -95,10 +86,10 @@ class User( BaseController ): trans.log_event( "User logged in" ) return trans.show_ok_message( "Now logged in as " + user.email, refresh_frames=['masthead', 'history'] ) return trans.show_form( - web.FormBuilder( "/user/login", "Login", submit_text="Login" ) + web.FormBuilder( web.url_for(), "Login", submit_text="Login" ) .add_text( "email", "Email address", value=email, error=email_error ) .add_password( "password", "Password", value='', error=password_error, - help="Forgot password? Reset here" ) ) + help="Forgot password? Reset here" % web.url_for( action='reset_password' ) ) ) @web.expose def logout( self, trans ): @@ -144,7 +135,7 @@ class User( BaseController ): return trans.show_warn_message( "Now logged in as " + user.email+". However, subscribing to the mailing list has failed.", refresh_frames=['masthead', 'history'] ) return trans.show_ok_message( "Now logged in as " + user.email, refresh_frames=['masthead', 'history'] ) return trans.show_form( - web.FormBuilder( "/user/create", "Create account", submit_text="Create" ) + web.FormBuilder( web.url_for(), "Create account", submit_text="Create" ) .add_text( "email", "Email address", value=email, error=email_error ) .add_password( "password", "Password", value='', error=password_error ) .add_password( "confirm", "Confirm password", value='', error=confirm_error ) @@ -174,5 +165,5 @@ class User( BaseController ): elif email != None: error = "The specified user does not exist" return trans.show_form( - web.FormBuilder( "/user/reset_password", "Reset Password", submit_text="Submit" ) + web.FormBuilder( web.url_for(), "Reset Password", submit_text="Submit" ) .add_text( "email", "Email", value=email, error=error ) ) diff --git a/templates/base.mako b/templates/base.mako new file mode 100644 index 00000000000..f5bfac89e0e --- /dev/null +++ b/templates/base.mako @@ -0,0 +1,21 @@ + + + + +${self.title()} + +${self.stylesheets()} + + + + ${next.body()} + + + +## Default title +<%def name="title()"> + +## Default stylesheets +<%def name="stylesheets()"> + + \ No newline at end of file diff --git a/templates/user/index.mako b/templates/user/index.mako new file mode 100644 index 00000000000..2b11262cece --- /dev/null +++ b/templates/user/index.mako @@ -0,0 +1,19 @@ +<%inherit file="/base.mako"/> +<%def name="title()">Account settings + +

Account settings

+ +%if user: +

You are currently logged in as ${user.email}.

+ +%else: +

You are currently not logged in.

+ +%endif \ No newline at end of file diff --git a/templates/user_account.tmpl b/templates/user_account.tmpl deleted file mode 100644 index 894bb2a6cfd..00000000000 --- a/templates/user_account.tmpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - -User Settings - - - - - - -
-

User settings for $user.email

- #if $msg: -

$msg

- #end if - -

Account settings

- - -
- - \ No newline at end of file diff --git a/templates/user_main.tmpl b/templates/user_main.tmpl deleted file mode 100644 index aaf189359d8..00000000000 --- a/templates/user_main.tmpl +++ /dev/null @@ -1,22 +0,0 @@ - - - - -Galaxy User Options - - - - - - -
-
User Options
-
- - - -
You may login here.
If you don't have an account you can make one here.
-
-
- - \ No newline at end of file