- galaxy-dev - lists.galaxyproject.org

[hg] galaxy 2486: Replaced id's with objects as parameters to al...
by Greg Von Kuster 16 Jul '09

16 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/079bf1a8422b changeset: 2486:079bf1a8422b user: rc date: Thu Jul 16 09:45:43 2009 -0400 description: Replaced id's with objects as parameters to all the form & requests table classes 6 file(s) affected in this change: lib/galaxy/model/__init__.py lib/galaxy/model/mapping.py lib/galaxy/web/controllers/admin.py lib/galaxy/web/controllers/requests.py lib/galaxy/web/controllers/requests_admin.py templates/admin/requests/manage_request_types.mako diffs (296 lines): diff -r dd5f1fe8f5e9 -r 079bf1a8422b lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py Wed Jul 15 14:11:35 2009 -0400 +++ b/lib/galaxy/model/__init__.py Thu Jul 16 09:45:43 2009 -0400 @@ -1099,53 +1099,55 @@ class FormDefinition( object ): - def __init__(self, name=None, desc=None, fields=[], current_form_id=None): + def __init__(self, name=None, desc=None, fields=[], current_form=None): self.name = name self.desc = desc self.fields = fields - self.form_definition_current_id = current_form_id + self.form_definition_current = current_form class FormDefinitionCurrent( object ): - def __init__(self, form_definition_id=None): - self.latest_form_id = form_definition_id + def __init__(self, form_definition=None): + self.latest_form = form_definition class FormValues( object ): - def __init__(self, form_def_id=None, content=None): - self.form_definition_id = form_def_id + def __init__(self, form_def=None, content=None): + self.form_definition = form_def self.content = content class Request( object ): - def __init__(self, name=None, desc=None, request_type_id=None, user_id=None, - form_values_id=None, library_id=None): + def __init__(self, name=None, desc=None, request_type=None, user=None, + form_values=None, library=None): self.name = name self.desc = desc - self.request_type_id = request_type_id - self.form_values_id = form_values_id - self.user_id = user_id - self.library_id = library_id + self.type = request_type + self.values = form_values + self.user = user + self.library = library class RequestType( object ): - def __init__(self, request_form_id=None, sample_form_id=None): - self.request_form_id = request_form_id - self.sample_form_id = sample_form_id + def __init__(self, request_form=None, sample_form=None): + self.request_form = request_form + self.sample_form = sample_form class Sample( object ): - def __init__(self, name=None, desc=None, request_id=None, form_values_id=None): + def __init__(self, name=None, desc=None, request=None, form_values=None): self.name = name self.desc = desc - self.request_id = request_id - self.form_values_id = form_values_id + self.request = request + self.values = form_values + + class SampleState( object ): - def __init__(self, name=None, desc=None, request_type_id=None): + def __init__(self, name=None, desc=None, request_type=None): self.name = name self.desc = desc - self.request_type_id = request_type_id + self.request_type = request_type class SampleEvent( object ): - def __init__(self, sample_id=None, sample_state_id=None, comment=''): - self.sample_id = sample_id - self.sample_state_id = sample_state_id + def __init__(self, sample=None, sample_state=None, comment=''): + self.sample = sample + self.state = sample_state self.comment = comment diff -r dd5f1fe8f5e9 -r 079bf1a8422b lib/galaxy/model/mapping.py --- a/lib/galaxy/model/mapping.py Wed Jul 15 14:11:35 2009 -0400 +++ b/lib/galaxy/model/mapping.py Thu Jul 16 09:45:43 2009 -0400 @@ -613,7 +613,10 @@ primaryjoin=( Sample.table.c.request_id == Request.table.c.id ) ), ) ) -assign_mapper( context, FormValues, FormValues.table, properties=None) +assign_mapper( context, FormValues, FormValues.table, + properties=dict( form_definition=relation( FormDefinition, + primaryjoin=( FormValues.table.c.form_definition_id == FormDefinition.table.c.id ) ) + ) ) assign_mapper( context, Request, Request.table, properties=dict( values=relation( FormValues, @@ -723,9 +726,7 @@ assign_mapper( context, User, User.table, properties=dict( histories=relation( History, backref="user", - order_by=desc(History.table.c.update_time) ), -# requests=relation( Request, backref="user", -# order_by=desc(Request.table.c.update_time) ), + order_by=desc(History.table.c.update_time) ), active_histories=relation( History, primaryjoin=( ( History.table.c.user_id == User.table.c.id ) & ( not_( History.table.c.deleted ) ) ), order_by=desc( History.table.c.update_time ) ), galaxy_sessions=relation( GalaxySession, order_by=desc( GalaxySession.table.c.update_time ) ), stored_workflow_menu_entries=relation( StoredWorkflowMenuEntry, backref="user", diff -r dd5f1fe8f5e9 -r 079bf1a8422b lib/galaxy/web/controllers/admin.py --- a/lib/galaxy/web/controllers/admin.py Wed Jul 15 14:11:35 2009 -0400 +++ b/lib/galaxy/web/controllers/admin.py Thu Jul 16 09:45:43 2009 -0400 @@ -2185,8 +2185,8 @@ rt = trans.app.model.RequestType() rt.name = util.restore_text( params.name ) rt.desc = util.restore_text( params.description ) or "" - rt.request_form_id = int(util.restore_text( params.request_form_id )) - rt.sample_form_id = int(util.restore_text( params.sample_form_id )) + rt.request_form = trans.app.model.FormDefinition.get(int( params.request_form_id )) + rt.sample_form = trans.app.model.FormDefinition.get(int( params.sample_form_id )) rt.flush() # set sample states ss_list = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.request_type_id == rt.id).all() @@ -2196,7 +2196,7 @@ for i in range( num_states ): name = util.restore_text( params.get( 'new_element_name_%i' % i, None )) desc = util.restore_text( params.get( 'new_element_description_%i' % i, None )) - ss = trans.app.model.SampleState(name, desc, rt.id) + ss = trans.app.model.SampleState(name, desc, rt) ss.flush() msg = "The new sample type named '%s' with %s state(s) has been created" % (rt.name, num_states) return rt, msg diff -r dd5f1fe8f5e9 -r 079bf1a8422b lib/galaxy/web/controllers/requests.py --- a/lib/galaxy/web/controllers/requests.py Wed Jul 15 14:11:35 2009 -0400 +++ b/lib/galaxy/web/controllers/requests.py Thu Jul 16 09:45:43 2009 -0400 @@ -236,11 +236,11 @@ for index, field in enumerate(request_type.request_form.fields): values.append(util.restore_text(params.get('field_%i' % index, ''))) if not request_id: - form_values = trans.app.model.FormValues(request_type.request_form.id, values) + form_values = trans.app.model.FormValues(request_type.request_form, values) form_values.flush() - request = trans.app.model.Request(name, desc, request_type.id, - trans.user.id, form_values.id, - library_id) + request = trans.app.model.Request(name, desc, request_type, + trans.user, form_values, + trans.app.model.Library.get(library_id)) request.flush() else: # TODO editing @@ -252,7 +252,7 @@ messagetype = params.get( 'messagetype', 'done' ) request_type = trans.app.model.RequestType.get(int(params.request_type_id)) if request: - form_values = trans.app.model.FormValues.get(request.form_values_id) + form_values = request.values else: form_values = None # list of widgets to be rendered on the request form @@ -278,7 +278,8 @@ widget=lib_list, helptext='Associated library where the resultant \ dataset will be stored')) - widgets = self.__create_form(trans, request_type.request_form_id, widgets, form_values, **kwd) + widgets = self.__create_form(trans, request_type.request_form_id, widgets, + form_values, **kwd) title = 'Add a new request of type: %s' % request_type.name return trans.fill_template( '/requests/new_request.mako', request_form_id=request_type.request_form_id, @@ -336,7 +337,7 @@ messagetype = params.get( 'messagetype', 'done' ) request = trans.app.model.Request.get(int( params.request_id )) if sample: - form_values = trans.app.model.FormValues.get(sample.form_values_id) + form_values = sample.values else: form_values = None # list of widgets to be rendered on the request form @@ -349,7 +350,8 @@ widget=TextField('desc', 40, util.restore_text( params.get( 'desc', '' ) )), helptext='(Optional)')) - widgets = self.__create_form(trans, request.type.sample_form_id, widgets, form_values, **kwd) + widgets = self.__create_form(trans, request.type.sample_form_id, widgets, + form_values, **kwd) title = 'Add a new sample to request: %s of type: %s' % (request.name, request.type.name) return trans.fill_template( '/sample/new_sample.mako', sample_form_id=request.type.sample_form_id, @@ -393,13 +395,13 @@ for index, field in enumerate(request.type.sample_form.fields): values.append(util.restore_text(params.get('field_%i' % index, ''))) if not sample_id: - form_values = trans.app.model.FormValues(request.type.sample_form.id, values) + form_values = trans.app.model.FormValues(request.type.sample_form, values) form_values.flush() - sample = trans.app.model.Sample(name, desc, request.id, form_values.id) + sample = trans.app.model.Sample(name, desc, request, form_values) sample.flush() # set the initial state state = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.request_type_id == request.type.id).first() - event = trans.app.model.SampleEvent(sample.id, state.id) + event = trans.app.model.SampleEvent(sample, state) event.flush() else: form_data.content = values diff -r dd5f1fe8f5e9 -r 079bf1a8422b lib/galaxy/web/controllers/requests_admin.py --- a/lib/galaxy/web/controllers/requests_admin.py Wed Jul 15 14:11:35 2009 -0400 +++ b/lib/galaxy/web/controllers/requests_admin.py Thu Jul 16 09:45:43 2009 -0400 @@ -242,15 +242,13 @@ return trans.fill_template( '/admin/samples/view_sample.mako', sample_details=sample_details) def __get_all_states(self, trans, sample): - request = trans.app.model.Request.get(sample.request_id) - request_type = trans.app.model.RequestType.get(request.request_type_id) all_states = trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample.id).all() - curr_state = trans.app.model.SampleState.get(all_states[len(all_states)-1].sample_state_id) - states_list = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.request_type_id == request_type.id) + curr_state = all_states[len(all_states)-1].state + states_list = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.request_type_id == sample.request.type.id) return states_list def __get_curr_state(self, trans, sample): all_states = trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample.id).all() - curr_state = trans.app.model.SampleState.get(all_states[len(all_states)-1].sample_state_id) + curr_state = all_states[len(all_states)-1].state return curr_state def change_state(self, trans, sample_id_list): sample = trans.app.model.Sample.get(sample_id_list[0]) @@ -280,35 +278,33 @@ sample_id_list = util.string_to_object(util.restore_text( params.sample_id_list )) comments = util.restore_text( params.comment ) sample = trans.app.model.Sample.get(sample_id_list[0]) - request = trans.app.model.Request.get(sample.request_id) selected_state = util.restore_text( params.select_state ) - new_state = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.request_type_id == request.request_type_id + new_state = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.request_type_id == sample.request.type.id and trans.app.model.SampleState.table.c.name == selected_state)[0] - for sample_id in sample_id_list: - event = trans.app.model.SampleEvent(sample_id, new_state.id, comments) + for id in sample_id_list: + s = trans.app.model.Sample.get(id) + event = trans.app.model.SampleEvent(s, new_state, comments) event.flush() return trans.response.send_redirect( web.url_for( controller='requests_admin', action='list', operation='samples', - id=trans.security.encode_id(request.id)) ) + id=trans.security.encode_id(sample.request.id)) ) @web.expose @web.require_admin def show_events(self, trans, sample_id): sample = trans.app.model.Sample.get(sample_id) - request = trans.app.model.Request.get(sample.request_id) events_list = [] all_events = trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample_id).all() all_events.reverse() for event in all_events: - state = trans.app.model.SampleState.get(event.sample_state_id) delta = datetime.utcnow() - event.update_time if delta > timedelta( minutes=60 ): last_update = '%s hours' % int( delta.seconds / 60 / 60 ) else: last_update = '%s minutes' % int( delta.seconds / 60 ) - events_list.append((state.name, state.desc, last_update, event.comment)) + events_list.append((event.state.name, event.state.desc, last_update, event.comment)) return trans.fill_template( '/admin/samples/events.mako', events_list=events_list, - sample_name=sample.name, user=trans.app.model.User.get(request.user_id), - request=request.name) + sample_name=sample.name, user=sample.request.user, + request=sample.request.name) \ No newline at end of file diff -r dd5f1fe8f5e9 -r 079bf1a8422b templates/admin/requests/manage_request_types.mako --- a/templates/admin/requests/manage_request_types.mako Wed Jul 15 14:11:35 2009 -0400 +++ b/templates/admin/requests/manage_request_types.mako Thu Jul 16 09:45:43 2009 -0400 @@ -41,18 +41,8 @@ <tr> <td><b><a href="${h.url_for( controller='admin', action='request_type', edit='True', id=request_type.id)}">${request_type.name}</a></b></td> <td><i>${request_type.desc}</i></td> - <% for form in forms: - if form.id == request_type.request_form_id: - form_name = form.name - break - %> - <td><a href="${h.url_for( controller='forms', action='edit', form_id=request_type.request_form_id, read_only=True)}">${form_name}</a></td> - <% for form in forms: - if form.id == request_type.sample_form_id: - form_name = form.name - break - %> - <td><a href="${h.url_for( controller='forms', action='edit', form_id=request_type.sample_form_id, read_only=True)}">${form_name}</a></td> + <td><a href="${h.url_for( controller='forms', action='edit', form_id=request_type.request_form.id, read_only=True)}">${request_type.request_form.name}</a></td> + <td><a href="${h.url_for( controller='forms', action='edit', form_id=request_type.sample_form.id, read_only=True)}">${request_type.sample_form.name}</a></td> </tr> %endfor </tbody>

1 0

[hg] galaxy 2485: Initial pass at allowing the setting of certai...
by Greg Von Kuster 16 Jul '09

16 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/dd5f1fe8f5e9 changeset: 2485:dd5f1fe8f5e9 user: Dan Blankenberg <dan(a)bx.psu.edu> date: Wed Jul 15 14:11:35 2009 -0400 description: Initial pass at allowing the setting of certain metadata parameters on upload (controlled via a flag). This allows the user to specify the 'base_name' to be used for Rgenetics datatypes, etc. Bunch of cleanup needed in upload. 9 file(s) affected in this change: lib/galaxy/datatypes/data.py lib/galaxy/datatypes/genetics.py lib/galaxy/datatypes/metadata.py lib/galaxy/datatypes/registry.py lib/galaxy/tools/__init__.py lib/galaxy/tools/actions/upload.py lib/galaxy/tools/parameters/grouping.py templates/tool_form.mako tools/data_source/upload.xml diffs (418 lines): diff -r dacc94994979 -r dd5f1fe8f5e9 lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py Wed Jul 15 12:18:43 2009 -0400 +++ b/lib/galaxy/datatypes/data.py Wed Jul 15 14:11:35 2009 -0400 @@ -49,6 +49,8 @@ """If False, the peek is regenerated whenever a dataset of this type is copied""" copy_safe_peek = True + + is_binary = True #The dataset contains binary data --> do not space_to_tab or convert newlines, etc. Allow binary file uploads of this type when True. #Composite datatypes composite_type = None @@ -250,7 +252,8 @@ def after_edit( self, dataset ): """This function is called on the dataset after metadata is edited.""" dataset.clear_associated_files( metadata_safe = True ) - def __new_composite_file( self, optional = False, mimetype = None, description = None, substitute_name_with_metadata = None, **kwds ): + def __new_composite_file( self, name, optional = False, mimetype = None, description = None, substitute_name_with_metadata = None, **kwds ): + kwds[ 'name' ] = name kwds[ 'optional' ] = optional kwds[ 'mimetype' ] = mimetype kwds[ 'description' ] = description @@ -258,7 +261,7 @@ return Bunch( **kwds ) def add_composite_file( self, name, **kwds ): #self.composite_files = self.composite_files.copy() - self.composite_files[ name ] = self.__new_composite_file( **kwds ) + self.composite_files[ name ] = self.__new_composite_file( name, **kwds ) def __substitute_composite_key( self, key, composite_file, dataset = None ): @@ -273,7 +276,7 @@ def writable_files( self, dataset = None ): files = odict() if self.composite_type != 'auto_primary_file': - files[ self.primary_file_name ] = self.__new_composite_file() + files[ self.primary_file_name ] = self.__new_composite_file( self.primary_file_name ) for key, value in self.get_composite_files( dataset = dataset ).iteritems(): files[ key ] = value return files diff -r dacc94994979 -r dd5f1fe8f5e9 lib/galaxy/datatypes/genetics.py --- a/lib/galaxy/datatypes/genetics.py Wed Jul 15 12:18:43 2009 -0400 +++ b/lib/galaxy/datatypes/genetics.py Wed Jul 15 14:11:35 2009 -0400 @@ -117,7 +117,7 @@ class Rgenetics(Html): """class to use for rgenetics""" """Add metadata elements""" - MetadataElement( name="base_name", desc="base name for all transformed versions of this genetic dataset", default="galaxy", readonly=True) + MetadataElement( name="base_name", desc="base name for all transformed versions of this genetic dataset", default="galaxy", readonly=True, set_in_upload=True) file_ext="html" composite_type = 'auto_primary_file' @@ -151,10 +151,7 @@ else: dataset.peek = 'file does not exist' dataset.blurb = 'file purged from disk' - #def sniff( self, filename ): - # """ - # """ - # return True + class Lped(Rgenetics): """fake class to distinguish different species of Rgenetics data collections @@ -245,7 +242,10 @@ MetadataElement( name="columns", default=0, desc="Number of columns", readonly=True, visible=False ) MetadataElement( name="column_names", default=[], desc="Column names", readonly=True,visible=True ) MetadataElement( name="base_name", - desc="base name for all transformed versions of this genetic dataset", readonly=True) + desc="base name for all transformed versions of this genetic dataset", readonly=True, default='galaxy', set_in_upload=True) + ### Do we really need these below? can we rely on dataset.extra_files_path: os.path.join( dataset.extra_files_path, '%s.phenodata' % dataset.metadata.base_name ) ? + ### Do these have a different purpose? Ross will need to clarify + ### Uploading these datatypes will not work until this is sorted out (set_peek fails)... MetadataElement( name="pheno_path", desc="Path to phenotype data for this experiment", readonly=True) MetadataElement( name="pheno", @@ -253,11 +253,19 @@ file_ext = None + is_binary = True + + composite_type = 'basic' + + def __init__( self, **kwd ): + Html.__init__( self, **kwd ) + self.add_composite_file( '%s.phenodata', substitute_name_with_metadata = 'base_name' ) + def set_peek( self, dataset ): """expects a .pheno file in the extra_files_dir - ugh note that R is wierd and does not include the row.name in the header. why?""" - p = file(dataset.metadata.pheno_path,'r').readlines() + p = file(dataset.metadata.pheno_path,'r').readlines() #this fails head = p[0].strip().split('\t') head.insert(0,'ChipFileName') # fix R write.table b0rken-ness p[0] = '\t'.join(head) @@ -295,6 +303,7 @@ if not dataset.peek: dataset.set_peek() pk = dataset.peek # use the peek which is the pheno data insead of dataset (!) + ###this is probably not the best source, can we just access the raw data directly? if pk: p = pk.split('\n') h = p[0].strip().split('\t') # hope is header @@ -339,10 +348,6 @@ """Returns the mime type of the datatype""" return 'application/gzip' - def sniff(self): - """ can we be bothered looking for the signature or loading via rpy? - """ - return true class AffyBatch( RexpBase ): """derived class for BioC data structures in Galaxy """ diff -r dacc94994979 -r dd5f1fe8f5e9 lib/galaxy/datatypes/metadata.py --- a/lib/galaxy/datatypes/metadata.py Wed Jul 15 12:18:43 2009 -0400 +++ b/lib/galaxy/datatypes/metadata.py Wed Jul 15 14:11:35 2009 -0400 @@ -212,12 +212,13 @@ is a MetadataSpecCollection) of datatype. """ - def __init__( self, datatype, name=None, desc=None, param=MetadataParameter, default=None, no_value = None, visible=True, **kwargs ): + def __init__( self, datatype, name=None, desc=None, param=MetadataParameter, default=None, no_value = None, visible=True, set_in_upload = False, **kwargs ): self.name = name self.desc = desc or name self.default = default self.no_value = no_value self.visible = visible + self.set_in_upload = set_in_upload # Catch-all, allows for extra attributes to be set self.__dict__.update(kwargs) #set up param last, as it uses values set above diff -r dacc94994979 -r dd5f1fe8f5e9 lib/galaxy/datatypes/registry.py --- a/lib/galaxy/datatypes/registry.py Wed Jul 15 12:18:43 2009 -0400 +++ b/lib/galaxy/datatypes/registry.py Wed Jul 15 14:11:35 2009 -0400 @@ -308,3 +308,19 @@ def get_composite_extensions( self ): return [ ext for ( ext, d_type ) in self.datatypes_by_extension.iteritems() if d_type.composite_type is not None ] + def get_upload_metadata_params( self, context, group, tool ): + """Returns dict of case value:inputs for metadata conditional for upload tool""" + rval = {} + for ext, d_type in self.datatypes_by_extension.iteritems(): + inputs = [] + for meta_name, meta_spec in d_type.metadata_spec.iteritems(): + if meta_spec.set_in_upload: + help_txt = meta_spec.desc + if not help_txt or help_txt == meta_name: + help_txt = "" + inputs.append( '<param type="text" name="%s" label="Set metadata value for "%s"" value="%s" help="%s"/>' % ( meta_name, meta_name, meta_spec.default, help_txt ) ) + rval[ ext ] = "\n".join( inputs ) + if 'auto' not in rval and 'txt' in rval: #need to manually add 'auto' datatype + rval[ 'auto' ] = rval[ 'txt' ] + return rval + diff -r dacc94994979 -r dd5f1fe8f5e9 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py Wed Jul 15 12:18:43 2009 -0400 +++ b/lib/galaxy/tools/__init__.py Wed Jul 15 14:11:35 2009 -0400 @@ -596,18 +596,40 @@ elif elem.tag == "conditional": group = Conditional() group.name = elem.get( "name" ) - # Should have one child "input" which determines the case - input_elem = elem.find( "param" ) - assert input_elem is not None, "<conditional> must have a child <param>" - group.test_param = self.parse_param_elem( input_elem, enctypes, context ) - # Must refresh when test_param changes - group.test_param.refresh_on_change = True - # And a set of possible cases - for case_elem in elem.findall( "when" ): - case = ConditionalWhen() - case.value = case_elem.get( "value" ) - case.inputs = self.parse_input_elem( case_elem, enctypes, context ) - group.cases.append( case ) + + group.name = elem.get( "name" ) + + group.value_ref = elem.get( 'value_ref', None ) + group.value_ref_in_group = util.string_as_bool( elem.get( 'value_ref_in_group', 'True' ) ) + value_from = elem.get( "value_from" ) + if value_from: + value_from = value_from.split( ':' ) + group.value_from = locals().get( value_from[0] ) + group.test_param = rval[ group.value_ref ] + group.test_param.refresh_on_change = True + for attr in value_from[1].split( '.' ): + group.value_from = getattr( group.value_from, attr ) + for case_value, case_inputs in group.value_from( context, group, self ).iteritems(): + case = ConditionalWhen() + case.value = case_value + if case_inputs: + case.inputs = self.parse_input_elem( ElementTree.XML( "<when>%s</when>" % case_inputs ), enctypes, context ) + else: + case.inputs = {} + group.cases.append( case ) + else: + # Should have one child "input" which determines the case + input_elem = elem.find( "param" ) + assert input_elem is not None, "<conditional> must have a child <param>" + group.test_param = self.parse_param_elem( input_elem, enctypes, context ) + # Must refresh when test_param changes + group.test_param.refresh_on_change = True + # And a set of possible cases + for case_elem in elem.findall( "when" ): + case = ConditionalWhen() + case.value = case_elem.get( "value" ) + case.inputs = self.parse_input_elem( case_elem, enctypes, context ) + group.cases.append( case ) rval[group.name] = group elif elem.tag == "upload_dataset": group = UploadDataset() @@ -615,6 +637,7 @@ group.title = elem.get( "title" ) group.file_type_name = elem.get( 'file_type_name', group.file_type_name ) group.default_file_type = elem.get( 'default_file_type', group.default_file_type ) + group.metadata_ref = elem.get( 'metadata_ref', group.metadata_ref ) rval[ group.file_type_name ].refresh_on_change = True rval[ group.file_type_name ].refresh_on_change_values = self.app.datatypes_registry.get_composite_extensions() group.inputs = self.parse_input_elem( elem, enctypes, context ) @@ -917,7 +940,10 @@ old_current_case = group_state['__current_case__'] group_prefix = "%s|" % ( key ) # Deal with the 'test' element and see if it's value changed - test_param_key = group_prefix + input.test_param.name + if input.value_ref and not input.value_ref_in_group: #we are referencing an existant parameter, which is not part of this group + test_param_key = prefix + input.test_param.name + else: + test_param_key = group_prefix + input.test_param.name test_param_error = None test_incoming = get_incoming_value( incoming, test_param_key, None ) if test_param_key not in incoming \ diff -r dacc94994979 -r dd5f1fe8f5e9 lib/galaxy/tools/actions/upload.py --- a/lib/galaxy/tools/actions/upload.py Wed Jul 15 12:18:43 2009 -0400 +++ b/lib/galaxy/tools/actions/upload.py Wed Jul 15 14:11:35 2009 -0400 @@ -46,21 +46,26 @@ uploaded_datasets = dataset_upload_input.get_uploaded_datasets( trans, incoming ) for uploaded_dataset in uploaded_datasets: precreated_dataset = self.get_precreated_dataset( uploaded_dataset.precreated_name ) - dataset = self.add_file( trans, uploaded_dataset.primary_file, uploaded_dataset.name, uploaded_dataset.file_type, uploaded_dataset.is_multi_byte, uploaded_dataset.dbkey, space_to_tab = uploaded_dataset.space_to_tab, info = uploaded_dataset.info, precreated_dataset = precreated_dataset ) - if uploaded_dataset.composite_files: + dataset = self.add_file( trans, uploaded_dataset.primary_file, uploaded_dataset.name, uploaded_dataset.file_type, uploaded_dataset.is_multi_byte, uploaded_dataset.dbkey, space_to_tab = uploaded_dataset.space_to_tab, info = uploaded_dataset.info, precreated_dataset = precreated_dataset, metadata = uploaded_dataset.metadata ) + composite_files = dataset.datatype.get_composite_files( dataset ) + if composite_files: os.mkdir( dataset.extra_files_path ) #make extra files path - for name, value in uploaded_dataset.composite_files.iteritems(): + for name, value in composite_files.iteritems(): #what about binary files here, need to skip converting newlines - if value is None and not dataset.datatype.writable_files[ name ].optional: + if uploaded_dataset.composite_files[ value.name ] is None and not value.optional: dataset.info = "A required composite data file was not provided (%s)" % name dataset.state = dataset.states.ERROR break - elif value is not None: - if value.space_to_tab: - sniff.convert_newlines_sep2tabs( value.filename ) + elif uploaded_dataset.composite_files[ value.name] is not None: + if uploaded_dataset.composite_files[ value.name ].space_to_tab: + sniff.convert_newlines_sep2tabs( uploaded_dataset.composite_files[ value.name ].filename ) else: - sniff.convert_newlines( value.filename ) - shutil.move( value.filename, os.path.join( dataset.extra_files_path, name ) ) + sniff.convert_newlines( uploaded_dataset.composite_files[ value.name ].filename ) + shutil.move( uploaded_dataset.composite_files[ value.name ].filename, os.path.join( dataset.extra_files_path, name ) ) + if dataset.datatype.composite_type == 'auto_primary_file': + #now that metadata is set, we should create the primary file as required + open( dataset.file_name, 'wb+' ).write( dataset.datatype.generate_primary_file( dataset = dataset ) ) + data_list.append( dataset ) #clean up extra temp names uploaded_dataset.clean_up_temp_files() @@ -125,7 +130,7 @@ trans.log_event( 'job id %d ended with errors, err_msg: %s' % ( job.id, err_msg ), tool_id=job.tool_id ) return dict( output=data ) - def add_file( self, trans, temp_name, file_name, file_type, is_multi_byte, dbkey, info=None, space_to_tab=False, precreated_dataset=None ): + def add_file( self, trans, temp_name, file_name, file_type, is_multi_byte, dbkey, info=None, space_to_tab=False, precreated_dataset=None, metadata = {} ): def dataset_no_data_error( data, message = 'there was an error uploading your file' ): data.info = "No data: %s." % message data.state = data.states.ERROR @@ -217,6 +222,7 @@ if trans.app.datatypes_registry.get_datatype_by_extension( file_type ).composite_type != 'auto_primary_file' and self.check_html( temp_name ): return dataset_no_data_error( data, message = "you attempted to upload an inappropriate file" ) #raise BadFileException( "you attempted to upload an inappropriate file." ) + #if data_type != 'binary' and data_type != 'zip' and not trans.app.datatypes_registry.get_datatype_by_extension( ext ).is_binary: if data_type != 'binary' and data_type != 'zip': if space_to_tab: self.line_count = sniff.convert_newlines_sep2tabs( temp_name ) @@ -235,9 +241,14 @@ data.info = info data.flush() shutil.move( temp_name, data.file_name ) - data.state = data.states.OK + ## FIXME + data.state = data.states.OK ##THIS SHOULD BE THE LAST THING DONE + #### its bad to set other things after this point, i.e. metadata and composite files...this creates a race condition where a dataset could be pushed into a job before its metadata, etc is set data.set_size() data.init_meta() + #need to set metadata, has to be done after extention is set + for meta_name, meta_value in metadata.iteritems(): + setattr( data.metadata, meta_name, meta_value ) if self.line_count is not None: try: if is_multi_byte: diff -r dacc94994979 -r dd5f1fe8f5e9 lib/galaxy/tools/parameters/grouping.py --- a/lib/galaxy/tools/parameters/grouping.py Wed Jul 15 12:18:43 2009 -0400 +++ b/lib/galaxy/tools/parameters/grouping.py Wed Jul 15 14:11:35 2009 -0400 @@ -92,6 +92,7 @@ self.file_type_name = 'file_type' self.default_file_type = 'txt' self.file_type_to_ext = { 'auto':self.default_file_type } + self.metadata_ref = 'files_metadata' def get_file_type( self, context ): return context.get( self.file_type_name, self.default_file_type ) def get_datatype_ext( self, trans, context ): @@ -297,6 +298,7 @@ self.composite_files = odict() self.dbkey = None self.warnings = [] + self.metadata = {} self._temp_filenames = [] #store all created filenames here, delete on cleanup def register_temp_file( self, filename ): @@ -333,6 +335,13 @@ dataset.datatype = d_type dataset.dbkey = dbkey + #load metadata + files_metadata = context.get( self.metadata_ref, {} ) + for meta_name, meta_spec in d_type.metadata_spec.iteritems(): + if meta_spec.set_in_upload: + if meta_name in files_metadata: + dataset.metadata[ meta_name ] = files_metadata[ meta_name ] + temp_name = None precreated_name = None is_multi_byte = False @@ -359,10 +368,10 @@ dataset.warnings.extend( warnings ) dataset.register_temp_file( temp_name ) - keys = writable_files.keys() + keys = [ value.name for value in writable_files.values() ] for i, group_incoming in enumerate( groups_incoming[ writable_files_offset : ] ): key = keys[ i + writable_files_offset ] - if group_incoming is None and not writable_files[ key ].optional: + if group_incoming is None and not writable_files[ writable_files.keys()[ keys.index( key ) ] ].optional: dataset.warnings.append( "A required composite file (%s) was not specified." % ( key ) ) dataset.composite_files[ key ] = None else: @@ -372,7 +381,7 @@ dataset.register_temp_file( temp_name ) else: dataset.composite_files[ key ] = None - if not writable_files[ key ].optional: + if not writable_files[ writable_files.keys()[ keys.index( key ) ] ].optional: dataset.warnings.append( "A required composite file (%s) was not specified." % ( key ) ) return [ dataset ] else: @@ -404,6 +413,8 @@ Group.__init__( self ) self.test_param = None self.cases = [] + self.value_ref = None + self.value_ref_in_group = True #When our test_param is not part of the conditional Group, this is False def get_current_case( self, value, trans ): # Convert value to user representation str_value = self.test_param.filter_value( value, trans ) @@ -460,4 +471,4 @@ class ConditionalWhen( object ): def __init__( self ): self.value = None - self.inputs = None \ No newline at end of file + self.inputs = None diff -r dacc94994979 -r dd5f1fe8f5e9 templates/tool_form.mako --- a/templates/tool_form.mako Wed Jul 15 12:18:43 2009 -0400 +++ b/templates/tool_form.mako Wed Jul 15 14:11:35 2009 -0400 @@ -102,7 +102,9 @@ current_case = group_state['__current_case__'] group_prefix = prefix + input.name + "|" %> - ${row_for_param( group_prefix, input.test_param, group_state, group_errors, other_values )} + %if input.value_ref_in_group: + ${row_for_param( group_prefix, input.test_param, group_state, group_errors, other_values )} + %endif ${do_inputs( input.cases[current_case].inputs, group_state, group_errors, group_prefix, other_values )} %elif input.type == "upload_dataset": %if input.get_datatype( trans, other_values ).composite_type is None: #have non-composite upload appear as before diff -r dacc94994979 -r dd5f1fe8f5e9 tools/data_source/upload.xml --- a/tools/data_source/upload.xml Wed Jul 15 12:18:43 2009 -0400 +++ b/tools/data_source/upload.xml Wed Jul 15 14:11:35 2009 -0400 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tool name="Upload File" id="upload1" version="1.0.1"> +<tool name="Upload File" id="upload1" version="1.0.2"> <description> from your computer </description> @@ -15,7 +15,7 @@ </options> </param> <param name="async_datasets" type="hidden" value="None"/> - <upload_dataset name="files" title="Specify Files for Dataset" file_type_name="file_type"> + <upload_dataset name="files" title="Specify Files for Dataset" file_type_name="file_type" metadata_ref="files_metadata"> <param name="file_data" type="file" size="30" label="File" ajax-upload="true"> <validator type="expression" message="You will need to reselect the file you specified (%s)." substitute_value_in_message="True">not ( ( isinstance( value, unicode ) or isinstance( value, str ) ) and value != "" )</validator>  </param> @@ -25,6 +25,7 @@ </param> </upload_dataset> <param name="dbkey" type="genomebuild" label="Genome" /> + <conditional name="files_metadata" title="Specify metadata" value_from="self:app.datatypes_registry.get_upload_metadata_params" value_ref="file_type" value_ref_in_group="False" />  </inputs> <help>

