1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/705eef780e72/ changeset: 705eef780e72 user: jgoecks date: 2012-01-03 21:25:40 summary: Usability improvements: (a) standardize and simplify language for using visualizations; (b) new icon for adding datasets to trackster; and (c) simpler UI for adding dataset to new/saved visualization. affected #: 9 files
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad static/images/silk/chart_curve.png Binary file static/images/silk/chart_curve.png has changed
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad static/june_2007_style/base.css.tmpl --- a/static/june_2007_style/base.css.tmpl +++ b/static/june_2007_style/base.css.tmpl @@ -893,10 +893,6 @@ -sprite-group: fugue; -sprite-image: fugue/sticky-note-text.png; } -.icon-button.vis-chart { - -sprite-group: fugue; - -sprite-image: fugue/chart.png; -} .icon-button.go-to-full-screen { -sprite-group: fugue; -sprite-image: fugue/external.png; @@ -914,6 +910,10 @@ -sprite-image: fugue/gear.png; }
+.icon-button.chart_curve { + background: url(../images/silk/chart_curve.png) no-repeat; +} + .tipsy { padding: 5px; font-size: 10px;
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -161,7 +161,7 @@ .icon-button.disk{background:url(fugue.png) no-repeat 0px -208px;} .icon-button.information{background:url(fugue.png) no-repeat 0px -234px;} .icon-button.annotate{background:url(fugue.png) no-repeat 0px -260px;} -.icon-button.vis-chart{background:url(fugue.png) no-repeat 0px -286px;} +.icon-button.chart_curve{background:url(../images/silk/chart_curve.png) no-repeat;} .icon-button.go-to-full-screen{background:url(fugue.png) no-repeat 0px -312px;} .icon-button.import{background:url(fugue.png) no-repeat 0px -338px;} .icon-button.plus-button{background:url(fugue.png) no-repeat 0px -364px;}
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad static/june_2007_style/blue/trackster.css --- a/static/june_2007_style/blue/trackster.css +++ b/static/june_2007_style/blue/trackster.css @@ -89,7 +89,6 @@ .icon{display:inline-block;width:16px;height:16px;} .icon.more-down{background:url('../images/fugue/arrow-transition-270-bw.png') no-repeat 0px 0px;} .icon.more-across{background:url('../images/fugue/arrow-transition-bw.png') no-repeat 0px 0px;} -.intro{padding:1em;} -.intro > .action-button{background-color:#CCC;padding:1em;} +.intro > .action-button{margin:1em;padding:1em;text-decoration:underline;} .feature-popup{position:absolute;z-index:1000;padding:5px;font-size:10px;filter:alpha(opacity=80);background-repeat:no-repeat;background-image:url(../images/tipsy.gif);background-position:top center;} .feature-popup-inner{padding:5px 8px 4px 8px;background-color:black;color:white;} \ No newline at end of file
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad static/june_2007_style/trackster.css.tmpl --- a/static/june_2007_style/trackster.css.tmpl +++ b/static/june_2007_style/trackster.css.tmpl @@ -422,14 +422,11 @@ .icon.more-across { background: url('../images/fugue/arrow-transition-bw.png') no-repeat 0px 0px; } -.intro { - padding: 1em; -} .intro > .action-button { background-color: #CCC; padding: 1em; + text-decoration:underline; } - .feature-popup { position: absolute; z-index: 1000;
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad templates/root/history.mako --- a/templates/root/history.mako +++ b/templates/root/history.mako @@ -244,17 +244,27 @@ error: function() { alert( "Could not add this dataset to browser." ); }, success: function(table_html) { var parent = window.parent; - parent.show_modal("Add to Browser:", table_html, { + + parent.show_modal("View Data in a New or Saved Visualization", "", { "Cancel": function() { parent.hide_modal(); }, - "Insert into selected": function() { - $(parent.document).find('input[name=id]:checked').each(function() { - var vis_id = $(this).val(); - parent.location = dataset_jquery.attr("action-url") + "&id=" + vis_id; + "View in saved visualization": function() { + // Show new modal with saved visualizations. + parent.hide_modal(); + parent.show_modal("Add Data to Saved Visualization", table_html, { + "Cancel": function() { + parent.hide_modal(); + }, + "Add to visualization": function() { + $(parent.document).find('input[name=id]:checked').each(function() { + var vis_id = $(this).val(); + parent.location = dataset_jquery.attr("action-url") + "&id=" + vis_id; + }); + }, }); }, - "Insert into new browser": function() { + "View in new visualization": function() { parent.location = dataset_jquery.attr("new-url"); } });
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad templates/root/history_common.mako --- a/templates/root/history_common.mako +++ b/templates/root/history_common.mako @@ -220,9 +220,9 @@ else: data_url = h.url_for( controller='tracks', action='list_tracks' ) %> - <a data-url="${data_url}" class="icon-button vis-chart tooltip trackster-add" + <a data-url="${data_url}" class="icon-button chart_curve tooltip trackster-add" action-url="${h.url_for( controller='tracks', action='browser', dataset_id=dataset_id)}" - new-url="${h.url_for( controller='tracks', action='index', dataset_id=dataset_id, default_dbkey=data.dbkey)}" title="Visualize in Trackster"></a> + new-url="${h.url_for( controller='tracks', action='index', dataset_id=dataset_id, default_dbkey=data.dbkey)}" title="View in Trackster"></a> %endif %if trans.user: %if not display_structured:
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad templates/tracks/browser.mako --- a/templates/tracks/browser.mako +++ b/templates/tracks/browser.mako @@ -187,7 +187,7 @@ data: {}, error: function() { alert( "Couldn't create new browser" ) }, success: function(form_html) { - show_modal("New Track Browser", form_html, { + show_modal("New Visualization", form_html, { "Cancel": function() { window.location = "${h.url_for( controller='visualization', action='list' )}"; }, "Continue": function() { $(document).trigger("convert_to_values"); continue_fn(); } });
diff -r 04967fa31a177c16286cd742f1635ffc64a997e8 -r 705eef780e7255775fe9fed93ff0e1339e59b6ad templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -98,7 +98,7 @@ %if app.config.get_bool( 'enable_tracks', False ): <% menu_options = [ - [_('New Track Browser'), h.url_for( controller='/tracks', action='index' ) ], + [_('New Visualization'), h.url_for( controller='/tracks', action='index' ) ], [_('Saved Visualizations'), h.url_for( controller='/visualization', action='list' ) ] ] tab( "visualization", _("Visualization"), h.url_for( controller='/visualization', action='list'), menu_options=menu_options )
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.