1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/c6b9d40bdd0e/
changeset: c6b9d40bdd0e
user: jgoecks
date: 2011-06-08 18:46:11
summary: Disable grid controls and content when new content is being fetched. Fixes #272
affected #: 1 file (8 bytes)
--- a/templates/grid_base.mako Wed Jun 08 12:10:51 2011 -0400
+++ b/templates/grid_base.mako Wed Jun 08 12:46:11 2011 -0400
@@ -689,7 +689,7 @@
width : 100%;
height : 100%;
z-index : 14000;
- position : absolute;
+ position : fixed;
display: none;
}
## If page is displayed in panels, pad from edges for readability.
@@ -708,6 +708,7 @@
<%namespace file="./grid_common.mako" import="*" /><%def name="make_grid( grid )">
+ <div class="loading-elt-overlay"></div><table><tr><td width="75%">${self.render_grid_header( grid )}</td>
@@ -769,9 +770,7 @@
if show_item_checkboxes or multiple_item_ops_exist:
show_item_checkboxes = True
%>
-
<form action="${url()}" method="post" onsubmit="return false;">
- <div class="loading-elt-overlay"></div><table id="grid-table" class="grid"><thead id="grid-table-header"><tr>
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/515151397bc5/
changeset: 515151397bc5
user: greg
date: 2011-06-07 20:53:53
summary: Revert change set 2b4d50205705, adding a [missing] comment so all meta data items will always be displayed on the ldda_info page.
affected #: 1 file (12 bytes)
--- a/templates/library/common/ldda_info.mako Tue Jun 07 14:36:46 2011 -0400
+++ b/templates/library/common/ldda_info.mako Tue Jun 07 14:53:53 2011 -0400
@@ -135,23 +135,22 @@
<div class="form-row"><div>${ldda.blurb}</div></div>
+ ## We want to display all metadata item here, whether marked visible or not since they are all pretty useful
%for name, spec in ldda.metadata.spec.items():
- %if spec.visible:
- <div class="form-row">
- <label>${spec.desc.replace( ' (click box & select)', '' )}:</label>
- <%
- metadata_val = ldda.metadata.get( name )
- if isinstance( metadata_val, trans.model.MetadataFile ):
- metadata_val = metadata_val.file_name
- elif isinstance( metadata_val, list ):
- # Make sure list items are strings
- metadata_val = [ str( item ) for item in metadata_val ]
- metadata_val = ', '.join( metadata_val )
- %>
- ${metadata_val}
- <div style="clear: both"></div>
- </div>
- %endif
+ <div class="form-row">
+ <label>${spec.desc.replace( ' (click box & select)', '' )}:</label>
+ <%
+ metadata_val = ldda.metadata.get( name )
+ if isinstance( metadata_val, trans.model.MetadataFile ):
+ metadata_val = metadata_val.file_name
+ elif isinstance( metadata_val, list ):
+ # Make sure list items are strings
+ metadata_val = [ str( item ) for item in metadata_val ]
+ metadata_val = ', '.join( metadata_val )
+ %>
+ ${metadata_val}
+ <div style="clear: both"></div>
+ </div>
%endfor
%if ldda.peek != "no peek":
<div class="form-row">
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/bcc9c7aa5569/
changeset: bcc9c7aa5569
user: richard_burhans
date: 2011-06-07 20:36:46
summary: allow lines starting with arbitrary characters to be excluded from the peek
affected #: 1 file (243 bytes)
--- a/lib/galaxy/datatypes/data.py Tue Jun 07 14:31:58 2011 -0400
+++ b/lib/galaxy/datatypes/data.py Tue Jun 07 14:36:46 2011 -0400
@@ -417,13 +417,13 @@
if line and not line.startswith( '#' ):
data_lines += 1
return data_lines
- def set_peek( self, dataset, line_count=None, is_multi_byte=False ):
+ def set_peek( self, dataset, line_count=None, is_multi_byte=False, skipchars=[] ):
"""
Set the peek. This method is used by various subclasses of Text.
"""
if not dataset.dataset.purged:
# The file must exist on disk for the get_file_peek() method
- dataset.peek = get_file_peek( dataset.file_name, is_multi_byte=is_multi_byte )
+ dataset.peek = get_file_peek( dataset.file_name, is_multi_byte=is_multi_byte, skipchars=skipchars )
if line_count is None:
# See if line_count is stored in the metadata
if dataset.metadata.data_lines:
@@ -461,7 +461,7 @@
path, name = os.path.split(__file__)
full_path = os.path.join( path, 'test', fname )
return full_path
-def get_file_peek( file_name, is_multi_byte=False, WIDTH=256, LINE_COUNT=5 ):
+def get_file_peek( file_name, is_multi_byte=False, WIDTH=256, LINE_COUNT=5, skipchars=[] ):
"""
Returns the first LINE_COUNT lines wrapped to WIDTH
@@ -489,8 +489,14 @@
data_checked = True
if file_type in [ 'gzipped', 'binary' ]:
break
- lines.append( line )
- count += 1
+ skip_line = False
+ for skipchar in skipchars:
+ if line.startswith( skipchar ):
+ skip_line = True
+ break
+ if not skip_line:
+ lines.append( line )
+ count += 1
temp.close()
if file_type in [ 'gzipped', 'binary' ]:
text = "%s file" % file_type
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/063ac2ef7a5e/
changeset: 063ac2ef7a5e
branches:
user: greg
date: 2011-06-07 17:32:11
summary: Commit versions of tools from the last_gen tool shed in order of oldest -> newest in the next-gen tool shed. Fixes issue # 578.
affected #: 1 file (0 bytes)
--- a/scripts/tool_shed/migrate_tools_to_repositories.py Tue Jun 07 11:06:50 2011 -0400
+++ b/scripts/tool_shed/migrate_tools_to_repositories.py Tue Jun 07 11:32:11 2011 -0400
@@ -59,12 +59,12 @@
this_item = item
while item.newer_version:
if item.newer_version.state in valid_states:
- versions.insert( 0, item.newer_version )
+ versions.append( item.newer_version )
item = item.newer_version
item = this_item
while item.older_version:
if item.older_version[ 0 ].state in valid_states:
- versions.append( item.older_version[ 0 ] )
+ versions.insert( 0, item.older_version[ 0 ] )
item = item.older_version[ 0 ]
return versions
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.