1 0

[hg] galaxy 2483: Updates to egg configs for Python 2.6 support....
by Greg Von Kuster 16 Jul '09

16 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/5707f033e31a changeset: 2483:5707f033e31a user: Nate Coraor <nate(a)bx.psu.edu> date: Wed Jul 15 12:00:02 2009 -0400 description: Updates to egg configs for Python 2.6 support. 2.6 is not yet supported, this commit is preliminary work for such support. 2 file(s) affected in this change: dist-eggs.ini eggs.ini diffs (80 lines): diff -r b0fb9200afe0 -r 5707f033e31a dist-eggs.ini --- a/dist-eggs.ini Tue Jul 14 16:55:18 2009 -0400 +++ b/dist-eggs.ini Wed Jul 15 12:00:02 2009 -0400 @@ -11,36 +11,49 @@ py2.4-linux-i686-ucs4 = scofield.bx.psu.edu /depot/projects/pythons/linux-i686-ucs4/bin/python2.4 py2.5-linux-i686-ucs2 = scofield.bx.psu.edu /depot/projects/pythons/linux-i686-ucs2/bin/python2.5 py2.5-linux-i686-ucs4 = scofield.bx.psu.edu /depot/projects/pythons/linux-i686-ucs4/bin/python2.5 +py2.6-linux-i686-ucs2 = scofield.bx.psu.edu /depot/projects/pythons/linux-i686-ucs2/bin/python2.6 +py2.6-linux-i686-ucs4 = scofield.bx.psu.edu /depot/projects/pythons/linux-i686-ucs4/bin/python2.6 py2.4-linux-x86_64-ucs2 = herbie.bx.psu.edu /depot/projects/pythons/linux-x86_64-ucs2/bin/python2.4 py2.4-linux-x86_64-ucs4 = herbie.bx.psu.edu /depot/projects/pythons/linux-x86_64-ucs4/bin/python2.4 py2.5-linux-x86_64-ucs2 = herbie.bx.psu.edu /depot/projects/pythons/linux-x86_64-ucs2/bin/python2.5 py2.5-linux-x86_64-ucs4 = herbie.bx.psu.edu /depot/projects/pythons/linux-x86_64-ucs4/bin/python2.5 +py2.6-linux-x86_64-ucs2 = herbie.bx.psu.edu /depot/projects/pythons/linux-x86_64-ucs2/bin/python2.6 +py2.6-linux-x86_64-ucs4 = herbie.bx.psu.edu /depot/projects/pythons/linux-x86_64-ucs4/bin/python2.6 py2.4-macosx-10.3-fat-ucs2 = medeski.bx.psu.edu /usr/local/bin/python2.4 py2.5-macosx-10.3-fat-ucs2 = medeski.bx.psu.edu /usr/local/bin/python2.5 +py2.6-macosx-10.3-fat-ucs2 = medeski.bx.psu.edu /usr/local/bin/python2.6 py2.5-macosx-10.5-i386-ucs2 = lion.bx.psu.edu /usr/bin/python2.5 py2.4-solaris-2.11-i86pc-ucs2 = victory.bx.psu.edu /depot/projects/pythons/solaris-2.11-i86pc-ucs2/bin/python2.4 py2.5-solaris-2.11-i86pc-ucs2 = victory.bx.psu.edu /depot/projects/pythons/solaris-2.11-i86pc-ucs2/bin/python2.5 +py2.6-solaris-2.11-i86pc-ucs2 = victory.bx.psu.edu /depot/projects/pythons/solaris-2.11-i86pc-ucs2/bin/python2.6 py2.4-solaris-2.10-sun4u-ucs2 = v880.bx.psu.edu /depot/projects/pythons/solaris-2.10-sun4u-ucs2/bin/python2.4 py2.5-solaris-2.10-sun4u-ucs2 = v880.bx.psu.edu /depot/projects/pythons/solaris-2.10-sun4u-ucs2/bin/python2.5 +py2.6-solaris-2.10-sun4u-ucs2 = v880.bx.psu.edu /depot/projects/pythons/solaris-2.10-sun4u-ucs2/bin/python2.6 [groups] py2.4-linux-i686 = py2.4-linux-i686-ucs2 py2.4-linux-i686-ucs4 py2.4-linux-x86_64 = py2.4-linux-x86_64-ucs2 py2.4-linux-x86_64-ucs4 py2.5-linux-i686 = py2.5-linux-i686-ucs2 py2.5-linux-i686-ucs4 py2.5-linux-x86_64 = py2.5-linux-x86_64-ucs2 py2.5-linux-x86_64-ucs4 +py2.6-linux-i686 = py2.6-linux-i686-ucs2 py2.6-linux-i686-ucs4 +py2.6-linux-x86_64 = py2.6-linux-x86_64-ucs2 py2.6-linux-x86_64-ucs4 py2.4-linux = py2.4-linux-i686 py2.4-linux-x86_64 py2.5-linux = py2.5-linux-i686 py2.5-linux-x86_64 -linux-i686 = py2.4-linux-i686 py2.5-linux-i686 -linux-x86_64 = py2.4-linux-x86_64 py2.5-linux-x86_64 +py2.6-linux = py2.6-linux-i686 py2.6-linux-x86_64 +linux-i686 = py2.4-linux-i686 py2.5-linux-i686 py2.6-linux-i686 +linux-x86_64 = py2.4-linux-x86_64 py2.5-linux-x86_64 py2.6-linux-x86_64 linux = linux-i686 linux-x86_64 py2.4-macosx = py2.4-macosx-10.3-fat-ucs2 py2.5-macosx = py2.5-macosx-10.3-fat-ucs2 py2.5-macosx-10.5-i386-ucs2 -macosx = py2.4-macosx py2.5-macosx +py2.6-macosx = py2.6-macosx-10.3-fat-ucs2 +macosx = py2.4-macosx py2.5-macosx py2.6-macosx py2.4-solaris = py2.4-solaris-2.11-i86pc-ucs2 py2.4-solaris-2.10-sun4u-ucs2 py2.5-solaris = py2.5-solaris-2.11-i86pc-ucs2 py2.5-solaris-2.10-sun4u-ucs2 -solaris = py2.4-solaris py2.5-solaris +py2.6-solaris = py2.6-solaris-2.11-i86pc-ucs2 py2.6-solaris-2.10-sun4u-ucs2 +solaris = py2.4-solaris py2.5-solaris py2.6-solaris py2.4-all = py2.4-linux py2.4-macosx py2.4-solaris py2.5-all = py2.5-linux py2.5-macosx py2.5-solaris -all = py2.4-all py2.5-all +py2.6-all = py2.6-linux py2.6-macosx py2.6-solaris +all = py2.4-all py2.5-all py2.6-all ; default hosts for platform-inspecific eggs -noplatform = py2.4-linux-i686-ucs4 py2.5-linux-i686-ucs4 +noplatform = py2.4-linux-i686-ucs4 py2.5-linux-i686-ucs4 py2.6-linux-i686-ucs4 diff -r b0fb9200afe0 -r 5707f033e31a eggs.ini --- a/eggs.ini Tue Jul 14 16:55:18 2009 -0400 +++ b/eggs.ini Wed Jul 15 12:00:02 2009 -0400 @@ -68,7 +68,7 @@ bx_python = http://bitbucket.org/james_taylor/bx-python/get/4bf1f32e6b76.bz2 Cheetah = http://voxel.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-1.0.tar… DRMAA_python = http://gridengine.sunsource.net/files/documents/7/36/DRMAA-python-0.2.tar.gz -MySQL_python = http://superb-west.dl.sourceforge.net/sourceforge/mysql-python/MySQL-python… http://mysql.mirrors.pair.com/Downloads/MySQL-5.0/mysql-5.0.67.tar.gz +MySQL_python = http://superb-west.dl.sourceforge.net/sourceforge/mysql-python/MySQL-python… http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.67.tar.gz pbs_python = http://ftp.sara.nl/pub/outgoing/pbs_python-2.9.4.tar.gz psycopg2 = http://initd.org/pub/software/psycopg/PSYCOPG-2-0/psycopg2-2.0.6.tar.gz ftp://ftp-archives.postgresql.org/pub/source/v8.2.6/postgresql-8.2.6.tar.bz2 pycrypto = http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz @@ -79,7 +79,7 @@ Beaker = http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-0.5.tar.gz docutils = http://downloads.sourceforge.net/docutils/docutils-0.4.tar.gz elementtree = http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz -flup = http://www.saddi.com/software/flup/dist/flup-r2311.tar.gz +flup = http://www.saddi.com/software/flup/dist/archive/flup-r2311.tar.gz lrucache = http://evan.prodromou.name/lrucache/lrucache-0.2.tar.gz Mako = http://www.makotemplates.org/downloads/Mako-0.1.10.tar.gz MyghtyUtils = http://cheeseshop.python.org/packages/source/M/MyghtyUtils/MyghtyUtils-0.52…

1 0

[hg] galaxy 2482: Removed a debug statement
by Greg Von Kuster 15 Jul '09

15 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/b0fb9200afe0 changeset: 2482:b0fb9200afe0 user: rc date: Tue Jul 14 16:55:18 2009 -0400 description: Removed a debug statement 1 file(s) affected in this change: lib/galaxy/web/controllers/requests.py diffs (11 lines): diff -r c60fc2075dd5 -r b0fb9200afe0 lib/galaxy/web/controllers/requests.py --- a/lib/galaxy/web/controllers/requests.py Tue Jul 14 15:49:53 2009 -0400 +++ b/lib/galaxy/web/controllers/requests.py Tue Jul 14 16:55:18 2009 -0400 @@ -184,7 +184,6 @@ msg=msg, messagetype=messagetype ) elif params.get('create', False) == 'True': - print >> sys.stderr, '###KWD', kwd return self.__show_request_form(trans=trans, request=None, **kwd) elif params.get('save', False) == 'True':

1 0

[hg] galaxy 2481: Updates to forms/requests:
by Greg Von Kuster 15 Jul '09

