diff --git a/templates/admin/dataset_security/group/group.mako b/templates/admin/dataset_security/group/group.mako index ab72dea0889..7c3400e4811 100644 --- a/templates/admin/dataset_security/group/group.mako +++ b/templates/admin/dataset_security/group/group.mako @@ -50,7 +50,7 @@ $().ready(function() {
Group '${group.name}'
-
+
diff --git a/templates/admin/dataset_security/group/group_create.mako b/templates/admin/dataset_security/group/group_create.mako index db4b8e03592..bc474623efc 100644 --- a/templates/admin/dataset_security/group/group_create.mako +++ b/templates/admin/dataset_security/group/group_create.mako @@ -55,7 +55,7 @@ $().ready(function() {
Create Group
- +
diff --git a/templates/admin/dataset_security/role/role.mako b/templates/admin/dataset_security/role/role.mako index 8f2131b78f9..ccad5e165f9 100644 --- a/templates/admin/dataset_security/role/role.mako +++ b/templates/admin/dataset_security/role/role.mako @@ -50,7 +50,7 @@ $().ready(function() {
Role '${role.name}'
- +
diff --git a/templates/admin/dataset_security/role/role_create.mako b/templates/admin/dataset_security/role/role_create.mako index 82e8bcb16f4..fb7ea562449 100644 --- a/templates/admin/dataset_security/role/role_create.mako +++ b/templates/admin/dataset_security/role/role_create.mako @@ -55,7 +55,7 @@
Create Role
- +
diff --git a/templates/admin/jobs.mako b/templates/admin/jobs.mako index 995bbcacb19..2db23a12c83 100644 --- a/templates/admin/jobs.mako +++ b/templates/admin/jobs.mako @@ -37,7 +37,7 @@

%if jobs: - + @@ -101,7 +101,7 @@
There are no unfinished jobs to show with current cutoff time.

%endif - +

Update Jobs @@ -125,7 +125,7 @@
- +

diff --git a/templates/admin/memdump.mako b/templates/admin/memdump.mako index 70654bbc406..d15c3577739 100644 --- a/templates/admin/memdump.mako +++ b/templates/admin/memdump.mako @@ -37,7 +37,7 @@ id = None new_s += re.sub( id_re, r'\1\2', line ) if id and heap[int(id)].count == 1: - new_s += " theone\n" % h.url_for( ids=ids, sorts=sorts, new_id=id, theone=True ) + new_s += " theone\n" % h.url_for( controller='admin', action='memdump', ids=ids, sorts=sorts, new_id=id, theone=True ) else: new_s += "\n" return new_s diff --git a/templates/admin/quota/quota.mako b/templates/admin/quota/quota.mako index d8ac45cd75d..ce42d9423d2 100644 --- a/templates/admin/quota/quota.mako +++ b/templates/admin/quota/quota.mako @@ -50,7 +50,7 @@ $().ready(function() {
Quota '${name}'
- +
diff --git a/templates/admin/quota/quota_create.mako b/templates/admin/quota/quota_create.mako index 712a2a3af6b..f1192f466bd 100644 --- a/templates/admin/quota/quota_create.mako +++ b/templates/admin/quota/quota_create.mako @@ -64,7 +64,7 @@
Create quota
- +
diff --git a/templates/admin/quota/quota_set_default.mako b/templates/admin/quota/quota_set_default.mako index 3ad792da524..ed64e0ad81e 100644 --- a/templates/admin/quota/quota_set_default.mako +++ b/templates/admin/quota/quota_set_default.mako @@ -27,7 +27,7 @@
Set quota default
- +
diff --git a/templates/admin/user/user.mako b/templates/admin/user/user.mako index da27ffdfda2..dfb28f29afa 100644 --- a/templates/admin/user/user.mako +++ b/templates/admin/user/user.mako @@ -50,7 +50,7 @@ $().ready(function() {
User '${user.email}'
- +
diff --git a/templates/export_base.mako b/templates/export_base.mako index 5f1be362928..0c26d33d805 100644 --- a/templates/export_base.mako +++ b/templates/export_base.mako @@ -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) %> @@ -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:
- ${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 )}
(Copy this URL into the box titled 'Workflow URL' in the Import Workflow page.) %else: - This ${get_class_display_name( item.__class__ ).lower()} must be accessible before it can be imported into another Galaxy. + This ${get_class_display_name( item.__class__ ).lower()} must be accessible before it can be imported into another Galaxy. %endif <%def name="render_download_to_file(item)">

Download to File

- + Download ${get_class_display_name( item.__class__ ).lower()} to file so that it can be saved or imported into another Galaxy server. @@ -98,7 +99,7 @@ <%def name="render_footer()">



- Back to ${self.item_class_plural_name} List + Back to ${self.item_class_plural_name} List <%def name="body()"> @@ -114,4 +115,4 @@ ${self.render_more(item)} ${self.render_footer()} - \ No newline at end of file + diff --git a/templates/ind_share_base.mako b/templates/ind_share_base.mako index 6fd79a48a29..916ea7fa02a 100644 --- a/templates/ind_share_base.mako +++ b/templates/ind_share_base.mako @@ -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 @@

Share ${item_class_name} '${item_name}' with Another User
- +
- Back to ${item_class_name}'s Sharing Home + Back to ${item_class_name}'s Sharing Home
- \ No newline at end of file + diff --git a/templates/sharing_base.mako b/templates/sharing_base.mako index 3885bafc2da..7048412423c 100644 --- a/templates/sharing_base.mako +++ b/templates/sharing_base.mako @@ -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 "":

To make a ${item_class_name_lc} accessible via link or publish it, you must create a public username:

-
@@ -157,7 +158,7 @@
<% - 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("/") %> ${url} @@ -169,29 +170,29 @@
%if item.published: - This ${item_class_name_lc} is publicly listed and searchable in Galaxy's Published ${item_class_plural_name} section. + This ${item_class_name_lc} is publicly listed and searchable in Galaxy's Published ${item_class_plural_name} section. %endif

You can:

- + %if not item.published: ## Item is importable but not published. User can disable importable or publish.
Disables ${item_class_name_lc}'s link so that it is not accessible.

-
Publishes the ${item_class_name_lc} to Galaxy's Published ${item_class_plural_name} section, where it is publicly listed and searchable.
+
Publishes the ${item_class_name_lc} to Galaxy's Published ${item_class_plural_name} section, where it is publicly listed and searchable.

%else: ## item.published == True ## Item is importable and published. User can unpublish or disable import and unpublish. -
Removes this ${item_class_name_lc} from Galaxy's Published ${item_class_plural_name} section so that it is not publicly listed or searchable.
+
Removes this ${item_class_name_lc} from Galaxy's Published ${item_class_plural_name} section so that it is not publicly listed or searchable.

-
Disables this ${item_class_name_lc}'s link so that it is not accessible and removes ${item_class_name_lc} from Galaxy's Published ${item_class_plural_name} section so that it is not publicly listed or searchable.
+
Disables this ${item_class_name_lc}'s link so that it is not accessible and removes ${item_class_name_lc} from Galaxy's Published ${item_class_plural_name} section so that it is not publicly listed or searchable.
%endif
@@ -200,13 +201,13 @@

This ${item_class_name_lc} is currently restricted so that only you and the users listed below can access it. You can:

-
+
Generates a web link that you can share with other people so that they can view and import the ${item_class_name_lc}.

-
Makes the ${item_class_name_lc} accessible via link (see above) and publishes the ${item_class_name_lc} to Galaxy's Published ${item_class_plural_name} section, where it is publicly listed and searchable.
+
Makes the ${item_class_name_lc} accessible via link (see above) and publishes the ${item_class_name_lc} to Galaxy's Published ${item_class_plural_name} section, where it is publicly listed and searchable.
%endif @@ -237,7 +238,7 @@
@@ -246,7 +247,7 @@

+ href="${h.url_for(controller=controller_name, action='share', id=trans.security.encode_id(item.id), use_panels=use_panels )}"> Share with another user @@ -255,7 +256,7 @@

You have not shared this ${item_class_name_lc} with any users.

+ href="${h.url_for(controller=controller_name, action='share', id=trans.security.encode_id(item.id), use_panels=use_panels )}"> Share with a user
@@ -266,5 +267,5 @@ %endif

- Back to ${item_class_plural_name} List - \ No newline at end of file + Back to ${item_class_plural_name} List + diff --git a/templates/user/index.mako b/templates/user/index.mako index 50a6e492666..a9ee215606d 100644 --- a/templates/user/index.mako +++ b/templates/user/index.mako @@ -43,7 +43,7 @@

${n_('You are currently not logged in.')}

%endif %endif diff --git a/templates/user/openid_associate.mako b/templates/user/openid_associate.mako index bfa92905a58..8d4961f8838 100644 --- a/templates/user/openid_associate.mako +++ b/templates/user/openid_associate.mako @@ -59,7 +59,7 @@ %endif
- <% 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 )} diff --git a/templates/webapps/community/admin/index.mako b/templates/webapps/community/admin/index.mako index 545c14dcaa0..556310a3b29 100644 --- a/templates/webapps/community/admin/index.mako +++ b/templates/webapps/community/admin/index.mako @@ -133,7 +133,7 @@ <%def name="center_panel()"> <% - center_url = h.url_for( action='center' ) + center_url = h.url_for(controller='admin', action='center' ) %> diff --git a/templates/webapps/community/category/create_category.mako b/templates/webapps/community/category/create_category.mako index 693778ff787..4ea13030b8f 100644 --- a/templates/webapps/community/category/create_category.mako +++ b/templates/webapps/community/category/create_category.mako @@ -17,7 +17,7 @@
Create Category
-
+
diff --git a/templates/webapps/galaxy/dataset/errors.mako b/templates/webapps/galaxy/dataset/errors.mako index 8eb3625049b..3a12f6cf36d 100644 --- a/templates/webapps/galaxy/dataset/errors.mako +++ b/templates/webapps/galaxy/dataset/errors.mako @@ -60,7 +60,7 @@
Error Report
- +
diff --git a/templates/webapps/galaxy/history/permissions.mako b/templates/webapps/galaxy/history/permissions.mako index 8cfcf9d8616..e5c553e04c0 100644 --- a/templates/webapps/galaxy/history/permissions.mako +++ b/templates/webapps/galaxy/history/permissions.mako @@ -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 diff --git a/templates/webapps/galaxy/history/share.mako b/templates/webapps/galaxy/history/share.mako index fb582940e1e..48aca6e5ed4 100644 --- a/templates/webapps/galaxy/history/share.mako +++ b/templates/webapps/galaxy/history/share.mako @@ -7,7 +7,7 @@
%if not can_change and not cannot_change and not no_change_needed: ## We are sharing histories that contain only public datasets - +
Histories to be shared:
diff --git a/templates/webapps/galaxy/history/view.mako b/templates/webapps/galaxy/history/view.mako index f028d998a4d..a0238b1bd08 100644 --- a/templates/webapps/galaxy/history/view.mako +++ b/templates/webapps/galaxy/history/view.mako @@ -94,13 +94,13 @@ ## Render view of history. diff --git a/templates/webapps/galaxy/mobile/dataset/detail.mako b/templates/webapps/galaxy/mobile/dataset/detail.mako index fdc99b1e99c..02fed87189d 100644 --- a/templates/webapps/galaxy/mobile/dataset/detail.mako +++ b/templates/webapps/galaxy/mobile/dataset/detail.mako @@ -20,7 +20,7 @@ %if dataset.state == "ok":
- Peek + Peek
%endif diff --git a/templates/webapps/galaxy/mobile/history/detail.mako b/templates/webapps/galaxy/mobile/history/detail.mako index ba3071e1ffe..70f628f49ca 100644 --- a/templates/webapps/galaxy/mobile/history/detail.mako +++ b/templates/webapps/galaxy/mobile/history/detail.mako @@ -30,7 +30,7 @@ %endif - +
${data.hid}: ${data.display_name()}
diff --git a/templates/webapps/galaxy/mobile/history/list.mako b/templates/webapps/galaxy/mobile/history/list.mako index d3dec3e109f..ef30263b8cb 100644 --- a/templates/webapps/galaxy/mobile/history/list.mako +++ b/templates/webapps/galaxy/mobile/history/list.mako @@ -19,7 +19,7 @@
  • - + ${history.name}
    ${h.date.distance_of_time_in_words( history.update_time, h.date.datetime.utcnow() )} ago
    diff --git a/templates/webapps/galaxy/mobile/index.mako b/templates/webapps/galaxy/mobile/index.mako index 2879520dc67..98ed4912b4f 100644 --- a/templates/webapps/galaxy/mobile/index.mako +++ b/templates/webapps/galaxy/mobile/index.mako @@ -30,7 +30,7 @@ @@ -41,12 +41,12 @@     - \ No newline at end of file + diff --git a/templates/webapps/galaxy/mobile/settings.mako b/templates/webapps/galaxy/mobile/settings.mako index 5e50d079d16..f012a8538ab 100644 --- a/templates/webapps/galaxy/mobile/settings.mako +++ b/templates/webapps/galaxy/mobile/settings.mako @@ -1,4 +1,4 @@ - +

    Settings

    @@ -31,4 +31,4 @@
    ${message}
    %endif
    - \ No newline at end of file + diff --git a/templates/webapps/galaxy/page/editor.mako b/templates/webapps/galaxy/page/editor.mako index 35221eb6713..426a72a483a 100644 --- a/templates/webapps/galaxy/page/editor.mako +++ b/templates/webapps/galaxy/page/editor.mako @@ -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)}", diff --git a/templates/webapps/galaxy/page/index.mako b/templates/webapps/galaxy/page/index.mako index 459159d9c57..3b6d350c81c 100644 --- a/templates/webapps/galaxy/page/index.mako +++ b/templates/webapps/galaxy/page/index.mako @@ -29,12 +29,12 @@ <% page = association.page %>
    • diff --git a/templates/webapps/galaxy/root/alternate_history.mako b/templates/webapps/galaxy/root/alternate_history.mako index 48a117d000f..4789a2099eb 100644 --- a/templates/webapps/galaxy/root/alternate_history.mako +++ b/templates/webapps/galaxy/root/alternate_history.mako @@ -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' : { diff --git a/templates/webapps/galaxy/root/history.mako b/templates/webapps/galaxy/root/history.mako index 0e2869417c9..c2f1746b6d7 100644 --- a/templates/webapps/galaxy/root/history.mako +++ b/templates/webapps/galaxy/root/history.mako @@ -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 { diff --git a/templates/webapps/galaxy/visualization/scatterplot.mako b/templates/webapps/galaxy/visualization/scatterplot.mako index 9016af079e6..277e7ef81db 100644 --- a/templates/webapps/galaxy/visualization/scatterplot.mako +++ b/templates/webapps/galaxy/visualization/scatterplot.mako @@ -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(); diff --git a/templates/webapps/galaxy/workflow/build_from_current_history.mako b/templates/webapps/galaxy/workflow/build_from_current_history.mako index 0a6611b37e5..0e5e5afa779 100644 --- a/templates/webapps/galaxy/workflow/build_from_current_history.mako +++ b/templates/webapps/galaxy/workflow/build_from_current_history.mako @@ -76,7 +76,7 @@ into a workflow will be shown in gray.

    ${warning}
    %endfor - +
    @@ -149,4 +149,4 @@ into a workflow will be shown in gray.

    - ${page.title} + ${page.title} ${page.user.username}
    - View + View
    - ${visualization.title} + ${visualization.title} ${visualization.user.username}
    - View - Copy + View + Copy
    - \ No newline at end of file + diff --git a/templates/webapps/galaxy/workflow/configure_menu.mako b/templates/webapps/galaxy/workflow/configure_menu.mako index f51e0d82f60..52121f77c41 100644 --- a/templates/webapps/galaxy/workflow/configure_menu.mako +++ b/templates/webapps/galaxy/workflow/configure_menu.mako @@ -15,7 +15,7 @@

    %endif -
    + @@ -74,4 +74,4 @@

    - \ No newline at end of file + diff --git a/templates/webapps/galaxy/workflow/edit_attributes.mako b/templates/webapps/galaxy/workflow/edit_attributes.mako index c517a6886cd..910e8341fd7 100644 --- a/templates/webapps/galaxy/workflow/edit_attributes.mako +++ b/templates/webapps/galaxy/workflow/edit_attributes.mako @@ -20,7 +20,7 @@

    ${_('Edit Workflow Attributes')}
    -
    +
    - \ No newline at end of file + diff --git a/templates/webapps/galaxy/workflow/editor.mako b/templates/webapps/galaxy/workflow/editor.mako index 207adc87784..81d3045d12b 100644 --- a/templates/webapps/galaxy/workflow/editor.mako +++ b/templates/webapps/galaxy/workflow/editor.mako @@ -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 )}", diff --git a/templates/webapps/galaxy/workflow/editor_generic_form.mako b/templates/webapps/galaxy/workflow/editor_generic_form.mako index 3eb7b3d7301..a0bd64539b2 100644 --- a/templates/webapps/galaxy/workflow/editor_generic_form.mako +++ b/templates/webapps/galaxy/workflow/editor_generic_form.mako @@ -1,4 +1,4 @@ -
    +
    ${form.title}
    diff --git a/templates/webapps/galaxy/workflow/editor_tool_form.mako b/templates/webapps/galaxy/workflow/editor_tool_form.mako index 6e76090a521..4cc16a72218 100644 --- a/templates/webapps/galaxy/workflow/editor_tool_form.mako +++ b/templates/webapps/galaxy/workflow/editor_tool_form.mako @@ -94,7 +94,7 @@ from galaxy.util.expressions import ExpressionContext
    - +
    Tool: ${tool.name}
    @@ -113,4 +113,4 @@ from galaxy.util.expressions import ExpressionContext
    - \ No newline at end of file + diff --git a/templates/webapps/galaxy/workflow/export.mako b/templates/webapps/galaxy/workflow/export.mako index bbc3480529e..450294cb623 100644 --- a/templates/webapps/galaxy/workflow/export.mako +++ b/templates/webapps/galaxy/workflow/export.mako @@ -25,7 +25,7 @@

    Export to myExperiment

    -
    @@ -49,7 +49,7 @@ ## Add link to render as SVG image.

    Create Image

    - + Create image of ${get_class_display_name( item.__class__ ).lower()} in SVG format diff --git a/templates/webapps/galaxy/workflow/list.mako b/templates/webapps/galaxy/workflow/list.mako index 701842e6087..edaf559f983 100644 --- a/templates/webapps/galaxy/workflow/list.mako +++ b/templates/webapps/galaxy/workflow/list.mako @@ -31,7 +31,7 @@
    @@ -115,7 +115,7 @@

    Other options

    - + Configure your workflow menu diff --git a/templates/webapps/galaxy/workflow/list_for_run.mako b/templates/webapps/galaxy/workflow/list_for_run.mako index 6b699fb4e75..c8ee51ad3e5 100644 --- a/templates/webapps/galaxy/workflow/list_for_run.mako +++ b/templates/webapps/galaxy/workflow/list_for_run.mako @@ -19,7 +19,7 @@ @@ -64,7 +64,7 @@ <% workflow = association.stored_workflow %> @@ -76,4 +76,4 @@ No workflows have been shared with you. -%endif \ No newline at end of file +%endif diff --git a/templates/webapps/galaxy/workflow/rename.mako b/templates/webapps/galaxy/workflow/rename.mako index 62c9d709e5d..3a10a7b1d93 100644 --- a/templates/webapps/galaxy/workflow/rename.mako +++ b/templates/webapps/galaxy/workflow/rename.mako @@ -17,7 +17,7 @@ else:
    Rename workflow '${stored.name}'
    - +
    -
    \ No newline at end of file + diff --git a/templates/webapps/galaxy/workflow/run.mako b/templates/webapps/galaxy/workflow/run.mako index 175f148b264..40852dc7527 100644 --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -463,7 +463,7 @@ if wf_parms: %endfor %if missing_tools:
    - This workflow utilizes tools which are unavailable, and cannot be run. Enable the tools listed below, or edit the workflow to correct these errors.
    + This workflow utilizes tools which are unavailable, and cannot be run. Enable the tools listed below, or edit the workflow to correct these errors.
      %for i, tool in enumerate( missing_tools ):
    • ${tool}
    - ${h.to_unicode( workflow.name )} + ${h.to_unicode( workflow.name )} ${workflow.user.email} ${len(workflow.latest_workflow.steps)}
    - ${h.to_unicode( workflow.name )} + ${h.to_unicode( workflow.name )} ${len(workflow.latest_workflow.steps)}
    - ${workflow.name} + ${workflow.name} ${workflow.user.email}