1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/97816731e24b/ changeset: 97816731e24b user: greg date: 2012-10-22 21:06:55 summary: Fix styles for wrapping text in tool shed forms. affected #: 3 files diff -r 3f2e69afaf8cc02a35373e544ee426d8e2a41672 -r 97816731e24bff2d825c7713787df2b0f2fc445f lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -2421,7 +2421,7 @@ except Exception, e: raw_text = "Error locating and reading this repository's README file '%s': %s" % ( readme_file, str( e ) ) log.debug( raw_text ) - readme_text = translate_string( raw_text, to_html=True ) + readme_text = raw_text else: readme_text = '' is_malicious = changeset_is_malicious( trans, id, changeset_revision ) diff -r 3f2e69afaf8cc02a35373e544ee426d8e2a41672 -r 97816731e24bff2d825c7713787df2b0f2fc445f lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -1205,7 +1205,7 @@ response = urllib2.urlopen( url ) raw_text = response.read() response.close() - readme_text = translate_string( raw_text, to_html=True ) + readme_text = raw_text else: readme_text = '' if trans.app.config.tool_dependency_dir is None: diff -r 3f2e69afaf8cc02a35373e544ee426d8e2a41672 -r 97816731e24bff2d825c7713787df2b0f2fc445f templates/webapps/community/common/common.mako --- a/templates/webapps/community/common/common.mako +++ b/templates/webapps/community/common/common.mako @@ -15,6 +15,7 @@ </%def><%def name="render_readme( readme_text )"> + <% readme_text = readme_text.replace( '\n', '<br/>' ) %><style type="text/css"> #readme_table{ table-layout:fixed; width:100%; @@ -38,6 +39,7 @@ </%def><%def name="render_long_description( description_text )"> + <% description_text = description_text.replace( '\n', '<br/>' ) %><style type="text/css"> #description_table{ table-layout:fixed; width:100%; @@ -51,7 +53,7 @@ <div class="form-row"><label>Detailed description:</label><table id="description_table"> - <tr><td><pre>${description_text}</pre></td></tr> + <tr><td>${description_text}</td></tr></table><div style="clear: both"></div></div> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.