opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update all template url_for invocations to explicitly specify a controller. This is preparation for removing the deprecated Routes mapper.explicit option.

Browse Source
This commit is contained in:
Dannon Baker
2013-02-05 21:42:21 -05:00
parent 5c98fdda30
commit cae989cd5e
46 changed files with 108 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/admin/dataset_security/group/group.mako
+1 -1
View File
@@ -50,7 +50,7 @@ $().ready(function() {
<div class="toolForm">
<div class="toolFormTitle">Group '${group.name}'</div>
<div class="toolFormBody">
<form name="associate_group_role_user" id="associate_group_role_user" action="${h.url_for( action='manage_users_and_roles_for_group', id=trans.security.encode_id( group.id ) )}" method="post" >
<form name="associate_group_role_user" id="associate_group_role_user" action="${h.url_for(controller='admin', action='manage_users_and_roles_for_group', id=trans.security.encode_id( group.id ) )}" method="post" >
<div class="form-row">
<div style="float: left; margin-right: 10px;">
<label>Roles associated with '${group.name}'</label>
templates/admin/dataset_security/group/group_create.mako
+1 -1
View File
@@ -55,7 +55,7 @@ $().ready(function() {
<div class="toolForm">
<div class="toolFormTitle">Create Group</div>
<div class="toolFormBody">
<form name="associate_group_role_user" id="associate_group_role_user" action="${h.url_for( action='create_group' )}" method="post" >
<form name="associate_group_role_user" id="associate_group_role_user" action="${h.url_for(controller='admin', action='create_group' )}" method="post" >
<div class="form-row">
<label>Name:</label>
<input name="name" type="textfield" value="${name}" size=40"/>
templates/admin/dataset_security/role/role.mako
+1 -1
View File
@@ -50,7 +50,7 @@ $().ready(function() {
<div class="toolForm">
<div class="toolFormTitle">Role '${role.name}'</div>
<div class="toolFormBody">
<form name="associate_role_user_group" id="associate_role_user_group" action="${h.url_for( action='manage_users_and_groups_for_role', id=trans.security.encode_id( role.id ) )}" method="post" >
<form name="associate_role_user_group" id="associate_role_user_group" action="${h.url_for(controller='admin', action='manage_users_and_groups_for_role', id=trans.security.encode_id( role.id ) )}" method="post" >
<div class="form-row">
<div style="float: left; margin-right: 10px;">
<label>Users associated with '${role.name}'</label>
templates/admin/dataset_security/role/role_create.mako
+1 -1
View File
@@ -55,7 +55,7 @@
<div class="toolForm">
<div class="toolFormTitle">Create Role</div>
<div class="toolFormBody">
<form name="associate_role_group_user" id="associate_role_group_user" action="${h.url_for( action='create_role' )}" method="post" >
<form name="associate_role_group_user" id="associate_role_group_user" action="${h.url_for(controller='admin', action='create_role' )}" method="post" >
<div class="form-row">
<label>Name:</label>
<input name="name" type="textfield" value="${name}" size=40"/>
templates/admin/jobs.mako
+3 -3
View File
@@ -37,7 +37,7 @@
<p/>
%if jobs:
<form name="jobs" action="${h.url_for()}" method="POST">
<form name="jobs" action="${h.url_for(controller='admin', action='jobs')}" method="POST">
<table class="manage-table colored" border="0" cellspacing="0" cellpadding="0" width="100%">
<tr class="header">
<td><input type="checkbox" onClick="toggle_all(this)"/></td>
@@ -101,7 +101,7 @@
<div class="infomessage">There are no unfinished jobs to show with current cutoff time.</div>
<p/>
%endif
<form name="jobs" action="${h.url_for()}" method="POST">
<form name="jobs" action="${h.url_for(controller='admin', action='jobs')}" method="POST">
<div class="toolForm">
<div class="toolFormTitle">
Update Jobs
@@ -125,7 +125,7 @@
</div>
</div>
</form>
<form name="jobs" action="${h.url_for()}" method="POST">
<form name="jobs" action="${h.url_for(controller='admin', action='jobs')}" method="POST">
<p/>
<div class="toolForm">
<div class="toolFormTitle">
templates/admin/memdump.mako
+1 -1
View File
@@ -37,7 +37,7 @@
id = None
new_s += re.sub( id_re, r'\1<a href="' + h.url_for( controller='admin', action='memdump', ids=ids, sorts=sorts, new_id=id ) + r'">\2</a>', line )
if id and heap[int(id)].count == 1:
new_s += " <a href='%s'>theone</a>\n" % h.url_for( ids=ids, sorts=sorts, new_id=id, theone=True )
new_s += " <a href='%s'>theone</a>\n" % h.url_for( controller='admin', action='memdump', ids=ids, sorts=sorts, new_id=id, theone=True )
else:
new_s += "\n"
return new_s
templates/admin/quota/quota.mako
+1 -1
View File
@@ -50,7 +50,7 @@ $().ready(function() {
<div class="toolForm">
<div class="toolFormTitle">Quota '${name}'</div>
<div class="toolFormBody">
<form name="associate_quota_user_group" id="associate_quota_user_group" action="${h.url_for( action='manage_users_and_groups_for_quota', id=id )}" method="post" >
<form name="associate_quota_user_group" id="associate_quota_user_group" action="${h.url_for(controller='admin', action='manage_users_and_groups_for_quota', id=id )}" method="post" >
<div class="form-row">
<div style="float: left; margin-right: 10px;">
<label>Users associated with '${name}'</label>
templates/admin/quota/quota_create.mako
+1 -1
View File
@@ -64,7 +64,7 @@
<div class="toolForm">
<div class="toolFormTitle">Create quota</div>
<div class="toolFormBody">
<form name="associate_quota_group_user" id="associate_quota_group_user" action="${h.url_for( action='create_quota' )}" method="post" >
<form name="associate_quota_group_user" id="associate_quota_group_user" action="${h.url_for(controller='admin', action='create_quota' )}" method="post" >
<div class="form-row">
<label>Name:</label>
<input name="name" type="textfield" value="${name}" size=40"/>
templates/admin/quota/quota_set_default.mako
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="toolForm">
<div class="toolFormTitle">Set quota default</div>
<div class="toolFormBody">
<form name="set_quota_default" id="set_quota_default" action="${h.url_for( action='set_quota_default' )}" method="post" >
<form name="set_quota_default" id="set_quota_default" action="${h.url_for(controller='admin', action='set_quota_default' )}" method="post" >
<input name="id" type="hidden" value="${id}"/>
<div class="form-row">
<label>Is this quota a default for a class of users (if yes, what type)?</label>
templates/admin/user/user.mako
+1 -1
View File
@@ -50,7 +50,7 @@ $().ready(function() {
<div class="toolForm">
<div class="toolFormTitle">User '${user.email}'</div>
<div class="toolFormBody">
<form name="associate_user_role_group" id="associate_user_role_group" action="${h.url_for( action='manage_roles_and_groups_for_user', id=trans.security.encode_id( user.id ) )}" method="post" >
<form name="associate_user_role_group" id="associate_user_role_group" action="${h.url_for(controller='admin', action='manage_roles_and_groups_for_user', id=trans.security.encode_id( user.id ) )}" method="post" >
<div class="form-row">
<div style="float: left; margin-right: 10px;">
<label>Roles associated with '${user.email}'</label>
templates/export_base.mako
+6 -5
View File
@@ -37,6 +37,7 @@
self.item_class_name_lc = self.item_class_name.lower()
self.item_class_plural_name = get_class_plural_display_name( item.__class__ )
self.item_class_plural_name_lc = self.item_class_plural_name.lower()
self.controller = get_controller_name(item)
%>
</%def>
@@ -77,18 +78,18 @@
%if item.importable:
Use this URL to import the ${get_class_display_name( item.__class__ ).lower()} directly into another Galaxy server:
<div class="display-url">
${h.url_for( action='for_direct_import', id=trans.security.encode_id( item.id ), qualified=True )}
${h.url_for(controller=self.controller, action='for_direct_import', id=trans.security.encode_id( item.id ), qualified=True )}
</div>
(Copy this URL into the box titled 'Workflow URL' in the Import Workflow page.)
%else:
<a href="${h.url_for( action='sharing', id=trans.security.encode_id( item.id ) )}">This ${get_class_display_name( item.__class__ ).lower()} must be accessible before it can be imported into another Galaxy.</a>
<a href="${h.url_for(controller=self.controller, action='sharing', id=trans.security.encode_id( item.id ) )}">This ${get_class_display_name( item.__class__ ).lower()} must be accessible before it can be imported into another Galaxy.</a>
%endif
</%def>
<%def name="render_download_to_file(item)">
<h3>Download to File</h3>
<a href="${h.url_for( action='export_to_file', id=trans.security.encode_id( item.id ) )}">
<a href="${h.url_for(controller=self.controller, action='export_to_file', id=trans.security.encode_id( item.id ) )}">
Download ${get_class_display_name( item.__class__ ).lower()} to file so that it can be saved or imported into another Galaxy server.</a>
</%def>
@@ -98,7 +99,7 @@
<%def name="render_footer()">
<p><br><br>
<a href="${h.url_for( action="list" )}">Back to ${self.item_class_plural_name} List</a>
<a href="${h.url_for(controller=self.controller, action="list" )}">Back to ${self.item_class_plural_name} List</a>
</%def>
<%def name="body()">
@@ -114,4 +115,4 @@
${self.render_more(item)}
${self.render_footer()}
</%def>
</%def>
templates/ind_share_base.mako
+4 -3
View File
@@ -76,6 +76,7 @@
item_class_name_lc = item_class_name.lower()
item_class_plural_name = get_class_plural_display_name( item.__class__ )
item_class_plural_name_lc = item_class_plural_name.lower()
item_controller = get_controller_name(item)
# Get item name.
item_name = get_item_name(item)
@@ -84,7 +85,7 @@
<div class="toolForm">
<div class="toolFormTitle">Share ${item_class_name} '${item_name}' with Another User</div>
<div class="toolFormBody">
<form action="${h.url_for( action='share', id=trans.security.encode_id( item.id ) )}" method="POST">
<form action="${h.url_for(controller=item_controller, action='share', id=trans.security.encode_id( item.id ) )}" method="POST">
<div class="form-row">
<label>
Email address of user to share with
@@ -98,11 +99,11 @@
<input type="submit" value="Share"></input>
</div>
<div class="form-row">
<a href="${h.url_for( action="sharing", id=trans.security.encode_id( item.id ) )}">Back to ${item_class_name}'s Sharing Home</a>
<a href="${h.url_for(controller=item_controller, action="sharing", id=trans.security.encode_id( item.id ) )}">Back to ${item_class_name}'s Sharing Home</a>
</div>
</form>
</div>
</div>
</div>
</%def>
</%def>
templates/sharing_base.mako
+15 -14
View File
@@ -100,6 +100,7 @@
<%def name="body()">
## Set use_panels var for use in page's URLs.
<% use_panels = context.get('use_panels', False) %>
<% controller_name = get_controller_name( item ) %>
## Render message.
%if message:
@@ -127,7 +128,7 @@
%if trans.get_user().username is None or trans.get_user().username is "":
<p>To make a ${item_class_name_lc} accessible via link or publish it, you must create a public username:</p>
<form action="${h.url_for( action='set_public_username', id=trans.security.encode_id( item.id ) )}"
<form action="${h.url_for( controller=controller_name, action='set_public_username', id=trans.security.encode_id( item.id ) )}"
method="POST">
<div class="form-row">
<label>Public Username:</label>
@@ -157,7 +158,7 @@
<blockquote>
<%
url = h.url_for( action='display_by_username_and_slug', username=trans.get_user().username, slug=item.slug, qualified=True )
url = h.url_for( controller=controller_name, action='display_by_username_and_slug', username=trans.get_user().username, slug=item.slug, qualified=True )
url_parts = url.split("/")
%>
<a id="item-url" href="${url}" target="_top">${url}</a>
@@ -169,29 +170,29 @@
</blockquote>
%if item.published:
This ${item_class_name_lc} is publicly listed and searchable in Galaxy's <a href='${h.url_for( action='list_published' )}' target="_top">Published ${item_class_plural_name}</a> section.
This ${item_class_name_lc} is publicly listed and searchable in Galaxy's <a href='${h.url_for( controller=controller_name, action='list_published' )}' target="_top">Published ${item_class_plural_name}</a> section.
%endif
</div>
<p>You can:
<div>
<form action="${h.url_for( action='sharing', id=trans.security.encode_id( item.id ) )}" method="POST">
<form action="${h.url_for( controller=controller_name, action='sharing', id=trans.security.encode_id( item.id ) )}" method="POST">
%if not item.published:
## Item is importable but not published. User can disable importable or publish.
<input class="action-button" type="submit" name="disable_link_access" value="Disable Access to ${item_class_name} Link">
<div class="toolParamHelp">Disables ${item_class_name_lc}'s link so that it is not accessible.</div>
<br />
<input class="action-button" type="submit" name="publish" value="Publish ${item_class_name}" method="POST">
<div class="toolParamHelp">Publishes the ${item_class_name_lc} to Galaxy's <a href='${h.url_for( action='list_published' )}' target="_top">Published ${item_class_plural_name}</a> section, where it is publicly listed and searchable.</div>
<div class="toolParamHelp">Publishes the ${item_class_name_lc} to Galaxy's <a href='${h.url_for( controller=controller_name, action='list_published' )}' target="_top">Published ${item_class_plural_name}</a> section, where it is publicly listed and searchable.</div>
<br />
%else: ## item.published == True
## Item is importable and published. User can unpublish or disable import and unpublish.
<input class="action-button" type="submit" name="unpublish" value="Unpublish ${item_class_name}">
<div class="toolParamHelp">Removes this ${item_class_name_lc} from Galaxy's <a href='${h.url_for( action='list_published' )}' target="_top">Published ${item_class_plural_name}</a> section so that it is not publicly listed or searchable.</div>
<div class="toolParamHelp">Removes this ${item_class_name_lc} from Galaxy's <a href='${h.url_for(controller=controller_name, action='list_published' )}' target="_top">Published ${item_class_plural_name}</a> section so that it is not publicly listed or searchable.</div>
<br />
<input class="action-button" type="submit" name="disable_link_access_and_unpublish" value="Disable Access to ${item_class_name} via Link and Unpublish">
<div class="toolParamHelp">Disables this ${item_class_name_lc}'s link so that it is not accessible and removes ${item_class_name_lc} from Galaxy's <a href='${h.url_for( action='list_published' )}' target='_top'>Published ${item_class_plural_name}</a> section so that it is not publicly listed or searchable.</div>
<div class="toolParamHelp">Disables this ${item_class_name_lc}'s link so that it is not accessible and removes ${item_class_name_lc} from Galaxy's <a href='${h.url_for(controller=controller_name, action='list_published' )}' target='_top'>Published ${item_class_plural_name}</a> section so that it is not publicly listed or searchable.</div>
%endif
</form>
</div>
@@ -200,13 +201,13 @@
<p>This ${item_class_name_lc} is currently restricted so that only you and the users listed below can access it. You can:</p>
<form action="${h.url_for( action='sharing', id=trans.security.encode_id(item.id) )}" method="POST">
<form action="${h.url_for(controller=controller_name, action='sharing', id=trans.security.encode_id(item.id) )}" method="POST">
<input class="action-button" type="submit" name="make_accessible_via_link" value="Make ${item_class_name} Accessible via Link">
<div class="toolParamHelp">Generates a web link that you can share with other people so that they can view and import the ${item_class_name_lc}.</div>
<br />
<input class="action-button" type="submit" name="make_accessible_and_publish" value="Make ${item_class_name} Accessible and Publish" method="POST">
<div class="toolParamHelp">Makes the ${item_class_name_lc} accessible via link (see above) and publishes the ${item_class_name_lc} to Galaxy's <a href='${h.url_for( action='list_published' )}' target='_top'>Published ${item_class_plural_name}</a> section, where it is publicly listed and searchable.</div>
<div class="toolParamHelp">Makes the ${item_class_name_lc} accessible via link (see above) and publishes the ${item_class_name_lc} to Galaxy's <a href='${h.url_for(controller=controller_name, action='list_published' )}' target='_top'>Published ${item_class_plural_name}</a> section, where it is publicly listed and searchable.</div>
</form>
%endif
@@ -237,7 +238,7 @@
</td>
<td>
<div popupmenu="user-${i}-popup">
<a class="action-button" href="${h.url_for( action='sharing', id=trans.security.encode_id( item.id ), unshare_user=trans.security.encode_id( user.id ), use_panels=use_panels )}">Unshare</a>
<a class="action-button" href="${h.url_for(controller=controller_name, action='sharing', id=trans.security.encode_id( item.id ), unshare_user=trans.security.encode_id( user.id ), use_panels=use_panels )}">Unshare</a>
</div>
</td>
</tr>
@@ -246,7 +247,7 @@
<p>
<a class="action-button"
href="${h.url_for( action='share', id=trans.security.encode_id(item.id), use_panels=use_panels )}">
href="${h.url_for(controller=controller_name, action='share', id=trans.security.encode_id(item.id), use_panels=use_panels )}">
<span>Share with another user</span>
</a>
@@ -255,7 +256,7 @@
<p>You have not shared this ${item_class_name_lc} with any users.</p>
<a class="action-button"
href="${h.url_for( action='share', id=trans.security.encode_id(item.id), use_panels=use_panels )}">
href="${h.url_for(controller=controller_name, action='share', id=trans.security.encode_id(item.id), use_panels=use_panels )}">
<span>Share with a user</span>
</a>
<br />
@@ -266,5 +267,5 @@
%endif
<br /><br />
<a href="${h.url_for( action="list" )}">Back to ${item_class_plural_name} List</a>
</%def>
<a href="${h.url_for(controller=controller_name, action="list" )}">Back to ${item_class_plural_name} List</a>
</%def>
templates/user/index.mako
+2 -2
View File
@@ -43,7 +43,7 @@
<p>${n_('You are currently not logged in.')}</p>
%endif
<ul>
<li><a href="${h.url_for( action='login' )}">${_('Login')}</li>
<li><a href="${h.url_for( action='create', cntrller='user' )}">${_('Register')}</a></li>
<li><a href="${h.url_for( controller='user', action='login' )}">${_('Login')}</li>
<li><a href="${h.url_for( controller='user', action='create', cntrller='user' )}">${_('Register')}</a></li>
</ul>
%endif
templates/user/openid_associate.mako
+1 -1
View File
@@ -59,7 +59,7 @@
%endif
<br/>
<% form_action = h.url_for( cntrller=cntrller, use_panels=use_panels ) %>
<% form_action = h.url_for( controller='user', action='openid_associate', cntrller=cntrller, use_panels=use_panels ) %>
${render_login_form( form_action=form_action )}
templates/webapps/community/admin/index.mako
+1 -1
View File
@@ -133,7 +133,7 @@
<%def name="center_panel()">
<%
center_url = h.url_for( action='center' )
center_url = h.url_for(controller='admin', action='center' )
%>
<iframe name="galaxy_main" id="galaxy_main" frameborder="0" style="position: absolute; width: 100%; height: 100%;" src="${center_url}"> </iframe>
</%def>
templates/webapps/community/category/create_category.mako
+1 -1
View File
@@ -17,7 +17,7 @@
<div class="toolForm">
<div class="toolFormTitle">Create Category</div>
<div class="toolFormBody">
<form name="create_category_form" id="create_category_form" action="${h.url_for( action='create_category' )}" method="post" >
<form name="create_category_form" id="create_category_form" action="${h.url_for(controller='admin', action='create_category' )}" method="post" >
<div class="form-row">
<label>Name:</label>
<input name="name" type="textfield" value="${name | h}" size=40"/>
templates/webapps/galaxy/dataset/errors.mako
+1 -1
View File
@@ -60,7 +60,7 @@
<div class="toolForm">
<div class="toolFormTitle">Error Report</div>
<div class="toolFormBody">
<form name="report_error" action="${h.url_for( action='report_error')}" method="post" >
<form name="report_error" action="${h.url_for(controller='dataset', action='report_error')}" method="post" >
<input type="hidden" name="id" value="${hda.id}" />
<div class="form-row">
<label>Your email</label>
templates/webapps/galaxy/history/permissions.mako
+1 -1
View File
@@ -4,5 +4,5 @@
%if trans.user:
<% history = trans.get_history() %>
${render_permission_form( history, history.name, h.url_for(), trans.user.all_roles() )}
${render_permission_form( history, history.name, h.url_for(controller='root'), trans.user.all_roles() )}
%endif
templates/webapps/galaxy/history/share.mako
+1 -1
View File
@@ -7,7 +7,7 @@
<div class="toolFormBody">
%if not can_change and not cannot_change and not no_change_needed:
## We are sharing histories that contain only public datasets
<form name='share' id='share' action="${h.url_for( action='share' )}" method="post" >
<form name='share' id='share' action="${h.url_for( controller='history', action='share' )}" method="post" >
<div class="form-title-row"><b>Histories to be shared:</b></div>
<div class="form-row" style="padding-left: 2em;">
<table width="100%">
templates/webapps/galaxy/history/view.mako
+3 -3
View File
@@ -94,13 +94,13 @@
## Render view of history.
<div id="top-links" class="historyLinks" style="padding: 0px 0px 5px 0px">
%if not history.purged:
<a href="${h.url_for( action='imp', id=trans.security.encode_id(history.id) )}">import and start using history</a> |
<a href="${h.url_for(controller='history', action='imp', id=trans.security.encode_id(history.id) )}">import and start using history</a> |
<a href="${get_history_link( history )}">${_('refresh')}</a> |
%endif
%if show_deleted:
<a href="${h.url_for( id=trans.security.encode_id(history.id), show_deleted=False, use_panels=use_panels )}">${_('hide deleted')}</a> |
<a href="${h.url_for(controller='history', id=trans.security.encode_id(history.id), show_deleted=False, use_panels=use_panels )}">${_('hide deleted')}</a> |
%else:
<a href="${h.url_for( id=trans.security.encode_id(history.id), show_deleted=True, use_panels=use_panels )}">${_('show deleted')}</a> |
<a href="${h.url_for(controller='history', id=trans.security.encode_id(history.id), show_deleted=True, use_panels=use_panels )}">${_('show deleted')}</a> |
%endif
<a href="#" class="toggle">collapse all</a>
</div>
templates/webapps/galaxy/mobile/dataset/detail.mako
+1 -1
View File
@@ -20,7 +20,7 @@
</div>
%if dataset.state == "ok":
<div class="row">
<a href="${h.url_for( action='dataset_peek', id=dataset.id )}">Peek</a>
<a href="${h.url_for(controller='mobile', action='dataset_peek', id=dataset.id )}">Peek</a>
</div>
%endif
</fieldset>
templates/webapps/galaxy/mobile/history/detail.mako
+1 -1
View File
@@ -30,7 +30,7 @@
%endif
</div>
<a href="${h.url_for( action="dataset_detail", id=data.id )}">
<a href="${h.url_for(controller='mobile', action="dataset_detail", id=data.id )}">
<div>${data.hid}: ${data.display_name()}</div>
templates/webapps/galaxy/mobile/history/list.mako
+1 -1
View File
@@ -19,7 +19,7 @@
<li>
<a href="${h.url_for( action="history_detail", id=history.id )}">
<a href="${h.url_for(controller='mobile', action="history_detail", id=history.id )}">
${history.name}
<div class="secondary">${h.date.distance_of_time_in_words( history.update_time, h.date.datetime.utcnow() )} ago</div>
templates/webapps/galaxy/mobile/index.mako
+4 -4
View File
@@ -30,7 +30,7 @@
<script type="text/javascript" src="${h.url_for('/static/scripts/libs/jquery/jqtouch.js')}"></script>
<script type="text/javascript" charset="utf-8">
$(document).jQTouch( {
icon: "${h.url_for('static/images/galaxyIcon_noText.png')}",
icon: "${h.url_for('/static/images/galaxyIcon_noText.png')}",
slideInSelector: 'ul li a, .row a, a.async'
});
</script>
@@ -41,12 +41,12 @@
<div id="home" selected="true">
<div class="toolbar">
<h1><span class="logo">Galaxy</span></h1>
<a class="button async" href="${h.url_for( action='settings' )}">Settings</a>
<a class="button async" href="${h.url_for(controller='mobile', action='settings' )}">Settings</a>
</div>
<ul class="edgetoedge">
<li><a href="${h.url_for( action='history_list' )}">Histories</a></li>
<li><a href="${h.url_for(controller='mobile', action='history_list' )}">Histories</a></li>
</ul>
</div>
</body>
</html>
</html>
templates/webapps/galaxy/mobile/settings.mako
+2 -2
View File
@@ -1,4 +1,4 @@
<form id="settings" class="panel" action="${h.url_for( action='settings' )}" method="post">
<form id="settings" class="panel" action="${h.url_for(controller='mobile', action='settings' )}" method="post">
<div class="toolbar">
<h1>Settings</h1>
@@ -31,4 +31,4 @@
<div>${message}</div>
%endif
</div>
</form>
</form>
templates/webapps/galaxy/page/editor.mako
+4 -4
View File
@@ -114,7 +114,7 @@
// Build ajax URL that lists items for selection.
var item_list_action = "list_" + item_plural.toLowerCase() + "_for_selection";
var url_template = "${h.url_for( action='LIST_ACTION' )}";
var url_template = "${h.url_for(controller='page', action='LIST_ACTION' )}";
var ajax_url = url_template.replace( "LIST_ACTION", item_list_action );
// Set up and return dict.
@@ -522,7 +522,7 @@
if ( dialogType == Galaxy.DIALOG_ANNOTATE_HISTORY ) {
$.ajax(
{
url: "${h.url_for( action='list_histories_for_selection' )}",
url: "${h.url_for(controller='page', action='list_histories_for_selection' )}",
data: {},
error: function() { alert( "Grid refresh failed" ) },
success: function(table_html)
@@ -541,7 +541,7 @@
// Get annotation table for history.
$.ajax(
{
url: "${h.url_for( action='get_history_annotation_table' )}",
url: "${h.url_for(controller='page', action='get_history_annotation_table' )}",
data: { id : item_id },
error: function() { alert( "Grid refresh failed" ) },
success: function(result)
@@ -638,7 +638,7 @@
// Do save.
$.ajax( {
url: "${h.url_for( action='save' )}",
url: "${h.url_for(controller='page', action='save' )}",
type: "POST",
data: {
id: "${trans.security.encode_id(page.id)}",
templates/webapps/galaxy/page/index.mako
+2 -2
View File
@@ -29,12 +29,12 @@
<% page = association.page %>
<tr>
<td>
<a class="menubutton" id="shared-${i}-popup" href="${h.url_for( action='display_by_username_and_slug', username=page.user.username, slug=page.slug)}">${page.title}</a>
<a class="menubutton" id="shared-${i}-popup" href="${h.url_for(controller='page', action='display_by_username_and_slug', username=page.user.username, slug=page.slug)}">${page.title}</a>
</td>
<td>${page.user.username}</td>
<td>
<div popupmenu="shared-${i}-popup">
<a class="action-button" href="${h.url_for( action='display_by_username_and_slug', username=page.user.username, slug=page.slug)}" target="_top">View</a>
<a class="action-button" href="${h.url_for(controller='page', action='display_by_username_and_slug', username=page.user.username, slug=page.slug)}" target="_top">View</a>
</div>
</td>
</tr>
templates/webapps/galaxy/root/alternate_history.mako
+5 -5
View File
@@ -95,11 +95,11 @@ ${ h.to_json_string( dict([ ( string, _(string) ) for string in strings_to_local
url_dict = {
##TODO: into their own MVs
'rename' : h.url_for( controller="/history", action="rename_async",
'rename' : h.url_for( controller="history", action="rename_async",
id=encoded_id_template ),
'tag' : h.url_for( controller='tag', action='get_tagging_elt_async',
item_class=history_class_name, item_id=encoded_id_template ),
'annotate' : h.url_for( controller="/history", action="annotate_async",
'annotate' : h.url_for( controller="history", action="annotate_async",
id=encoded_id_template )
}
%>
@@ -148,9 +148,9 @@ ${ unquote_plus( h.to_json_string( url_dict ) ) }
'delete' : h.url_for( controller='dataset', action='delete_async', dataset_id=encoded_id_template ),
# ................................................................ download links (and associated meta files),
'download' : h.url_for( controller='/dataset', action='display',
'download' : h.url_for( controller='dataset', action='display',
dataset_id=encoded_id_template, to_ext=hda_ext_template ),
'meta_download' : h.url_for( controller='/dataset', action='get_metadata_file',
'meta_download' : h.url_for( controller='dataset', action='get_metadata_file',
hda_id=encoded_id_template, metadata_name=meta_type_template ),
# ................................................................ primary actions (errors, params, rerun),
@@ -160,7 +160,7 @@ ${ unquote_plus( h.to_json_string( url_dict ) ) }
dataset_id=encoded_id_template ),
'rerun' : h.url_for( controller='tool_runner', action='rerun',
id=encoded_id_template ),
'visualization' : h.url_for( controller='visualization' ),
'visualization' : h.url_for( controller='visualization', action='index' ),
# ................................................................ secondary actions (tagging, annotation),
'tags' : {
templates/webapps/galaxy/root/history.mako
+4 -4
View File
@@ -98,7 +98,7 @@ function annotation_handling(parent_elt) {
annotation_area.find(".tooltip").tooltip({ placement : 'bottom' });
async_save_text(
annotation_elt.attr("id"), annotation_elt.attr("id"),
"${h.url_for( controller='/dataset', action='annotate_async')}?" + href_parms,
"${h.url_for( controller='dataset', action='annotate_async')}?" + href_parms,
"new_annotation", 18, true, 4);
annotation_area.slideDown("fast");
}
@@ -594,7 +594,7 @@ div.form-row {
<div id="top-links" class="historyLinks">
<a title="${_('refresh')}" class="icon-button arrow-circle tooltip" href="${h.url_for('history', show_deleted=show_deleted)}"></a>
<a title="${_('refresh')}" class="icon-button arrow-circle tooltip" href="${h.url_for(controller='history', show_deleted=show_deleted)}"></a>
<a title='${_('collapse all')}' class='icon-button toggle tooltip' href='#' style="display: none"></a>
%if trans.get_user():
@@ -609,13 +609,13 @@ div.form-row {
%if show_deleted:
<div class="historyLinks">
<a href="${h.url_for('history', show_deleted=False)}">${_('hide deleted')}</a>
<a href="${h.url_for(controller='history', show_deleted=False)}">${_('hide deleted')}</a>
</div>
%endif
%if show_hidden:
<div class="historyLinks">
<a href="${h.url_for('history', show_hidden=False)}">${_('hide hidden')}</a>
<a href="${h.url_for(controller='history', show_hidden=False)}">${_('hide hidden')}</a>
</div>
%endif
templates/webapps/galaxy/tracks/browser.mako
+1 -1
View File
@@ -96,7 +96,7 @@ ${render_trackster_js_files()}
hide_modal();
};
$.ajax({
url: "${h.url_for( action='new_browser', default_dbkey=default_dbkey )}",
url: "${h.url_for( controller='visualization', action='new_browser', default_dbkey=default_dbkey )}",
data: {},
error: function() { alert( "Couldn't create new browser" ) },
success: function(form_html) {
templates/webapps/galaxy/tracks/history_select_grid.mako
+2 -2
View File
@@ -76,8 +76,8 @@ ${grid_javascripts()}
if cur_filter_dict:
dbkey = cur_filter_dict.get( 'dbkey', '?' )
%>
<a class="addtracktab${histories_active}" href="${h.url_for( action='list_histories')}?f-dbkey=${dbkey}">Histories</a>
<a class="addtracktab${data_libraries_active}" href="${h.url_for( action='list_libraries' )}">Data Libraries</a>
<a class="addtracktab${histories_active}" href="${h.url_for(controller='visualization', action='list_histories')}?f-dbkey=${dbkey}">Histories</a>
<a class="addtracktab${data_libraries_active}" href="${h.url_for(controller='visualization', action='list_libraries' )}">Data Libraries</a>
<div class="divider"></div>
</%def>
templates/webapps/galaxy/visualization/circster.mako
+1 -1
View File
@@ -70,7 +70,7 @@
show_modal("Saving...", "progress");
$.ajax({
url: "${h.url_for( action='save' )}",
url: "${h.url_for( controller='visualization', action='save' )}",
type: "POST",
data: {
'id': view.vis_id,
templates/webapps/galaxy/visualization/list.mako
+3 -3
View File
@@ -42,13 +42,13 @@
<% visualization = association.visualization %>
<tr>
<td>
<a class="menubutton" id="shared-${i}-popup" href="${h.url_for( action='display_by_username_and_slug', username=visualization.user.username, slug=visualization.slug)}">${visualization.title}</a>
<a class="menubutton" id="shared-${i}-popup" href="${h.url_for( controller='visualization', action='display_by_username_and_slug', username=visualization.user.username, slug=visualization.slug)}">${visualization.title}</a>
</td>
<td>${visualization.user.username}</td>
<td>
<div popupmenu="shared-${i}-popup">
<a class="action-button" href="${h.url_for( action='display_by_username_and_slug', username=visualization.user.username, slug=visualization.slug)}" target="_top">View</a>
<a class="action-button" href="${h.url_for( action='copy', id=trans.security.encode_id(visualization.id) )}">Copy</a>
<a class="action-button" href="${h.url_for( controller='visualization', action='display_by_username_and_slug', username=visualization.user.username, slug=visualization.slug)}" target="_top">View</a>
<a class="action-button" href="${h.url_for( controller='visualization', action='copy', id=trans.security.encode_id(visualization.id) )}">Copy</a>
</div>
</td>
</tr>
templates/webapps/galaxy/visualization/scatterplot.mako
+1 -1
View File
@@ -238,7 +238,7 @@ $(function(){
var settingsForm = new ScatterplotControlForm({
dataset : hda,
apiDatasetsURL : "${h.url_for( controller='/api/datasets' )}",
apiDatasetsURL : "${h.url_for( controller='/api/datasets', action='index' )}",
el : $( '#scatterplot' ),
chartConfig : chartConfig
}).render();
templates/webapps/galaxy/workflow/build_from_current_history.mako
+2 -2
View File
@@ -76,7 +76,7 @@ into a workflow will be shown in gray.</p>
<div class="warningmark">${warning}</div>
%endfor
<form method="post" action="${h.url_for()}">
<form method="post" action="${h.url_for(controller='workflow', action='build_from_current_history')}">
<div class='form-row'>
<label>${_('Workflow name')}</label>
<input name="workflow_name" type="text" value="Workflow constructed from history '${ util.unicodify( history.name )}'" size="60"/>
@@ -149,4 +149,4 @@ into a workflow will be shown in gray.</p>
</table>
</form>
</form>
templates/webapps/galaxy/workflow/configure_menu.mako
+2 -2
View File
@@ -15,7 +15,7 @@
</div>
%endif
<form action="${h.url_for()}" method="POST">
<form action="${h.url_for(controller='workflow', action='configure_menu')}" method="POST">
<table class="colored" border="0" cellspacing="0" cellpadding="0" width="100%">
<tr class="header">
@@ -74,4 +74,4 @@
<p />
<input type="Submit" />
</form>
</form>
templates/webapps/galaxy/workflow/edit_attributes.mako
+2 -2
View File
@@ -20,7 +20,7 @@
<div class="toolForm">
<div class="toolFormTitle">${_('Edit Workflow Attributes')}</div>
<div class="toolFormBody">
<form name="edit_attributes" action="${h.url_for( action='edit_attributes' )}" method="post">
<form name="edit_attributes" action="${h.url_for(controller='workflow', action='edit_attributes' )}" method="post">
<input type="hidden" name="id" value="${trans.security.encode_id( stored.id )}"/>
<div class="form-row">
<label>
@@ -63,4 +63,4 @@
</form>
</div>
</div>
</%def>
</%def>
templates/webapps/galaxy/workflow/editor.mako
+7 -7
View File
@@ -135,14 +135,14 @@
reset();
// Load the datatype info
$.ajax( {
url: "${h.url_for( action='get_datatypes' )}",
url: "${h.url_for( controller='workflow', action='get_datatypes' )}",
dataType: "json",
cache: false,
success: function( data ) {
populate_datatype_info( data );
// Load workflow definition
$.ajax( {
url: "${h.url_for( action='load_workflow' )}",
url: "${h.url_for( controller='workflow', action='load_workflow' )}",
data: { id: "${trans.security.encode_id( stored.id )}", "_": "true" },
dataType: 'json',
cache: false,
@@ -333,7 +333,7 @@
});
// Rename async.
async_save_text("workflow-name", "workflow-name", "${h.url_for( action='rename_async', id=trans.security.encode_id(stored.id) )}", "new_name");
async_save_text("workflow-name", "workflow-name", "${h.url_for( controller='workflow', action='rename_async', id=trans.security.encode_id(stored.id) )}", "new_name");
// Tag async. Simply have the workflow edit element generate a click on the tag element to activate tagging.
$('#workflow-tag').click( function() {
@@ -341,7 +341,7 @@
return false;
});
// Annotate async.
async_save_text("workflow-annotation", "workflow-annotation", "${h.url_for( action='annotate_async', id=trans.security.encode_id(stored.id) )}", "new_annotation", 25, true, 4);
async_save_text("workflow-annotation", "workflow-annotation", "${h.url_for( controller='workflow', action='annotate_async', id=trans.security.encode_id(stored.id) )}", "new_annotation", 25, true, 4);
});
// Global state for the whole workflow
@@ -377,7 +377,7 @@
canvas_manager.draw_overview();
workflow.activate_node( node );
$.ajax( {
url: "${h.url_for( action='get_new_module_info' )}",
url: "${h.url_for(controller='workflow', action='get_new_module_info' )}",
data: { type: "tool", tool_id: id, "_": "true" },
global: false,
dataType: "json",
@@ -401,7 +401,7 @@
canvas_manager.draw_overview();
workflow.activate_node( node );
$.ajax( {
url: "${h.url_for( action='get_new_module_info' )}",
url: "${h.url_for(controller='workflow', action='get_new_module_info' )}",
data: { type: type, "_": "true" },
dataType: "json",
success: function( data ) {
@@ -624,7 +624,7 @@
workflow.rectify_workflow_outputs();
var savefn = function(callback) {
$.ajax( {
url: "${h.url_for( action='save_workflow' )}",
url: "${h.url_for(controller='workflow', action='save_workflow' )}",
type: "POST",
data: {
id: "${trans.security.encode_id( stored.id )}",
templates/webapps/galaxy/workflow/editor_generic_form.mako
+1 -1
View File
@@ -1,4 +1,4 @@
<form name="${form.name}" action="${h.url_for( action='editor_form_post' )}" method="post">
<form name="${form.name}" action="${h.url_for( controller='workflow', action='editor_form_post' )}" method="post">
<div class="toolForm">
<div class="toolFormTitle">${form.title}</div>
<div class="toolFormBody">
templates/webapps/galaxy/workflow/editor_tool_form.mako
+2 -2
View File
@@ -94,7 +94,7 @@ from galaxy.util.expressions import ExpressionContext
</div>
</%def>
<form method="post" action="${h.url_for( action='editor_form_post' )}">
<form method="post" action="${h.url_for(controller='workflow', action='editor_form_post' )}">
<div class="toolForm">
<div class="toolFormTitle">Tool: ${tool.name}</div>
@@ -113,4 +113,4 @@ from galaxy.util.expressions import ExpressionContext
</div>
</form>
</form>
templates/webapps/galaxy/workflow/export.mako
+2 -2
View File
@@ -25,7 +25,7 @@
<h3>Export to myExperiment</h3>
<div class="toolForm">
<form action="${h.url_for( action='export_to_myexp', id=trans.security.encode_id( item.id ) )}"
<form action="${h.url_for(controller='workflow', action='export_to_myexp', id=trans.security.encode_id( item.id ) )}"
method="POST">
<div class="form-row">
<label>myExperiment username:</label>
@@ -49,7 +49,7 @@
## Add link to render as SVG image.
<h3>Create Image</h3>
<a href="${h.url_for( action='gen_image', id=trans.security.encode_id( item.id ) )}">
<a href="${h.url_for(controller='workflow', action='gen_image', id=trans.security.encode_id( item.id ) )}">
Create image of ${get_class_display_name( item.__class__ ).lower()} in SVG format
</a>
</%def>
templates/webapps/galaxy/workflow/list.mako
+3 -3
View File
@@ -31,7 +31,7 @@
<ul class="manage-table-actions">
<li>
<a class="action-button" href="${h.url_for( action='create' )}">
<a class="action-button" href="${h.url_for( controller='workflow', action='create' )}">
<img src="${h.url_for('/static/images/silk/add.png')}" />
<span>Create new workflow</span>
</a>
@@ -94,7 +94,7 @@
<% workflow = association.stored_workflow %>
<tr>
<td>
<a class="menubutton" id="shared-${i}-popup" href="${h.url_for( action='run', id=trans.security.encode_id(workflow.id) )}">${h.to_unicode( workflow.name )}</a>
<a class="menubutton" id="shared-${i}-popup" href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${h.to_unicode( workflow.name )}</a>
</td>
<td>${workflow.user.email}</td>
<td>${len(workflow.latest_workflow.steps)}</td>
@@ -115,7 +115,7 @@
<h2>Other options</h2>
<a class="action-button" href="${h.url_for( action='configure_menu' )}">
<a class="action-button" href="${h.url_for( controller='workflow', action='configure_menu' )}">
<span>Configure your workflow menu</span>
</a>
</div>
templates/webapps/galaxy/workflow/list_for_run.mako
+4 -4
View File
@@ -19,7 +19,7 @@
<ul class="manage-table-actions">
<li>
<a class="action-button" href="${h.url_for( controller="workflow", action='index' )}" target="_parent">
<a class="action-button" href="${h.url_for( controller='workflow', action='index' )}" target="_parent">
<span>Switch to workflow management view</span>
</a>
</li>
@@ -36,7 +36,7 @@
%for i, workflow in enumerate( workflows ):
<tr>
<td>
<a href="${h.url_for( action='run', id=trans.security.encode_id(workflow.id) )}">${h.to_unicode( workflow.name )}</a>
<a href="${h.url_for(controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${h.to_unicode( workflow.name )}</a>
<a id="wf-${i}-popup" class="popup-arrow" style="display: none;">&#9660;</a>
</td>
<td>${len(workflow.latest_workflow.steps)}</td>
@@ -64,7 +64,7 @@
<% workflow = association.stored_workflow %>
<tr>
<td>
<a href="${h.url_for( action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
<a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
<a id="shared-${i}-popup" class="popup-arrow" style="display: none;">&#9660;</a>
</td>
<td>${workflow.user.email}</td>
@@ -76,4 +76,4 @@
No workflows have been shared with you.
%endif
%endif
templates/webapps/galaxy/workflow/rename.mako
+2 -2
View File
@@ -17,7 +17,7 @@ else:
<div class="toolForm">
<div class="toolFormTitle">Rename workflow '${stored.name}'</div>
<div class="toolFormBody">
<form action="${h.url_for( action='rename', id=trans.security.encode_id(stored.id) )}" method="POST">
<form action="${h.url_for(controller='workflow', action='rename', id=trans.security.encode_id(stored.id) )}" method="POST">
<div class="form-row">
<label>
New name
@@ -33,4 +33,4 @@ else:
</form>
</div>
</div>
</div>
</div>
templates/webapps/galaxy/workflow/run.mako
+1 -1
View File
@@ -463,7 +463,7 @@ if wf_parms:
%endfor
%if missing_tools:
<div class='errormessage'>
<strong>This workflow utilizes tools which are unavailable, and cannot be run. Enable the tools listed below, or <a href="${h.url_for( action='editor', id=trans.security.encode_id(workflow.id) )}" target="_parent">edit the workflow</a> to correct these errors.</strong><br/>
<strong>This workflow utilizes tools which are unavailable, and cannot be run. Enable the tools listed below, or <a href="${h.url_for(controller='workflow', action='editor', id=trans.security.encode_id(workflow.id) )}" target="_parent">edit the workflow</a> to correct these errors.</strong><br/>
<ul>
%for i, tool in enumerate( missing_tools ):
<li>${tool}</li>