diff --git a/client/galaxy/scripts/mvc/tool/tools.js b/client/galaxy/scripts/mvc/tool/tools.js index a0d7da79d4d..96451d1d74b 100644 --- a/client/galaxy/scripts/mvc/tool/tools.js +++ b/client/galaxy/scripts/mvc/tool/tools.js @@ -531,9 +531,7 @@ var ToolLinkView = BaseView.extend({ Galaxy.upload.show(); }); } - - // regular tools - if ( this.model.id !== 'upload1' && this.model.get( 'model_class' ) === 'Tool' ) { + else if ( this.model.get( 'model_class' ) === 'Tool' ) { // regular tools var self = this; $link.find('a').on('click', function(e) { e.preventDefault(); diff --git a/client/galaxy/scripts/viz/trackster/tracks.js b/client/galaxy/scripts/viz/trackster/tracks.js index d5318a2797d..265d0bf07d8 100644 --- a/client/galaxy/scripts/viz/trackster/tracks.js +++ b/client/galaxy/scripts/viz/trackster/tracks.js @@ -3259,7 +3259,7 @@ extend(LabelTrack.prototype, Track.prototype, { new_div = $("
").addClass('label-container'); while ( position < view.high ) { var screenPosition = Math.floor( ( position - view.low ) / range * width ); - new_div.append( $("").addClass('label').text(util.commatize( position )).css( { + new_div.append( $("").addClass('pos-label').text(commatize( position )).css( { left: screenPosition })); position += tickDistance; diff --git a/client/galaxy/style/less/trackster.less b/client/galaxy/style/less/trackster.less index eabdfcf527a..d68ccbb2553 100644 --- a/client/galaxy/style/less/trackster.less +++ b/client/galaxy/style/less/trackster.less @@ -18,7 +18,7 @@ /* Used to push nav into title bar: */ height: 0; } - + text-align: center; } @@ -202,7 +202,7 @@ padding: 0px 2px; text-align: left; margin: 2px; - + /* Make header opaque when focused on. */ &:hover { background-color: #DDDDDD; @@ -232,7 +232,7 @@ overflow: hidden; } -.overlay { +.overlay { position: absolute; left: 0; top: 0; @@ -241,7 +241,7 @@ .track-tile { position: absolute; background: white; - + canvas { position: relative; z-index: @base-index; @@ -292,7 +292,7 @@ } .label-track { - font-size: 10px; + font-size: 10px; border: none; padding: 0; margin: 0; @@ -300,11 +300,11 @@ overflow: hidden; .label-container { - position: relative; + position: relative; height: 1.3em; } - .label { + .pos-label { position: absolute; border-left: solid #999 1px; padding: 1px; @@ -344,7 +344,7 @@ .nav-labeltrack { border-top: solid #999 1px; border-bottom: solid #333 1px; -} +} // Styles for tools and filters. input { @@ -544,7 +544,7 @@ input { top: 0px; background-color: #ccf; opacity: 0.5; - z-index: @overlay-index; + z-index: @overlay-index; } .mouse-pos { @@ -565,7 +565,7 @@ input { height: 12px; } -// Highlight for element(s) being dragged. This definition must be after definition of draggable +// Highlight for element(s) being dragged. This definition must be after definition of draggable // elements (e.g. track, group) in order to take precedence. .dragging { border: 1px solid blue; diff --git a/lib/galaxy/datatypes/converters/lped_to_pbed_converter.py b/lib/galaxy/datatypes/converters/lped_to_pbed_converter.py index 381630e9d8a..33365131980 100644 --- a/lib/galaxy/datatypes/converters/lped_to_pbed_converter.py +++ b/lib/galaxy/datatypes/converters/lped_to_pbed_converter.py @@ -104,7 +104,7 @@ def main(): f.write('