mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Fixed creation of new tracks, missing template-generated css for trackster, add .DS_Store, *.rej and *.orig to hgignore
This commit is contained in:
Kanwei Li
@@ -38,3 +38,9 @@ run_functional_tests.html
|
||||
|
||||
# Chrom len files
|
||||
*.len
|
||||
|
||||
# Misc
|
||||
*.orig
|
||||
.DS_Store
|
||||
*.rej
|
||||
|
||||
|
||||
@@ -1,125 +1,23 @@
|
||||
.viewport-container {
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
/*canvas{
|
||||
border-left: 1px solid green;
|
||||
border-right: 1px solid red; } /* debugging */
|
||||
.nav {
|
||||
padding: 0 0;
|
||||
color:#333;font-weight:bold;
|
||||
}
|
||||
|
||||
.nav-controls {
|
||||
text-align: center;
|
||||
background:#cccccc;
|
||||
background-image:url(style/panel_header_bg.png);
|
||||
background-position:top center;
|
||||
background-repeat:repeat-x;
|
||||
padding: 2px 0;
|
||||
}
|
||||
.nav-controls input {
|
||||
margin: 0 5px;
|
||||
}
|
||||
.nav-controls a {
|
||||
padding: 0 0.4em;
|
||||
}
|
||||
|
||||
.overview {
|
||||
width: 100%;
|
||||
margin: 0px;
|
||||
color: white;
|
||||
margin-top: -6px;
|
||||
margin-bottom: -4px;
|
||||
}
|
||||
|
||||
.overview-viewport {
|
||||
position: relative;
|
||||
height: 14px;
|
||||
/* border-top: solid #666 1px;*/
|
||||
/* border-bottom: solid #aaa 1px;*/
|
||||
background: white;
|
||||
border-top: solid gray 1px;
|
||||
border-bottom: solid gray 1px;
|
||||
margin: 5px 0;
|
||||
}
|
||||
.overview-box {
|
||||
position: absolute;
|
||||
margin-top: 0px;
|
||||
height: 14px;
|
||||
background: #ddd url(images/visualization/draggable_horizontal.png) center center no-repeat;
|
||||
/*border-style: outset;*/
|
||||
}
|
||||
|
||||
.viewport {
|
||||
/* overflow-x: hidden;*/
|
||||
background-color: #fff;
|
||||
/* overflow: scroll;*/
|
||||
/* border-bottom: 2px solid black;*/
|
||||
}
|
||||
|
||||
.viewport-canvas {
|
||||
width: 100%;
|
||||
height: 100px;
|
||||
}
|
||||
|
||||
.yaxislabel {
|
||||
color: #777;
|
||||
}
|
||||
/* Line track needs borders to show range */
|
||||
.line-track .track-content {
|
||||
border-top: 1px solid #ddd;
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.track {
|
||||
/* border-top: solid #DDDDDD 1px; */
|
||||
/* border-bottom: solid #DDDDDD 1px; */
|
||||
background: white;
|
||||
}
|
||||
|
||||
.track-header {
|
||||
text-align: center;
|
||||
padding: 4px;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.track-content {
|
||||
overflow: hidden;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.track.error {
|
||||
background-color: #ECB4AF;
|
||||
}
|
||||
.track.nodata {
|
||||
background-color: #ddd;
|
||||
}
|
||||
|
||||
.loading {
|
||||
min-height: 100px;
|
||||
}
|
||||
|
||||
.label-track {
|
||||
/* font-weight: bold; */
|
||||
/* font-size: 10px; */
|
||||
}
|
||||
.label-track .label {
|
||||
border-left: solid #999 1px;
|
||||
padding: 1px;
|
||||
display: inline-block;
|
||||
}
|
||||
.right-float {
|
||||
float: right;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.top-labeltrack {
|
||||
border-bottom: solid #999 1px;
|
||||
}
|
||||
|
||||
.nav-labeltrack {
|
||||
border-top: solid #999 1px;
|
||||
border-bottom: solid #999 1px;
|
||||
}
|
||||
.viewport-container{overflow-x:hidden;overflow-y:auto;}
|
||||
.nav{padding:0 0;color:#333;font-weight:bold;}
|
||||
.nav-controls{text-align:center;background:#cccccc;background-image:url(panel_header_bg.png);background-position:top center;background-repeat:repeat-x;padding:2px 0;}
|
||||
.nav-controls input{margin:0 5px;}
|
||||
.nav-controls a{padding:0 0.4em;}
|
||||
.overview{width:100%;margin:0px;color:white;margin-top:-6px;margin-bottom:-4px;}
|
||||
.overview-viewport{position:relative;height:14px;background:white;border-top:solid gray 1px;border-bottom:solid gray 1px;margin:5px 0;}
|
||||
.overview-box{position:absolute;margin-top:0px;height:14px;background:#ddd url(../images/visualization/draggable_horizontal.png) center center no-repeat;}
|
||||
.viewport{background-color:#fff;}
|
||||
.viewport-canvas{width:100%;height:100px;}
|
||||
.yaxislabel{color:#777;}
|
||||
.line-track .track-content{border-top:1px solid #ddd;border-bottom:1px solid #ddd;}
|
||||
.track{background:white;}
|
||||
.track-header{text-align:center;padding:4px;color:#666;}
|
||||
.track-content{overflow:hidden;text-align:center;}
|
||||
.track.error{background-color:#ECB4AF;}
|
||||
.track.nodata{background-color:#ddd;}
|
||||
.loading{min-height:100px;}
|
||||
.label-track{}
|
||||
.label-track .label{border-left:solid #999 1px;padding:1px;display:inline-block;}
|
||||
.right-float{float:right;margin-left:5px;}
|
||||
.top-labeltrack{border-bottom:solid #999 1px;}
|
||||
.nav-labeltrack{border-top:solid #999 1px;border-bottom:solid #999 1px;}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -110,15 +110,15 @@ $.extend( View.prototype, {
|
||||
this.low_input = $("<input/>").addClass("low").css("width", "10em").appendTo(this.chrom_form);
|
||||
$("<span/>").text(" - ").appendTo(this.chrom_form);
|
||||
this.high_input = $("<input/>").addClass("high").css("width", "10em").appendTo(this.chrom_form);
|
||||
this.hidden_input = $("<input/>").attr("type", "hidden").val(this.vis_id).appendTo(this.chrom_form);
|
||||
if (this.vis_id !== undefined) {
|
||||
this.hidden_input = $("<input/>").attr("type", "hidden").val(this.vis_id).appendTo(this.chrom_form);
|
||||
}
|
||||
this.zi_link = $("<a/>").click(function() { view.zoom_in(); view.redraw() }).html('<img src="../images/fugue/magnifier-zoom.png" />').appendTo(this.chrom_form);
|
||||
this.zo_link = $("<a/>").click(function() { view.zoom_out(); view.redraw() }).html('<img src="../images/fugue/magnifier-zoom-out.png" />').appendTo(this.chrom_form);;
|
||||
|
||||
var data_d = (this.vis_id !== undefined ? { vis_id: this.vis_id } : { dbkey: this.dbkey });
|
||||
|
||||
$.ajax({
|
||||
url: chrom_url,
|
||||
data: data_d,
|
||||
data: (this.vis_id !== undefined ? { vis_id: this.vis_id } : { dbkey: this.dbkey }),
|
||||
dataType: "json",
|
||||
success: function ( result ) {
|
||||
if (result['reference']) {
|
||||
|
||||
@@ -85,8 +85,8 @@ ${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jquery.event.drag",
|
||||
%endfor
|
||||
init();
|
||||
%else:
|
||||
continue_fn = function() {
|
||||
view = new View( undefined, $("#new-title").val(), undefined, $("#new-dbkey").val() );
|
||||
var continue_fn = function() {
|
||||
view = new View( $("#center"), undefined, $("#new-title").val(), undefined, $("#new-dbkey").val() );
|
||||
init();
|
||||
hide_modal();
|
||||
};
|
||||
@@ -105,18 +105,20 @@ ${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jquery.event.drag",
|
||||
});
|
||||
%endif
|
||||
|
||||
$(document).bind( "redraw", function( e ) {
|
||||
$(document).bind( "redraw", function() {
|
||||
view.redraw();
|
||||
});
|
||||
|
||||
// To adjust the size of the viewport to fit the fixed-height footer
|
||||
var refresh = function( e ) {
|
||||
view.viewport_container.height( $(window).height() - 100 );
|
||||
view.nav_container.width( $("#center").width() );
|
||||
view.redraw();
|
||||
var refresh = function() {
|
||||
if (view !== undefined) {
|
||||
view.viewport_container.height( $(window).height() - 100 );
|
||||
view.nav_container.width( $("#center").width() );
|
||||
view.redraw();
|
||||
}
|
||||
};
|
||||
$(window).bind( "resize", function(e) { refresh(e); } );
|
||||
$("#right-border").bind( "click dragend", function(e) { refresh(e); } );
|
||||
$(window).bind( "resize", function() { refresh(); } );
|
||||
$("#right-border").bind( "click dragend", function() { refresh(); } );
|
||||
$(window).trigger( "resize" );
|
||||
|
||||
// Execute initializer for EDITOR specific javascript
|
||||
@@ -154,9 +156,10 @@ ${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jquery.event.drag",
|
||||
error: function() {},
|
||||
success: function(track_data) {
|
||||
var td = track_data,
|
||||
track_types = { "LineTrack": LineTrack, "FeatureTrack": FeatureTrack, "ReadTrack": ReadTrack };
|
||||
|
||||
view.add_track(new track_types[track_data.track_type]( track_data.name, view, track_data.dataset_id, track_data.prefs) );
|
||||
track_types = { "LineTrack": LineTrack, "FeatureTrack": FeatureTrack, "ReadTrack": ReadTrack },
|
||||
new_track = new track_types[track_data.track_type]( track_data.name, view, track_data.dataset_id, track_data.prefs);
|
||||
|
||||
view.add_track(new_track);
|
||||
view.has_changes = true;
|
||||
sidebar_box(new_track);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user