15 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/c60fc2075dd5 changeset: 2481:c60fc2075dd5 user: rc date: Tue Jul 14 15:49:53 2009 -0400 description: Updates to forms/requests: - Mappers added to form & requests tables - Required/optional fields in requests and samples are now enforced Bug fix: duplicate field names in a request is working now 9 file(s) affected in this change: lib/galaxy/model/__init__.py lib/galaxy/model/mapping.py lib/galaxy/web/controllers/admin.py lib/galaxy/web/controllers/forms.py lib/galaxy/web/controllers/requests.py lib/galaxy/web/controllers/requests_admin.py templates/base.mako templates/sample/grid.mako templates/sample/sample_events.mako diffs (935 lines): diff -r dc5068efc3e7 -r c60fc2075dd5 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py Tue Jul 14 11:33:42 2009 -0400 +++ b/lib/galaxy/model/__init__.py Tue Jul 14 15:49:53 2009 -0400 @@ -1115,7 +1115,8 @@ self.content = content class Request( object ): - def __init__(self, name=None, desc=None, request_type_id=None, user_id=None, form_values_id=None, library_id=None): + def __init__(self, name=None, desc=None, request_type_id=None, user_id=None, + form_values_id=None, library_id=None): self.name = name self.desc = desc self.request_type_id = request_type_id diff -r dc5068efc3e7 -r c60fc2075dd5 lib/galaxy/model/mapping.py --- a/lib/galaxy/model/mapping.py Tue Jul 14 11:33:42 2009 -0400 +++ b/lib/galaxy/model/mapping.py Tue Jul 14 15:49:53 2009 -0400 @@ -607,19 +607,39 @@ assign_mapper( context, Sample, Sample.table, properties=dict( events=relation( SampleEvent, backref="sample", order_by=desc(SampleEvent.table.c.update_time) ), + values=relation( FormValues, + primaryjoin=( Sample.table.c.form_values_id == FormValues.table.c.id ) ), + request=relation( Request, + primaryjoin=( Sample.table.c.request_id == Request.table.c.id ) ), ) ) assign_mapper( context, FormValues, FormValues.table, properties=None) -assign_mapper( context, Request, Request.table, properties=None) +assign_mapper( context, Request, Request.table, + properties=dict( values=relation( FormValues, + primaryjoin=( Request.table.c.form_values_id == FormValues.table.c.id ) ), + type=relation( RequestType, + primaryjoin=( Request.table.c.request_type_id == RequestType.table.c.id ) ), + user=relation( User, + primaryjoin=( Request.table.c.user_id == User.table.c.id ), + backref="requests" ), + library=relation( Library, + primaryjoin=( Request.table.c.library_id == Library.table.c.id ) ), + ) ) assign_mapper( context, RequestType, RequestType.table, properties=dict( states=relation( SampleState, backref="request_type", order_by=desc(SampleState.table.c.update_time) ), + request_form=relation( FormDefinition, + primaryjoin=( RequestType.table.c.request_form_id == FormDefinition.table.c.id ) ), + sample_form=relation( FormDefinition, + primaryjoin=( RequestType.table.c.sample_form_id == FormDefinition.table.c.id ) ), ) ) -assign_mapper( context, FormDefinition, FormDefinition.table, properties=None) - +assign_mapper( context, FormDefinition, FormDefinition.table, + properties=dict( current=relation( FormDefinitionCurrent, + primaryjoin=( FormDefinition.table.c.form_definition_current_id == FormDefinitionCurrent.table.c.id ) ) + ) ) assign_mapper( context, FormDefinitionCurrent, FormDefinitionCurrent.table, properties=dict( forms=relation( FormDefinition, backref='form_definition_current', cascade="all, delete-orphan", @@ -628,11 +648,14 @@ primaryjoin=( FormDefinitionCurrent.table.c.latest_form_id == FormDefinition.table.c.id ) ) ) ) -assign_mapper( context, SampleEvent, SampleEvent.table, properties=None) +assign_mapper( context, SampleEvent, SampleEvent.table, + properties=dict( state=relation( SampleState, + primaryjoin=( SampleEvent.table.c.sample_state_id == SampleState.table.c.id ) ), + ) ) + assign_mapper( context, SampleState, SampleState.table, - properties=None #dict( sample=relation( Sample, backref="sample" ), - )# ) + properties=None ) assign_mapper( context, ValidationError, ValidationError.table ) @@ -701,8 +724,8 @@ assign_mapper( context, User, User.table, properties=dict( histories=relation( History, backref="user", order_by=desc(History.table.c.update_time) ), - requests=relation( Request, backref="user", - order_by=desc(Request.table.c.update_time) ), +# requests=relation( Request, backref="user", +# order_by=desc(Request.table.c.update_time) ), active_histories=relation( History, primaryjoin=( ( History.table.c.user_id == User.table.c.id ) & ( not_( History.table.c.deleted ) ) ), order_by=desc( History.table.c.update_time ) ), galaxy_sessions=relation( GalaxySession, order_by=desc( GalaxySession.table.c.update_time ) ), stored_workflow_menu_entries=relation( StoredWorkflowMenuEntry, backref="user", diff -r dc5068efc3e7 -r c60fc2075dd5 lib/galaxy/web/controllers/admin.py --- a/lib/galaxy/web/controllers/admin.py Tue Jul 14 11:33:42 2009 -0400 +++ b/lib/galaxy/web/controllers/admin.py Tue Jul 14 15:49:53 2009 -0400 @@ -2146,7 +2146,7 @@ msg=msg, messagetype=messagetype) elif params.get('save_new', False) == 'True': - st, msg = self._save_request_type(trans, params, None) + st, msg = self._save_request_type(trans, **kwd) if not st: return trans.fill_template( '/admin/requests/create_request_type.mako', forms=self._get_all_forms(trans, all_versions=False), @@ -2170,24 +2170,9 @@ show_deleted=False, msg=msg, messagetype=messagetype ) - elif params.get('save_changes', False) == 'True': - st = trans.app.model.SampleType.get(int(util.restore_text( params.id ))) - st, msg = self._save_sample_type(trans, params, st.id) - if st: - msg = "The sample type '%s' has been updated with the changes." % st.name - messagetype = 'done' - else: - messagetype = 'error' - ss_list = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.sample_type_id == st.id).all() - return trans.fill_template( '/admin/samples/edit_sample_type.mako', - sample_type=st, - forms=self._get_all_forms(trans, all_versions=False), - states_list=ss_list, - deleted=False, - show_deleted=False, - msg=msg, - messagetype=messagetype ) - def _save_request_type(self, trans, params, request_type_id): + + def _save_request_type(self, trans, **kwd): + params = util.Params( kwd ) num_states = int( util.restore_text( params.get( 'num_states', 0 ) )) proceed = True for i in range( num_states ): @@ -2197,10 +2182,7 @@ if not proceed: msg = "All the state name(s) must be completed." return None, msg - if not request_type_id: # create a new sample type to save - rt = trans.app.model.RequestType() - else: # use the existing sample type to save changes - rt = trans.app.model.RequestType.get(request_type_id) + rt = trans.app.model.RequestType() rt.name = util.restore_text( params.name ) rt.desc = util.restore_text( params.description ) or "" rt.request_form_id = int(util.restore_text( params.request_form_id )) diff -r dc5068efc3e7 -r c60fc2075dd5 lib/galaxy/web/controllers/forms.py --- a/lib/galaxy/web/controllers/forms.py Tue Jul 14 11:33:42 2009 -0400 +++ b/lib/galaxy/web/controllers/forms.py Tue Jul 14 15:49:53 2009 -0400 @@ -70,7 +70,7 @@ elif params.get('create_form', False) == 'True': if 'submitted' in params.new: self.num_add_fields = 0 - fd, msg = self.__save_form(trans, params) + fd, msg = self.__save_form(trans, fdc_id=None, **kwd) self.__get_saved_form(fd) return self._show_forms_list(trans, msg, messagetype) @web.expose @@ -90,29 +90,34 @@ # the following two dicts store the unsaved select box options self.del_options = {} self.add_options = {} - return self.__show(trans, params, fd) + return self.__show(trans=trans, form=fd, msg=msg, + messagetype=messagetype, **kwd) # DELETE FIELD elif params.get('remove_button', False): - self.__update_current_form(params) + self.__update_current_form(**kwd) index = int(params.get('remove_button', None).split(' ')[2])-1 self.__remove_field(index) - return self.__show(trans, params, fd) + return self.__show(trans=trans, form=fd, msg=msg, + messagetype=messagetype, **kwd) # SAVE CHANGES elif params.get('save_changes_button', False) == 'Save': - self.__update_current_form(params) - fd_new, msg = self.__save_form(trans, params, fd.form_definition_current.id) + self.__update_current_form(**kwd) + fd_new, msg = self.__save_form(trans, fd.form_definition_current.id, **kwd) if not fd_new: - return self.__show(trans, params, fd, msg, 'error') + return self.__show(trans=trans, form=fd, msg=msg, + messagetype='error', **kwd) else: fd = fd_new msg = "The form '%s' has been updated with the changes." % fd.name - return self.__show(trans, params, fd, msg) + return self.__show(trans=trans, form=fd, msg=msg, + messagetype=messagetype, **kwd) #ADD A FIELD elif params.get('add_field_button', False) == 'Add field': - self.__update_current_form(params) + self.__update_current_form(**kwd) self.__add_field() # show the form again with one empty field - return self.__show(trans, params, fd) + return self.__show(trans=trans, form=fd, msg=msg, + messagetype=messagetype, **kwd) # SHOW FORM READ ONLY elif params.get('read_only', False): return trans.fill_template( '/admin/forms/show_form_read_only.mako', @@ -121,21 +126,24 @@ messagetype=messagetype ) # REFRESH PAGE, SelectField is selected/deselected as the type of a field elif params.get('refresh', False) == 'true': - self.__update_current_form(params) - return self.__show(trans, params, fd) + self.__update_current_form(**kwd) + return self.__show(trans=trans, form=fd, msg=msg, + messagetype=messagetype, **kwd) # REMOVE SelectField OPTION elif params.get('select_box_options', False) == 'remove': - #self.__update_current_form(params) + #self.__update_current_form(**kwd) index = int(params.get( 'field_index', None )) option = int(params.get( 'option_index', None )) del self.current_form['fields'][index]['selectlist'][option] - return self.__show(trans, params, fd) + return self.__show(trans=trans, form=fd, msg=msg, + messagetype=messagetype, **kwd) # ADD SelectField OPTION elif params.get('select_box_options', False) == 'add': - #self.__update_current_form(params) + #self.__update_current_form(**kwd) index = int(params.get( 'field_index', None )) self.current_form['fields'][index]['selectlist'].append('') - return self.__show(trans, params, fd) + return self.__show(trans=trans, form=fd, msg=msg, + messagetype=messagetype, **kwd) def __remove_field(self, index): del self.current_form['fields'][index] def __add_field(self): @@ -149,26 +157,31 @@ 'type': BaseField.form_field_types()[0], 'selectlist': '' } self.current_form['fields'].append(empty_field) - def __get_field(self, params, index): + def __get_field(self, index, **kwd): + params = util.Params( kwd ) name = util.restore_text( params.get( 'field_name_%i' % index, None ) ) helptext = util.restore_text( params.get( 'field_helptext_%i' % index, None ) ) required = params.get( 'field_required_%i' % index, False ) field_type = util.restore_text( params.get( 'field_type_%i' % index, None ) ) if field_type == 'SelectField': - selectlist = self.__get_selectbox_options(params, index) - else: - selectlist = None + selectlist = self.__get_selectbox_options(index, **kwd) + return {'label': name, + 'helptext': helptext, + 'visible': True, + 'required': required, + 'type': field_type, + 'selectlist': selectlist } return {'label': name, 'helptext': helptext, 'visible': True, 'required': required, - 'type': field_type, - 'selectlist': selectlist } - def __get_selectbox_options(self, params, index): + 'type': field_type} + def __get_selectbox_options(self, index, **kwd): ''' This method gets all the options entered by the user for field when the fieldtype is SelectField ''' + params = util.Params( kwd ) ctr=0 sb_options = [] while True: @@ -183,12 +196,13 @@ self.current_form['name'] = fd.name self.current_form['desc'] = fd.desc self.current_form['fields'] = list(copy.deepcopy(fd.fields)) - def __validate_form(self, params): + def __validate_form(self, **kwd): ''' This method checks the following text inputs are filled out by the user - the name of form - name of all the fields ''' + params = util.Params( kwd ) # form name if not util.restore_text( params.name ): return None, 'Form name must be filled.' @@ -197,32 +211,33 @@ if not util.restore_text(params.get( 'field_name_%i' % i, None )): return None, "All the field label(s) must be completed." return True, '' - def __get_form(self, params): + def __get_form(self, **kwd): + params = util.Params( kwd ) name = util.restore_text( params.name ) desc = util.restore_text( params.description ) or "" # set form fields fields = [] for i in range( len(self.current_form['fields']) ): - fields.append(self.__get_field(params, i)) + fields.append(self.__get_field(i, **kwd)) fields = fields return name, desc, fields - def __update_current_form(self, params): - name, desc, fields = self.__get_form(params) + def __update_current_form(self, **kwd): + name, desc, fields = self.__get_form(**kwd) self.current_form = {} self.current_form['name'] = name self.current_form['desc'] = desc self.current_form['fields'] = fields - def __save_form(self, trans, params, fdc_id=None): + def __save_form(self, trans, fdc_id=None, **kwd): ''' This method saves the current form ''' # check the form for invalid inputs - flag, msg = self.__validate_form(params) + flag, msg = self.__validate_form(**kwd) if not flag: return None, msg fd = trans.app.model.FormDefinition() - fd.name, fd.desc, fd.fields = self.__get_form(params) + fd.name, fd.desc, fd.fields = self.__get_form(**kwd) if fdc_id: # save changes to the existing form # change the pointer in the form_definition_current table to point # to this new record @@ -302,10 +317,11 @@ def label(self): return str(self.index)+'.'+self.label - def __show(self, trans, params, form, msg=None, messagetype='done'): + def __show(self, trans, form, msg=None, messagetype='done', **kwd): ''' This method displays the form and any of the changes made to it ''' + params = util.Params( kwd ) # name & description form_details = [ ( 'Name', TextField('name', 40, self.current_form['name']) ), ( 'Description', TextField('description', 40, self.current_form['desc']) ) ] diff -r dc5068efc3e7 -r c60fc2075dd5 lib/galaxy/web/controllers/requests.py --- a/lib/galaxy/web/controllers/requests.py Tue Jul 14 11:33:42 2009 -0400 +++ b/lib/galaxy/web/controllers/requests.py Tue Jul 14 15:49:53 2009 -0400 @@ -6,11 +6,9 @@ from galaxy.util.streamball import StreamBall import logging, tempfile, zipfile, tarfile, os, sys from galaxy.web.form_builder import * +from datetime import datetime, timedelta log = logging.getLogger( __name__ ) - -# States for passing messages -SUCCESS, INFO, WARNING, ERROR = "done", "info", "warning", "error" class RequestsListGrid( grids.Grid ): title = "Requests" @@ -41,8 +39,7 @@ def get_current_item( self, trans ): return None def get_request_type(self, trans, request): - request_type = trans.app.model.RequestType.get(request.request_type_id) - return request_type.name + return request.type.name def apply_default_filter( self, trans, query ): return query.filter_by( user=trans.user ) def number_of_samples(self, trans, request): @@ -83,7 +80,7 @@ return query.filter_by( request_id=self.request.id ) def get_status(self, trans, sample): all_states = trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample.id).all() - curr_state = trans.app.model.SampleState.get(all_states[len(all_states)-1].sample_state_id) + curr_state = all_states[len(all_states)-1].state return curr_state.name class Requests( BaseController ): @@ -92,6 +89,7 @@ @web.expose def index( self, trans ): return trans.fill_template( "requests/index.mako" ) + def get_authorized_libs(self, trans): all_libraries = trans.app.model.Library.filter(trans.app.model.Library.table.c.deleted == False).order_by(trans.app.model.Library.name).all() authorized_libraries = [] @@ -134,9 +132,6 @@ Shows the request details ''' request = trans.app.model.Request.get(id) - request_type = trans.app.model.RequestType.get(request.request_type_id) - request_form = trans.app.model.FormDefinition.get(request_type.request_form_id) - request_values = trans.app.model.FormValues.get(request.form_values_id) libraries = self.get_authorized_libs(trans) # list of widgets to be rendered on the request form request_details = [] @@ -148,7 +143,7 @@ value=request.desc, helptext='')) request_details.append(dict(label='Type', - value=request_type.name, + value=request.type.name, helptext='')) request_details.append(dict(label='Date created', value=request.create_time, @@ -157,26 +152,26 @@ value=request.create_time, helptext='')) request_details.append(dict(label='User', - value=str(trans.user.email), + value=str(request.user.email), helptext='')) # library associated request_details.append(dict(label='Library', - value=trans.app.model.Library.get(request.library_id).name, + value=request.library.name, helptext='Associated library where the resultant \ dataset will be stored')) # form fields - for field in request_form.fields: + for index, field in enumerate(request.type.request_form.fields): if field['required']: req = 'Required' else: req = 'Optional' request_details.append(dict(label=field['label'], - value=request_values.content[field['label']], + value=request.values.content[index], helptext=field['helptext']+' ('+req+')')) return trans.fill_template( '/requests/view_request.mako', - request_form_id=request_form.id, + request_form_id=request.type.request_form.id, request_details=request_details, - request_type=request_type) + request_type=request.type) @web.expose def new(self, trans, **kwd): params = util.Params( kwd ) @@ -189,49 +184,74 @@ msg=msg, messagetype=messagetype ) elif params.get('create', False) == 'True': - request_type_id = int(util.restore_text( params.request_type_id )) - return self.__show_request_form(trans, params, request_type_id) + print >> sys.stderr, '###KWD', kwd + return self.__show_request_form(trans=trans, + request=None, **kwd) elif params.get('save', False) == 'True': - request = self.__save(trans, params) + request_type = trans.app.model.RequestType.get(int(params.request_type_id)) + msg = self.__validate(trans, + [('name','Name'), ('library_id','Library')], + request_type.request_form.fields, + **kwd) + if msg: + kwd['create'] = 'True' + return trans.response.send_redirect( web.url_for( controller='requests', + action='new', + msg=msg, + messagetype='error', + **kwd) ) + request = self.__save_request(trans, None, **kwd) msg = 'The new request named %s has been created' % request.name request_type_id = int(util.restore_text( params.request_type_id )) return trans.response.send_redirect( web.url_for( controller='requests', action='list', msg=msg , messagetype='done') ) - return self.__show_request_form(trans, params, request_type_id, request=request) - def __save(self, trans, params, request_id=None): + def __validate(self, trans, main_fields=[], form_fields=[], **kwd): ''' - This method save a new request if request_id is None. + Validates the request entered by the user ''' + params = util.Params( kwd ) + for field, field_name in main_fields: + if not util.restore_text(params.get(field, None)): + return 'Please enter the <b>%s</b> of the request' % field_name + # check rest of the fields of the form + for index, field in enumerate(form_fields): + if not util.restore_text(params.get('field_%i' % index, None)) and field['required']: + return 'Please enter the <b>%s</b> field of the request' % field['label'] + return None + def __save_request(self, trans, request_id=None, **kwd): + ''' + This method saves a new request if request_id is None. + ''' + params = util.Params( kwd ) if not request_id: - request_type_id = int(util.restore_text( params.request_type_id )) - request_form_id = trans.app.model.RequestType.get(request_type_id).request_form_id - request_form = trans.app.model.FormDefinition.get(request_form_id) + request_type = trans.app.model.RequestType.get(int(params.request_type_id )) else: - request = trans.app.model.Request.get(request_id) - form_values = trans.app.model.FormValues.get(request.form_values_id) - request_form = trans.app.model.FormDefinition.get(form_values.request_form_id) + # TODO editing + pass name = util.restore_text(params.get('name', '')) desc = util.restore_text(params.get('desc', '')) - library_id = util.restore_text(params.get('library', '')) - values = {} - for field in request_form.fields: - values[field['label']] = util.restore_text(params.get(field['label'], '')) + library_id = int(util.restore_text(params.get('library_id', 0))) + values = [] + for index, field in enumerate(request_type.request_form.fields): + values.append(util.restore_text(params.get('field_%i' % index, ''))) if not request_id: - form_values = trans.app.model.FormValues(request_form_id, values) + form_values = trans.app.model.FormValues(request_type.request_form.id, values) form_values.flush() - request = trans.app.model.Request(name, desc, request_type_id, + request = trans.app.model.Request(name, desc, request_type.id, trans.user.id, form_values.id, library_id) request.flush() else: - form_values.content = values - form_values.flush() + # TODO editing + pass return request - def __show_request_form(self, trans, params, request_type_id, request=None): - request_type = trans.app.model.RequestType.get(request_type_id) - request_form_id = request_type.request_form_id + def __show_request_form(self, trans, request=None, **kwd): + params = util.Params( kwd ) + msg = util.restore_text( params.get( 'msg', '' ) ) + messagetype = params.get( 'messagetype', 'done' ) + request_type = trans.app.model.RequestType.get(int(params.request_type_id)) if request: form_values = trans.app.model.FormValues.get(request.form_values_id) else: @@ -239,56 +259,63 @@ # list of widgets to be rendered on the request form widgets = [] widgets.append(dict(label='Name', - widget=TextField('name'), + widget=TextField('name', 40, + util.restore_text( params.get( 'name', '' ) )), helptext='(Required)')) widgets.append(dict(label='Description', - widget=TextField('desc'), + widget=TextField('desc', 40, + util.restore_text( params.get( 'desc', '' ) )), helptext='(Optional)')) - widgets[0]['widget'].set_size(40) - widgets[1]['widget'].set_size(40) # libraries selectbox + value = int(params.get( 'library_id', 0 )) libraries = self.get_authorized_libs(trans) - lib_list = SelectField('library') + lib_list = SelectField('library_id') for lib in libraries: - lib_list.add_option(lib.name, lib.id) + if lib.id == value: + lib_list.add_option(lib.name, lib.id, selected=True) + else: + lib_list.add_option(lib.name, lib.id) widgets.append(dict(label='Library', widget=lib_list, helptext='Associated library where the resultant \ dataset will be stored')) - widgets = self.__create_form(trans, params, request_form_id, widgets, form_values) + widgets = self.__create_form(trans, request_type.request_form_id, widgets, form_values, **kwd) title = 'Add a new request of type: %s' % request_type.name return trans.fill_template( '/requests/new_request.mako', - request_form_id=request_form_id, + request_form_id=request_type.request_form_id, request_type=request_type, widgets=widgets, - title=title) + title=title, + msg=msg, + messagetype=messagetype) - def __create_form(self, trans, params, form_id, widgets=[], form_values=None): + def __create_form(self, trans, form_id, widgets=[], form_values=None, **kwd): + params = util.Params( kwd ) form = trans.app.model.FormDefinition.get(form_id) - if not form_values: - values = {} - for field in form.fields: - if field['type'] in ['SelectField' or 'CheckBoxField']: - values[field['label']] = False - else: - values[field['label']] = '' - else: - values = form_values.content # form fields - for field in form.fields: - fw = eval(field['type'])(field['label']) + for index, field in enumerate(form.fields): + # value of the field + if field['type'] == 'CheckboxField': + value = util.restore_text( params.get( 'field_%i' % index, False ) ) + else: + value = util.restore_text( params.get( 'field_%i' % index, '' ) ) + # create the field + fw = eval(field['type'])('field_%i' % index) if field['type'] == 'TextField': fw.set_size(40) - fw.value = values[field['label']] + fw.value = value elif field['type'] == 'TextArea': fw.set_size(3, 40) - fw.value = values[field['label']] + fw.value = value elif field['type'] == 'SelectField': for option in field['selectlist']: - fw.add_option(option, option, values[field['label']]) - elif field['type'] == 'CheckBoxField': - fw.checked = values[field['label']] - + if option == value: + fw.add_option(option, option, selected=True) + else: + fw.add_option(option, option) + elif field['type'] == 'CheckboxField': + fw.checked = value + # require/optional if field['required']: req = 'Required' else: @@ -302,13 +329,13 @@ params = util.Params( kwd ) msg = util.restore_text( params.get( 'msg', '' ) ) messagetype = params.get( 'messagetype', 'done' ) - request_id = int(util.restore_text( params.get( 'id', '' ) )) - return self.__show_sample_form(trans, params, request_id) + return self.__show_sample_form(trans, sample=None, **kwd) - def __show_sample_form(self, trans, params, request_id, sample=None): - request = trans.app.model.Request.get(request_id) - request_type = trans.app.model.RequestType.get(request.request_type_id) - sample_form_id = request_type.sample_form_id + def __show_sample_form(self, trans, sample=None, **kwd): + params = util.Params( kwd ) + msg = util.restore_text( params.get( 'msg', '' ) ) + messagetype = params.get( 'messagetype', 'done' ) + request = trans.app.model.Request.get(int( params.request_id )) if sample: form_values = trans.app.model.FormValues.get(sample.form_values_id) else: @@ -316,50 +343,63 @@ # list of widgets to be rendered on the request form widgets = [] widgets.append(dict(label='Name', - widget=TextField('name'), + widget=TextField('name', 40, + util.restore_text( params.get( 'name', '' ) )), helptext='(Required)')) widgets.append(dict(label='Description', - widget=TextField('desc'), + widget=TextField('desc', 40, + util.restore_text( params.get( 'desc', '' ) )), helptext='(Optional)')) - widgets[0]['widget'].set_size(40) - widgets[1]['widget'].set_size(40) - widgets = self.__create_form(trans, params, sample_form_id, widgets, form_values) - title = 'Add a new sample to request: %s of type: %s' % (request.name, request_type.name) + widgets = self.__create_form(trans, request.type.sample_form_id, widgets, form_values, **kwd) + title = 'Add a new sample to request: %s of type: %s' % (request.name, request.type.name) return trans.fill_template( '/sample/new_sample.mako', - sample_form_id=sample_form_id, + sample_form_id=request.type.sample_form_id, request_id=request.id, widgets=widgets, - title=title) + title=title, + msg=msg, + messagetype=messagetype) @web.expose def samples(self, trans, **kwd): params = util.Params( kwd ) if params.get('save', False) == 'True': - sample = self.__save_sample(trans, params) + request = trans.app.model.Request.get(int(params.request_id )) + msg = self.__validate(trans, + [('name','Name')], + request.type.sample_form.fields, + **kwd) + if msg: + return trans.response.send_redirect( web.url_for( controller='requests', + action='add_sample', + msg=msg, + messagetype='error', + **kwd) ) + sample = self.__save_sample(trans, sample_id=None, **kwd) + msg = 'The new sample named %s has been created' % sample.name return trans.response.send_redirect( web.url_for( controller='requests', action='list', operation='samples', - id=trans.security.encode_id(sample.request_id)) ) - def __save_sample(self, trans, params, sample_id=None): + id=trans.security.encode_id(sample.request_id), + **kwd) ) + def __save_sample(self, trans, sample_id=None, **kwd): + params = util.Params( kwd ) if not sample_id: - request = trans.app.model.Request.get(int(util.restore_text( params.request_id ))) - request_type = trans.app.model.RequestType.get(request.request_type_id) - sample_form = trans.app.model.FormDefinition.get(request_type.sample_form_id) + request = trans.app.model.Request.get(int(params.request_id)) else: - sample = trans.app.model.Sample.get(sample_id) - form_data = trans.app.model.FormData.get(sample.form_data_id) - form = trans.app.model.FormDefinition.get(form_data.form_definition_id) + #TODO editing + pass name = util.restore_text(params.get('name', '')) desc = util.restore_text(params.get('desc', '')) - values = {} - for field in sample_form.fields: - values[field['label']] = util.restore_text(params.get(field['label'], '')) + values = [] + for index, field in enumerate(request.type.sample_form.fields): + values.append(util.restore_text(params.get('field_%i' % index, ''))) if not sample_id: - form_values = trans.app.model.FormValues(sample_form.id, values) + form_values = trans.app.model.FormValues(request.type.sample_form.id, values) form_values.flush() sample = trans.app.model.Sample(name, desc, request.id, form_values.id) sample.flush() # set the initial state - state = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.request_type_id == request_type.id).first() + state = trans.app.model.SampleState.filter(trans.app.model.SampleState.table.c.request_type_id == request.type.id).first() event = trans.app.model.SampleEvent(sample.id, state.id) event.flush() else: @@ -371,10 +411,10 @@ Shows the sample details ''' sample = trans.app.model.Sample.get(sample_id) - request = trans.app.model.Request.get(sample.request_id) - request_type = trans.app.model.RequestType.get(request.request_type_id) - sample_form = trans.app.model.FormDefinition.get(request_type.sample_form_id) - sample_values = trans.app.model.FormValues.get(sample.form_values_id) + request = sample.request + request_type = sample.request.type + sample_form = sample.request.type.sample_form + sample_values = sample.values # list of widgets to be rendered on the request form sample_details = [] # main details @@ -398,31 +438,37 @@ helptext='Name/ID of the request this sample belongs to.')) # get the current state of the sample all_states = trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample_id).all() - curr_state = trans.app.model.SampleState.get(all_states[len(all_states)-1].sample_state_id) + curr_state = all_states[len(all_states)-1].state sample_details.append(dict(label='State', value=curr_state.name, helptext=curr_state.desc)) # form fields - for field in sample_form.fields: + for index, field in enumerate(sample_form.fields): if field['required']: req = 'Required' else: req = 'Optional' sample_details.append(dict(label=field['label'], - value=sample_values.content[field['label']], + value=sample_values.content[index], helptext=field['helptext']+' ('+req+')')) return trans.fill_template( '/sample/view_sample.mako', sample_details=sample_details) def show_events(self, trans, sample_id): sample = trans.app.model.Sample.get(sample_id) events_list = [] - for event in trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample_id).all(): - state = trans.app.model.SampleState.get(event.sample_state_id) - events_list.append((state.name, event.update_time, state.desc, event.comment)) + all_events = trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample_id).all() + all_events.reverse() + for event in all_events: + delta = datetime.utcnow() - event.update_time + if delta > timedelta( minutes=60 ): + last_update = '%s hours' % int( delta.seconds / 60 / 60 ) + else: + last_update = '%s minutes' % int( delta.seconds / 60 ) + events_list.append((event.state.name, event.state.desc, last_update, event.comment)) return trans.fill_template( '/sample/sample_events.mako', events_list=events_list, sample_name=sample.name, - request=trans.app.model.Request.get(sample.request_id).name) + request=sample.request.name) diff -r dc5068efc3e7 -r c60fc2075dd5 lib/galaxy/web/controllers/requests_admin.py --- a/lib/galaxy/web/controllers/requests_admin.py Tue Jul 14 11:33:42 2009 -0400 +++ b/lib/galaxy/web/controllers/requests_admin.py Tue Jul 14 15:49:53 2009 -0400 @@ -146,9 +146,6 @@ Shows the request details ''' request = trans.app.model.Request.get(id) - request_type = trans.app.model.RequestType.get(request.request_type_id) - request_form = trans.app.model.FormDefinition.get(request_type.request_form_id) - request_values = trans.app.model.FormValues.get(request.form_values_id) libraries = self.get_authorized_libs(trans) # list of widgets to be rendered on the request form request_details = [] @@ -160,7 +157,7 @@ value=request.desc, helptext='')) request_details.append(dict(label='Type', - value=request_type.name, + value=request.type.name, helptext='')) request_details.append(dict(label='Date created', value=request.create_time, @@ -169,7 +166,7 @@ value=request.create_time, helptext='')) request_details.append(dict(label='User', - value=str(trans.user.email), + value=str(request.user.email), helptext='')) # library associated request_details.append(dict(label='Library', @@ -177,18 +174,18 @@ helptext='Associated library where the resultant \ dataset will be stored')) # form fields - for field in request_form.fields: + for index, field in enumerate(request.type.request_form.fields): if field['required']: req = 'Required' else: req = 'Optional' request_details.append(dict(label=field['label'], - value=request_values.content[field['label']], + value=request.values.content[index], helptext=field['helptext']+' ('+req+')')) return trans.fill_template( '/admin/requests/view_request.mako', - request_form_id=request_form.id, + request_form_id=request.type.request_form.id, request_details=request_details, - request_type=request_type) + request_type=request.type) @web.expose @web.require_admin @@ -202,10 +199,10 @@ Shows the sample details ''' sample = trans.app.model.Sample.get(sample_id) - request = trans.app.model.Request.get(sample.request_id) - request_type = trans.app.model.RequestType.get(request.request_type_id) - sample_form = trans.app.model.FormDefinition.get(request_type.sample_form_id) - sample_values = trans.app.model.FormValues.get(sample.form_values_id) + request = sample.request + request_type = sample.request.type + sample_form = sample.request.type.sample_form + sample_values = sample.values # list of widgets to be rendered on the request form sample_details = [] # main details @@ -229,18 +226,18 @@ helptext='Name/ID of the request this sample belongs to.')) # get the current state of the sample all_states = trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample_id).all() - curr_state = trans.app.model.SampleState.get(all_states[len(all_states)-1].sample_state_id) + curr_state = all_states[len(all_states)-1].state sample_details.append(dict(label='State', value=curr_state.name, helptext=curr_state.desc)) # form fields - for field in sample_form.fields: + for index, field in enumerate(sample_form.fields): if field['required']: req = 'Required' else: req = 'Optional' sample_details.append(dict(label=field['label'], - value=sample_values.content[field['label']], + value=sample_values.content[index], helptext=field['helptext']+' ('+req+')')) return trans.fill_template( '/admin/samples/view_sample.mako', sample_details=sample_details) @@ -300,7 +297,9 @@ sample = trans.app.model.Sample.get(sample_id) request = trans.app.model.Request.get(sample.request_id) events_list = [] - for event in trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample_id).order_by(trans.app.model.SampleEvent.c.update_time.desc()).all(): + all_events = trans.app.model.SampleEvent.filter(trans.app.model.SampleEvent.table.c.sample_id == sample_id).all() + all_events.reverse() + for event in all_events: state = trans.app.model.SampleState.get(event.sample_state_id) delta = datetime.utcnow() - event.update_time if delta > timedelta( minutes=60 ): diff -r dc5068efc3e7 -r c60fc2075dd5 templates/base.mako --- a/templates/base.mako Tue Jul 14 11:33:42 2009 -0400 +++ b/templates/base.mako Tue Jul 14 15:49:53 2009 -0400 @@ -58,4 +58,5 @@ $( "#edit_form" ).submit(); } }); -}); \ No newline at end of file +}); +</script> \ No newline at end of file diff -r dc5068efc3e7 -r c60fc2075dd5 templates/sample/grid.mako --- a/templates/sample/grid.mako Tue Jul 14 11:33:42 2009 -0400 +++ b/templates/sample/grid.mako Tue Jul 14 15:49:53 2009 -0400 @@ -89,7 +89,7 @@ <ul class="manage-table-actions"> <li> - <a class="action-button" href="${h.url_for( controller='requests', action='add_sample', id=grid.request.id)}"> + <a class="action-button" href="${h.url_for( controller='requests', action='add_sample', request_id=grid.request.id)}"> <img src="${h.url_for('/static/images/silk/add.png')}" /> <span>Add sample</span></a> </li> diff -r dc5068efc3e7 -r c60fc2075dd5 templates/sample/sample_events.mako --- a/templates/sample/sample_events.mako Tue Jul 14 11:33:42 2009 -0400 +++ b/templates/sample/sample_events.mako Tue Jul 14 15:49:53 2009 -0400 @@ -14,17 +14,17 @@ <thead> <tr> <th>State</th> + <th>Description</th> <th>Updated</th> - <th>Description</th> <th>Comments</th> </tr> </thead> <tbody> - %for state, updated, desc, comments in events_list: + %for state, desc, updated, comments in events_list: <tr class="libraryRow libraryOrFolderRow" id="libraryRow"> <td><b><a>${state}</a></b></td> + <td><a>${desc}</a></td> <td><a>${updated}</a></td> - <td><a>${desc}</a></td> <td><a>${comments}</a></td> </tr> %endfor

1 0

[hg] galaxy 2477: Fix some display problems with the tabs. Somet...
by Greg Von Kuster 15 Jul '09

15 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/d202e2f4b910 changeset: 2477:d202e2f4b910 user: James Taylor <james(a)jamestaylor.org> date: Fri Jul 10 18:33:36 2009 -0400 description: Fix some display problems with the tabs. Sometimes you just have to use tables.... 5 file(s) affected in this change: static/june_2007_style/blue/panel_layout.css static/june_2007_style/panel_layout.css.tmpl static/scripts/galaxy.panels.js static/scripts/packed/galaxy.panels.js templates/base_panels.mako diffs (257 lines): diff -r 14fd033f08eb -r d202e2f4b910 static/june_2007_style/blue/panel_layout.css --- a/static/june_2007_style/blue/panel_layout.css Fri Jul 10 16:21:19 2009 -0400 +++ b/static/june_2007_style/blue/panel_layout.css Fri Jul 10 18:33:36 2009 -0400 @@ -35,7 +35,6 @@ border-bottom: solid #999 1px; font-size: 90%; } - #left, #left-border, #center, #right-border, #right { @@ -272,16 +271,22 @@ text-decoration: underline; } -div.tab-group + +.tab-group { margin: 0; padding: 0 10px; height: 100%; white-space: nowrap; + -moz-user-select: none; + -khtml-user-select: none; + user-select: none; + cursor: default; } -div.tab-group span.tab +.tab-group .tab { + background: #2C3143; position: relative; display: block; float: left; @@ -292,17 +297,17 @@ text-align: left; } -div.tab-group > span.tab:hover > a +.tab-group .tab:hover > a { color: gold !important; } -div.tab-group > span.active +.tab-group .active { background: rgb(1,1,1); } -div.tab-group span.tab div.submenu { +.tab-group .tab .submenu { display: none; position: absolute; z-index: 16000; @@ -318,7 +323,8 @@ -webkit-border-bottom-left-radius: 1em; } -div.tab-group span.tab div.submenu ul { +.tab-group .tab .submenu ul +{ display: block; margin: 0; padding: 0; @@ -326,7 +332,8 @@ background: #2C3143; } -div.tab-group span.tab div.submenu ul li { +.tab-group .tab .submenu ul li +{ display: block; padding: 0 1em; white-space: nowrap; diff -r 14fd033f08eb -r d202e2f4b910 static/june_2007_style/panel_layout.css.tmpl --- a/static/june_2007_style/panel_layout.css.tmpl Fri Jul 10 16:21:19 2009 -0400 +++ b/static/june_2007_style/panel_layout.css.tmpl Fri Jul 10 18:33:36 2009 -0400 @@ -35,7 +35,6 @@ border-bottom: solid #999 1px; font-size: 90%; } - #left, #left-border, #center, #right-border, #right { @@ -274,16 +273,23 @@ text-decoration: underline; } -div.tab-group +## Tabs + +.tab-group { margin: 0; padding: 0 10px; height: 100%; white-space: nowrap; + -moz-user-select: none; + -khtml-user-select: none; + user-select: none; + cursor: default; } -div.tab-group span.tab +.tab-group .tab { + background: ${masthead_bg}; position: relative; display: block; float: left; @@ -294,17 +300,17 @@ text-align: left; } -div.tab-group > span.tab:hover > a +.tab-group .tab:hover > a { color: gold !important; } -div.tab-group > span.active +.tab-group .active { background: rgb(1,1,1); } -div.tab-group span.tab div.submenu { +.tab-group .tab .submenu { display: none; position: absolute; z-index: 16000; @@ -320,7 +326,8 @@ -webkit-border-bottom-left-radius: 1em; } -div.tab-group span.tab div.submenu ul { +.tab-group .tab .submenu ul +{ display: block; margin: 0; padding: 0; @@ -328,7 +335,8 @@ background: ${masthead_bg}; } -div.tab-group span.tab div.submenu ul li { +.tab-group .tab .submenu ul li +{ display: block; padding: 0 1em; white-space: nowrap; diff -r 14fd033f08eb -r d202e2f4b910 static/scripts/galaxy.panels.js --- a/static/scripts/galaxy.panels.js Fri Jul 10 16:21:19 2009 -0400 +++ b/static/scripts/galaxy.panels.js Fri Jul 10 18:33:36 2009 -0400 @@ -216,8 +216,8 @@ // Tab management $(function() { - $("span.tab").each( function() { - var submenu = $(this).children( "div.submenu" ); + $(".tab").each( function() { + var submenu = $(this).children( ".submenu" ); if ( submenu.length > 0 ) { if ( $.browser.msie ) { // Vile IE iframe hack -- even IE7 needs this diff -r 14fd033f08eb -r d202e2f4b910 static/scripts/packed/galaxy.panels.js --- a/static/scripts/packed/galaxy.panels.js Fri Jul 10 16:21:19 2009 -0400 +++ b/static/scripts/packed/galaxy.panels.js Fri Jul 10 18:33:36 2009 -0400 @@ -1,1 +1,1 @@ -function ensure_dd_helper(){if($("#DD-helper").length==0){$("<div id='DD-helper'/>").css({background:"white",opacity:0,zIndex:9000,position:"absolute",top:0,left:0,width:"100%",height:"100%"}).appendTo("body").hide()}}function make_left_panel(h,c,e){var g=false;var f=null;var d=function(i){var j=i;if(i<0){i=0}$(h).css("width",i);$(e).css("left",j);$(c).css("left",i+7);if(document.recalc){document.recalc()}};var a=function(){if(g){$(e).removeClass("hover");$(e).animate({left:f},"fast");$(h).css("left",-f).show().animate({left:0},"fast",function(){d(f);$(e).removeClass("hidden")});g=false}else{f=$(e).position().left;$(c).css("left",$(e).innerWidth());if(document.recalc){document.recalc()}$(e).removeClass("hover");$(h).animate({left:-f},"fast");$(e).animate({left:-1},"fast",function(){$(this).addClass("hidden")});g=true}};$(e).hover(function(){$(this).addClass("hover")},function(){$(this).removeClass("hover")}).bind("dragstart",function(i){$("#DD-helper").show()}).bind("dragend ",function(i){$("#DD-helper").hide()}).bind("drag",function(i){x=i.offsetX;x=Math.min(400,Math.max(100,x));if(g){$(h).css("left",0);$(e).removeClass("hidden");g=false}d(x)}).bind("dragclickonly",function(i){a()}).find("div").show();var b=function(i){if((g&&i=="show")||(!g&&i=="hide")){a()}};return{force_panel:b}}function make_right_panel(a,e,h){var j=false;var g=false;var c=null;var d=function(k){$(a).css("width",k);$(e).css("right",k+9);$(h).css("right",k).css("left","");if(document.recalc){document.recalc()}};var i=function(){if(j){$(h).removeClass("hover");$(h).animate({right:c},"fast");$(a).css("right",-c).show().animate({right:0},"fast",function(){d(c);$(h).removeClass("hidden")});j=false}else{c=$(document).width()-$(h).position().left-$(h).outerWidth();$(e).css("right",$(h).innerWidth()+1);if(document.recalc){document.recalc()}$(h).removeClass("hover");$(a).animate({right:-c},"fast");$(h).animate({right:-1},"fast",function(){$(this).addClass("hidden")});j=true}g=false} ;var b=function(k){var l=$(e).width()-(j?c:0);if(l<k){if(!j){i();g=true}}else{if(g){i();g=false}}};$(h).hover(function(){$(this).addClass("hover")},function(){$(this).removeClass("hover")}).bind("dragstart",function(k){$("#DD-helper").show()}).bind("dragend",function(k){$("#DD-helper").hide()}).bind("drag",function(k){x=k.offsetX;w=$(window).width();x=Math.min(w-100,x);x=Math.max(w-400,x);if(j){$(a).css("right",0);$(h).removeClass("hidden");j=false}d(w-x-$(this).outerWidth())}).bind("dragclickonly",function(k){i()}).find("div").show();var f=function(k){if((j&&k=="show")||(!j&&k=="hide")){i()}};return{handle_minwidth_hint:b,force_panel:f}}function hide_modal(){$(".dialog-box-container").fadeOut(function(){$("#overlay").hide();$(".dialog-box").find(".body").children().remove()})}function show_modal(f,c,e,d){if(f){$(".dialog-box").find(".title").html(f);$(".dialog-box").find(".unified-panel-header").show()}else{$(".dialog-box").find(".unified-panel-header").hide()}var a=$(".dia log-box").find(".buttons").html("");if(e){$.each(e,function(b,g){a.append($("<button/>").text(b).click(g));a.append(" ")});a.show()}else{a.hide()}var a=$(".dialog-box").find(".extra_buttons").html("");if(d){$.each(d,function(b,g){a.append($("<button/>").text(b).click(g));a.append(" ")});a.show()}else{a.hide()}if(c=="progress"){c=$("<img src='../images/yui/rel_interstitial_loading.gif')' />")}$(".dialog-box").find(".body").html(c);if(!$(".dialog-box-container").is(":visible")){$("#overlay").show();$(".dialog-box-container").fadeIn()}}function show_in_overlay(c){var d=c.width||"600";var b=c.height||"400";var a=c.scroll||"auto";$("#overlay-background").bind("click.overlay",function(){hide_modal();$("#overlay-background").unbind("click.overlay")});show_modal(null,$("<div style='margin: -5px;'><iframe style='margin: 0; padding: 0;' src='"+c.url+"' width='"+d+"' height='"+b+"' scrolling='"+a+"' frameborder='0'></iframe></div>"))}$(function(){$("span.tab").each(function(){var a=$(t his).children("div.submenu");if(a.length>0){if($.browser.msie){a.prepend("<iframe style=\"position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: -1; filter:Alpha(Opacity='0');\"></iframe>")}$(this).hover(function(){a.show()},function(){a.hide()});a.click(function(){a.hide()})}})});function user_changed(a,b){if(a){$(".loggedin-only").show();$(".loggedout-only").hide();$("#user-email").text(a);if(b){$(".admin-only").show()}}else{$(".loggedin-only").hide();$(".loggedout-only").show();$(".admin-only").hide()}}; \ No newline at end of file +function ensure_dd_helper(){if($("#DD-helper").length==0){$("<div id='DD-helper'/>").css({background:"white",opacity:0,zIndex:9000,position:"absolute",top:0,left:0,width:"100%",height:"100%"}).appendTo("body").hide()}}function make_left_panel(h,c,e){var g=false;var f=null;var d=function(i){var j=i;if(i<0){i=0}$(h).css("width",i);$(e).css("left",j);$(c).css("left",i+7);if(document.recalc){document.recalc()}};var a=function(){if(g){$(e).removeClass("hover");$(e).animate({left:f},"fast");$(h).css("left",-f).show().animate({left:0},"fast",function(){d(f);$(e).removeClass("hidden")});g=false}else{f=$(e).position().left;$(c).css("left",$(e).innerWidth());if(document.recalc){document.recalc()}$(e).removeClass("hover");$(h).animate({left:-f},"fast");$(e).animate({left:-1},"fast",function(){$(this).addClass("hidden")});g=true}};$(e).hover(function(){$(this).addClass("hover")},function(){$(this).removeClass("hover")}).bind("dragstart",function(i){$("#DD-helper").show()}).bind("dragend ",function(i){$("#DD-helper").hide()}).bind("drag",function(i){x=i.offsetX;x=Math.min(400,Math.max(100,x));if(g){$(h).css("left",0);$(e).removeClass("hidden");g=false}d(x)}).bind("dragclickonly",function(i){a()}).find("div").show();var b=function(i){if((g&&i=="show")||(!g&&i=="hide")){a()}};return{force_panel:b}}function make_right_panel(a,e,h){var j=false;var g=false;var c=null;var d=function(k){$(a).css("width",k);$(e).css("right",k+9);$(h).css("right",k).css("left","");if(document.recalc){document.recalc()}};var i=function(){if(j){$(h).removeClass("hover");$(h).animate({right:c},"fast");$(a).css("right",-c).show().animate({right:0},"fast",function(){d(c);$(h).removeClass("hidden")});j=false}else{c=$(document).width()-$(h).position().left-$(h).outerWidth();$(e).css("right",$(h).innerWidth()+1);if(document.recalc){document.recalc()}$(h).removeClass("hover");$(a).animate({right:-c},"fast");$(h).animate({right:-1},"fast",function(){$(this).addClass("hidden")});j=true}g=false} ;var b=function(k){var l=$(e).width()-(j?c:0);if(l<k){if(!j){i();g=true}}else{if(g){i();g=false}}};$(h).hover(function(){$(this).addClass("hover")},function(){$(this).removeClass("hover")}).bind("dragstart",function(k){$("#DD-helper").show()}).bind("dragend",function(k){$("#DD-helper").hide()}).bind("drag",function(k){x=k.offsetX;w=$(window).width();x=Math.min(w-100,x);x=Math.max(w-400,x);if(j){$(a).css("right",0);$(h).removeClass("hidden");j=false}d(w-x-$(this).outerWidth())}).bind("dragclickonly",function(k){i()}).find("div").show();var f=function(k){if((j&&k=="show")||(!j&&k=="hide")){i()}};return{handle_minwidth_hint:b,force_panel:f}}function hide_modal(){$(".dialog-box-container").fadeOut(function(){$("#overlay").hide();$(".dialog-box").find(".body").children().remove()})}function show_modal(f,c,e,d){if(f){$(".dialog-box").find(".title").html(f);$(".dialog-box").find(".unified-panel-header").show()}else{$(".dialog-box").find(".unified-panel-header").hide()}var a=$(".dia log-box").find(".buttons").html("");if(e){$.each(e,function(b,g){a.append($("<button/>").text(b).click(g));a.append(" ")});a.show()}else{a.hide()}var a=$(".dialog-box").find(".extra_buttons").html("");if(d){$.each(d,function(b,g){a.append($("<button/>").text(b).click(g));a.append(" ")});a.show()}else{a.hide()}if(c=="progress"){c=$("<img src='../images/yui/rel_interstitial_loading.gif')' />")}$(".dialog-box").find(".body").html(c);if(!$(".dialog-box-container").is(":visible")){$("#overlay").show();$(".dialog-box-container").fadeIn()}}function show_in_overlay(c){var d=c.width||"600";var b=c.height||"400";var a=c.scroll||"auto";$("#overlay-background").bind("click.overlay",function(){hide_modal();$("#overlay-background").unbind("click.overlay")});show_modal(null,$("<div style='margin: -5px;'><iframe style='margin: 0; padding: 0;' src='"+c.url+"' width='"+d+"' height='"+b+"' scrolling='"+a+"' frameborder='0'></iframe></div>"))}$(function(){$(".tab").each(function(){var a=$(this) .children(".submenu");if(a.length>0){if($.browser.msie){a.prepend("<iframe style=\"position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: -1; filter:Alpha(Opacity='0');\"></iframe>")}$(this).hover(function(){a.show()},function(){a.hide()});a.click(function(){a.hide()})}})});function user_changed(a,b){if(a){$(".loggedin-only").show();$(".loggedout-only").hide();$("#user-email").text(a);if(b){$(".admin-only").show()}}else{$(".loggedin-only").hide();$(".loggedout-only").show();$(".admin-only").hide()}}; \ No newline at end of file diff -r 14fd033f08eb -r d202e2f4b910 templates/base_panels.mako --- a/templates/base_panels.mako Fri Jul 10 16:21:19 2009 -0400 +++ b/templates/base_panels.mako Fri Jul 10 18:33:36 2009 -0400 @@ -131,8 +131,10 @@ %endif </div> - <div style="position: absolute; left: 50%;"> - <div class="tab-group" style="position: relative; left: -50%;"> + <div style="position: absolute; left: 0; width: 100%; text-align: center;"> + + <table class="tab-group" border="0" cellspacing="0" style="margin: auto;"> + <tr> <%def name="tab( id, display, href, target='_parent', visible=True, extra_class='' )"> <% @@ -145,31 +147,31 @@ if not visible: style = "display: none;" %> - <span class="${cls}" style="${style}"><a target="${target}" href="${href}">${display}</a></span> + <td class="${cls}" style="${style}"><a target="${target}" href="${href}">${display}</a></td> </%def> ${tab( "analysis", "Analyze Data", h.url_for( controller='root', action='index' ))} - + ${tab( "workflow", "Workflow", h.url_for( controller='workflow', action='index' ))} - + ${tab( "libraries", "Libraries", h.url_for( controller='library', action='index' ))} ${tab( "requests", "Requests", h.url_for( controller='requests', action='index' ), visible = (trans.user and trans.request_types)) } %if app.config.get_bool( 'enable_tracks', False ): - <span class="tab"> + <td class="tab"> Visualization <div class="submenu"> <ul> <li><a href="${h.url_for( controller='tracks', action='index' )}">Build track browser</a></li> </ul> </div> - </span> + </td> %endif ${tab( "admin", "Admin", h.url_for( controller='admin', action='index' ), extra_class="admin-only", visible=( trans.user and app.config.is_admin_user( trans.user ) ) )} - <span class="tab"> + <td class="tab"> <a>Help</a> <div class="submenu"> <ul> @@ -178,9 +180,9 @@ <li><a target="_blank" href="${app.config.get( "screencasts_url", "http://g2.trac.bx.psu.edu/wiki/ScreenCasts" )}">Video tutorials (screencasts)</a></li> </ul> </div> - </span> + </td> - <span class="tab"> + <td class="tab"> <a>User</a> <% if trans.user: @@ -219,9 +221,11 @@ %endif </ul> </div> - </span> + </td> - </div> + </tr> + </table> + </div> </%def>

1 0

[hg] galaxy 2478: Pre-compressing CSS with yui-compressor
by Greg Von Kuster 15 Jul '09

15 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/feb7438276fb changeset: 2478:feb7438276fb user: James Taylor <james(a)jamestaylor.org> date: Mon Jul 13 13:08:52 2009 -0400 description: Pre-compressing CSS with yui-compressor 10 file(s) affected in this change: static/june_2007_style/blue/base.css static/june_2007_style/blue/history.css static/june_2007_style/blue/iphone.css static/june_2007_style/blue/library.css static/june_2007_style/blue/masthead.css static/june_2007_style/blue/panel_layout.css static/june_2007_style/blue/reset.css static/june_2007_style/blue/tool_menu.css static/june_2007_style/make_style.py static/june_2007_style/panel_layout.css.tmpl diffs (1871 lines): diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/blue/base.css Mon Jul 13 13:08:52 2009 -0400 @@ -1,645 +1,1 @@ -@import url( "reset.css" ); - -body -{ - font: 75% verdana, "Bitstream Vera Sans", geneva, arial, helvetica, helve, sans-serif; - background: #FFFFFF; - color: #303030; - background-image: url(base_bg.png); - background-repeat: repeat-x; - background-position: top; - margin: 10px; -} - -img -{ - border: 0; -} - - -a:link, a:visited, a:active -{ - color: #303030; -} - -h1, h2, h3, h4 -{ - color: #023858; - /*text-shadow: #bbb 2px 2px 1px;*/ -} - -hr -{ - border: none; - height: 0px; - border-bottom: dotted #303030 1px; -} - -div.toolForm -{ - border: solid #d8b365 1px; -} - -div.toolFormTitle -{ - font-weight: bold; - padding: 5px; - padding-left: 10px; - padding-right: 10px; - background: #d2c099; - background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-bottom: solid #d8b365 1px; -} - -div.toolParamHelp -{ - color: #666; -} - -div.toolParamHelp a -{ - color: #666; -} - -div.toolFormBody -{ - background: #FFFFFF; - background-image: url(form_body_bg.png); - background-repeat: repeat-x; - background-position: top; - padding: 5px 0; -} - -div.toolFormBody div.toolFormTitle -{ - background: transparent; - border: none; - font-weight: bold; - border-bottom: solid #d8b365 1px; - margin-bottom: 5px; -} - -div.toolFormDisabled div.toolFormTitle { - background: #eee; - border-color: #999; -} - -div.toolFormDisabled { - border-color: #999; -} - -div.toolHelp -{ -} - -div.toolHelpBody -{ - width: 100%; - overflow: auto; -} - -div.titleRow { - font-weight: bold; - border-bottom: dotted gray 1px; - margin-bottom: 0.5em; - padding-bottom: 0.25em; -} - -/* Forms */ - -div.form -{ - border: solid #d8b365 1px; -} - -div.form-title -{ - font-weight: bold; - padding: 5px 10px; - background: #d2c099; - background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-bottom: solid #d8b365 1px; -} - -div.form-body -{ - padding: 5px 0; -} - -div.form-row -{ - padding: 5px 10px; -} - -div.form-title-row -{ - padding: 5px 10px; -} - -div.repeat-group-item -{ - border-left: solid #d8b365 5px; - margin-left: 10px; - margin-bottom: 10px; -} - -div.form-row-error -{ - background: #FFCCCC; -} - -div.form-row label -{ - font-weight: bold; - display: block; - margin-bottom: .2em; -} - -div.form-row-input -{ - float: left; - width: 300px; -} - -div.form-row-input > input -{ - max-width: 300px; -} - -div.form-row-error-message -{ - width: 300px; - float: left; - color: red; - font-weight: bold; - padding: 3px 0 0 1em; -} - -select, input, textarea -{ - font: inherit; - font-size: 115%; -} - -select, textarea, input[type="text"], input[type="file"], input[type="password"] -{ - -webkit-box-sizing: border-box; - max-width: 300px; -} - -/* Messages */ - -.errormessage, .warningmessage, .donemessage, .infomessage, .welcomeBlue, .welcomeRed , .screencastBox, .yellowbox, .redbox, .bluebox, .greenbox -{ - padding: 10px; - padding-left: 52px; - min-height: 32px; - border: 1px solid #AA6666; - background-color: #FFCCCC; - background-image: url(error_message_icon.png); - background-repeat: no-repeat; - background-position: 10px 10px; -} - -.warningmessage -{ - background-image: url(warn_message_icon.png); - border-color: #AAAA66; - background-color: #FFFFCC; -} - -.donemessage -{ - background-image: url(done_message_icon.png); - border-color: #66AA66; - background-color: #CCFFCC; -} - -.infomessage -{ - background-image: url(info_message_icon.png); - border-color: #6666AA; - background-color: #CCCCFF; -} - -.welcomeBlue -{ - padding-left: 10px; - border-color: #6666AA; - background-color: #CCCCFF; - background-image: none; -} - -.welcomeRed -{ - padding-left: 10px; - border-color: #AA6666; - background-color: #FFCCCC; - background-image: none; -} - -.screencastBox -{ - padding-left: 10px; - border-color: #AAAA66; - background-color: #FFFFCC; - background-image: none; -} - -.redbox -{ - border: none; - padding: 10px; - border-color: #000000; - background-color: #FF6666; - background-image: none; - border-right-width: 1px; - border-right-style: dotted; - border-bottom-width: 1px; - border-bottom-style: dotted; - margin-top: 5px; - min-height: 32px; - -} - -.yellowbox -{ - border: none; - padding: 10px; - border-color: #000000; - background-color: #FFCC00; - background-image: none; - border-right-width: 1px; - border-right-style: dotted; - border-bottom-width: 1px; - border-bottom-style: dotted; - margin-top: 5px; - min-height: 32px; -} - -.bluebox -{ - border: none; - padding: 10px; - border-color: #000000; - background-color: #6666FF; - background-image: none; - border-right-width: 1px; - border-right-style: dotted; - border-bottom-width: 1px; - border-bottom-style: dotted; - margin-top: 5px; - color: #FFFFFF; - min-height: 32px; -} - -.greenbox -{ - border: none; - padding: 10px; - border-color: #000000; - background-color: #00CC00; - background-image: none; - border-right-width: 1px; - border-right-style: dotted; - border-bottom-width: 1px; - border-bottom-style: dotted; - margin-top: 5px; - min-height: 32px; -} - -.redbox li, .yellowbox li, .bluebox li, .greenbox li { - list-style: disc; - text-transform: none; - list-style-position: inside; - list-style-image: none; - margin: 3px; -} - - -.errormessagesmall, .warningmessagesmall, .donemessagesmall, .infomessagesmall -{ - padding: 5px; - padding-left: 25px; - min-height: 25px; - border: 1px solid #AA6666; - background-color: #FFCCCC; - background-image: url(error_small.png); - background-repeat: no-repeat; - background-position: 5px 5px; -} - -.warningmessagesmall -{ - background-image: url(warn_small.png); - border-color: #AAAA66; - background-color: #FFFFCC; -} - -.donemessagesmall -{ - background-image: url(ok_small.png); - border-color: #66AA66; - background-color: #CCFFCC; -} - -.infomessagesmall -{ - background-image: url(info_small.png); - border-color: #6666AA; - background-color: #CCCCFF; -} - -.errormark, .warningmark, .donemark, .infomark, .ok_bgr, .err_bgr -{ - padding-left: 20px; - min-height: 15px; - background: url(error_small.png) no-repeat; -} - -.warningmark -{ - background-image: url(warn_small.png); -} - -.donemark -{ - background-image: url(ok_small.png); -} - -.infomark, .ok_bgr -{ - background-image: url(info_small.png); -} - -table.colored -{ - border-top: solid #d8b365 1px; - border-bottom: solid #d8b365 1px; -} - -table.colored td, table.colored th -{ - text-align: left; - padding: 5px; -} - -table.colored tr.header -{ - background: #ebd9b2; - background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-bottom: solid #d8b365 1px; - font-weight: bold; -} - -table.colored tr -{ - background: white; -} - -table.colored tr.odd_row -{ - background: #DADFEF; -} - -div.debug -{ - margin: 10px; - padding: 5px; - background: #FFFF99; - border: solid #FFFF33 1px; - color: black; -} - -div.odd_row -{ - background: #DADFEF; -} - -#footer { - display: none; -} - - -td.panel-body -{ - background: white; - color: #303030; - background: #C1C9E5 url(menu_bg.png) top repeat-x; -} - -div.toolSectionPad -{ - margin: 0; - padding: 0; - height: 5px; - font-size: 0px; -} - -div.toolSectionDetailsInner -{ - margin-left: 5px; - margin-right: 5px; -} - -div.toolSectionTitle -{ - padding-bottom: 0px; - font-weight: bold; -} - -div.toolTitle -{ - padding-top: 5px; - padding-bottom: 5px; - margin-left: 16px; - margin-right: 10px; - display: list-item; - list-style: square outside; -} - -span.toolParameterExpandableCollapsable -{ - font-weight: bold; - cursor: pointer; -} -ul.toolParameterExpandableCollapsable -{ - list-style: none; -} - -ul.manage-table-actions { - float: right; - margin-top: -2.5em; -} -ul.manage-table-actions li { - display: block; - float: left; - margin-left: 0.5em; -} - - -.state-color-queued { - border-color: #888888; - background: #EEEEEE; -} - -.state-color-ok { - border-color: #66AA66; - background: #CCFFCC; -} - -.state-color-error { - border-color: #AA6666; - background: #FFCCCC; -} - -.state-color-running { - border-color: #AAAA66; - background: #FFFFCC; -} - -.state-fg-queued { - color: #888888; -} -.state-fg-ok { - color: #66AA66; -} -.state-fg-running { - color: #AAAA66; -} -.state-fg-error { - color: #AA6666; -} - - -.action-button { - background: #eeeeee; - color: #333; - text-decoration: none; - font-size: 95%; - font-weight: bold; - display: inline-block; - cursor: pointer; - padding: 2px; - border: solid #aaaaaa 1px; - padding-right: 0.5em; - padding-left: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; -} - -.action-button > * { - vertical-align: middle; -} - -.action-button:hover { - color: black; - background: #dddddd; -} -.action-button:active { - color: white; - background: #aaaaaa; -} - - -div.popupmenu { - display: none; - background: #eeeeee; - color: #333; - font-size: 110%; - font-weight: bold; - font-style: normal; - white-space: nowrap; - position: absolute; - z-index: 20000; - border: solid #aaaaaa 1px; - padding: 3px 0; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; -} - -div.popupmenu-item { - padding: 3px 1em; - cursor: pointer; -} - -div.popupmenu-item:hover { - background: #aaaaaa; -} - -.popup-arrow { - font-size: 80%; - cursor: pointer; - text-decoration: none; - color: #555 -} - -.popup-arrow:hover { - color: black; -} - -div.permissionContainer { - padding-left: 20px; -} - - -.grid-header { - padding-bottom: 1em; -} - -.grid-header h2 { - margin: 0; - margin-bottom: 0.5em; -} - -.grid-header .title { - font-weight: bold; -} - -.grid { - padding-top: 1em; - border-collapse: collapse; - width: 100%; -} -.grid tbody td { - border-top: solid #DDDDDD 1px; - border-bottom: solid #DDDDDD 1px; - padding: 0.5em 1em; -} -.grid tbody td:empty { - padding: 0; -} -.grid thead th { - background: #ebd9b2; - background-image: url(form_title_bg.png); - background-repeat: repeat-x; - background-position: top; - border-top: solid #d8b365 1px; - border-bottom: solid #d8b365 1px; - padding: 0.5em 1em; - text-align: left; -} -.grid tfoot td { - background-color: #F8F8F8; - border-top: solid #DDDDDD 1px; - border-bottom: solid #DDDDDD 1px; - padding: 0.5em 1em; -} -.grid .current { - background-color: #EEEEFF; -} \ No newline at end of file +@import url("reset.css");body{font:75% verdana,"Bitstream Vera Sans",geneva,arial,helvetica,helve,sans-serif;background:#FFF;color:#303030;background-image:url(base_bg.png);background-repeat:repeat-x;background-position:top;margin:10px;}img{border:0;}a:link,a:visited,a:active{color:#303030;}h1,h2,h3,h4{color:#023858;}hr{border:none;height:0;border-bottom:dotted #303030 1px;}div.toolForm{border:solid #d8b365 1px;}div.toolFormTitle{font-weight:bold;padding:5px;padding-left:10px;padding-right:10px;background:#d2c099;background-image:url(form_title_bg.png);background-repeat:repeat-x;background-position:top;border-bottom:solid #d8b365 1px;}div.toolParamHelp{color:#666;}div.toolParamHelp a{color:#666;}div.toolFormBody{background:#FFF;background-image:url(form_body_bg.png);background-repeat:repeat-x;background-position:top;padding:5px 0;}div.toolFormBody div.toolFormTitle{background:transparent;border:none;font-weight:bold;border-bottom:solid #d8b365 1px;margin-bottom:5px;}div.tool FormDisabled div.toolFormTitle{background:#eee;border-color:#999;}div.toolFormDisabled{border-color:#999;}div.toolHelpBody{width:100%;overflow:auto;}div.titleRow{font-weight:bold;border-bottom:dotted gray 1px;margin-bottom:.5em;padding-bottom:.25em;}div.form{border:solid #d8b365 1px;}div.form-title{font-weight:bold;padding:5px 10px;background:#d2c099;background-image:url(form_title_bg.png);background-repeat:repeat-x;background-position:top;border-bottom:solid #d8b365 1px;}div.form-body{padding:5px 0;}div.form-row{padding:5px 10px;}div.form-title-row{padding:5px 10px;}div.repeat-group-item{border-left:solid #d8b365 5px;margin-left:10px;margin-bottom:10px;}div.form-row-error{background:#FCC;}div.form-row label{font-weight:bold;display:block;margin-bottom:.2em;}div.form-row-input{float:left;width:300px;}div.form-row-input>input{max-width:300px;}div.form-row-error-message{width:300px;float:left;color:red;font-weight:bold;padding:3px 0 0 1em;}select,input,textarea{font:inherit;fo nt-size:115%;}select,textarea,input[type="text"],input[type="file"],input[type="password"]{-webkit-box-sizing:border-box;max-width:300px;}.errormessage,.warningmessage,.donemessage,.infomessage,.welcomeBlue,.welcomeRed,.screencastBox,.yellowbox,.redbox,.bluebox,.greenbox{padding:10px;padding-left:52px;min-height:32px;border:1px solid #A66;background-color:#FCC;background-image:url(error_message_icon.png);background-repeat:no-repeat;background-position:10px 10px;}.warningmessage{background-image:url(warn_message_icon.png);border-color:#AA6;background-color:#FFC;}.donemessage{background-image:url(done_message_icon.png);border-color:#6A6;background-color:#CFC;}.infomessage{background-image:url(info_message_icon.png);border-color:#66A;background-color:#CCF;}.welcomeBlue{padding-left:10px;border-color:#66A;background-color:#CCF;background-image:none;}.welcomeRed{padding-left:10px;border-color:#A66;background-color:#FCC;background-image:none;}.screencastBox{padding-left:10px;borde r-color:#AA6;background-color:#FFC;background-image:none;}.redbox{border:none;padding:10px;border-color:#000;background-color:#F66;background-image:none;border-right-width:1px;border-right-style:dotted;border-bottom-width:1px;border-bottom-style:dotted;margin-top:5px;min-height:32px;}.yellowbox{border:none;padding:10px;border-color:#000;background-color:#FC0;background-image:none;border-right-width:1px;border-right-style:dotted;border-bottom-width:1px;border-bottom-style:dotted;margin-top:5px;min-height:32px;}.bluebox{border:none;padding:10px;border-color:#000;background-color:#66F;background-image:none;border-right-width:1px;border-right-style:dotted;border-bottom-width:1px;border-bottom-style:dotted;margin-top:5px;color:#FFF;min-height:32px;}.greenbox{border:none;padding:10px;border-color:#000;background-color:#0C0;background-image:none;border-right-width:1px;border-right-style:dotted;border-bottom-width:1px;border-bottom-style:dotted;margin-top:5px;min-height:32px;}.redbo x li,.yellowbox li,.bluebox li,.greenbox li{list-style:disc;text-transform:none;list-style-position:inside;list-style-image:none;margin:3px;}.errormessagesmall,.warningmessagesmall,.donemessagesmall,.infomessagesmall{padding:5px;padding-left:25px;min-height:25px;border:1px solid #A66;background-color:#FCC;background-image:url(error_small.png);background-repeat:no-repeat;background-position:5px 5px;}.warningmessagesmall{background-image:url(warn_small.png);border-color:#AA6;background-color:#FFC;}.donemessagesmall{background-image:url(ok_small.png);border-color:#6A6;background-color:#CFC;}.infomessagesmall{background-image:url(info_small.png);border-color:#66A;background-color:#CCF;}.errormark,.warningmark,.donemark,.infomark,.ok_bgr,.err_bgr{padding-left:20px;min-height:15px;background:url(error_small.png) no-repeat;}.warningmark{background-image:url(warn_small.png);}.donemark{background-image:url(ok_small.png);}.infomark,.ok_bgr{background-image:url(info_small.png);}table.c olored{border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;}table.colored td,table.colored th{text-align:left;padding:5px;}table.colored tr.header{background:#ebd9b2;background-image:url(form_title_bg.png);background-repeat:repeat-x;background-position:top;border-bottom:solid #d8b365 1px;font-weight:bold;}table.colored tr{background:white;}table.colored tr.odd_row{background:#DADFEF;}div.debug{margin:10px;padding:5px;background:#FF9;border:solid #FF3 1px;color:black;}div.odd_row{background:#DADFEF;}#footer{display:none;}td.panel-body{background:white;color:#303030;background:#C1C9E5 url(menu_bg.png) top repeat-x;}div.toolSectionPad{margin:0;padding:0;height:5px;font-size:0;}div.toolSectionDetailsInner{margin-left:5px;margin-right:5px;}div.toolSectionTitle{padding-bottom:0;font-weight:bold;}div.toolTitle{padding-top:5px;padding-bottom:5px;margin-left:16px;margin-right:10px;display:list-item;list-style:square outside;}span.toolParameterExpandableCollapsable{font-weigh t:bold;cursor:pointer;}ul.toolParameterExpandableCollapsable{list-style:none;}ul.manage-table-actions{float:right;margin-top:-2.5em;}ul.manage-table-actions li{display:block;float:left;margin-left:.5em;}.state-color-queued{border-color:#888;background:#EEE;}.state-color-ok{border-color:#6A6;background:#CFC;}.state-color-error{border-color:#A66;background:#FCC;}.state-color-running{border-color:#AA6;background:#FFC;}.state-fg-queued{color:#888;}.state-fg-ok{color:#6A6;}.state-fg-running{color:#AA6;}.state-fg-error{color:#A66;}.action-button{background:#eee;color:#333;text-decoration:none;font-size:95%;font-weight:bold;display:inline-block;cursor:pointer;padding:2px;border:solid #aaa 1px;padding-right:.5em;padding-left:.5em;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em;user-select:none;-moz-user-select:none;-webkit-user-select:none;}.action-button>*{vertical-align:middle;}.action-button:hover{color:black;background:#ddd;}.action-button:active{color:whit e;background:#aaa;}div.popupmenu{display:none;background:#eee;color:#333;font-size:110%;font-weight:bold;font-style:normal;white-space:nowrap;position:absolute;z-index:20000;border:solid #aaa 1px;padding:3px 0;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em;user-select:none;-moz-user-select:none;-webkit-user-select:none;}div.popupmenu-item{padding:3px 1em;cursor:pointer;}div.popupmenu-item:hover{background:#aaa;}.popup-arrow{font-size:80%;cursor:pointer;text-decoration:none;color:#555;}.popup-arrow:hover{color:black;}div.permissionContainer{padding-left:20px;}.grid-header{padding-bottom:1em;}.grid-header h2{margin:0;margin-bottom:.5em;}.grid-header .title{font-weight:bold;}.grid{padding-top:1em;border-collapse:collapse;width:100%;}.grid tbody td{border-top:solid #DDD 1px;border-bottom:solid #DDD 1px;padding:.5em 1em;}.grid tbody td:empty{padding:0;}.grid thead th{background:#ebd9b2;background-image:url(form_title_bg.png);background-repeat:repeat-x;backg round-position:top;border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;padding:.5em 1em;text-align:left;}.grid tfoot td{background-color:#F8F8F8;border-top:solid #DDD 1px;border-bottom:solid #DDD 1px;padding:.5em 1em;}.grid .current{background-color:#EEF;} \ No newline at end of file diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/blue/history.css --- a/static/june_2007_style/blue/history.css Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/blue/history.css Mon Jul 13 13:08:52 2009 -0400 @@ -1,117 +1,1 @@ -body -{ - background: #C1C9E5; - color: #303030; - background-image: url(menu_bg.png); - background-repeat: repeat-x; - background-position: top; - margin: 5px; - border: 0; - padding: 0; -} - -a -{ - color: #base_text; -} - -div.historyLinks -{ - padding: 5px; - margin-top: 5px; - margin-bottom: 5px; - padding-right: 5px; - padding-left: 5px; - margin-bottom: 5px; -} - -div.historyItem -{ - margin-right: -5px; - margin-top: 5px; - margin-bottom: 5px; - padding: 5px; - padding-right: 11px; - - border: solid #888888 1px; - border-left: solid #888888 5px; - border-right: none; - background: #EEEEEE; - background-image: url(gray_bg.png); - background-repeat: repeat-x; - background-position: top; -} - -div.historyItem div.historyItem -{ - margin-right: -11px; -} - -div.historyItem-ok -{ - border-color: #66AA66; - background: #CCFFCC; - /* - background-image: url(ok_bg.png); - background-repeat: repeat-x; - background-position: top; - */ -} - -div.historyItem-error, div.historyItem-empty -{ - border-color: #AA6666; - background: #FFCCCC; - /* - background-image: url(error_bg.png); - background-repeat: repeat-x; - background-position: top; - */ -} - -div.historyItem-running -{ - border-color: #AAAA66; - background: #FFFFCC; - /* - background-image: url(warn_bg.png); - background-repeat: repeat-x; - background-position: top; - */ -} - -div.historyItem-upload -{ - border-color: #6666AA; - background: #CCCCFF; -} - -div.historyItem-noPermission -{ - filter: alpha(opacity=60); - -moz-opacity: .60; - opacity: .60; -} - -div.historyItem-queued -{ -} - -div.historyItemBody div -{ - padding-top: 2px; -} - -pre.peek -{ - background: white; - color: black; - width: 100%; - overflow: auto; -} - -pre.peek th -{ - color: white; - background: #023858; -} +body{background:#C1C9E5;color:#303030;background-image:url(menu_bg.png);background-repeat:repeat-x;background-position:top;margin:5px;border:0;padding:0;}a{color:#base_text;}div.historyLinks{padding:5px;margin-top:5px;margin-bottom:5px;padding-right:5px;padding-left:5px;margin-bottom:5px;}div.historyItem{margin-right:-5px;margin-top:5px;margin-bottom:5px;padding:5px;padding-right:11px;border:solid #888 1px;border-left:solid #888 5px;border-right:none;background:#EEE;background-image:url(gray_bg.png);background-repeat:repeat-x;background-position:top;}div.historyItem div.historyItem{margin-right:-11px;}div.historyItem-ok{border-color:#6A6;background:#CFC;}div.historyItem-error,div.historyItem-empty{border-color:#A66;background:#FCC;}div.historyItem-running{border-color:#AA6;background:#FFC;}div.historyItem-upload{border-color:#66A;background:#CCF;}div.historyItem-noPermission{filter:alpha(opacity=60);-moz-opacity:.60;opacity:.60;}div.historyItemBody div{padding-top:2px;}pre.p eek{background:white;color:black;width:100%;overflow:auto;}pre.peek th{color:white;background:#023858;} \ No newline at end of file diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/blue/iphone.css --- a/static/june_2007_style/blue/iphone.css Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/blue/iphone.css Mon Jul 13 13:08:52 2009 -0400 @@ -1,433 +1,1 @@ - -body { - margin: 0; - font-family: Helvetica; - background: #FFFFFF; - color: #000000; - overflow-x: hidden; - -webkit-user-select: none; - -webkit-text-size-adjust: none; -} - -body > *:not(.toolbar) { - display: none; - position: absolute; - margin: 0; - padding: 0; - left: 0; - width: 100%; - min-height: 372px; -} - -body[orient="landscape"] > *:not(.toolbar) { - min-height: 268px; -} - -body > *[selected="true"] { - display: block; -} - -a[selected], a:active { - background-color: #194fdb !important; - background-image: url(../iui/listArrowSel.png), url(../iui/selection.png) !important; - background-repeat: no-repeat, repeat-x; - background-position: right center, left top; - color: #FFFFFF !important; -} - -a[selected="progress"] { - background-image: url(../iui/loading.gif), url(../iui/selection.png) !important; -} - -/************************************************************************************************/ - -body > .toolbar { - position: relative; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - border-bottom: 1px solid #2d3642; - padding: 10px; - height: 45px; - background: url(../iui/toolbar.png) #6d84a2 repeat-x; -} - -.toolbar > h1 { - position: absolute; - overflow: hidden; - left: 50%; - margin: 1px 0 0 -75px; - height: 45px; - font-size: 20px; - width: 150px; - font-weight: bold; - text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; - text-align: center; - text-overflow: ellipsis; - white-space: nowrap; - color: #FFFFFF; -} - -body[orient="landscape"] > .toolbar > h1 { - margin-left: -125px; - width: 250px; -} - -body > .toolbar.masthead { - background: #2C3143 repeat-x; -} - -body > .toolbar.masthead > h1 { - left: 0; margin-left: 0; width: 100%; -} - - -.button { - position: absolute; - overflow: hidden; - top: 8px; - right: 6px; - margin: 0; - border-width: 0 5px; - padding: 0 3px; - width: auto; - height: 30px; - line-height: 30px; - font-family: inherit; - font-size: 12px; - font-weight: bold; - color: #FFFFFF; - text-shadow: rgba(0, 0, 0, 0.6) 0px -1px 0; - text-overflow: ellipsis; - text-decoration: none; - white-space: nowrap; - background: none; - -webkit-border-image: url(../iui/toolButton.png) 0 5 0 5; -} - -.blueButton { - -webkit-border-image: url(../iui/blueButton.png) 0 5 0 5; - border-width: 0 5px; -} - -.leftButton { - left: 6px; - right: auto; -} - -#backButton { - display: none; - left: 6px; - right: auto; - padding: 0; - max-width: 55px; - border-width: 0 8px 0 14px; - -webkit-border-image: url(../iui/backButton.png) 0 8 0 14; -} - -.whiteButton, -.grayButton { - display: block; - border-width: 0 12px; - padding: 10px; - text-align: center; - font-size: 20px; - font-weight: bold; - text-decoration: inherit; - color: inherit; -} - -.whiteButton { - -webkit-border-image: url(../iui/whiteButton.png) 0 12 0 12; - text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0; -} - -.grayButton { - -webkit-border-image: url(../iui/grayButton.png) 0 12 0 12; - color: #FFFFFF; -} - -/************************************************************************************************/ - -body > ul > li { - position: relative; - margin: 0; - border-bottom: 1px solid #E0E0E0; - padding: 8px 0 8px 10px; - font-size: 20px; - font-weight: bold; - list-style: none; -} - -body > ul > li.group { - position: relative; - top: -1px; - margin-bottom: -2px; - border-top: 1px solid #7d7d7d; - border-bottom: 1px solid #999999; - padding: 1px 10px; - background: url(../iui/listGroup.png) repeat-x; - font-size: 17px; - font-weight: bold; - text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0; - color: #FFFFFF; -} - -body > ul > li.group:first-child { - top: 0; - border-top: none; -} - -body > ul > li > a { - display: block; - margin: -8px 0 -8px -10px; - padding: 8px 32px 8px 10px; - text-decoration: none; - color: inherit; - background: url(../iui/listArrow.png) no-repeat right center; -} - -a[target="_replace"] { - box-sizing: border-box; - -webkit-box-sizing: border-box; - padding-top: 25px; - padding-bottom: 25px; - font-size: 18px; - color: cornflowerblue; - background-color: #FFFFFF; - background-image: none; -} - -/************************************************************************************************/ - -body > .dialog { - top: 0; - width: 100%; - min-height: 417px; - z-index: 2; - background: rgba(0, 0, 0, 0.8); - padding: 0; - text-align: right; -} - -.dialog > fieldset { - box-sizing: border-box; - -webkit-box-sizing: border-box; - width: 100%; - margin: 0; - border: none; - border-top: 1px solid #6d84a2; - padding: 10px 6px; - background: url(../iui/toolbar.png) #7388a5 repeat-x; -} - -.dialog > fieldset > h1 { - margin: 0 10px 0 10px; - padding: 0; - font-size: 20px; - font-weight: bold; - color: #FFFFFF; - text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; - text-align: center; -} - -.dialog > fieldset > label { - position: absolute; - margin: 16px 0 0 6px; - font-size: 14px; - color: #999999; -} - - - -input:not(input[type|=radio]):not(input[type|=checkbox]) { - box-sizing: border-box; - -webkit-box-sizing: border-box; - width: 100%; - margin: 8px 0 0 0; - padding: 6px 6px 6px 44px; - font-size: 16px; - font-weight: normal; -} - -/************************************************************************************************/ - -body > .panel { - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - padding: 10px; - background: #c8c8c8 url(../iui/pinstripes.png); -} - -.panel > fieldset { - position: relative; - margin: 0 0 20px 0; - padding: 0; - background: #FFFFFF; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border: 1px solid #999999; - text-align: right; - font-size: 16px; -} - -.row { - position: relative; - min-height: 42px; - border-bottom: 1px solid #999999; - -webkit-border-radius: 0; - text-align: right; - overflow: hidden; - text-overflow: ellipsis; -} - -fieldset > .row:last-child { - border-bottom: none !important; -} - -.row > input:not(input[type|=radio]):not(input[type|=checkbox]) { - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - margin: 0; - border: none; - padding: 12px 10px 0 110px; - height: 42px; - background: none; -} -.row > input[type|=radio], .row > input[type|=checkbox] { - margin: 7px 7px 0 0; - height: 25px; - width: 25px; -} - -.row > label { - position: absolute; - margin: 0 0 0 14px; - line-height: 42px; - font-weight: bold; -} - -.row > a { - font-weight: bold; - text-align: left; - display: block; - padding: 8px 32px 8px 14px; - text-decoration: none; - color: inherit; - background: url(../iui/listArrow.png) no-repeat right center; -} - -.row > .error { - height: 25px; - text-align: left; - font-size: 14px; - padding: 0 0 0 110px; - color: red; -} - -.row > span { - position: absolute; - padding: 12px 10px 0 110px; - margin: 0; -} - -.row > .toggle { - position: absolute; - top: 6px; - right: 6px; - width: 100px; - height: 28px; -} - -.toggle { - border: 1px solid #888888; - -webkit-border-radius: 6px; - background: #FFFFFF url(../iui/toggle.png) repeat-x; - font-size: 19px; - font-weight: bold; - line-height: 30px; -} - -.toggle[toggled="true"] { - border: 1px solid #143fae; - background: #194fdb url(../iui/toggleOn.png) repeat-x; -} - -.toggleOn { - display: none; - position: absolute; - width: 60px; - text-align: center; - left: 0; - top: 0; - color: #FFFFFF; - text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; -} - -.toggleOff { - position: absolute; - width: 60px; - text-align: center; - right: 0; - top: 0; - color: #666666; -} - -.toggle[toggled="true"] > .toggleOn { - display: block; -} - -.toggle[toggled="true"] > .toggleOff { - display: none; -} - -.thumb { - position: absolute; - top: -1px; - left: -1px; - width: 40px; - height: 28px; - border: 1px solid #888888; - -webkit-border-radius: 6px; - background: #ffffff url(../iui/thumb.png) repeat-x; -} - -.toggle[toggled="true"] > .thumb { - left: auto; - right: -1px; -} - -.panel > h2 { - margin: 0 0 8px 14px; - font-size: inherit; - font-weight: bold; - color: #4d4d70; - text-shadow: rgba(255, 255, 255, 0.75) 2px 2px 0; -} - -/************************************************************************************************/ - -#preloader { - display: none; - background-image: url(loading.gif), url(selection.png), - url(blueButton.png), url(listArrowSel.png), url(listGroup.png); -} - - -.state-color-queued { - background: #EEEEEE; -} - -.state-color-ok { - background: #CCFFCC; -} - -.state-color-error { - background: #FFCCCC; -} - -.state-color-running { - background: #FFFFCC; -} +body{margin:0;font-family:Helvetica;background:#FFF;color:#000;overflow-x:hidden;-webkit-user-select:none;-webkit-text-size-adjust:none;}body>*:not(.toolbar){display:none;position:absolute;margin:0;padding:0;left:0;width:100%;min-height:372px;}body[orient="landscape"]>*:not(.toolbar){min-height:268px;}body>*[selected="true"]{display:block;}a[selected],a:active{background-color:#194fdb!important;background-image:url(../iui/listArrowSel.png),url(../iui/selection.png)!important;background-repeat:no-repeat,repeat-x;background-position:right center,left top;color:#FFF!important;}a[selected="progress"]{background-image:url(../iui/loading.gif),url(../iui/selection.png)!important;}body>.toolbar{position:relative;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border-bottom:1px solid #2d3642;padding:10px;height:45px;background:url(../iui/toolbar.png) #6d84a2 repeat-x;}.toolbar>h1{position:absolute;overflow:hidden;left:50%;margin:1px 0 0 -75px;height:45p x;font-size:20px;width:150px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;text-overflow:ellipsis;white-space:nowrap;color:#FFF;}body[orient="landscape"]>.toolbar>h1{margin-left:-125px;width:250px;}body>.toolbar.masthead{background:#2C3143 repeat-x;}body>.toolbar.masthead>h1{left:0;margin-left:0;width:100%;}.button{position:absolute;overflow:hidden;top:8px;right:6px;margin:0;border-width:0 5px;padding:0 3px;width:auto;height:30px;line-height:30px;font-family:inherit;font-size:12px;font-weight:bold;color:#FFF;text-shadow:rgba(0,0,0,0.6) 0 -1px 0;text-overflow:ellipsis;text-decoration:none;white-space:nowrap;background:none;-webkit-border-image:url(../iui/toolButton.png) 0 5 0 5;}.blueButton{-webkit-border-image:url(../iui/blueButton.png) 0 5 0 5;border-width:0 5px;}.leftButton{left:6px;right:auto;}#backButton{display:none;left:6px;right:auto;padding:0;max-width:55px;border-width:0 8px 0 14px;-webkit-border-image:url(../iui/backButton.png) 0 8 0 14;}. whiteButton,.grayButton{display:block;border-width:0 12px;padding:10px;text-align:center;font-size:20px;font-weight:bold;text-decoration:inherit;color:inherit;}.whiteButton{-webkit-border-image:url(../iui/whiteButton.png) 0 12 0 12;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}.grayButton{-webkit-border-image:url(../iui/grayButton.png) 0 12 0 12;color:#FFF;}body>ul>li{position:relative;margin:0;border-bottom:1px solid #E0E0E0;padding:8px 0 8px 10px;font-size:20px;font-weight:bold;list-style:none;}body>ul>li.group{position:relative;top:-1px;margin-bottom:-2px;border-top:1px solid #7d7d7d;border-bottom:1px solid #999;padding:1px 10px;background:url(../iui/listGroup.png) repeat-x;font-size:17px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 1px 0;color:#FFF;}body>ul>li.group:first-child{top:0;border-top:none;}body>ul>li>a{display:block;margin:-8px 0 -8px -10px;padding:8px 32px 8px 10px;text-decoration:none;color:inherit;background:url(../iui/listArrow.png) no-repeat right center;} a[target="_replace"]{box-sizing:border-box;-webkit-box-sizing:border-box;padding-top:25px;padding-bottom:25px;font-size:18px;color:cornflowerblue;background-color:#FFF;background-image:none;}body>.dialog{top:0;width:100%;min-height:417px;z-index:2;background:rgba(0,0,0,0.8);padding:0;text-align:right;}.dialog>fieldset{box-sizing:border-box;-webkit-box-sizing:border-box;width:100%;margin:0;border:none;border-top:1px solid #6d84a2;padding:10px 6px;background:url(../iui/toolbar.png) #7388a5 repeat-x;}.dialog>fieldset>h1{margin:0 10px 0 10px;padding:0;font-size:20px;font-weight:bold;color:#FFF;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;}.dialog>fieldset>label{position:absolute;margin:16px 0 0 6px;font-size:14px;color:#999;}input:not(input[type|=radio]):not(input[type|=checkbox]){box-sizing:border-box;-webkit-box-sizing:border-box;width:100%;margin:8px 0 0 0;padding:6px 6px 6px 44px;font-size:16px;font-weight:normal;}body>.panel{box-sizing:border-box;-moz-box-sizing:b order-box;-webkit-box-sizing:border-box;padding:10px;background:#c8c8c8 url(../iui/pinstripes.png);}.panel>fieldset{position:relative;margin:0 0 20px 0;padding:0;background:#FFF;-webkit-border-radius:10px;-moz-border-radius:10px;border:1px solid #999;text-align:right;font-size:16px;}.row{position:relative;min-height:42px;border-bottom:1px solid #999;-webkit-border-radius:0;text-align:right;overflow:hidden;text-overflow:ellipsis;}fieldset>.row:last-child{border-bottom:none!important;}.row>input:not(input[type|=radio]):not(input[type|=checkbox]){box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;margin:0;border:none;padding:12px 10px 0 110px;height:42px;background:none;}.row>input[type|=radio],.row>input[type|=checkbox]{margin:7px 7px 0 0;height:25px;width:25px;}.row>label{position:absolute;margin:0 0 0 14px;line-height:42px;font-weight:bold;}.row>a{font-weight:bold;text-align:left;display:block;padding:8px 32px 8px 14px;text-decoration:none;color:i nherit;background:url(../iui/listArrow.png) no-repeat right center;}.row>.error{height:25px;text-align:left;font-size:14px;padding:0 0 0 110px;color:red;}.row>span{position:absolute;padding:12px 10px 0 110px;margin:0;}.row>.toggle{position:absolute;top:6px;right:6px;width:100px;height:28px;}.toggle{border:1px solid #888;-webkit-border-radius:6px;background:#FFF url(../iui/toggle.png) repeat-x;font-size:19px;font-weight:bold;line-height:30px;}.toggle[toggled="true"]{border:1px solid #143fae;background:#194fdb url(../iui/toggleOn.png) repeat-x;}.toggleOn{display:none;position:absolute;width:60px;text-align:center;left:0;top:0;color:#FFF;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;}.toggleOff{position:absolute;width:60px;text-align:center;right:0;top:0;color:#666;}.toggle[toggled="true"]>.toggleOn{display:block;}.toggle[toggled="true"]>.toggleOff{display:none;}.thumb{position:absolute;top:-1px;left:-1px;width:40px;height:28px;border:1px solid #888;-webkit-border-radius:6px;background: #fff url(../iui/thumb.png) repeat-x;}.toggle[toggled="true"]>.thumb{left:auto;right:-1px;}.panel>h2{margin:0 0 8px 14px;font-size:inherit;font-weight:bold;color:#4d4d70;text-shadow:rgba(255,255,255,0.75) 2px 2px 0;}#preloader{display:none;background-image:url(loading.gif),url(selection.png),url(blueButton.png),url(listArrowSel.png),url(listGroup.png);}.state-color-queued{background:#EEE;}.state-color-ok{background:#CFC;}.state-color-error{background:#FCC;}.state-color-running{background:#FFC;} \ No newline at end of file diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/blue/library.css --- a/static/june_2007_style/blue/library.css Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/blue/library.css Mon Jul 13 13:08:52 2009 -0400 @@ -1,75 +1,1 @@ -.libraryRow { - background-color: #d2c099; -} - -.datasetHighlighted { - background-color: #C1C9E5; -} - -.libraryItemDeleted-True { - font-style: italic; -} - -div.historyItemBody { - padding: 4px 4px 2px 4px; -} - -li.folderRow, -li.datasetRow -{ - border-top: solid 1px #ddd; -} - -li.folderRow:hover, -li.datasetRow:hover -{ - background-color: #C1C9E5; -} - -img.expanderIcon { - padding-right: 4px; -} - -input.datasetCheckbox, -li, ul -{ - padding: 0; - margin: 0; -} - -.rowTitle -{ - padding: 2px; -} - -ul { - list-style: none; -} - -.libraryTitle th { - text-align: left; -} - -pre.peek -{ - background: white; - color: black; - width: 100%; - overflow: auto; -} - -pre.peek th -{ - color: white; - background: #023858; -} - -a.expandLink { - text-decoration: none; -} - -span.expandLink { - width: 100%; - height: 100%; - display: block; -} +.libraryRow{background-color:#d2c099;}.datasetHighlighted{background-color:#C1C9E5;}.libraryItemDeleted-True{font-style:italic;}div.historyItemBody{padding:4px 4px 2px 4px;}li.folderRow,li.datasetRow{border-top:solid 1px #ddd;}li.folderRow:hover,li.datasetRow:hover{background-color:#C1C9E5;}img.expanderIcon{padding-right:4px;}input.datasetCheckbox,li,ul{padding:0;margin:0;}.rowTitle{padding:2px;}ul{list-style:none;}.libraryTitle th{text-align:left;}pre.peek{background:white;color:black;width:100%;overflow:auto;}pre.peek th{color:white;background:#023858;}a.expandLink{text-decoration:none;}span.expandLink{width:100%;height:100%;display:block;} \ No newline at end of file diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/blue/masthead.css --- a/static/june_2007_style/blue/masthead.css Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/blue/masthead.css Mon Jul 13 13:08:52 2009 -0400 @@ -1,62 +1,1 @@ -body -{ - background: #2C3143 url(masthead_bg.png) bottom; - color: #eeeeee; - padding: 0; - border: 0; - margin: 3px; - margin-right: 5px; - margin-left: 5px; - overflow: hidden; -} - -div.pageTitle -{ - font-size: 175%; - font-weight: bold; -} - -div.pageTitle a:link, div.pageTitle a:visited, div.pageTitle a:active, div.pageTitle a:hover -{ - text-decoration: none; -} - -a:link, a:visited, a:active -{ - color: #eeeeee; -} - -#tab-bar-bottom -{ - z-index: -1; - position:absolute; - top:27px; left: 0; - width: 100%; - height: 100%; - background: #222532; -} - -span.link-group -{ - margin: 0; - padding: 0; - display: inline; - padding-bottom: 10px; - margin-bottom: -10px; -} - -span.link-group span -{ - margin: 0; - padding: 0; - display: inline; -} - -span.link-group span.active-link -{ - background: #222532; - padding-left: 3px; padding-right: 3px; - margin-left: -3px; margin-right: -3px; - padding-bottom: 10px; - margin-bottom: -10px; -} \ No newline at end of file +body{background:#2C3143 url(masthead_bg.png) bottom;color:#eee;padding:0;border:0;margin:3px;margin-right:5px;margin-left:5px;overflow:hidden;}div.pageTitle{font-size:175%;font-weight:bold;}div.pageTitle a:link,div.pageTitle a:visited,div.pageTitle a:active,div.pageTitle a:hover{text-decoration:none;}a:link,a:visited,a:active{color:#eee;}#tab-bar-bottom{z-index:-1;position:absolute;top:27px;left:0;width:100%;height:100%;background:#222532;}span.link-group{margin:0;padding:0;display:inline;padding-bottom:10px;margin-bottom:-10px;}span.link-group span{margin:0;padding:0;display:inline;}span.link-group span.active-link{background:#222532;padding-left:3px;padding-right:3px;margin-left:-3px;margin-right:-3px;padding-bottom:10px;margin-bottom:-10px;} \ No newline at end of file diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/blue/panel_layout.css --- a/static/june_2007_style/blue/panel_layout.css Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/blue/panel_layout.css Mon Jul 13 13:08:52 2009 -0400 @@ -1,340 +1,1 @@ -body, html -{ - overflow: hidden; - margin: 0; - padding: 0; - width: 100%; - height: 100%; -} -body -{ - font: 75% verdana, "Bitstream Vera Sans", geneva, arial, helvetica, helve, sans-serif; - background: #eee; -} -#background -{ - position: absolute; - background: #eee; - z-index: -1; - top: 0; - left: 0; - margin: 0; - padding: 0; - width: 100%; - height: 100%; -} - -#messagebox -{ - position:absolute; - top:33px; - left:0; - width:100%; - height:24px !important; - overflow: hidden; - border-bottom: solid #999 1px; - font-size: 90%; -} - -#left, #left-border, #center, #right-border, #right -{ - position: absolute; - top: 39px; - bottom: 0px; - overflow: hidden; - background: #fff; -} -#left, #center, #right -{ - border-top: solid #999 1px; -} -#left-border, #right-border -{ - background: #eeeeee; - border-left: solid #999 1px; - border-right: solid #999 1px; - padding-right: 1px; - padding-left: 1px; - width: 5px; - z-index: 10000; -} -#left-border div, #right-border div -{ - width: 100%; - height: 100%; - background-repeat: no-repeat; - background-position: center center; - position: absolute; - width: 5px; - height: 100%; -} -#left-border div, #right-border.hidden div -{ - background-image: url(tiny_arrow_left.png); - cursor: w-resize; -} -#left-border.hidden div, #right-border div -{ - background-image: url(tiny_arrow_right.png); - cursor: e-resize; -} -#left-border.hover div, #right-border.hover div -{ - background-color: #AAAAEE; -} -#left -{ - left: 0px; - width: 250px; - z-index: 200; -} -#left-border -{ - left: 250px; -} -#center -{ - left:259px; - right: 259px; - overflow: hidden; - z-index: 1; -} -#right-border -{ - right: 250px; -} -#right -{ - width: 250px; - right: 0px; - z-index: 200; -} - -.unified-panel-header { - height: 2em; - z-index: 1000; - background: #cccccc; - background-image: url(panel_header_bg.png); - background-position: top center; - background-repeat: repeat-x; - border-bottom: solid #999 1px; - margin: 0; - padding: 0; - padding-right: 10px; - padding-left: 10px; - color: #333; - font-weight: bold; - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; -} - -.unified-panel-header-inner { - padding-top: 0.45em; -} - -.menu-bg { - background: #C1C9E5 url(menu_bg.png) top repeat-x; -} - -div.unified-panel-body { - position: absolute; - top: 2em; - bottom: 0; - width: 100%; - margin-top: 1px; -} - -.panel-header-button { - color: #333; - text-decoration: none; - display: inline-block; - cursor: pointer; - margin: -1px; padding: 1px; - border: 0px; - padding-right: 0.5em; - padding-left: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - border-radius: 0.5em; - background: transparent; -} - -.panel-header-button:hover { - color: black; - background: #aaaaaa; -} - -.panel-header-button:active { - color: white; - background: #aaaaaa; -} - -#overlay { - position: fixed; - top: 0; left: 0; width: 100%; height: 100%; - z-index: 20000; -} - -.dialog-box-container { - position: relative; - margin-top: 80px; - margin-right: auto; - margin-left: auto; -} - -.dialog-box-wrapper { - position: relative; - padding: 1em; - background-color: rgba(0,0,0,0.5); - -moz-border-radius: 1em; - -webkit-border-radius: 1em; -} - -.dialog-box { - border: solid #999 1px; - background: white; - min-width: 230px; - z-index: 80000; -} - -.dialog-box .body, .dialog-box .buttons { - padding: 5px; -} - - -.panel-error-message, .panel-warning-message, .panel-done-message, .panel-info-message -{ - height: 24px; - line-height: 24px; - color: #303030; - padding: 0px; - padding-left: 26px; - background-color: #FFCCCC; - background-image: url(error_small.png); - background-repeat: no-repeat; - background-position: 6px 50%; -} - -.panel-warning-message -{ - background-image: url(warn_small.png); - background-color: #FFFFCC; -} - -.panel-done-message -{ - background-image: url(done_small.png); - background-color: #CCFFCC; -} - -.panel-info-message -{ - background-image: url(info_small.png); - background-color: #CCCCFF; -} - - -#masthead -{ - position:absolute; - top:0; - left:0; - width:100%; - height:32px; - background: #2C3143; - color:#fff; - border-bottom: solid #444 1px; - z-index: 15000; - padding: 0; -} - -#masthead a -{ - color: #eeeeee; -} - -#masthead .title -{ - padding: 3px 10px; - font-size: 175%; - font-weight: bold; -} - -#masthead a -{ - text-decoration: none; -} - -#masthead a:hover -{ - text-decoration: underline; -} - - -.tab-group -{ - margin: 0; - padding: 0 10px; - height: 100%; - white-space: nowrap; - -moz-user-select: none; - -khtml-user-select: none; - user-select: none; - cursor: default; -} - -.tab-group .tab -{ - background: #2C3143; - position: relative; - display: block; - float: left; - margin: 0; - padding: 0 1em; - height: 32px; - line-height: 32px; - text-align: left; -} - -.tab-group .tab:hover > a -{ - color: gold !important; -} - -.tab-group .active -{ - background: rgb(1,1,1); -} - -.tab-group .tab .submenu { - display: none; - position: absolute; - z-index: 16000; - left: 0; - top: 32px; - padding: 1em; - margin: -1em; - padding-top: 0; - margin-top: 0; - background-color: rgba(0,0,0,0.5); - -moz-border-radius: 0 0 1em 1em; - -webkit-border-bottom-right-radius: 1em; - -webkit-border-bottom-left-radius: 1em; -} - -.tab-group .tab .submenu ul -{ - display: block; - margin: 0; - padding: 0; - list-style-type: none; - background: #2C3143; -} - -.tab-group .tab .submenu ul li -{ - display: block; - padding: 0 1em; - white-space: nowrap; -} +body,html{overflow:hidden;margin:0;padding:0;width:100%;height:100%;}body{font:75% verdana,"Bitstream Vera Sans",geneva,arial,helvetica,helve,sans-serif;background:#eee;}#background{position:absolute;background:#eee;z-index:-1;top:0;left:0;margin:0;padding:0;width:100%;height:100%;}#messagebox{position:absolute;top:33px;left:0;width:100%;height:24px!important;overflow:hidden;border-bottom:solid #999 1px;font-size:90%;}#left,#left-border,#center,#right-border,#right{position:absolute;top:39px;bottom:0;overflow:hidden;background:#fff;}#left,#center,#right{border-top:solid #999 1px;}#left-border,#right-border{background:#eee;border-left:solid #999 1px;border-right:solid #999 1px;padding-right:1px;padding-left:1px;width:5px;z-index:10000;}#left-border div,#right-border div{width:100%;height:100%;background-repeat:no-repeat;background-position:center center;position:absolute;width:5px;height:100%;}#left-border div,#right-border.hidden div{background-image:url(tiny_arrow_left.png) ;cursor:w-resize;}#left-border.hidden div,#right-border div{background-image:url(tiny_arrow_right.png);cursor:e-resize;}#left-border.hover div,#right-border.hover div{background-color:#AAE;}#left{left:0;width:250px;z-index:200;}#left-border{left:250px;}#center{left:259px;right:259px;overflow:hidden;z-index:1;}#right-border{right:250px;}#right{width:250px;right:0;z-index:200;}.unified-panel-header{height:2em;z-index:1000;background:#ccc;background-image:url(panel_header_bg.png);background-position:top center;background-repeat:repeat-x;border-bottom:solid #999 1px;margin:0;padding:0;padding-right:10px;padding-left:10px;color:#333;font-weight:bold;}.unified-panel-header-inner{padding-top:.45em;}.menu-bg{background:#C1C9E5 url(menu_bg.png) top repeat-x;}div.unified-panel-body{position:absolute;top:2em;bottom:0;width:100%;margin-top:1px;}.panel-header-button{color:#333;text-decoration:none;display:inline-block;cursor:pointer;margin:-1px;padding:1px;border:0;padding-right:.5em;pad ding-left:.5em;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em;background:transparent;}.panel-header-button:hover{color:black;background:#aaa;}.panel-header-button:active{color:white;background:#aaa;}#overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:20000;}.dialog-box-container{position:relative;margin-top:80px;margin-right:auto;margin-left:auto;}.dialog-box-wrapper{position:relative;padding:1em;background-color:rgba(0,0,0,0.5);-moz-border-radius:1em;-webkit-border-radius:1em;}.dialog-box{border:solid #999 1px;background:white;min-width:230px;z-index:80000;}.dialog-box .body,.dialog-box .buttons{padding:5px;}.panel-error-message,.panel-warning-message,.panel-done-message,.panel-info-message{height:24px;line-height:24px;color:#303030;padding:0;padding-left:26px;background-color:#FCC;background-image:url(error_small.png);background-repeat:no-repeat;background-position:6px 50%;}.panel-warning-message{background-image:url(warn_small.png);b ackground-color:#FFC;}.panel-done-message{background-image:url(done_small.png);background-color:#CFC;}.panel-info-message{background-image:url(info_small.png);background-color:#CCF;}#masthead{position:absolute;top:0;left:0;width:100%;height:32px;background:#2C3143;color:#fff;border-bottom:solid #444 1px;z-index:15000;padding:0;}#masthead a{color:#eee;}#masthead .title{padding:3px 10px;font-size:175%;font-weight:bold;}#masthead a{text-decoration:none;}#masthead a:hover{text-decoration:underline;}.tab-group{margin:0;padding:0 10px;height:100%;white-space:nowrap;cursor:default;user-select:none;-moz-user-select:none;-webkit-user-select:none;}.tab-group .tab{background:#2C3143;position:relative;float:left;margin:0;padding:0 1em;height:32px;line-height:32px;text-align:left;}.tab-group .tab:hover>a{color:gold!important;}.tab-group .active{background:#010101;}.tab-group .tab .submenu{display:none;position:absolute;z-index:16000;left:0;top:32px;padding:1em;margin:-1em;padding-top:0;m argin-top:0;background-color:rgba(0,0,0,0.5);-moz-border-radius:0 0 1em 1em;-webkit-border-bottom-right-radius:1em;-webkit-border-bottom-left-radius:1em;}.tab-group .tab .submenu ul{display:block;margin:0;padding:0;list-style-type:none;background:#2C3143;}.tab-group .tab .submenu ul li{display:block;padding:0 1em;white-space:nowrap;} \ No newline at end of file diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/blue/reset.css --- a/static/june_2007_style/blue/reset.css Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/blue/reset.css Mon Jul 13 13:08:52 2009 -0400 @@ -1,3 +1,1 @@ -/* Copyright (c) 2008, Yahoo! Inc. All rights reserved. */ -body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} -/*body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}ol,ul {list-style:none;}caption,th {text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym {border:0;}*/ +body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} \ No newline at end of file diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/blue/tool_menu.css --- a/static/june_2007_style/blue/tool_menu.css Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/blue/tool_menu.css Mon Jul 13 13:08:52 2009 -0400 @@ -1,69 +1,1 @@ -body -{ - background: white; - color: #303030; - background: #C1C9E5 url(menu_bg.png) top repeat-x; - margin: 5px; - margin-right: 10px; - margin-left: 10px; -} - -hr -{ - border: none; - height: 0px; - margin-top: 0px; -} - -div.toolSectionPad -{ - margin: 0; - padding: 0; - height: 5px; - font-size: 0px; -} - -div.toolSectionDetailsInner -{ - margin-left: 5px; - margin-right: 5px; -} - -div.toolSectionTitle -{ - font-weight: bold; -} - -div.toolPanelLabel -{ - padding-top: 10px; - padding-bottom: 5px; - font-weight: bold; - color: gray; - text-transform: uppercase; -} - -div.toolTitle -{ - padding-top: 5px; - padding-bottom: 5px; - margin-left: 16px; - margin-right: 10px; - display: list-item; - list-style: square outside; -} - -div.toolSectionBody div.toolPanelLabel -{ - padding-top: 5px; - padding-bottom: 5px; - margin-left: 16px; - margin-right: 10px; - display: list-item; - list-style: none outside; -} - -div.toolTitleNoSection -{ - padding-bottom: 0px; -} +body{background:white;color:#303030;background:#C1C9E5 url(menu_bg.png) top repeat-x;margin:5px;margin-right:10px;margin-left:10px;}hr{border:none;height:0;margin-top:0;}div.toolSectionPad{margin:0;padding:0;height:5px;font-size:0;}div.toolSectionDetailsInner{margin-left:5px;margin-right:5px;}div.toolSectionTitle{font-weight:bold;}div.toolPanelLabel{padding-top:10px;padding-bottom:5px;font-weight:bold;color:gray;text-transform:uppercase;}div.toolTitle{padding-top:5px;padding-bottom:5px;margin-left:16px;margin-right:10px;display:list-item;list-style:square outside;}div.toolSectionBody div.toolPanelLabel{padding-top:5px;padding-bottom:5px;margin-left:16px;margin-right:10px;display:list-item;list-style:none outside;}div.toolTitleNoSection{padding-bottom:0;} \ No newline at end of file diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/make_style.py --- a/static/june_2007_style/make_style.py Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/make_style.py Mon Jul 13 13:08:52 2009 -0400 @@ -4,7 +4,7 @@ #import pkg_resources #pkg_resources.require("Cheetah") -import sys, string, os.path +import sys, string, os.path, tempfile, subprocess #from galaxy import eggs import pkg_resources pkg_resources.require( "Cheetah" ) @@ -73,7 +73,18 @@ for input, output in templates: print input ,"->", output - open( os.path.join( out_dir, output ), "w" ).write( str( Template( file=input, searchList=[context] ) ) ) + out_fname = os.path.join( out_dir, output ) + temp_file = tempfile.NamedTemporaryFile() + # Write processed template to temporary file + print "Processing template..." + temp_file.write( str( Template( file=input, searchList=[context] ) ) ) + temp_file.flush() + # Compress CSS with YUI + print "Compressing..." + subprocess.call( + "java -jar ../../scripts/yuicompressor.jar --type css %s -o %s" % ( temp_file.name, out_fname ), + shell = True ) + """ for rule, output in images: diff -r d202e2f4b910 -r feb7438276fb static/june_2007_style/panel_layout.css.tmpl --- a/static/june_2007_style/panel_layout.css.tmpl Fri Jul 10 18:33:36 2009 -0400 +++ b/static/june_2007_style/panel_layout.css.tmpl Mon Jul 13 13:08:52 2009 -0400 @@ -1,3 +1,11 @@ +#set $unselectable = """ + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; +""" + +## Rules + body, html { overflow: hidden; @@ -124,9 +132,6 @@ padding-left: 10px; color: #333; font-weight: bold; - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; } .unified-panel-header-inner { @@ -281,17 +286,14 @@ padding: 0 10px; height: 100%; white-space: nowrap; - -moz-user-select: none; - -khtml-user-select: none; - user-select: none; cursor: default; + ${unselectable} } .tab-group .tab { - background: ${masthead_bg}; + background: ${masthead_bg}; position: relative; - display: block; float: left; margin: 0; padding: 0 1em;

1 0

[hg] galaxy 2480: Fix job recovery when a tool has been removed ...
by Greg Von Kuster 15 Jul '09

15 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/dc5068efc3e7 changeset: 2480:dc5068efc3e7 user: Nate Coraor <nate(a)bx.psu.edu> date: Tue Jul 14 11:33:42 2009 -0400 description: Fix job recovery when a tool has been removed while the job is running 1 file(s) affected in this change: lib/galaxy/jobs/__init__.py diffs (24 lines): diff -r 3f407d489ade -r dc5068efc3e7 lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py Fri May 22 14:46:17 2009 -0400 +++ b/lib/galaxy/jobs/__init__.py Tue Jul 14 11:33:42 2009 -0400 @@ -119,10 +119,17 @@ """ model = self.app.model for job in model.Job.filter( model.Job.c.state==model.Job.states.NEW ).all(): - log.debug( "no runner: %s is still in new state, adding to the jobs queue" %job.id ) - self.queue.put( ( job.id, job.tool_id ) ) + if job.tool_id not in self.app.toolbox.tools_by_id: + log.warning( "Tool '%s' removed from tool config, unable to recover job: %s" % ( job.tool_id, job.id ) ) + JobWrapper( job, None, self ).fail( 'This tool was disabled before the job completed. Please contact your Galaxy administrator, or' ) + else: + log.debug( "no runner: %s is still in new state, adding to the jobs queue" %job.id ) + self.queue.put( ( job.id, job.tool_id ) ) for job in model.Job.filter( (model.Job.c.state == model.Job.states.RUNNING) | (model.Job.c.state == model.Job.states.QUEUED) ).all(): - if job.job_runner_name is None: + if job.tool_id not in self.app.toolbox.tools_by_id: + log.warning( "Tool '%s' removed from tool config, unable to recover job: %s" % ( job.tool_id, job.id ) ) + JobWrapper( job, None, self ).fail( 'This tool was disabled before the job completed. Please contact your Galaxy administrator, or' ) + elif job.job_runner_name is None: log.debug( "no runner: %s is still in queued state, adding to the jobs queue" %job.id ) self.queue.put( ( job.id, job.tool_id ) ) else:

1 0

[hg] galaxy 2479: Performance improvements for large histories (...
by Greg Von Kuster 15 Jul '09

15 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/3f407d489ade changeset: 2479:3f407d489ade user: James Taylor <james(a)jamestaylor.org> date: Fri May 22 14:46:17 2009 -0400 description: Performance improvements for large histories (both on database query and javascript) 5 file(s) affected in this change: lib/galaxy/datatypes/registry.py lib/galaxy/model/mapping.py lib/galaxy/web/controllers/root.py lib/galaxy/web/framework/__init__.py templates/root/history.mako diffs (243 lines): diff -r feb7438276fb -r 3f407d489ade lib/galaxy/datatypes/registry.py --- a/lib/galaxy/datatypes/registry.py Mon Jul 13 13:08:52 2009 -0400 +++ b/lib/galaxy/datatypes/registry.py Fri May 22 14:46:17 2009 -0400 @@ -211,7 +211,8 @@ builder = self.datatypes_by_extension[ext] except KeyError: builder = data.Text() - self.log.warning('unknown extension in data factory %s' % ext) + if ext is not None: + self.log.warning('unknown extension in data factory %s', ext) return builder def change_datatype(self, data, ext ): diff -r feb7438276fb -r 3f407d489ade lib/galaxy/model/mapping.py --- a/lib/galaxy/model/mapping.py Mon Jul 13 13:08:52 2009 -0400 +++ b/lib/galaxy/model/mapping.py Fri May 22 14:46:17 2009 -0400 @@ -690,7 +690,7 @@ assign_mapper( context, History, History.table, properties=dict( galaxy_sessions=relation( GalaxySessionToHistoryAssociation ), datasets=relation( HistoryDatasetAssociation, backref="history", order_by=asc(HistoryDatasetAssociation.table.c.hid) ), - active_datasets=relation( HistoryDatasetAssociation, primaryjoin=( ( HistoryDatasetAssociation.table.c.history_id == History.table.c.id ) & ( not_( HistoryDatasetAssociation.table.c.deleted ) ) ), order_by=asc( HistoryDatasetAssociation.table.c.hid ), lazy=False, viewonly=True ) + active_datasets=relation( HistoryDatasetAssociation, primaryjoin=( ( HistoryDatasetAssociation.table.c.history_id == History.table.c.id ) & ( not_( HistoryDatasetAssociation.table.c.deleted ) ) ), order_by=asc( HistoryDatasetAssociation.table.c.hid ), viewonly=True ) ) ) assign_mapper( context, HistoryUserShareAssociation, HistoryUserShareAssociation.table, diff -r feb7438276fb -r 3f407d489ade lib/galaxy/web/controllers/root.py --- a/lib/galaxy/web/controllers/root.py Mon Jul 13 13:08:52 2009 -0400 +++ b/lib/galaxy/web/controllers/root.py Fri May 22 14:46:17 2009 -0400 @@ -61,7 +61,18 @@ return trans.fill_template_mako( "root/history_as_xml.mako", history=history, show_deleted=util.string_as_bool( show_deleted ) ) else: template = "root/history.mako" - return trans.fill_template( "root/history.mako", history=history, show_deleted=util.string_as_bool( show_deleted ) ) + show_deleted = util.string_as_bool( show_deleted ) + query = trans.sa_session.query( model.HistoryDatasetAssociation ) \ + .filter( model.HistoryDatasetAssociation.history == history ) \ + .options( eagerload( "children" ) ) \ + .join( "dataset" ).filter( model.Dataset.purged == False ) \ + .options( eagerload_all( "dataset.actions" ) ) + if not show_deleted: + query.filter_by( deleted=False ) + return trans.stream_template_mako( "root/history.mako", + history = history, + datasets = query.all(), + show_deleted = show_deleted ) @web.expose def dataset_state ( self, trans, id=None, stamp=None ): diff -r feb7438276fb -r 3f407d489ade lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py Mon Jul 13 13:08:52 2009 -0400 +++ b/lib/galaxy/web/framework/__init__.py Fri May 22 14:46:17 2009 -0400 @@ -23,6 +23,7 @@ pkg_resources.require( "Mako" ) import mako.template import mako.lookup +import mako.runtime pkg_resources.require( "Babel" ) from babel.support import Translations @@ -575,6 +576,23 @@ data.update( self.template_context ) data.update( kwargs ) return template.render( **data ) + def stream_template_mako( self, filename, **kwargs ): + template = self.webapp.mako_template_lookup.get_template( filename ) + template.output_encoding = 'utf-8' + data = dict( caller=self, t=self, trans=self, h=webhelpers, util=util, request=self.request, response=self.response, app=self.app ) + data.update( self.template_context ) + data.update( kwargs ) + ## return template.render( **data ) + def render( environ, start_response ): + response_write = start_response( self.response.wsgi_status(), + self.response.wsgi_headeritems() ) + class C: + def write( self, *args, **kwargs ): + response_write( *args, **kwargs ) + context = mako.runtime.Context( C(), **data ) + template.render_context( context ) + return [] + return render def fill_template_string(self, template_string, context=None, **kwargs): """ Fill in a template, putting any keyword arguments on the context. diff -r feb7438276fb -r 3f407d489ade templates/root/history.mako --- a/templates/root/history.mako Mon Jul 13 13:08:52 2009 -0400 +++ b/templates/root/history.mako Fri May 22 14:46:17 2009 -0400 @@ -70,7 +70,15 @@ $("#history-name-area").append( t ); t.focus(); return false; - }) + }); + // Updater + updater({ + %for data in reversed( datasets ): + %if data.visible and data.state not in [ "deleted", "empty", "error", "ok" ]: + "${data.id}": "${data.state}"; + %endif + %endfor + }); }) //' Functionized so AJAX'd datasets can call them // Get shown/hidden state from cookie @@ -80,7 +88,7 @@ var state = new CookieSet( "galaxy.history.expand_state" ); for ( id in state.store ) { if ( id ) { - $( "#" + id ).children( "div.historyItemBody" ).show(); + $( "#" + id + " div.historyItemBody" ).show(); } } // If Mozilla, hide scrollbars in hidden items since they cause animation bugs @@ -114,51 +122,51 @@ state.add( id ); state.save(); delete state; } - return false; + return false; }); // Delete link $(this).find( "a.historyItemDelete" ).each( function() { - var data_id = this.id.split( "-" )[1]; - $(this).click( function() { - $( '#progress-' + data_id ).show(); - $.ajax({ - url: "${h.url_for( action='delete_async', id='XXX' )}".replace( 'XXX', data_id ), - error: function() { alert( "Delete failed" ) }, - success: function() { - %if show_deleted: - var to_update = {}; - to_update[data_id] = "none"; - updater( to_update ); - %else: - $( "#historyItem-" + data_id ).fadeOut( "fast", function() { - $( "#historyItemContainer-" + data_id ).remove(); - if ( $( "div.historyItemContainer" ).length < 1 ) { - $( "#emptyHistoryMessage" ).show(); - } + var data_id = this.id.split( "-" )[1]; + $(this).click( function() { + $( '#progress-' + data_id ).show(); + $.ajax({ + url: "${h.url_for( action='delete_async', id='XXX' )}".replace( 'XXX', data_id ), + error: function() { alert( "Delete failed" ) }, + success: function() { + %if show_deleted: + var to_update = {}; + to_update[data_id] = "none"; + updater( to_update ); + %else: + $( "#historyItem-" + data_id ).fadeOut( "fast", function() { + $( "#historyItemContainer-" + data_id ).remove(); + if ( $( "div.historyItemContainer" ).length < 1 ) { + $( "#emptyHistoryMessage" ).show(); + } + }); + %endif + } + }); + return false; }); - %endif - } }); - return false; - }); - }); // Undelete link $(this).find( "a.historyItemUndelete" ).each( function() { - var data_id = this.id.split( "-" )[1]; - $(this).click( function() { - $( '#progress-' + data_id ).show(); - $.ajax({ - url: "${h.url_for( controller='dataset', action='undelete_async', id='XXX' )}".replace( 'XXX', data_id ), - error: function() { alert( "Undelete failed" ) }, - success: function() { - var to_update = {}; - to_update[data_id] = "none"; - updater( to_update ); - } + var data_id = this.id.split( "-" )[1]; + $(this).click( function() { + $( '#progress-' + data_id ).show(); + $.ajax({ + url: "${h.url_for( controller='dataset', action='undelete_async', id='XXX' )}".replace( 'XXX', data_id ), + error: function() { alert( "Undelete failed" ) }, + success: function() { + var to_update = {}; + to_update[data_id] = "none"; + updater( to_update ); + } + }); + return false; + }); }); - return false; - }); - }); }); }; // Looks for changes in dataset state using an async request. Keeps @@ -261,36 +269,21 @@ <%namespace file="history_common.mako" import="render_dataset" /> -<% activatable_datasets = history.activatable_datasets %> +%if not datasets: -%if ( show_deleted and not activatable_datasets ) or ( not show_deleted and not history.active_datasets ): <div class="infomessagesmall" id="emptyHistoryMessage"> + %else: - <% - if show_deleted: - ## All datasets - datasets_to_show = activatable_datasets - else: - ## Active (not deleted) - datasets_to_show = history.active_datasets - %> + ## Render requested datasets, ordered from newest to oldest - %for data in reversed( datasets_to_show ): + %for data in reversed( datasets ): %if data.visible: <div class="historyItemContainer" id="historyItemContainer-${data.id}"> ${render_dataset( data, data.hid, show_deleted_on_refresh = show_deleted )} </div> %endif %endfor - <script type="text/javascript"> - var tracked_datasets = {}; - %for data in reversed( history.active_datasets ): - %if data.visible and data.state not in [ "deleted", "empty", "error", "ok" ]: - tracked_datasets[ ${data.id} ] = "${data.state}"; - %endif - %endfor - updater( tracked_datasets ); - </script> + <div class="infomessagesmall" id="emptyHistoryMessage" style="display:none;"> %endif ${_("Your history is empty. Click 'Get Data' on the left pane to start")}

