3 new changesets in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/66a1c6138524/ changeset: r5002:66a1c6138524 user: james_taylor date: 2011-02-05 21:37:56 summary: Fix problem with adding filters when no data is returned, eliminates one of the problems drawing feature track tiles affected #: 2 files (50 bytes) --- a/static/scripts/trackster.js Fri Feb 04 14:48:39 2011 -0500 +++ b/static/scripts/trackster.js Sat Feb 05 15:37:56 2011 -0500 @@ -1638,7 +1638,7 @@ Track.call( this, name, view, view.viewport_container ); TiledTrack.call( this ); - this.min_height_px = 12; + this.min_height_px = 16; this.max_height_px = 400; this.height_px = 80; this.hda_ldda = hda_ldda; @@ -2255,12 +2255,12 @@ ctx.fillText(result.message, 100 + left_offset, y_scale); return canvas; } - + // // If tile is filterable, add class to canvas. // for (var f = 0; f < this.filters.length; f++) { - if (this.filters[f].applies_to(result.data[0])) { + if (result.data.length && this.filters[f].applies_to(result.data[0])) { canvas.addClass(FILTERABLE_CLASS); break; } --- a/templates/tracks/browser.mako Fri Feb 04 14:48:39 2011 -0500 +++ b/templates/tracks/browser.mako Sat Feb 05 15:37:56 2011 -0500 @@ -104,6 +104,7 @@ .track-content { background: #eee url(${h.url_for('/static/images/tracks/diag_bg.gif')}); min-height: 16px; + border-top: 1px solid #eee; } .label-track .track-content { http://bitbucket.org/galaxy/galaxy-central/changeset/c1a6a293c870/ changeset: r5003:c1a6a293c870 user: james_taylor date: 2011-02-05 21:38:11 summary: Automated merge with https://bitbucket.org/galaxy/galaxy-central affected #: 1 file (14 bytes) --- a/static/scripts/trackster.js Fri Feb 04 21:13:36 2011 -0500 +++ b/static/scripts/trackster.js Sat Feb 05 15:38:11 2011 -0500 @@ -1647,7 +1647,7 @@ Track.call( this, name, view, view.viewport_container ); TiledTrack.call( this ); - this.min_height_px = 12; + this.min_height_px = 16; this.max_height_px = 400; this.height_px = 80; this.hda_ldda = hda_ldda; @@ -2264,12 +2264,12 @@ ctx.fillText(result.message, 100 + left_offset, y_scale); return canvas; } - + // // If tile is filterable, add class to canvas. // for (var f = 0; f < this.filters.length; f++) { - if (this.filters[f].applies_to(result.data[0])) { + if (result.data.length && this.filters[f].applies_to(result.data[0])) { canvas.addClass(FILTERABLE_CLASS); break; } --- a/templates/tracks/browser.mako Fri Feb 04 21:13:36 2011 -0500 +++ b/templates/tracks/browser.mako Sat Feb 05 15:38:11 2011 -0500 @@ -104,6 +104,7 @@ .track-content { background: #eee url(${h.url_for('/static/images/tracks/diag_bg.gif')}); min-height: 16px; + border-top: 1px solid #eee; } .label-track .track-content { http://bitbucket.org/galaxy/galaxy-central/changeset/92a7af072bc6/ changeset: r5004:92a7af072bc6 user: james_taylor date: 2011-02-05 22:04:30 summary: trackster: Move some CSS rules into trackster.css, fix CSS problem with label tracks affected #: 3 files (4.1 KB) --- a/static/june_2007_style/blue/trackster.css Sat Feb 05 15:38:11 2011 -0500 +++ b/static/june_2007_style/blue/trackster.css Sat Feb 05 16:04:30 2011 -0500 @@ -18,17 +18,33 @@ .overview-box{cursor:pointer;bottom:0px;z-index:100;position:absolute;margin-top:0px;height:14px;background:#C1C9E5 url(../images/visualization/draggable_horizontal.png) center center no-repeat;border:solid #666 1px;} .viewport-canvas{width:100%;height:100px;} .yaxislabel{color:#777;z-index:100;} -.line-track .track-content{border-top:1px solid #ddd;border-bottom:1px solid #ddd;} +.line-track .track-content{border-top:1px solid #eee;border-bottom:1px solid #eee;} .track{background:white;} .track-header{text-align:left;padding:4px 0px;color:#666;} .track-header .menubutton{margin-left:0px;} -.track-content{overflow:hidden;text-align:center;margin-bottom:2px;border-bottom:#eee solid 1px;} +.track-content{overflow:hidden;text-align:center;margin-bottom:2px;border-top:1px solid #eee;border-bottom:#eee solid 1px;background:#eee url('/static/images/tracks/diag_bg.gif');min-height:16px;} +.label-track .track-content{background:white;} +.track-tile{background:white;} +.track-tile canvas{position:relative;z-index:100;} .track.error .track-content{background-color:#ECB4AF;padding:2px 0;} .track.nodata .track-content{background-color:#ddd;padding:2px 0;} .loading{min-height:100px;} -.label-track{font-size:10px;border:none;padding:0;margin:0;height:1.3em;} +.label-track{font-size:10px;border:none;padding:0;margin:0;height:1.5em;overflow:hidden;} .label-track .label{border-left:solid #999 1px;padding:1px;padding-bottom:2px;display:inline-block;} +.label-track .track-content{border:none;} .reference-track{border:none;margin:0;padding:0;} .right-float{float:right;margin-left:5px;} .top-labeltrack{position:relative;border-bottom:solid #999 1px;} .nav-labeltrack{border-top:solid #999 1px;border-bottom:solid #333 1px;} +.filter-name{float:left;} +input{font:10px verdana;} +table.filters{border-collapse:separate;border-spacing:7px 0px;} +.values{padding-left:0.25em;} +.dynamic-tool{width:400px;margin-left:0.25em;} +.param-row{margin-top:0.4em;margin-left:1em;} +.slider-label{float:left;font-weight:bold;} +.slider{float:right;width:200px;position:relative;} +.tool-name{font-size:110%;font-weight:bold;} +.child-track-icon{background:url('../images/fugue/arrow-000-small-bw.png') no-repeat;width:30px;cursor:move;} +.param-value{cursor:pointer;} +.track-resize{background:white url('../images/visualization/draggable_vertical.png') no-repeat top center;position:absolute;right:3px;bottom:-4px;width:14px;height:7px;border:solid #999 1px;z-index:100;} --- a/static/june_2007_style/trackster.css.tmpl Sat Feb 05 15:38:11 2011 -0500 +++ b/static/june_2007_style/trackster.css.tmpl Sat Feb 05 16:04:30 2011 -0500 @@ -123,8 +123,8 @@ } /* Line track needs borders to show range */ .line-track .track-content { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; + border-top: 1px solid #eee; + border-bottom: 1px solid #eee; } .track { @@ -147,7 +147,23 @@ overflow: hidden; text-align: center; margin-bottom: 2px; + border-top: 1px solid #eee; border-bottom: #eee solid 1px; + background: #eee url('/static/images/tracks/diag_bg.gif'); + min-height: 16px; +} + +.label-track .track-content { + background: white; +} + +.track-tile { + background: white; +} + +.track-tile canvas { + position: relative; + z-index: 100; } .track.error .track-content { @@ -162,14 +178,14 @@ .loading { min-height: 100px; } - .label-track { /* font-weight: bold; */ font-size: 10px; border: none; padding: 0; margin: 0; - height: 1.3em; + height: 1.5em; + overflow: hidden; } .label-track .label { border-left: solid #999 1px; @@ -177,6 +193,9 @@ padding-bottom: 2px; display: inline-block; } +.label-track .track-content { + border: none; +} .reference-track { border: none; margin: 0; @@ -195,4 +214,61 @@ .nav-labeltrack { border-top: solid #999 1px; border-bottom: solid #333 1px; +} + +## Styles for tools and filters. + +.filter-name { + float: left; } +input { + font: 10px verdana; +} +table.filters { + border-collapse: separate; + border-spacing: 7px 0px; +} +.values { + padding-left: 0.25em; +} +.dynamic-tool { + width: 400px; + margin-left: 0.25em; +} +.param-row { + margin-top: 0.4em; + margin-left: 1em; +} +.slider-label { + float: left; + font-weight: bold; +} +.slider { + float: right; + width: 200px; + position: relative; +} +.tool-name { + font-size: 110%; + font-weight: bold; +} +.child-track-icon { + background:url('../images/fugue/arrow-000-small-bw.png') no-repeat; + width: 30px; + cursor: move; +} +.param-value { + cursor: pointer; +} + +.track-resize { + background: white url('../images/visualization/draggable_vertical.png') no-repeat top center; + position: absolute; + right: 3px; + bottom: -4px; + width: 14px; + height: 7px; + border: solid #999 1px; + z-index: 100; +} + --- a/templates/tracks/browser.mako Sat Feb 05 15:38:11 2011 -0500 +++ b/templates/tracks/browser.mako Sat Feb 05 16:04:30 2011 -0500 @@ -18,16 +18,6 @@ #browser-container { overflow: none; } - ul#sortable-ul { - list-style: none; - padding: 0; - margin: 5px; - } - ul#sortable-ul li { - display: block; - margin: 5px 0; - background: #eee; - } .nav-container { width: 100%; ## Overriding styles from trackster.css to push nav up into title bar @@ -42,83 +32,6 @@ background: transparent; border: none; } - # - # TODO: move these into trackster.css - # Styles for tools and filters. - # - .filter-name { - float: left; - } - input { - font: 10px verdana; - } - table.filters { - border-collapse: separate; - border-spacing: 7px 0px; - } - .values { - padding-left: 0.25em; - } - .dynamic-tool { - width: 400px; - margin-left: 0.25em; - } - .param-row { - margin-top: 0.4em; - margin-left: 1em; - } - .slider-label { - float: left; - font-weight: bold; - } - .slider { - float: right; - width: 200px; - position: relative; - } - .tool-name { - font-size: 110%; - font-weight: bold; - } - .child-track-icon { - background:url(${h.url_for('/static/images/fugue/arrow-000-small-bw.png')}) no-repeat; - width: 30px; - cursor: move; - } - .param-value { - cursor: pointer; - } - - .track-resize { - - background: white url(${h.url_for('/static/images/visualization/draggable_vertical.png')}) no-repeat top center; - position: absolute; - right: 3px; - bottom: -4px; - width: 14px; - height: 7px; - border: solid #999 1px; - z-index: 100; - } - - .track-content { - background: #eee url(${h.url_for('/static/images/tracks/diag_bg.gif')}); - min-height: 16px; - border-top: 1px solid #eee; - } - - .label-track .track-content { - background: white; - } - - .track-tile { - background: white; - } - - .track-tile canvas { - position: relative; - z-index: 100; - } </style></%def> 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.