opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Visualizations registry: allow registry visualizations to be rendered properly when displayed by slugline; Scatterplot: use embedded to cue loading of display (w/o editor)

Browse Source
This commit is contained in:
Carl Eberhard
2014-02-14 13:58:30 -05:00
parent ba17a35a99
commit 3e82f95468
4 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/scatterplot/static/scatterplot-edit.js
+1 -1
View File
File diff suppressed because one or more lines are too long
config/plugins/visualizations/scatterplot/static/scatterplot.css
+20 -2
View File
@@ -7,18 +7,36 @@
margin-bottom: 16px;
overflow: auto;
background-color: #ebd9b2;
padding : 16px 12px 12px 12px;
padding : 8px 12px 8px 12px;
}
.chart-header h2 {
margin-bottom: 4px;
}
.chart-header h2:hover {
text-decoration: underline;
cursor: pointer;
}
.chart-header p {
color: white;
color: #555;
font-size: small;
}
figcaption {
margin-bottom: 8px;
font-size: 120%;
}
figcaption .title {
display: block;
font-weight: bold;
}
figcaption .title-info {
display: block;
font-style: italic;
}
/* -------------------------------------------- main layout */
.scatterplot-editor > * { margin: 0; padding: 0; }
.scatterplot-editor .tab-pane {
config/plugins/visualizations/scatterplot/templates/scatterplot.mako
+37 -4
View File
@@ -18,7 +18,6 @@
## ----------------------------------------------------------------------------
<link type="text/css" rel="Stylesheet" media="screen" href="/static/style/base.css">
<link type="text/css" rel="Stylesheet" media="screen" href="/static/style/jquery-ui/smoothness/jquery-ui.css">
<link type="text/css" rel="Stylesheet" media="screen" href="/plugins/visualizations/scatterplot/static/scatterplot.css">
## ----------------------------------------------------------------------------
@@ -40,8 +39,35 @@
## ----------------------------------------------------------------------------
<body>
%if not embedded:
## dataset info: only show if on own page
%if embedded and saved_visualization:
<figcaption>
<span class="title">${title}</span>
<span class="title-info">${info}</span>
</figcaption>
<figure class="scatterplot-display"></div>
<script type="text/javascript">
$(function(){
var model = new ScatterplotModel({
id : ${h.to_json_string( visualization_id )} || undefined,
title : "${title}",
config : ${h.to_json_string( config, indent=2 )}
});
hdaJson = ${h.to_json_string( trans.security.encode_dict_ids( hda.to_dict() ), indent=2 )},
display = new ScatterplotDisplay({
el : $( '.scatterplot-display' ).attr( 'id', 'scatterplot-display-' + '${visualization_id}' ),
model : model,
dataset : hdaJson,
embedded: "${embedded}"
}).render();
display.fetchData();
//window.model = model;
//window.display = display;
});
</script>
%else:
<div class="chart-header">
<h2>${title or default_title}</h2>
<p>${info}</p>
@@ -61,10 +87,17 @@ $(function(){
model : model,
dataset : hdaJson
}).render();
window.editor = editor;
//window.editor = editor;
$( '.chart-header h2' ).click( function(){
var returned = prompt( 'Enter a new title:' );
if( returned ){
model.set( 'title', returned );
}
});
model.on( 'change:title', function(){
$( '.chart-header h2' ).text( model.get( 'title' ) );
document.title = model.get( 'title' ) + ' | ' + '${visualization_display_name}';
})
});