details: http://www.bx.psu.edu/hg/galaxy/rev/12789b4ba919 changeset: 3340:12789b4ba919 user: rc date: Fri Feb 05 14:25:38 2010 -0500 description: Forms UI improvements diffstat: lib/galaxy/web/controllers/forms.py | 8 +++++--- templates/display_common.mako | 34 +++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 18 deletions(-) diffs (76 lines): diff -r 9e2ba4cf4494 -r 12789b4ba919 lib/galaxy/web/controllers/forms.py --- a/lib/galaxy/web/controllers/forms.py Fri Feb 05 14:18:37 2010 -0500 +++ b/lib/galaxy/web/controllers/forms.py Fri Feb 05 14:25:38 2010 -0500 @@ -135,7 +135,9 @@ return trans.response.send_redirect( web.url_for( controller='forms', action='new', msg=msg, - messagetype='error' ) ) + messagetype='error', + name=util.restore_text( params.get( 'name', '' ) ), + description=util.restore_text( params.get( 'description', '' ) ) ) ) self.__get_saved_form( fd ) if self.__imported_from_file: return trans.response.send_redirect( web.url_for( controller='forms', @@ -151,8 +153,8 @@ name=fd.name, description=fd.desc, form_type_selectbox=fd.type ) ) - inputs = [ ( 'Name', TextField( 'name', 40, 'New Form' ) ), - ( 'Description', TextField( 'description', 40, '' ) ), + inputs = [ ( 'Name', TextField( 'name', 40, util.restore_text( params.get( 'name', '' ) ) ) ), + ( 'Description', TextField( 'description', 40, util.restore_text( params.get( 'description', '' ) ) ) ), ( 'Type', self.__form_types_widget(trans, selected=params.get( 'form_type', 'none' )) ), ( 'Import from csv file (Optional)', FileField( 'file_data', 40, '' ) ) ] return trans.fill_template( '/admin/forms/create_form.mako', diff -r 9e2ba4cf4494 -r 12789b4ba919 templates/display_common.mako --- a/templates/display_common.mako Fri Feb 05 14:18:37 2010 -0500 +++ b/templates/display_common.mako Fri Feb 05 14:25:38 2010 -0500 @@ -30,6 +30,8 @@ ## Start with exceptions, end with default. if a_class is model.History: return "Histories" + elif a_class is model.FormDefinitionCurrent: + return "Forms" else: return get_class_display_name( a_class ) + "s" %> @@ -55,21 +57,23 @@ ## Get plural term for class. <%def name="get_class_plural( a_class )"> - <% - if a_class == model.History: - class_plural = "Histories" - elif a_class == model.StoredWorkflow: - class_plural = "Workflows" - elif a_class == model.Page: - class_plural = "Pages" - elif a_class == model.Library: - class_plural = "Libraries" - elif a_class == model.HistoryDatasetAssociation: - class_plural = "Datasets" - else: - class_plural = a_class.__name__ + "s" - return class_plural - %> +<% + if a_class == model.History: + class_plural = "Histories" + elif a_class == model.StoredWorkflow: + class_plural = "Workflows" + elif a_class == model.Page: + class_plural = "Pages" + elif a_class == model.Library: + class_plural = "Libraries" + elif a_class == model.HistoryDatasetAssociation: + class_plural = "Datasets" + elif a_class == model.FormDefinitionCurrent: + class_plural = "Forms" + else: + class_plural = a_class.__name__ + "s" + return class_plural +%> </%def> ## Returns the controller name for an item based on its class.