1 0

[hg] galaxy 2476: IE compatibility fixes in workflow editor java...
by Greg Von Kuster 15 Jul '09

15 Jul '09

details: http://www.bx.psu.edu/hg/galaxy/rev/14fd033f08eb changeset: 2476:14fd033f08eb user: James Taylor <james(a)jamestaylor.org> date: Fri Jul 10 16:21:19 2009 -0400 description: IE compatibility fixes in workflow editor javascript (groan) 2 file(s) affected in this change: static/scripts/galaxy.workflow_editor.canvas.js static/scripts/packed/galaxy.workflow_editor.canvas.js diffs (474 lines): diff -r 0b5d64cde142 -r 14fd033f08eb static/scripts/galaxy.workflow_editor.canvas.js --- a/static/scripts/galaxy.workflow_editor.canvas.js Fri Jul 10 16:15:32 2009 -0400 +++ b/static/scripts/galaxy.workflow_editor.canvas.js Fri Jul 10 16:21:19 2009 -0400 @@ -2,7 +2,7 @@ this.element = element; this.connectors = []; } -Terminal.prototype = { +$.extend( Terminal.prototype, { connect: function ( connector ) { this.connectors.push( connector ); if ( this.node ) { @@ -25,26 +25,26 @@ c.destroy(); }); } -} +}); function OutputTerminal( element, datatype ) { Terminal.call( this, element ); this.datatype = datatype; } -OutputTerminal.prototype = new Terminal; +OutputTerminal.prototype = new Terminal(); function InputTerminal( element, datatypes ) { Terminal.call( this, element ); this.datatypes = datatypes; } -InputTerminal.prototype = new Terminal; +InputTerminal.prototype = new Terminal(); $.extend( InputTerminal.prototype, { can_accept: function ( other ) { if ( this.connectors.length < 1 ) { - for ( t in this.datatypes ) { + for ( var t in this.datatypes ) { // FIXME: No idea what to do about this case if ( other.datatype == "input" ) { return true; } if ( issubtype( other.datatype, this.datatypes[t] ) ) { @@ -60,7 +60,7 @@ this.canvas = null; this.dragging = false; this.inner_color = "#FFFFFF"; - this.outer_color = "#D8B365" + this.outer_color = "#D8B365"; if ( handle1 && handle2 ) { this.connect( handle1, handle2 ); } @@ -90,10 +90,16 @@ G_vmlCanvasManager.initElement( this.canvas ); } canvas_container.append( $(this.canvas) ); - if ( this.dragging ) { this.canvas.style.zIndex = "300" } + if ( this.dragging ) { + this.canvas.style.zIndex = "300"; + } } - var relativeLeft = function( e ) { return $(e).offset().left - canvas_container.offset().left } - var relativeTop = function( e ) { return $(e).offset().top - canvas_container.offset().top } + var relativeLeft = function( e ) { + return $(e).offset().left - canvas_container.offset().left; + }; + var relativeTop = function( e ) { + return $(e).offset().top - canvas_container.offset().top; + }; // Find the position of each handle var start_x = relativeLeft( this.handle1.element ) + 5; var start_y = relativeTop( this.handle1.element ) + 5; @@ -157,7 +163,7 @@ }).bind( "dropend", function ( e ) { e.dragProxy.terminal.connectors[0].inner_color = "#FFFFFF"; }).bind( "drop", function( e ) { - new Connector( e.dragTarget.terminal, e.dropTarget.terminal ).redraw(); + ( new Connector( e.dragTarget.terminal, e.dropTarget.terminal ) ).redraw(); }).bind( "hover", function() { // If connected, create a popup to allow disconnection if ( terminal.connectors.length > 0 ) { @@ -168,22 +174,24 @@ .append( $("<div class='buttons'></div>").append( $("<img src='../images/delete_icon.png' />").click( function() { - $.each( terminal.connectors, function( _, x ) { x.destroy() } ); + $.each( terminal.connectors, function( _, x ) { + x.destroy(); + }); t.remove(); }))) .bind( "mouseleave", function() { $(this).remove(); }); // Position it and show - t.css( { + t.css({ top: $(this).offset().top - 2, left: $(this).offset().left - t.width(), - 'padding-right': $(this).width() } - ).show(); + 'padding-right': $(this).width() + }).show(); } }); node.input_terminals[name] = terminal; - }) + }); }, enable_output_terminal : function( elements, name, type ) { var node = this; @@ -213,7 +221,7 @@ e.dragProxy.terminal.redraw(); // FIXME: global canvas_manager.update_viewport_overlay(); - } + }; onmove(); $("#canvas-container").get(0).scroll_panel.test( e, onmove ); }).bind( "dragend", function ( e ) { @@ -226,8 +234,12 @@ }); }, redraw : function () { - $.each( this.input_terminals, function( _, t ) { t.redraw() } ); - $.each( this.output_terminals, function( _, t ) { t.redraw() } ); + $.each( this.input_terminals, function( _, t ) { + t.redraw(); + }); + $.each( this.output_terminals, function( _, t ) { + t.redraw(); + }); }, destroy : function () { $.each( this.input_terminals, function( k, t ) { @@ -246,7 +258,7 @@ // Keep inactive nodes stacked from most to least recently active // by moving element to the end of parent's node list var element = this.element.get(0); - (function(p) { p.removeChild( element ); p.appendChild( element ) })(element.parentNode); + (function(p) { p.removeChild( element ); p.appendChild( element ); })(element.parentNode); // Remove active class $(element).removeClass( "toolForm-active" ); }, @@ -279,7 +291,7 @@ $.each( data.data_outputs, function( i, output ) { var t = $( "<div class='terminal output-terminal'></div>" ); node.enable_output_terminal( t, output.name, output.extension ); - var label = output.name + var label = output.name; if ( output.extension != 'input' ) { label = label + " (" + output.extension + ")"; } @@ -301,7 +313,7 @@ // Update input rows var old_body = el.find( "div.inputs" ); var new_body = $("<div class='inputs'></div>"); - var old = old_body.find( "div.input-data-row") + var old = old_body.find( "div.input-data-row"); $.each( data.data_inputs, function( i, input ) { var t = $("<div class='terminal input-terminal'></div>"); node.enable_input_terminal( t, input.name, input.extensions ); @@ -323,7 +335,7 @@ // Cleanup any leftover terminals old_body.find( "div.input-data-row > .terminal" ).each( function() { this.terminal.destroy(); - }) + }); // If active, reactivate with new form_html this.changed(); this.redraw(); @@ -344,7 +356,7 @@ function Workflow( canvas_container ) { this.canvas_container = canvas_container; this.id_counter = 0; - this.nodes = {} + this.nodes = {}; this.name = null; this.has_changes = false; } @@ -372,9 +384,9 @@ }); }, to_simple : function () { - var nodes = {} + var nodes = {}; $.each( this.nodes, function ( i, node ) { - var input_connections = {} + var input_connections = {}; $.each( node.input_terminals, function ( k, t ) { input_connections[ t.name ] = null; // There should only be 0 or 1 connectors, so this is @@ -391,10 +403,10 @@ tool_errors : node.tool_errors, input_connections : input_connections, position : $(node.element).position() - } + }; nodes[ node.id ] = node_data; - }) - return { steps: nodes } + }); + return { steps: nodes }; }, from_simple : function ( data ) { wf = this; @@ -409,7 +421,7 @@ } node.id = step.id; wf.nodes[ node.id ] = node; - max_id = Math.max( max_id, parseInt( id ) ) + max_id = Math.max( max_id, parseInt( id ) ); }); wf.id_counter = max_id + 1; // Second pass, connections @@ -423,7 +435,7 @@ node.input_terminals[ k ] ); c.redraw(); } - }) + }); }); }, clear_active_node : function() { @@ -471,31 +483,32 @@ }); }); // Assemble order, tracking levels - node_ids_by_level = [] + node_ids_by_level = []; while ( true ) { // Everything without a predecessor - level_parents = [] - $.each( n_pred, function( k, v ) { - if ( v == 0 ) { - level_parents.push( k ); + level_parents = []; + for ( var pred_k in n_pred ) { + if ( n_pred[ pred_k ] == 0 ) { + level_parents.push( pred_k ); } - }); + } if ( level_parents.length == 0 ) { break; } - node_ids_by_level.push( level_parents ) + node_ids_by_level.push( level_parents ); // Remove the parents from this level, and decrement the number // of predecessors for each successor - $.each( level_parents, function( k, v ) { + for ( var k in level_parents ) { + var v = level_parents[k]; delete n_pred[v]; - $.each( successors[v], function( sk, sv ) { - n_pred[sv] -= 1; - }); - }); + for ( var sk in successors[v] ) { + n_pred[ sucessors[v][sk] ] -= 1; + } + } } if ( n_pred.length ) { // ERROR: CYCLE! Currently we do nothing - return + return; } // Layout each level var all_nodes = this.nodes; @@ -505,7 +518,7 @@ // We keep nodes in the same order in a level to give the user // some control over ordering ids.sort( function( a, b ) { - return $(all_nodes[a].element).position().top - $(all_nodes[b].element).position().top + return $(all_nodes[a].element).position().top - $(all_nodes[b].element).position().top; }); // Position each node var max_width = 0; @@ -520,7 +533,7 @@ left += max_width + h_pad; }); // Need to redraw all connectors - $.each( all_nodes, function( _, node ) { node.redraw() } ); + $.each( all_nodes, function( _, node ) { node.redraw(); } ); }, bounds_for_all_nodes: function() { var xmin = Infinity, xmax = -Infinity, @@ -528,7 +541,7 @@ p; $.each( this.nodes, function( id, node ) { e = $(node.element); - p = e.position() + p = e.position(); xmin = Math.min( xmin, p.left ); xmax = Math.max( xmax, p.left + e.width() ); ymin = Math.min( ymin, p.top ); @@ -559,11 +572,11 @@ left: left, top: top, width: width, - height: height, + height: height }); // Move elements back if needed this.canvas_container.children().each( function() { - var p = $(this).position() + var p = $(this).position(); $(this).css( "left", p.left + xmin_delta ); $(this).css( "top", p.top + ymin_delta ); }); @@ -585,26 +598,26 @@ function prebuild_node( type, title_text, tool_id ) { var f = $("<div class='toolForm toolFormInCanvas'></div>"); var node = new Node( f ); - node.type = type + node.type = type; if ( type == 'tool' ) { node.tool_id = tool_id; } - var title = $("<div class='toolFormTitle unselectable'>" + title_text + "</div>" ) + var title = $("<div class='toolFormTitle unselectable'>" + title_text + "</div>" ); f.append( title ); f.css( "left", $(window).scrollLeft() + 20 ); f.css( "top", $(window).scrollTop() + 20 ); - var b = $("<div class='toolFormBody'></div>") + var b = $("<div class='toolFormBody'></div>"); var tmp = "<div><img height='16' align='middle' src='../images/loading_small_white_bg.gif'/> loading tool info...</div>"; b.append( tmp ); node.form_html = tmp; - f.append( b ) + f.append( b ); // Fix width to computed width // Now add floats var buttons = $("<div class='buttons' style='float: right;'></div>"); buttons.append( $("<img src='../images/delete_icon.png' />").click( function( e ) { node.destroy(); } ).hover( - function() { $(this).attr( 'src', "../images/delete_icon_dark.png" ) }, - function() { $(this).attr( 'src', "../images/delete_icon.png" ) } + function() { $(this).attr( 'src', "../images/delete_icon_dark.png" ); }, + function() { $(this).attr( 'src', "../images/delete_icon.png" ); } ) ); // Place inside container f.appendTo( "#canvas-container" ); @@ -647,12 +660,12 @@ child = ext_to_type[child]; parent = ext_to_type[parent]; return ( type_to_type[child] ) && ( parent in type_to_type[child] ); -}; +} function populate_datatype_info( data ) { ext_to_type = data.ext_to_class_name; type_to_type = data.class_to_classes; -}; +} // FIXME: merge scroll panel into CanvasManager, clean up hardcoded stuff. @@ -663,14 +676,14 @@ test: function( e, onmove ) { clearTimeout( this.timeout ); var x = e.pageX, - y = e.pageY; + y = e.pageY, // Panel size and position panel = $(this.panel), panel_pos = panel.position(), panel_w = panel.width(), - panel_h = panel.height() + panel_h = panel.height(), // Viewport size and offset - viewport = panel.parent(); + viewport = panel.parent(), viewport_w = viewport.width(), viewport_h = viewport.height(), viewport_offset = viewport.offset(), @@ -747,7 +760,7 @@ top: y }); self.update_viewport_overlay(); - } + }; // Dragging within canvas background this.cc.each( function() { this.scroll_panel = new ScrollPanel( this ); @@ -766,13 +779,13 @@ }); // Dragging for overview pane this.ov.bind( "drag", function( e ) { - var in_w = self.cc.width(); - var in_h = self.cc.height() - var o_w = self.oc.width(); - var o_h = self.oc.height(); - var p = $(this).offsetParent().offset(); - var new_x_offset = e.offsetX - p.left; - var new_y_offset = e.offsetY - p.top; + var in_w = self.cc.width(), + in_h = self.cc.height(), + o_w = self.oc.width(), + o_h = self.oc.height(), + p = $(this).offsetParent().offset(), + new_x_offset = e.offsetX - p.left, + new_y_offset = e.offsetY - p.top; move( - ( new_x_offset / o_w * in_w ), - ( new_y_offset / o_h * in_h ) ); }).bind( "dragend", function() { @@ -794,15 +807,15 @@ }, update_viewport_overlay: function() { - var cc = this.cc; - var cv = this.cv; - var oc = this.oc; - var ov = this.ov; - var in_w = cc.width(); - var in_h = cc.height() - var o_w = oc.width(); - var o_h = oc.height(); - var cc_pos = cc.position() + var cc = this.cc, + cv = this.cv, + oc = this.oc, + ov = this.ov, + in_w = cc.width(), + in_h = cc.height(), + o_w = oc.width(), + o_h = oc.height(), + cc_pos = cc.position(); ov.css( { left: - ( cc_pos.left / in_w * o_w ), top: - ( cc_pos.top / in_h * o_h ), @@ -812,11 +825,11 @@ }); }, draw_overview: function() { - var canvas_el = $("#overview-canvas"); - var size = canvas_el.parent().parent().width() - var c = canvas_el.get(0).getContext("2d"); - var in_w = $("#canvas-container").width(); - var in_h = $("#canvas-container").height() + var canvas_el = $("#overview-canvas"), + size = canvas_el.parent().parent().width(), + c = canvas_el.get(0).getContext("2d"), + in_w = $("#canvas-container").width(), + in_h = $("#canvas-container").height(); var o_h, shift_h, o_w, shift_w; // Fit canvas into overview area var cv_w = this.cv.width(); @@ -853,7 +866,7 @@ c.strokeStyle = "#D8B365"; c.lineWidth = 1; $.each( workflow.nodes, function( id, node ) { - var node_element = $(node.element); + var node_element = $(node.element), position = node_element.position(), x = position.left / in_w * o_w, y = position.top / in_h * o_h, @@ -864,4 +877,4 @@ }); this.update_viewport_overlay(); } -}) \ No newline at end of file +}); \ No newline at end of file diff -r 0b5d64cde142 -r 14fd033f08eb static/scripts/packed/galaxy.workflow_editor.canvas.js --- a/static/scripts/packed/galaxy.workflow_editor.canvas.js Fri Jul 10 16:15:32 2009 -0400 +++ b/static/scripts/packed/galaxy.workflow_editor.canvas.js Fri Jul 10 16:21:19 2009 -0400 @@ -1,1 +1,1 @@ -function Terminal(a){this.element=a;this.connectors=[]}Terminal.prototype={connect:function(a){this.connectors.push(a);if(this.node){this.node.changed()}},disconnect:function(a){this.connectors.splice($.inArray(a,this.connectors),1);if(this.node){this.node.changed()}},redraw:function(){$.each(this.connectors,function(a,b){b.redraw()})},destroy:function(){$.each(this.connectors.slice(),function(a,b){b.destroy()})}};function OutputTerminal(a,b){Terminal.call(this,a);this.datatype=b}OutputTerminal.prototype=new Terminal;function InputTerminal(a,b){Terminal.call(this,a);this.datatypes=b}InputTerminal.prototype=new Terminal;$.extend(InputTerminal.prototype,{can_accept:function(a){if(this.connectors.length<1){for(t in this.datatypes){if(a.datatype=="input"){return true}if(issubtype(a.datatype,this.datatypes[t])){return true}}}return false}});function Connector(b,a){this.canvas=null;this.dragging=false;this.inner_color="#FFFFFF";this.outer_color="#D8B365";if(b&&a){this.connect(b,a) }}$.extend(Connector.prototype,{connect:function(b,a){this.handle1=b;this.handle1.connect(this);this.handle2=a;this.handle2.connect(this)},destroy:function(){if(this.handle1){this.handle1.disconnect(this)}if(this.handle2){this.handle2.disconnect(this)}$(this.canvas).remove()},redraw:function(){var d=$("#canvas-container");if(!this.canvas){this.canvas=document.createElement("canvas");if(window.G_vmlCanvasManager){G_vmlCanvasManager.initElement(this.canvas)}d.append($(this.canvas));if(this.dragging){this.canvas.style.zIndex="300"}}var o=function(c){return $(c).offset().left-d.offset().left};var j=function(c){return $(c).offset().top-d.offset().top};var i=o(this.handle1.element)+5;var g=j(this.handle1.element)+5;var q=o(this.handle2.element)+5;var n=j(this.handle2.element)+5;var f=100;var l=Math.min(i,q);var a=Math.max(i,q);var k=Math.min(g,n);var v=Math.max(g,n);var b=Math.min(Math.max(Math.abs(v-k)/2,100),300);var p=l-f;var u=k-f;var r=a-l+2*f;var m=v-k+2*f;this.canvas.style. left=p+"px";this.canvas.style.top=u+"px";this.canvas.setAttribute("width",r);this.canvas.setAttribute("height",m);i-=p;g-=u;q-=p;n-=u;var s=this.canvas.getContext("2d");s.lineCap="round";s.strokeStyle=this.outer_color;s.lineWidth=7;s.beginPath();s.moveTo(i,g);s.bezierCurveTo(i+b,g,q-b,n,q,n);s.stroke();s.strokeStyle=this.inner_color;s.lineWidth=5;s.beginPath();s.moveTo(i,g);s.bezierCurveTo(i+b,g,q-b,n,q,n);s.stroke()}});function Node(a){this.element=a;this.input_terminals={};this.output_terminals={};this.tool_errors={}}$.extend(Node.prototype,{enable_input_terminal:function(d,a,b){var c=this;$(d).each(function(){var f=this.terminal=new InputTerminal(this,b);f.node=c;f.name=a;$(this).bind("dropstart",function(g){g.dragProxy.terminal.connectors[0].inner_color="#BBFFBB"}).bind("dropend",function(g){g.dragProxy.terminal.connectors[0].inner_color="#FFFFFF"}).bind("drop",function(g){new Connector(g.dragTarget.terminal,g.dropTarget.terminal).redraw()}).bind("hover",function(){if(f. connectors.length>0){var g=$("<div class='callout'></div>").css({display:"none"}).appendTo("body").append($("<div class='buttons'></div>").append($("<img src='../images/delete_icon.png' />").click(function(){$.each(f.connectors,function(j,i){i.destroy()});g.remove()}))).bind("mouseleave",function(){$(this).remove()});g.css({top:$(this).offset().top-2,left:$(this).offset().left-g.width(),"padding-right":$(this).width()}).show()}});c.input_terminals[a]=f})},enable_output_terminal:function(d,a,b){var c=this;$(d).each(function(){var g=this;var f=this.terminal=new OutputTerminal(this,b);f.node=c;f.name=a;$(this).bind("dragstart",function(j){var i=$('<div class="drag-terminal" style="position: absolute;"></div>').appendTo("#canvas-container").get(0);i.terminal=new OutputTerminal(i);var k=new Connector();k.dragging=true;k.connect(this.terminal,i.terminal);$.dropManage({filter:function(l){return this.terminal.can_accept(f)}}).addClass("input-terminal-active");return i}).bind("drag", function(j){var i=function(){var l=$(j.dragProxy).offsetParent().offset(),k=j.offsetX-l.left,m=j.offsetY-l.top;$(j.dragProxy).css({left:k,top:m});j.dragProxy.terminal.redraw();canvas_manager.update_viewport_overlay()};i();$("#canvas-container").get(0).scroll_panel.test(j,i)}).bind("dragend",function(i){i.dragProxy.terminal.connectors[0].destroy();$(i.dragProxy).remove();$.dropManage().removeClass("input-terminal-active");$("#canvas-container").get(0).scroll_panel.stop()});c.output_terminals[a]=f})},redraw:function(){$.each(this.input_terminals,function(a,b){b.redraw()});$.each(this.output_terminals,function(a,b){b.redraw()})},destroy:function(){$.each(this.input_terminals,function(a,b){b.destroy()});$.each(this.output_terminals,function(a,b){b.destroy()});workflow.remove_node(this);$(this.element).remove()},make_active:function(){$(this.element).addClass("toolForm-active")},make_inactive:function(){var a=this.element.get(0);(function(b){b.removeChild(a);b.appendChild(a)})(a. parentNode);$(a).removeClass("toolForm-active")},init_field_data:function(g){var d=this.element;if(g.type){this.type=g.type}this.name=g.name;this.form_html=g.form_html;this.tool_state=g.tool_state;this.tool_errors=g.tool_errors;if(this.tool_errors){d.addClass("tool-node-error")}else{d.removeClass("tool-node-error")}var c=this;var a=d.find(".toolFormBody");a.find("div").remove();var i=$("<div class='inputs'></div>").appendTo(a);$.each(g.data_inputs,function(j,b){var f=$("<div class='terminal input-terminal'></div>");c.enable_input_terminal(f,b.name,b.extensions);i.append($("<div class='form-row dataRow input-data-row' name='"+b.name+"'>"+b.label+"</div>").prepend(f))});if((g.data_inputs.length>0)&&(g.data_outputs.length>0)){a.append($("<div class='rule'></div>"))}$.each(g.data_outputs,function(k,b){var j=$("<div class='terminal output-terminal'></div>");c.enable_output_terminal(j,b.name,b.extension);var f=b.name;if(b.extension!="input"){f=f+" ("+b.extension+")"}a.append($("<d iv class='form-row dataRow'>"+f+"</div>").append(j))});workflow.node_changed(this)},update_field_data:function(f){var c=$(this.element),d=this;this.tool_state=f.tool_state;this.form_html=f.form_html;this.tool_errors=f.tool_errors;if(this.tool_errors){c.addClass("tool-node-error")}else{c.removeClass("tool-node-error")}var g=c.find("div.inputs");var b=$("<div class='inputs'></div>");var a=g.find("div.input-data-row");$.each(f.data_inputs,function(l,j){var k=$("<div class='terminal input-terminal'></div>");d.enable_input_terminal(k,j.name,j.extensions);g.find("div[name="+j.name+"]").each(function(){$(this).find(".input-terminal").each(function(){var i=this.terminal.connectors[0];if(i){k[0].terminal.connectors[0]=i;i.handle2=k[0].terminal}});$(this).remove()});b.append($("<div class='form-row dataRow input-data-row' name='"+j.name+"'>"+j.label+"</div>").prepend(k))});g.replaceWith(b);g.find("div.input-data-row > .terminal").each(function(){this.terminal.destroy()});this.changed( );this.redraw()},error:function(d){var a=$(this.element).find(".toolFormBody");a.find("div").remove();var c="<div style='color: red; text-style: italic;'>"+d+"</div>";this.form_html=c;a.html(c);workflow.node_changed(this)},changed:function(){workflow.node_changed(this)}});function Workflow(a){this.canvas_container=a;this.id_counter=0;this.nodes={};this.name=null;this.has_changes=false}$.extend(Workflow.prototype,{add_node:function(a){a.id=this.id_counter;a.element.attr("id","wf-node-step-"+a.id);this.id_counter++;this.nodes[a.id]=a;this.has_changes=true;a.workflow=this},remove_node:function(a){if(this.active_node==a){this.clear_active_node()}delete this.nodes[a.id];this.has_changes=true},remove_all:function(){wf=this;$.each(this.nodes,function(b,a){a.destroy();wf.remove_node(a)})},to_simple:function(){var a={};$.each(this.nodes,function(b,d){var f={};$.each(d.input_terminals,function(g,i){f[i.name]=null;$.each(i.connectors,function(j,k){f[i.name]={id:k.handle1.node.id,output _name:k.handle1.name}})});var c={id:d.id,type:d.type,tool_id:d.tool_id,tool_state:d.tool_state,tool_errors:d.tool_errors,input_connections:f,position:$(d.element).position()};a[d.id]=c});return{steps:a}},from_simple:function(a){wf=this;var b=0;wf.name=a.name;$.each(a.steps,function(f,d){var c=prebuild_node("tool",d.name,d.tool_id);c.init_field_data(d);if(d.position){c.element.css({top:d.position.top,left:d.position.left})}c.id=d.id;wf.nodes[c.id]=c;b=Math.max(b,parseInt(f))});wf.id_counter=b+1;$.each(a.steps,function(f,d){var c=wf.nodes[f];$.each(d.input_connections,function(i,g){if(g){var j=wf.nodes[g.id];var l=new Connector();l.connect(j.output_terminals[g.output_name],c.input_terminals[i]);l.redraw()}})})},clear_active_node:function(){if(this.active_node){this.active_node.make_inactive();this.active_node=null}parent.show_form_for_tool("<div>No node selected</div>")},activate_node:function(a){if(this.active_node!=a){this.clear_active_node();parent.show_form_for_tool(a.form _html,a);a.make_active();this.active_node=a}},node_changed:function(a){this.has_changes=true;if(this.active_node==a){parent.show_form_for_tool(a.form_html,a)}},layout:function(){var a={};var b={};$.each(this.nodes,function(i,g){if(a[i]===undefined){a[i]=0}if(b[i]===undefined){b[i]=[]}});$.each(this.nodes,function(i,g){$.each(g.input_terminals,function(k,l){$.each(l.connectors,function(m,n){var j=n.handle1.node;a[g.id]+=1;b[j.id].push(g.id)})})});node_ids_by_level=[];while(true){level_parents=[];$.each(a,function(i,g){if(g==0){level_parents.push(i)}});if(level_parents.length==0){break}node_ids_by_level.push(level_parents);$.each(level_parents,function(i,g){delete a[g];$.each(b[g],function(k,j){a[j]-=1})})}if(a.length){return}var d=this.nodes;var c=80;v_pad=30;var f=c;$.each(node_ids_by_level,function(g,j){j.sort(function(m,i){return $(d[m].element).position().top-$(d[i].element).position().top});var k=0;var l=v_pad;$.each(j,function(i,o){var n=d[o];var m=$(n.element);$(m).css ({top:l,left:f});k=Math.max(k,$(m).width());l+=$(m).height()+v_pad});f+=k+c});$.each(d,function(g,i){i.redraw()})},bounds_for_all_nodes:function(){var d=Infinity,b=-Infinity,c=Infinity,a=-Infinity,f;$.each(this.nodes,function(i,g){e=$(g.element);f=e.position();d=Math.min(d,f.left);b=Math.max(b,f.left+e.width());c=Math.min(c,f.top);a=Math.max(a,f.top+e.width())});return{xmin:d,xmax:b,ymin:c,ymax:a}},fit_canvas_to_nodes:function(){var a=this.bounds_for_all_nodes();var f=this.canvas_container.position();var j=this.canvas_container.parent();var d=fix_delta(a.xmin,100);var i=fix_delta(a.ymin,100);d=Math.max(d,f.left);i=Math.max(i,f.top);var c=f.left-d;var g=f.top-i;var b=round_up(a.xmax+100,100)+d;var k=round_up(a.ymax+100,100)+i;b=Math.max(b,-c+j.width());k=Math.max(k,-g+j.height());this.canvas_container.css({left:c,top:g,width:b,height:k,});this.canvas_container.children().each(function(){var l=$(this).position();$(this).css("left",l.left+d);$(this).css("top",l.top+i)})}});func tion fix_delta(a,b){if(a<b||a>3*b){new_pos=(Math.ceil(((a%b))/b)+1)*b;return(-(a-new_pos))}return 0}function round_up(a,b){return Math.ceil(a/b)*b}function prebuild_node(m,k,s){var j=$("<div class='toolForm toolFormInCanvas'></div>");var g=new Node(j);g.type=m;if(m=="tool"){g.tool_id=s}var q=$("<div class='toolFormTitle unselectable'>"+k+"</div>");j.append(q);j.css("left",$(window).scrollLeft()+20);j.css("top",$(window).scrollTop()+20);var n=$("<div class='toolFormBody'></div>");var i="<div><img height='16' align='middle' src='../images/loading_small_white_bg.gif'/> loading tool info...</div>";n.append(i);g.form_html=i;j.append(n);var l=$("<div class='buttons' style='float: right;'></div>");l.append($("<img src='../images/delete_icon.png' />").click(function(b){g.destroy()}).hover(function(){$(this).attr("src","../images/delete_icon_dark.png")},function(){$(this).attr("src","../images/delete_icon.png")}));j.appendTo("#canvas-container");var d=$("#canvas-container").position( );var c=$("#canvas-container").parent();var a=j.width();var r=j.height();j.css({left:(-d.left)+(c.width()/2)-(a/2),top:(-d.top)+(c.height()/2)-(r/2)});l.prependTo(q);a+=(l.width()+10);j.css("width",a);$(j).bind("dragstart",function(){workflow.activate_node(g)}).bind("dragend",function(){workflow.node_changed(this);workflow.fit_canvas_to_nodes();canvas_manager.draw_overview()}).bind("dragclickonly",function(){workflow.activate_node(g)}).bind("drag",function(o){var f=$(this).offsetParent().offset(),b=o.offsetX-f.left,p=o.offsetY-f.top;$(this).css({left:b,top:p});$(this).find(".terminal").each(function(){this.terminal.redraw()})});return g}var ext_to_type=null;var type_to_type=null;function issubtype(b,a){b=ext_to_type[b];a=ext_to_type[a];return(type_to_type[b])&&(a in type_to_type[b])}function populate_datatype_info(a){ext_to_type=a.ext_to_class_name;type_to_type=a.class_to_classes}function ScrollPanel(a){this.panel=a}$.extend(ScrollPanel.prototype,{test:function(f,c){clearTim eout(this.timeout);var a=f.pageX,g=f.pageY;b=$(this.panel),panel_pos=b.position(),panel_w=b.width(),panel_h=b.height();viewport=b.parent();viewport_w=viewport.width(),viewport_h=viewport.height(),viewport_offset=viewport.offset(),min_x=viewport_offset.left,min_y=viewport_offset.top,max_x=min_x+viewport.width(),max_y=min_y+viewport.height(),p_min_x=-(panel_w-(viewport_w/2)),p_min_y=-(panel_h-(viewport_h/2)),p_max_x=(viewport_w/2),p_max_y=(viewport_h/2),moved=false,close_dist=5,nudge=23;if(a-close_dist<min_x){if(panel_pos.left<p_max_x){var d=Math.min(nudge,p_max_x-panel_pos.left);b.css("left",panel_pos.left+d);moved=true}}else{if(a+close_dist>max_x){if(panel_pos.left>p_min_x){var d=Math.min(nudge,panel_pos.left-p_min_x);b.css("left",panel_pos.left-d);moved=true}}else{if(g-close_dist<min_y){if(panel_pos.top<p_max_y){var d=Math.min(nudge,p_max_y-panel_pos.top);b.css("top",panel_pos.top+d);moved=true}}else{if(g+close_dist>max_y){if(panel_pos.top>p_min_y){var d=Math.min(nudge,pane l_pos.top-p_min_x);b.css("top",(panel_pos.top-d)+"px");moved=true}}}}}if(moved){c();var b=this;this.timeout=setTimeout(function(){b.test(f,c)},50)}},stop:function(b,a){clearTimeout(this.timeout)}});function CanvasManager(b,a){this.cv=b;this.cc=this.cv.find("#canvas-container");this.oc=a.find("#overview-canvas");this.ov=a.find("#overview-viewport");this.init_drag()}$.extend(CanvasManager.prototype,{init_drag:function(){var b=this;var a=function(f,g){f=Math.min(f,b.cv.width()/2);f=Math.max(f,-b.cc.width()+b.cv.width()/2);g=Math.min(g,b.cv.height()/2);g=Math.max(g,-b.cc.height()+b.cv.height()/2);b.cc.css({left:f,top:g});b.update_viewport_overlay()};this.cc.each(function(){this.scroll_panel=new ScrollPanel(this)});var d,c;this.cv.bind("dragstart",function(g){var i=$(this).offset();var f=b.cc.position();c=f.top-i.top;d=f.left-i.left}).bind("drag",function(f){a(f.offsetX+d,f.offsetY+c)}).bind("dragend",function(){workflow.fit_canvas_to_nodes();b.draw_overview()});this.ov.bind("dra g",function(l){var k=b.cc.width();var g=b.cc.height();var f=b.oc.width();var i=b.oc.height();var j=$(this).offsetParent().offset();var n=l.offsetX-j.left;var m=l.offsetY-j.top;a(-(n/f*k),-(m/i*g))}).bind("dragend",function(){workflow.fit_canvas_to_nodes();b.draw_overview()});$("#overview-border").bind("drag",function(g){var j=$(this).offsetParent();var i=j.offset();var f=Math.max(j.width()-(g.offsetX-i.left),j.height()-(g.offsetY-i.top));$(this).css({width:f,height:f});b.draw_overview()})},update_viewport_overlay:function(){var b=this.cc;var f=this.cv;var a=this.oc;var c=this.ov;var d=b.width();var k=b.height();var j=a.width();var g=a.height();var i=b.position();c.css({left:-(i.left/d*j),top:-(i.top/k*g),width:(f.width()/d*j)-2,height:(f.height()/k*g)-2})},draw_overview:function(){var k=$("#overview-canvas");var n=k.parent().parent().width();var j=k.get(0).getContext("2d");var d=$("#canvas-container").width();var m=$("#canvas-container").height();var g,a,l,f;var i=this.cv.wi dth();var b=this.cv.height();if(d<i&&m<b){l=d/i*n;f=(n-l)/2;g=m/b*n;a=(n-g)/2}else{if(d<m){a=0;g=n;l=Math.ceil(g*d/m);f=(n-l)/2}else{l=n;f=0;g=Math.ceil(l*m/d);a=(n-g)/2}}k.parent().css({left:f,top:a,width:l,height:g});k.attr("width",l);k.attr("height",g);j.fillStyle="#D2C099";j.strokeStyle="#D8B365";j.lineWidth=1;$.each(workflow.nodes,function(p,c){var o=$(c.element);position=o.position(),x=position.left/d*l,y=position.top/m*g,w=o.width()/d*l,h=o.height()/m*g;j.fillRect(x,y,w,h);j.strokeRect(x,y,w,h)});this.update_viewport_overlay()}}); \ No newline at end of file +function Terminal(a){this.element=a;this.connectors=[]}$.extend(Terminal.prototype,{connect:function(a){this.connectors.push(a);if(this.node){this.node.changed()}},disconnect:function(a){this.connectors.splice($.inArray(a,this.connectors),1);if(this.node){this.node.changed()}},redraw:function(){$.each(this.connectors,function(a,b){b.redraw()})},destroy:function(){$.each(this.connectors.slice(),function(a,b){b.destroy()})}});function OutputTerminal(a,b){Terminal.call(this,a);this.datatype=b}OutputTerminal.prototype=new Terminal();function InputTerminal(a,b){Terminal.call(this,a);this.datatypes=b}InputTerminal.prototype=new Terminal();$.extend(InputTerminal.prototype,{can_accept:function(a){if(this.connectors.length<1){for(var b in this.datatypes){if(a.datatype=="input"){return true}if(issubtype(a.datatype,this.datatypes[b])){return true}}}return false}});function Connector(b,a){this.canvas=null;this.dragging=false;this.inner_color="#FFFFFF";this.outer_color="#D8B365";if(b&&a) {this.connect(b,a)}}$.extend(Connector.prototype,{connect:function(b,a){this.handle1=b;this.handle1.connect(this);this.handle2=a;this.handle2.connect(this)},destroy:function(){if(this.handle1){this.handle1.disconnect(this)}if(this.handle2){this.handle2.disconnect(this)}$(this.canvas).remove()},redraw:function(){var d=$("#canvas-container");if(!this.canvas){this.canvas=document.createElement("canvas");if(window.G_vmlCanvasManager){G_vmlCanvasManager.initElement(this.canvas)}d.append($(this.canvas));if(this.dragging){this.canvas.style.zIndex="300"}}var n=function(c){return $(c).offset().left-d.offset().left};var i=function(c){return $(c).offset().top-d.offset().top};var h=n(this.handle1.element)+5;var g=i(this.handle1.element)+5;var p=n(this.handle2.element)+5;var m=i(this.handle2.element)+5;var f=100;var k=Math.min(h,p);var a=Math.max(h,p);var j=Math.min(g,m);var t=Math.max(g,m);var b=Math.min(Math.max(Math.abs(t-j)/2,100),300);var o=k-f;var s=j-f;var q=a-k+2*f;var l=t-j+2*f; this.canvas.style.left=o+"px";this.canvas.style.top=s+"px";this.canvas.setAttribute("width",q);this.canvas.setAttribute("height",l);h-=o;g-=s;p-=o;m-=s;var r=this.canvas.getContext("2d");r.lineCap="round";r.strokeStyle=this.outer_color;r.lineWidth=7;r.beginPath();r.moveTo(h,g);r.bezierCurveTo(h+b,g,p-b,m,p,m);r.stroke();r.strokeStyle=this.inner_color;r.lineWidth=5;r.beginPath();r.moveTo(h,g);r.bezierCurveTo(h+b,g,p-b,m,p,m);r.stroke()}});function Node(a){this.element=a;this.input_terminals={};this.output_terminals={};this.tool_errors={}}$.extend(Node.prototype,{enable_input_terminal:function(d,a,b){var c=this;$(d).each(function(){var f=this.terminal=new InputTerminal(this,b);f.node=c;f.name=a;$(this).bind("dropstart",function(g){g.dragProxy.terminal.connectors[0].inner_color="#BBFFBB"}).bind("dropend",function(g){g.dragProxy.terminal.connectors[0].inner_color="#FFFFFF"}).bind("drop",function(g){(new Connector(g.dragTarget.terminal,g.dropTarget.terminal)).redraw()}).bind("hov er",function(){if(f.connectors.length>0){var g=$("<div class='callout'></div>").css({display:"none"}).appendTo("body").append($("<div class='buttons'></div>").append($("<img src='../images/delete_icon.png' />").click(function(){$.each(f.connectors,function(i,h){h.destroy()});g.remove()}))).bind("mouseleave",function(){$(this).remove()});g.css({top:$(this).offset().top-2,left:$(this).offset().left-g.width(),"padding-right":$(this).width()}).show()}});c.input_terminals[a]=f})},enable_output_terminal:function(d,a,b){var c=this;$(d).each(function(){var g=this;var f=this.terminal=new OutputTerminal(this,b);f.node=c;f.name=a;$(this).bind("dragstart",function(j){var i=$('<div class="drag-terminal" style="position: absolute;"></div>').appendTo("#canvas-container").get(0);i.terminal=new OutputTerminal(i);var k=new Connector();k.dragging=true;k.connect(this.terminal,i.terminal);$.dropManage({filter:function(h){return this.terminal.can_accept(f)}}).addClass("input-terminal-active");ret urn i}).bind("drag",function(i){var h=function(){var k=$(i.dragProxy).offsetParent().offset(),j=i.offsetX-k.left,l=i.offsetY-k.top;$(i.dragProxy).css({left:j,top:l});i.dragProxy.terminal.redraw();canvas_manager.update_viewport_overlay()};h();$("#canvas-container").get(0).scroll_panel.test(i,h)}).bind("dragend",function(h){h.dragProxy.terminal.connectors[0].destroy();$(h.dragProxy).remove();$.dropManage().removeClass("input-terminal-active");$("#canvas-container").get(0).scroll_panel.stop()});c.output_terminals[a]=f})},redraw:function(){$.each(this.input_terminals,function(a,b){b.redraw()});$.each(this.output_terminals,function(a,b){b.redraw()})},destroy:function(){$.each(this.input_terminals,function(a,b){b.destroy()});$.each(this.output_terminals,function(a,b){b.destroy()});workflow.remove_node(this);$(this.element).remove()},make_active:function(){$(this.element).addClass("toolForm-active")},make_inactive:function(){var a=this.element.get(0);(function(b){b.removeChild(a);b .appendChild(a)})(a.parentNode);$(a).removeClass("toolForm-active")},init_field_data:function(g){var d=this.element;if(g.type){this.type=g.type}this.name=g.name;this.form_html=g.form_html;this.tool_state=g.tool_state;this.tool_errors=g.tool_errors;if(this.tool_errors){d.addClass("tool-node-error")}else{d.removeClass("tool-node-error")}var c=this;var a=d.find(".toolFormBody");a.find("div").remove();var h=$("<div class='inputs'></div>").appendTo(a);$.each(g.data_inputs,function(j,b){var f=$("<div class='terminal input-terminal'></div>");c.enable_input_terminal(f,b.name,b.extensions);h.append($("<div class='form-row dataRow input-data-row' name='"+b.name+"'>"+b.label+"</div>").prepend(f))});if((g.data_inputs.length>0)&&(g.data_outputs.length>0)){a.append($("<div class='rule'></div>"))}$.each(g.data_outputs,function(k,b){var j=$("<div class='terminal output-terminal'></div>");c.enable_output_terminal(j,b.name,b.extension);var f=b.name;if(b.extension!="input"){f=f+" ("+b.extensio n+")"}a.append($("<div class='form-row dataRow'>"+f+"</div>").append(j))});workflow.node_changed(this)},update_field_data:function(f){var c=$(this.element),d=this;this.tool_state=f.tool_state;this.form_html=f.form_html;this.tool_errors=f.tool_errors;if(this.tool_errors){c.addClass("tool-node-error")}else{c.removeClass("tool-node-error")}var g=c.find("div.inputs");var b=$("<div class='inputs'></div>");var a=g.find("div.input-data-row");$.each(f.data_inputs,function(k,h){var j=$("<div class='terminal input-terminal'></div>");d.enable_input_terminal(j,h.name,h.extensions);g.find("div[name="+h.name+"]").each(function(){$(this).find(".input-terminal").each(function(){var i=this.terminal.connectors[0];if(i){j[0].terminal.connectors[0]=i;i.handle2=j[0].terminal}});$(this).remove()});b.append($("<div class='form-row dataRow input-data-row' name='"+h.name+"'>"+h.label+"</div>").prepend(j))});g.replaceWith(b);g.find("div.input-data-row > .terminal").each(function(){this.terminal.destr oy()});this.changed();this.redraw()},error:function(d){var a=$(this.element).find(".toolFormBody");a.find("div").remove();var c="<div style='color: red; text-style: italic;'>"+d+"</div>";this.form_html=c;a.html(c);workflow.node_changed(this)},changed:function(){workflow.node_changed(this)}});function Workflow(a){this.canvas_container=a;this.id_counter=0;this.nodes={};this.name=null;this.has_changes=false}$.extend(Workflow.prototype,{add_node:function(a){a.id=this.id_counter;a.element.attr("id","wf-node-step-"+a.id);this.id_counter++;this.nodes[a.id]=a;this.has_changes=true;a.workflow=this},remove_node:function(a){if(this.active_node==a){this.clear_active_node()}delete this.nodes[a.id];this.has_changes=true},remove_all:function(){wf=this;$.each(this.nodes,function(b,a){a.destroy();wf.remove_node(a)})},to_simple:function(){var a={};$.each(this.nodes,function(b,d){var f={};$.each(d.input_terminals,function(g,h){f[h.name]=null;$.each(h.connectors,function(j,k){f[h.name]={id:k.ha ndle1.node.id,output_name:k.handle1.name}})});var c={id:d.id,type:d.type,tool_id:d.tool_id,tool_state:d.tool_state,tool_errors:d.tool_errors,input_connections:f,position:$(d.element).position()};a[d.id]=c});return{steps:a}},from_simple:function(a){wf=this;var b=0;wf.name=a.name;$.each(a.steps,function(f,d){var c=prebuild_node("tool",d.name,d.tool_id);c.init_field_data(d);if(d.position){c.element.css({top:d.position.top,left:d.position.left})}c.id=d.id;wf.nodes[c.id]=c;b=Math.max(b,parseInt(f))});wf.id_counter=b+1;$.each(a.steps,function(f,d){var c=wf.nodes[f];$.each(d.input_connections,function(h,g){if(g){var i=wf.nodes[g.id];var j=new Connector();j.connect(i.output_terminals[g.output_name],c.input_terminals[h]);j.redraw()}})})},clear_active_node:function(){if(this.active_node){this.active_node.make_inactive();this.active_node=null}parent.show_form_for_tool("<div>No node selected</div>")},activate_node:function(a){if(this.active_node!=a){this.clear_active_node();parent.show_ form_for_tool(a.form_html,a);a.make_active();this.active_node=a}},node_changed:function(a){this.has_changes=true;if(this.active_node==a){parent.show_form_for_tool(a.form_html,a)}},layout:function(){var i={};var b={};$.each(this.nodes,function(l,k){if(i[l]===undefined){i[l]=0}if(b[l]===undefined){b[l]=[]}});$.each(this.nodes,function(l,k){$.each(k.input_terminals,function(m,n){$.each(n.connectors,function(p,q){var o=q.handle1.node;i[k.id]+=1;b[o.id].push(k.id)})})});node_ids_by_level=[];while(true){level_parents=[];for(var a in i){if(i[a]==0){level_parents.push(a)}}if(level_parents.length==0){break}node_ids_by_level.push(level_parents);for(var f in level_parents){var j=level_parents[f];delete i[j];for(var g in b[j]){i[sucessors[j][g]]-=1}}}if(i.length){return}var d=this.nodes;var h=80;v_pad=30;var c=h;$.each(node_ids_by_level,function(k,l){l.sort(function(p,o){return $(d[p].element).position().top-$(d[o].element).position().top});var m=0;var n=v_pad;$.each(l,function(o,r){var q=d[r];var p=$(q.element);$(p).css({top:n,left:c});m=Math.max(m,$(p).width());n+=$(p).height()+v_pad});c+=m+h});$.each(d,function(k,l){l.redraw()})},bounds_for_all_nodes:function(){var d=Infinity,b=-Infinity,c=Infinity,a=-Infinity,f;$.each(this.nodes,function(h,g){e=$(g.element);f=e.position();d=Math.min(d,f.left);b=Math.max(b,f.left+e.width());c=Math.min(c,f.top);a=Math.max(a,f.top+e.width())});return{xmin:d,xmax:b,ymin:c,ymax:a}},fit_canvas_to_nodes:function(){var a=this.bounds_for_all_nodes();var f=this.canvas_container.position();var i=this.canvas_container.parent();var d=fix_delta(a.xmin,100);var h=fix_delta(a.ymin,100);d=Math.max(d,f.left);h=Math.max(h,f.top);var c=f.left-d;var g=f.top-h;var b=round_up(a.xmax+100,100)+d;var j=round_up(a.ymax+100,100)+h;b=Math.max(b,-c+i.width());j=Math.max(j,-g+i.height());this.canvas_container.css({left:c,top:g,width:b,height:j});this.canvas_container.children().each(function(){var k=$(this).position();$(this).css("left",k.left+d);$( this).css("top",k.top+h)})}});function fix_delta(a,b){if(a<b||a>3*b){new_pos=(Math.ceil(((a%b))/b)+1)*b;return(-(a-new_pos))}return 0}function round_up(a,b){return Math.ceil(a/b)*b}function prebuild_node(l,j,r){var i=$("<div class='toolForm toolFormInCanvas'></div>");var g=new Node(i);g.type=l;if(l=="tool"){g.tool_id=r}var n=$("<div class='toolFormTitle unselectable'>"+j+"</div>");i.append(n);i.css("left",$(window).scrollLeft()+20);i.css("top",$(window).scrollTop()+20);var m=$("<div class='toolFormBody'></div>");var h="<div><img height='16' align='middle' src='../images/loading_small_white_bg.gif'/> loading tool info...</div>";m.append(h);g.form_html=h;i.append(m);var k=$("<div class='buttons' style='float: right;'></div>");k.append($("<img src='../images/delete_icon.png' />").click(function(b){g.destroy()}).hover(function(){$(this).attr("src","../images/delete_icon_dark.png")},function(){$(this).attr("src","../images/delete_icon.png")}));i.appendTo("#canvas-container");var d=$("#canvas-container").position();var c=$("#canvas-container").parent();var a=i.width();var q=i.height();i.css({left:(-d.left)+(c.width()/2)-(a/2),top:(-d.top)+(c.height()/2)-(q/2)});k.prependTo(n);a+=(k.width()+10);i.css("width",a);$(i).bind("dragstart",function(){workflow.activate_node(g)}).bind("dragend",function(){workflow.node_changed(this);workflow.fit_canvas_to_nodes();canvas_manager.draw_overview()}).bind("dragclickonly",function(){workflow.activate_node(g)}).bind("drag",function(o){var f=$(this).offsetParent().offset(),b=o.offsetX-f.left,p=o.offsetY-f.top;$(this).css({left:b,top:p});$(this).find(".terminal").each(function(){this.terminal.redraw()})});return g}var ext_to_type=null;var type_to_type=null;function issubtype(b,a){b=ext_to_type[b];a=ext_to_type[a];return(type_to_type[b])&&(a in type_to_type[b])}function populate_datatype_info(a){ext_to_type=a.ext_to_class_name;type_to_type=a.class_to_classes}function ScrollPanel(a){this.panel=a}$.extend(ScrollPanel.prot otype,{test:function(v,d){clearTimeout(this.timeout);var k=v.pageX,j=v.pageY,l=$(this.panel),c=l.position(),b=l.width(),i=l.height(),w=l.parent(),s=w.width(),a=w.height(),r=w.offset(),p=r.left,m=r.top,A=p+w.width(),u=m+w.height(),B=-(b-(s/2)),z=-(i-(a/2)),g=(s/2),f=(a/2),h=false,q=5,o=23;if(k-q<p){if(c.left<g){var n=Math.min(o,g-c.left);l.css("left",c.left+n);h=true}}else{if(k+q>A){if(c.left>B){var n=Math.min(o,c.left-B);l.css("left",c.left-n);h=true}}else{if(j-q<m){if(c.top<f){var n=Math.min(o,f-c.top);l.css("top",c.top+n);h=true}}else{if(j+q>u){if(c.top>z){var n=Math.min(o,c.top-B);l.css("top",(c.top-n)+"px");h=true}}}}}if(h){d();var l=this;this.timeout=setTimeout(function(){l.test(v,d)},50)}},stop:function(b,a){clearTimeout(this.timeout)}});function CanvasManager(b,a){this.cv=b;this.cc=this.cv.find("#canvas-container");this.oc=a.find("#overview-canvas");this.ov=a.find("#overview-viewport");this.init_drag()}$.extend(CanvasManager.prototype,{init_drag:function(){var b=this; var a=function(f,g){f=Math.min(f,b.cv.width()/2);f=Math.max(f,-b.cc.width()+b.cv.width()/2);g=Math.min(g,b.cv.height()/2);g=Math.max(g,-b.cc.height()+b.cv.height()/2);b.cc.css({left:f,top:g});b.update_viewport_overlay()};this.cc.each(function(){this.scroll_panel=new ScrollPanel(this)});var d,c;this.cv.bind("dragstart",function(g){var h=$(this).offset();var f=b.cc.position();c=f.top-h.top;d=f.left-h.left}).bind("drag",function(f){a(f.offsetX+d,f.offsetY+c)}).bind("dragend",function(){workflow.fit_canvas_to_nodes();b.draw_overview()});this.ov.bind("drag",function(k){var j=b.cc.width(),g=b.cc.height(),f=b.oc.width(),h=b.oc.height(),i=$(this).offsetParent().offset(),m=k.offsetX-i.left,l=k.offsetY-i.top;a(-(m/f*j),-(l/h*g))}).bind("dragend",function(){workflow.fit_canvas_to_nodes();b.draw_overview()});$("#overview-border").bind("drag",function(g){var i=$(this).offsetParent();var h=i.offset();var f=Math.max(i.width()-(g.offsetX-h.left),i.height()-(g.offsetY-h.top));$(this).css({wi dth:f,height:f});b.draw_overview()})},update_viewport_overlay:function(){var b=this.cc,f=this.cv,a=this.oc,c=this.ov,d=b.width(),j=b.height(),i=a.width(),g=a.height(),h=b.position();c.css({left:-(h.left/d*i),top:-(h.top/j*g),width:(f.width()/d*i)-2,height:(f.height()/j*g)-2})},draw_overview:function(){var j=$("#overview-canvas"),m=j.parent().parent().width(),i=j.get(0).getContext("2d"),d=$("#canvas-container").width(),l=$("#canvas-container").height();var g,a,k,f;var h=this.cv.width();var b=this.cv.height();if(d<h&&l<b){k=d/h*m;f=(m-k)/2;g=l/b*m;a=(m-g)/2}else{if(d<l){a=0;g=m;k=Math.ceil(g*d/l);f=(m-k)/2}else{k=m;f=0;g=Math.ceil(k*l/d);a=(m-g)/2}}j.parent().css({left:f,top:a,width:k,height:g});j.attr("width",k);j.attr("height",g);i.fillStyle="#D2C099";i.strokeStyle="#D8B365";i.lineWidth=1;$.each(workflow.nodes,function(t,q){var s=$(q.element),n=s.position(),c=n.left/d*k,r=n.top/l*g,o=s.width()/d*k,p=s.height()/l*g;i.fillRect(c,r,o,p);i.strokeRect(c,r,o,p)});this.update_viewp ort_overlay()}}); \ No newline at end of file

1 0