details: http://www.bx.psu.edu/hg/galaxy/rev/6dab2b0a9801 changeset: 3779:6dab2b0a9801 user: Greg Von Kuster <greg@bx.psu.edu> date: Thu May 13 09:35:57 2010 -0400 description: Fix for changing a library dataset's data type ( resolves ticket # 333 ), add the library dataset's data type to the library dataset info page, and add <pre> tags to the tool description on the tool information page in the community space. diffstat: templates/library/common/ldda_edit_info.mako | 1 + templates/library/common/ldda_info.mako | 5 +++++ templates/webapps/community/tool/edit_tool.mako | 2 +- templates/webapps/community/tool/view_tool.mako | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diffs (50 lines): diff -r eb91e90d3405 -r 6dab2b0a9801 templates/library/common/ldda_edit_info.mako --- a/templates/library/common/ldda_edit_info.mako Wed May 12 17:43:29 2010 -0400 +++ b/templates/library/common/ldda_edit_info.mako Thu May 13 09:35:57 2010 -0400 @@ -101,6 +101,7 @@ %if ldda.datatype.allow_datatype_change: <form name="change_datatype" action="${h.url_for( controller='library_common', action='ldda_edit_info', cntrller=cntrller, library_id=library_id, folder_id=trans.security.encode_id( ldda.library_dataset.folder.id ), use_panels=use_panels, show_deleted=show_deleted, )}" method="post"> <div class="form-row"> + <input type="hidden" name="id" value="${trans.security.encode_id( ldda.id )}"/> <label>New Type:</label> ${datatype( ldda, file_formats )} <div class="toolParamHelp" style="clear: both;"> diff -r eb91e90d3405 -r 6dab2b0a9801 templates/library/common/ldda_info.mako --- a/templates/library/common/ldda_info.mako Wed May 12 17:43:29 2010 -0400 +++ b/templates/library/common/ldda_info.mako Thu May 13 09:35:57 2010 -0400 @@ -80,6 +80,11 @@ <div style="clear: both"></div> </div> <div class="form-row"> + <label>Data type:</label> + ${ldda.ext} + <div style="clear: both"></div> + </div> + <div class="form-row"> <label>Build:</label> ${ldda.dbkey} <div style="clear: both"></div> diff -r eb91e90d3405 -r 6dab2b0a9801 templates/webapps/community/tool/edit_tool.mako --- a/templates/webapps/community/tool/edit_tool.mako Wed May 12 17:43:29 2010 -0400 +++ b/templates/webapps/community/tool/edit_tool.mako Thu May 13 09:35:57 2010 -0400 @@ -83,7 +83,7 @@ <div class="form-row"> <label>Description:</label> %if tool.user_description: - <div class="form-row-input"><textarea name="user_description" rows="5" cols="35">${tool.user_description}</textarea></div> + <div class="form-row-input"><pre><textarea name="user_description" rows="5" cols="35">${tool.user_description}</textarea></pre></div> %else: <div class="form-row-input"><textarea name="user_description" rows="5" cols="35"></textarea></div> %endif diff -r eb91e90d3405 -r 6dab2b0a9801 templates/webapps/community/tool/view_tool.mako --- a/templates/webapps/community/tool/view_tool.mako Wed May 12 17:43:29 2010 -0400 +++ b/templates/webapps/community/tool/view_tool.mako Thu May 13 09:35:57 2010 -0400 @@ -119,7 +119,7 @@ <div class="form-row"> <label>Description:</label> %if tool.user_description: - ${tool.user_description} + <pre>${tool.user_description}</pre> %endif <div style="clear: both"></div> </div>