Permalink
Browse files

rename EW cursor to avoid google chrome warning

  • Loading branch information...
1 parent 5502abc commit 2d4affbd35fe7fd25b1104ad305d81c49bad020d @lstein lstein committed Aug 29, 2011
View
@@ -199,75 +199,72 @@ div.ipadtitle
color: black;
font-size: 16pt;
text-align :center;
-/* border-style:solid; */
-/* border-color:black; */
-
- /*"collapse('$label')",*/
}
+.tabbody {display:block}
+
span.ficon:active{
background-image: url('ficonactive.png');
}
- #dhtmlgoodies_leftPanel ul{
- padding-left:20px;
- margin-left:0px;
- }
- #dhtmlgoodies_leftPanel div{
- padding:3px;
- }
- #mainContent{
- width:660px;
- margin-left:150px;
- background-color:#FFF;
- padding-right:5px;
- border-left:1px solid #000;
- border-right:1px solid #000;
- border-bottom:1px solid #000;
+#dhtmlgoodies_leftPanel ul{
+ padding-left:20px;
+ margin-left:0px;
+}
+#dhtmlgoodies_leftPanel div{
+ padding:3px;
+}
+#mainContent{
+ width:660px;
+ margin-left:150px;
+ background-color:#FFF;
+ padding-right:5px;
+ border-left:1px solid #000;
+ border-right:1px solid #000;
+ border-bottom:1px solid #000;
- }
+}
- /* END CSS ONLY NEEDED FOR THIS DEMO PAGE */
+/* END CSS ONLY NEEDED FOR THIS DEMO PAGE */
- #dhtmlgoodies_leftPanel{ /* Styling the help panel */
-
- background-color: #FAFAD2;
- color:#000000; /* White text color */
- font-family: Trebuchet MS, Lucida Sans Unicode, Arial, sans-serif; /* Which font to use */
+#dhtmlgoodies_leftPanel{ /* Styling the help panel */
- /* You shouldn't change these 5 options unless you need to */
- height:100%;
- left:0px;
- z-index:10;
- position:absolute;
- display:none;
+ background-color: #FAFAD2;
+ color:#000000; /* White text color */
+ font-family: Trebuchet MS, Lucida Sans Unicode, Arial, sans-serif; /* Which font to use */
+
+ /* You shouldn't change these 5 options unless you need to */
+ height:100%;
+ left:0px;
+ z-index:10;
+ position:absolute;
+ display:none;
- }
-
- #dhtmlgoodies_leftPanel #leftPanelContent{
- padding:0px;
- }
- #dhtmlgoodies_leftPanel .closeLink{ /* Layout of close link */
- padding-left:2px;
- padding-right:2px;
- background-color:#FFF;
- position:absolute;
- top:2px;
- right:2px;
- border:1px solid #000;
- color:#000;
- font-size:1.2em;
- }
- #dhtmlgoodies_leftPanel .closeLink:hover{ /* Close link text - mouseover effect*/
- color:#FFF;
- background-color:#000;
- }
+}
- div.normal{
- font-style:normal;
- }
-z
+#dhtmlgoodies_leftPanel #leftPanelContent{
+ padding:0px;
+}
+#dhtmlgoodies_leftPanel .closeLink{ /* Layout of close link */
+ padding-left:2px;
+ padding-right:2px;
+ background-color:#FFF;
+ position:absolute;
+ top:2px;
+ right:2px;
+ border:1px solid #000;
+ color:#000;
+ font-size:1.2em;
+}
+#dhtmlgoodies_leftPanel .closeLink:hover{ /* Close link text - mouseover effect*/
+ color:#FFF;
+ background-color:#000;
+}
+
+div.normal{
+ font-style:normal;
+}
@@ -35,7 +35,7 @@ IMG.trackimg {
}
.subtrack {
z-index:11;
- /*position:absolute; Changed by Ahmed Elnaiem to allow for legends on overlapped xyplots*/
+ position:absolute;
font-weight:bold;
font-size: 9pt;
}
@@ -416,6 +416,8 @@ var GBrowseController = Class.create({
// alert('REPORT THIS BUG: element '+gbtrack.track_image_id+' should not be null');
});
+ console.log(TrackPan.get_start());
+
new Ajax.Request(Controller.url, {
method: 'post',
parameters: {
@@ -1134,9 +1136,6 @@ show_info_message:
backgroundColor:'beige',
padding:'5px 5px 5px 5px'
});
- // var r = document.createRange();
- // r.selectNodeContents(container_element);
- // window.getSelection().addRange(r);
Event.observe(container_element,'keypress',this.set_upload_description);
Event.observe(container_element,'blur',this.set_upload_description);
},
@@ -261,6 +261,9 @@ sendSnapshot: function(snapshot){
}
},
+ /* this code has nothing to do with snapshots
+ * but is instead a hack for xyplot overlays
+ * disable it for now
linkTrackLegend:
function(){
var subtrack_groups = $$('.subtrack_group');
@@ -287,6 +290,7 @@ sendSnapshot: function(snapshot){
}
});
}
+ */
});
@@ -192,7 +192,7 @@ var GBrowseTrackPan = Class.create({
return;
}
if (!Prototype.Browser.IE)
- gbtrack.get_image_div().setStyle({cursor: 'url('+Controller.button_url('cursor-ewmove.cur')+'), move'});
+ gbtrack.get_image_div().setStyle({cursor: 'url('+Controller.button_url('cursor-ewmove.ico')+'), move'});
new Draggable(gbtrack.get_image_div(), {
constraint: 'horizontal',
zindex: 0, // defaults to 1000, which we don't want because it covers labels
@@ -114,19 +114,19 @@ sub render_tabbed_pages {
$html .= div({-id=>'tabbed_section', -class=>'tabbed'},
div({-id=>'tabbed_menu',-class=>'tabmenu'},
- span({id=>'main_page_select'}, $main_title),
- span({id=>'track_page_select'}, $tracks_title),
- span({id=>'snapshots_page_select'}, $snapshot_title),
- $uses_database? span({id=>'community_tracks_page_select'}, $community_tracks_title) : "",
- span({id=>'custom_tracks_page_select'}, $custom_tracks_title),,
- span({id=>'settings_page_select'}, $settings_title)
- ),
- div({-id=>'main_page', -class=>'tabbody'}, $main_html),
- div({-id=>'track_page', -class=>'tabbody'}, $tracks_html),
- div({-id=>'snapshots_page', -class=>'tabbody'}, $snapshot_html),
- $uses_database?div({-id=>'community_tracks_page',-class=>'tabbody'}, $community_tracks_html) : "",
- div({-id=>'custom_tracks_page', -class=>'tabbody'}, $custom_tracks_html),
- div({-id=>'settings_page', -class=>'tabbody'}, $settings_html),
+ span({id=>'main_page_select'}, $main_title),
+ span({id=>'track_page_select'}, $tracks_title),
+ span({id=>'snapshots_page_select'}, $snapshot_title),
+ $uses_database? span({id=>'community_tracks_page_select'}, $community_tracks_title) : "",
+ span({id=>'custom_tracks_page_select'}, $custom_tracks_title),,
+ span({id=>'settings_page_select'}, $settings_title)
+ ),
+ div({-id=>'main_page', -class=>'tabbody'}, $main_html),
+ div({-id=>'track_page', -class=>'tabbody' ,-style=>'display:none'}, $tracks_html),
+ div({-id=>'snapshots_page', -class=>'tabbody' ,-style=>'display:none'}, $snapshot_html),
+ $uses_database?div({-id=>'community_tracks_page',-class=>'tabbody',-style=>'display:none'}, $community_tracks_html) : "",
+ div({-id=>'custom_tracks_page', -class=>'tabbody',-style=>'display:none'}, $custom_tracks_html),
+ div({-id=>'settings_page', -class=>'tabbody',-style=>'display:none'}, $settings_html),
);
return $html;
@@ -678,24 +678,25 @@ sub wrap_rendered_track {
-onClick => "Controller.scroll('right',0.5)",
});
- my $scale_div = div( { -id => "detail_scale_scale", -style => "position:absolute; top:12px", }, "" );
+ my $scale_div = div( { -id => "detail_scale_scale",
+ -style => "position:absolute; top:12px", }, "" );
- $overlay_div = div( { -id => "${label}_overlay_div", -style => "position:absolute; top:0px; width:100%; left:0px", }, $pan_left . $pan_right . $scale_div);
+ $overlay_div = div( { -id => "${label}_overlay_div",
+ -style => "position:absolute; top:0px; width:100%; left:0px", }, $pan_left . $pan_right . $scale_div);
}
my $inner_div = div( { -id => "${label}_inner_div" }, $img . $pad_img ); #Should probably improve this
- # The labels are now grouped so that a legend can be made for overlapping data sets.
my $subtrack_labels = join '',map {
my ($label,$left,$top) = @$_;
- div({-class=>'subtrack',-style=>"position:relative; display:inline-block; margin-left: 20px;"},$label);
+ $left = PAD_DETAIL_SIDES;
+ div({-class=>'subtrack',-style=>"top:${top}px;left:${left}px;background-color:white"},$label);
} @$titles;
- my $subtrack_container = div({-class=>'subtrack_group', -style=>"position:absolute; top:15px; left:40px;background-color:white;"}, $subtrack_labels);
my $html = div({-class=>'centered_block',
-style=>"position:relative;overflow:hidden"
},
- ($show_titlebar ? $titlebar : '' ) . $popmenu . $subtrack_container . $inner_div . $overlay_div ) . ( $map_html || '' );
+ ($show_titlebar ? $titlebar : '' ) . $popmenu . $subtrack_labels . $inner_div . $overlay_div ) . ( $map_html || '' );
return $html;
}
@@ -1008,6 +1009,8 @@ sub render_scale_bar {
my $flip = ( $section eq 'detail' and $state->{'flip'} ) ? 1 : 0;
+ $add_track_extra_args{'-postgrid'} = $args{'postgrid'} if $args{'postgrid'};
+
my @panel_args = $self->create_panel_args(
{ section => $section,
segment => $wide_segment,
@@ -1038,6 +1041,18 @@ sub render_scale_bar {
%add_track_extra_args,
);
+ if (my $feats = $args{'tracks'}) {
+
+ my @feature_types = $feats->types;
+
+ for my $type (@feature_types) {
+ my $features = $feats->features($type);
+ my %options = $feats->style($type);
+ $panel->add_track($features,%options);
+ }
+
+ }
+
# add uploaded files that have the "(over|region)view" option set
$gd = $panel->gd;

0 comments on commit 2d4affb

Please sign in to comment.