details: http://www.bx.psu.edu/hg/galaxy/rev/2e593cbb6c69 changeset: 2898:2e593cbb6c69 user: jeremy goecks jeremy.goecks@emory.edu date: Tue Oct 20 18:00:08 2009 -0400 description: Changes to User Menu and History|Options menu. User menu now provides direct links to user's histories and datasets. History|Options menu no longer uses the adjective 'My.'
2 file(s) affected in this change:
templates/base_panels.mako templates/root/index.mako
diffs (46 lines):
diff -r ed8ea4318e9a -r 2e593cbb6c69 templates/base_panels.mako --- a/templates/base_panels.mako Tue Oct 20 16:53:18 2009 -0400 +++ b/templates/base_panels.mako Tue Oct 20 18:00:08 2009 -0400 @@ -217,13 +217,12 @@ %endif </ul> <ul class="loggedin-only" style="${style2}"> - <li>Logged in as <span id="user-email">${user_email}</span></li> - <li><a target="galaxy_main" href="${h.url_for( controller='root', action='my_data' )}">My Data</a></li> %if app.config.use_remote_user: %if app.config.remote_user_logout_href: <li><a href="${app.config.remote_user_logout_href}" target="_top">Logout</a></li> %endif %else: + <li>Logged in as <span id="user-email">${user_email}</span></li> <li><a target="galaxy_main" href="${h.url_for( controller='user', action='index' )}">Preferences</a></li> <% if app.config.require_login: @@ -233,7 +232,10 @@ logout_target = "galaxy_main" logout_url = h.url_for( controller='user', action='logout' ) %> - <li><a target="${logout_target}" href="${logout_url}">Logout</a></li> + <li><a target="${logout_target}" href="${logout_url}">Logout ${user_email}</a></li> + <li><hr style="color: inherit; background-color: gray"/></li> + <li><a target="galaxy_main" href="${h.url_for( controller='history', action='list' )}">Histories</a></li> + <li><a target="galaxy_main" href="${h.url_for( controller='dataset', action='list' )}">Datasets</a></li> %endif </ul> </div> diff -r ed8ea4318e9a -r 2e593cbb6c69 templates/root/index.mako --- a/templates/root/index.mako Tue Oct 20 16:53:18 2009 -0400 +++ b/templates/root/index.mako Tue Oct 20 18:00:08 2009 -0400 @@ -7,10 +7,10 @@ $("#history-options-button").css( "position", "relative" ); make_popupmenu( $("#history-options-button"), { "History Lists": null, - "My Saved Histories": function() { + "Saved Histories": function() { galaxy_main.location = "${h.url_for( controller='history', action='list')}"; }, - "My Shared Histories": function() { + "Shared Histories": function() { galaxy_main.location = "${h.url_for( controller='history', action='list', operation='sharing' )}"; }, "Histories Shared with Me": function() {