diff --git a/lib/galaxy/datatypes/interval.py b/lib/galaxy/datatypes/interval.py index ccdea8daa3e..12554fccfd6 100644 --- a/lib/galaxy/datatypes/interval.py +++ b/lib/galaxy/datatypes/interval.py @@ -42,7 +42,7 @@ class Interval( Tabular ): MetadataElement( name="startCol", desc="Start column", param=metadata.ColumnParameter ) MetadataElement( name="endCol", desc="End column", param=metadata.ColumnParameter ) MetadataElement( name="strandCol", desc="Strand column (click box & select)", param=metadata.ColumnParameter, optional=True, no_value=0 ) - MetadataElement( name="columns", default=3, desc="Number of columns", readonly=True ) + MetadataElement( name="columns", default=3, desc="Number of columns", readonly=True, visible=False ) def __init__(self, **kwd): diff --git a/lib/galaxy/datatypes/metadata.py b/lib/galaxy/datatypes/metadata.py index f271a464b76..2d91e83a625 100644 --- a/lib/galaxy/datatypes/metadata.py +++ b/lib/galaxy/datatypes/metadata.py @@ -113,12 +113,13 @@ class MetadataElementSpec( object ): is a MetadataSpecCollection) of datatype. ''' - def __init__( self, datatype, name=None, desc=None, param=MetadataParameter, default=None, no_value = None, **kwargs ): + def __init__( self, datatype, name=None, desc=None, param=MetadataParameter, default=None, no_value = None, visible=True, **kwargs ): self.name = name self.desc = desc or name self.param = param self.default = default self.no_value = no_value + self.visible = visible # Catch-all, allows for extra attributes to be set self.__dict__.update(kwargs) datatype.metadata_spec.append( self ) diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py index fff31be3f5c..0d7ac0e17c4 100644 --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -20,8 +20,8 @@ class Tabular( data.Text ): """Tab delimited data""" """Add metadata elements""" - MetadataElement( name="columns", default=0, desc="Number of columns", readonly=True ) - MetadataElement( name="column_types", default=[], desc="Column types", readonly=True ) + MetadataElement( name="columns", default=0, desc="Number of columns", readonly=True, visible=False ) + MetadataElement( name="column_types", default=[], desc="Column types", readonly=True, visible=False ) def init_meta( self, dataset, copy_from=None ): data.Text.init_meta( self, dataset, copy_from=copy_from ) diff --git a/lib/galaxy/web/controllers/root.py b/lib/galaxy/web/controllers/root.py index 9361d7978b9..959ef59ff94 100644 --- a/lib/galaxy/web/controllers/root.py +++ b/lib/galaxy/web/controllers/root.py @@ -223,7 +223,8 @@ class Universe( BaseController ): metadata = list() # a list of MetadataParemeters for name, spec in data.datatype.metadata_spec.items(): - metadata.append( spec.wrap( data.metadata.get(name), data ) ) + if spec.visible: + metadata.append( spec.wrap( data.metadata.get(name), data ) ) datatypes = [x for x in trans.app.datatypes_registry.datatypes_by_extension.iterkeys()] trans.log_event( "Opened edit view on dataset %s" % str(id) ) diff --git a/static/june_2007_style/base.css.tmpl b/static/june_2007_style/base.css.tmpl index 00942a3657c..dccd05a10e5 100644 --- a/static/june_2007_style/base.css.tmpl +++ b/static/june_2007_style/base.css.tmpl @@ -51,6 +51,11 @@ div.toolParamHelp color: #666; } +div.toolParamHelp a +{ + color: #666; +} + div.toolFormBody { background: $form_body_bg_bottom; diff --git a/static/june_2007_style/blue/base.css b/static/june_2007_style/blue/base.css index a5e9da22c81..f5b97004293 100644 --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -51,6 +51,11 @@ div.toolParamHelp color: #666; } +div.toolParamHelp a +{ + color: #666; +} + div.toolFormBody { background: #FFFFFF; diff --git a/templates/edit_data.tmpl b/templates/edit_data.tmpl index e8493f89c01..09c465c7d8d 100644 --- a/templates/edit_data.tmpl +++ b/templates/edit_data.tmpl @@ -15,15 +15,6 @@

#end if - #def do_metadata( $metadata, $data ) - #for $element in $metadata - - $element.spec.desc - $element.get_html() - - #end for - #end def - #def datatype( $dataset, $datatypes ) #end def +
Edit Attributes
- +
+
+ +
+ +
+ +
+
+
+
+ +
+ +
+
+
+ #for $element in $metadata +
+ +
+ $element.get_html() +
+
+
+ #end for +
+ +
+
+
+
+ +

+ #set $converters = $data.get_converter_types() - - - #if $len($converters) > 0 - - - - #end if - - - - - - -
-
-
- - - - - - -
Convert data format - + #if len( $converters ) > 0: +
+
Convert to new format
+
+ + +
+ +
-
- -
-
-
-
-
-
- - - - - - -
Set data type - - $datatype( $data, $datatypes ) - - -
-
-
-
-
-
- - - - - - - - - - - - - $do_metadata( $metadata, $data ) -
Set other attributes
Name:
Info: - - -
-
-
-
+ -

-
-
+
+ This will create a new dataset with the contents of this + dataset converted to a new format. +
+
+
+
+ +
+ + + + +

+ #end if + + +

+
Change data type
+
+
+ +
+ +
+ $datatype( $data, $datatypes ) +
+ +
+ This will change the datatype of the existing dataset + but not modify its contents. Use this if Galaxy + has incorrectly guessed the type of your dataset. +
+
+
+
+ +
+
+
+ diff --git a/templates/form.tmpl b/templates/form.tmpl index 55377ba9261..ef16d8d94f9 100644 --- a/templates/form.tmpl +++ b/templates/form.tmpl @@ -8,20 +8,39 @@
-
$form.title
-
-
- - #for input in $form.inputs - - #if $input.error: - - #end if - #if $input.help - - #end if - #end for -
$input.label:
$input.error
$input.help
+
$form.title
+
+ + #for input in $form.inputs + #if $input.error: + #set cls = "form-row form-row-error" + #else + #set cls = "form-row" + #end if +
+ +
+ +
+ #if $input.error: +
+
 $input.error
+
+ #end if + + #if $input.help +
+ $input.help +
+ #end if + +
+ +
+ #end for +