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

style: remove use of tooltip class, always show tooltip for any element with title attribute, and use standard bootstrap tooltip component.

Browse Source
This commit is contained in:
James Taylor
2013-09-09 13:40:13 -04:00
parent 00d1e81527
commit 332267c411
56 changed files with 205 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/scripts/galaxy.autocom_tagging.js
+2 -2
View File
@@ -206,7 +206,7 @@ jQuery.fn.autocomplete_tagging = function(options) {
add_tag_button.show();
tag_input_field.hide();
tag_area.removeClass("active-tag-area");
tag_area.addClass("tooltip");
// tag_area.addClass("tooltip");
} else {
// No tags, so do nothing to ensure that input is still visible.
}
@@ -227,7 +227,7 @@ jQuery.fn.autocomplete_tagging = function(options) {
}
// Remove tooltip.
$(this).removeClass("tooltip");
// $(this).removeClass("tooltip");
// Hide add tag button, show tag_input field. Change background to show
// area is active.
static/scripts/galaxy.base.js
+3 -2
View File
@@ -682,6 +682,7 @@ $(document).ready( function() {
$( "a[confirm]" ).click( function() {
return confirm( $(this).attr("confirm") );
});
// Tooltips
// if ( $.fn.tipsy ) {
// // FIXME: tipsy gravity cannot be updated, so need classes that specify N/S gravity and
@@ -690,10 +691,10 @@ $(document).ready( function() {
// }
if ( $.fn.tooltip ) {
// Put tooltips below items in panel header so that they do not overlap masthead.
$(".unified-panel-header .tooltip").tooltip( { placement: 'bottom' } );
$(".unified-panel-header [title]").tooltip( { placement: 'bottom' } );
// Default tooltip location to be above item.
$(".tooltip").tooltip( { placement: 'top' } );
$("[title]").tooltip( { placement: 'top' } );
}
// Make popup menus.
make_popup_menus();
static/scripts/galaxy.frame.js
+1 -1
View File
@@ -1085,7 +1085,7 @@ var GalaxyFrameManager = Backbone.View.extend(
'<div class="number f-corner">0</div>' +
'<div class="icon fa-icon-2x"></div>' +
'</div>' +
'<div class="galaxy-frame-active f-corner" style="position: absolute; top: 8px;">' +
'<div class="galaxy-frame-active f-corner">' +
'<div class="icon fa-icon-2x fa-icon-th"></div>' +
'</div>';
},
static/scripts/libs/bootstrap.js
Vendored
+1 -1
View File
@@ -520,7 +520,7 @@
animation: false
, placement: 'top'
, selector: false
, template: '<div class="bs-tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
, trigger: 'hover'
, title: ''
, delay: 0
static/scripts/mvc/dataset/hda-edit.js
+2 -2
View File
@@ -524,7 +524,7 @@ var HDAEditView = HDABaseView.extend( LoggableMixin ).extend(
},
success: function(tag_elt_html) {
tagElt.html(tag_elt_html);
tagElt.find(".tooltip").tooltip();
tagElt.find("[title]").tooltip();
tagArea.slideDown("fast");
}
});
@@ -564,7 +564,7 @@ var HDAEditView = HDABaseView.extend( LoggableMixin ).extend(
htmlFromAjax = "<em>" + _l( "Describe or add notes to dataset" ) + "</em>";
}
annotationElem.html( htmlFromAjax );
annotationArea.find(".tooltip").tooltip();
annotationArea.find("[title]").tooltip();
async_save_text(
annotationElem.attr("id"), annotationElem.attr("id"),
static/scripts/mvc/tools.js
+1 -1
View File
@@ -587,7 +587,7 @@ var ToolSearchView = Backbone.View.extend({
if (!this.model.is_visible()) {
this.$el.hide();
}
this.$el.find('.tooltip').tooltip();
this.$el.find('[title]').tooltip();
return this;
},
static/scripts/mvc/ui.js
-4
View File
@@ -86,10 +86,6 @@ var IconButtonView = Backbone.View.extend(
if(options.is_menu_button)
buffer += ' menu-button';
// define tooltip
if(options.title)
buffer += ' tooltip';
// add icon class
buffer += ' ' + options.icon_class;
static/scripts/mvc/visualizations/scatterplotControlForm.js
+1 -1
View File
@@ -191,7 +191,7 @@ var ScatterplotControlForm = BaseView.extend( LoggableMixin ).extend({
}
// set up behaviours
this.$el.find( '.tooltip' ).tooltip();
this.$el.find( '[title]' ).tooltip();
// uncomment any of the following to have that tab show on initial load (for testing)
//this.$el.find( 'ul.nav' ).find( 'a[href="#data-control"]' ).tab( 'show' );
static/scripts/packed/galaxy.autocom_tagging.js
+1 -1
View File
@@ -1 +1 @@
function init_tag_click_function(b,a){$(b).find(".tag-name").each(function(){$(this).click(function(){var d=$(this).text();var c=d.split(":");a(c[0],c[1]);return true})})}jQuery.fn.autocomplete_tagging=function(m){var f={get_toggle_link_text_fn:function(n){var p="";var o=obj_length(n);if(o>0){p=o+(o>1?" Tags":" Tag")}else{p="Add tags"}return p},tag_click_fn:function(n,o){},editable:true,input_size:20,in_form:false,tags:{},use_toggle_link:true,item_id:"",add_tag_img:"",add_tag_img_rollover:"",delete_tag_img:"",ajax_autocomplete_tag_url:"",ajax_retag_url:"",ajax_delete_tag_url:"",ajax_add_tag_url:""};var d=jQuery.extend(f,m);var g=$(this);var b=g.find(".tag-area");var e=g.find(".toggle-link");var a=g.find(".tag-input");var l=g.find(".add-tag-button");e.click(function(){var n;if(b.is(":hidden")){n=function(){var o=$(this).find(".tag-button").length;if(o===0){b.click()}}}else{n=function(){b.blur()}}b.slideToggle("fast",n);return $(this)});if(d.editable){a.hide()}a.keyup(function(t){if(t.keyCode===27){$(this).trigger("blur")}else{if((t.keyCode===13)||(t.keyCode===188)||(t.keyCode===32)){var s=this.value;if(s.indexOf(": ",s.length-2)!==-1){this.value=s.substring(0,s.length-1);return false}if((t.keyCode===188)||(t.keyCode===32)){s=s.substring(0,s.length-1)}s=$.trim(s);if(s.length<2){return false}this.value="";var q=j(s);var p=b.children(".tag-button");if(p.length!==0){var u=p.slice(p.length-1);u.after(q)}else{b.prepend(q)}var o=s.split(":");d.tags[o[0]]=o[1];var r=d.get_toggle_link_text_fn(d.tags);e.text(r);var n=$(this);$.ajax({url:d.ajax_add_tag_url,data:{new_tag:s},error:function(){q.remove();delete d.tags[o[0]];var v=d.get_toggle_link_text_fn(d.tags);e.text(v);alert("Add tag failed")},success:function(){n.data("autocompleter").cacheFlush()}});return false}}});var i=function(q,p,o,s,r){var n=s.split(":");return(n.length===1?n[0]:n[1])};var h={selectFirst:false,formatItem:i,autoFill:false,highlight:false};a.autocomplete(d.ajax_autocomplete_tag_url,h);g.find(".delete-tag-img").each(function(){c($(this))});init_tag_click_function($(this),d.tag_click_fn);l.click(function(){$(this).hide();b.click();return false});if(d.editable){b.bind("blur",function(n){if(obj_length(d.tags)>0){l.show();a.hide();b.removeClass("active-tag-area");b.addClass("tooltip")}else{}});b.click(function(p){var o=$(this).hasClass("active-tag-area");if($(p.target).hasClass("delete-tag-img")&&!o){return false}if($(p.target).hasClass("tag-name")&&!o){return false}$(this).removeClass("tooltip");$(this).addClass("active-tag-area");l.hide();a.show();a.focus();var n=function(r){var q=function(s,u){var t=s.attr("id");if(u!==s){s.blur();$(window).unbind("click.tagging_blur");$(this).addClass("tooltip")}};q(b,$(r.target))};$(window).bind("click.tagging_blur",n);return false})}if(d.use_toggle_link){b.hide()}function k(o,n){return o+(n?":"+n:"")}function c(n){$(n).mouseenter(function(){$(this).attr("src",d.delete_tag_img_rollover)});$(n).mouseleave(function(){$(this).attr("src",d.delete_tag_img)});$(n).click(function(){var t=$(this).parent();var s=t.find(".tag-name").eq(0);var r=s.text();var p=r.split(":");var v=p[0];var o=p[1];var u=t.prev();t.remove();delete d.tags[v];var q=d.get_toggle_link_text_fn(d.tags);e.text(q);$.ajax({url:d.ajax_delete_tag_url,data:{tag_name:v},error:function(){d.tags[v]=o;if(u.hasClass("tag-button")){u.after(t)}else{b.prepend(t)}alert("Remove tag failed");e.text(d.get_toggle_link_text_fn(d.tags));n.mouseenter(function(){$(this).attr("src",d.delete_tag_img_rollover)});n.mouseleave(function(){$(this).attr("src",d.delete_tag_img)})},success:function(){}});return true})}function j(n){var o=$("<img/>").attr("src",d.delete_tag_img).addClass("delete-tag-img");c(o);var p=$("<span>").text(n).addClass("tag-name");p.click(function(){var r=n.split(":");d.tag_click_fn(r[0],r[1]);return true});var q=$("<span></span>").addClass("tag-button");q.append(p);if(d.editable){q.append(o)}return q}};
function init_tag_click_function(b,a){$(b).find(".tag-name").each(function(){$(this).click(function(){var d=$(this).text();var c=d.split(":");a(c[0],c[1]);return true})})}jQuery.fn.autocomplete_tagging=function(m){var f={get_toggle_link_text_fn:function(n){var p="";var o=obj_length(n);if(o>0){p=o+(o>1?" Tags":" Tag")}else{p="Add tags"}return p},tag_click_fn:function(n,o){},editable:true,input_size:20,in_form:false,tags:{},use_toggle_link:true,item_id:"",add_tag_img:"",add_tag_img_rollover:"",delete_tag_img:"",ajax_autocomplete_tag_url:"",ajax_retag_url:"",ajax_delete_tag_url:"",ajax_add_tag_url:""};var d=jQuery.extend(f,m);var g=$(this);var b=g.find(".tag-area");var e=g.find(".toggle-link");var a=g.find(".tag-input");var l=g.find(".add-tag-button");e.click(function(){var n;if(b.is(":hidden")){n=function(){var o=$(this).find(".tag-button").length;if(o===0){b.click()}}}else{n=function(){b.blur()}}b.slideToggle("fast",n);return $(this)});if(d.editable){a.hide()}a.keyup(function(t){if(t.keyCode===27){$(this).trigger("blur")}else{if((t.keyCode===13)||(t.keyCode===188)||(t.keyCode===32)){var s=this.value;if(s.indexOf(": ",s.length-2)!==-1){this.value=s.substring(0,s.length-1);return false}if((t.keyCode===188)||(t.keyCode===32)){s=s.substring(0,s.length-1)}s=$.trim(s);if(s.length<2){return false}this.value="";var q=j(s);var p=b.children(".tag-button");if(p.length!==0){var u=p.slice(p.length-1);u.after(q)}else{b.prepend(q)}var o=s.split(":");d.tags[o[0]]=o[1];var r=d.get_toggle_link_text_fn(d.tags);e.text(r);var n=$(this);$.ajax({url:d.ajax_add_tag_url,data:{new_tag:s},error:function(){q.remove();delete d.tags[o[0]];var v=d.get_toggle_link_text_fn(d.tags);e.text(v);alert("Add tag failed")},success:function(){n.data("autocompleter").cacheFlush()}});return false}}});var i=function(q,p,o,s,r){var n=s.split(":");return(n.length===1?n[0]:n[1])};var h={selectFirst:false,formatItem:i,autoFill:false,highlight:false};a.autocomplete(d.ajax_autocomplete_tag_url,h);g.find(".delete-tag-img").each(function(){c($(this))});init_tag_click_function($(this),d.tag_click_fn);l.click(function(){$(this).hide();b.click();return false});if(d.editable){b.bind("blur",function(n){if(obj_length(d.tags)>0){l.show();a.hide();b.removeClass("active-tag-area")}else{}});b.click(function(p){var o=$(this).hasClass("active-tag-area");if($(p.target).hasClass("delete-tag-img")&&!o){return false}if($(p.target).hasClass("tag-name")&&!o){return false}$(this).addClass("active-tag-area");l.hide();a.show();a.focus();var n=function(r){var q=function(s,u){var t=s.attr("id");if(u!==s){s.blur();$(window).unbind("click.tagging_blur");$(this).addClass("tooltip")}};q(b,$(r.target))};$(window).bind("click.tagging_blur",n);return false})}if(d.use_toggle_link){b.hide()}function k(o,n){return o+(n?":"+n:"")}function c(n){$(n).mouseenter(function(){$(this).attr("src",d.delete_tag_img_rollover)});$(n).mouseleave(function(){$(this).attr("src",d.delete_tag_img)});$(n).click(function(){var t=$(this).parent();var s=t.find(".tag-name").eq(0);var r=s.text();var p=r.split(":");var v=p[0];var o=p[1];var u=t.prev();t.remove();delete d.tags[v];var q=d.get_toggle_link_text_fn(d.tags);e.text(q);$.ajax({url:d.ajax_delete_tag_url,data:{tag_name:v},error:function(){d.tags[v]=o;if(u.hasClass("tag-button")){u.after(t)}else{b.prepend(t)}alert("Remove tag failed");e.text(d.get_toggle_link_text_fn(d.tags));n.mouseenter(function(){$(this).attr("src",d.delete_tag_img_rollover)});n.mouseleave(function(){$(this).attr("src",d.delete_tag_img)})},success:function(){}});return true})}function j(n){var o=$("<img/>").attr("src",d.delete_tag_img).addClass("delete-tag-img");c(o);var p=$("<span>").text(n).addClass("tag-name");p.click(function(){var r=n.split(":");d.tag_click_fn(r[0],r[1]);return true});var q=$("<span></span>").addClass("tag-button");q.append(p);if(d.editable){q.append(o)}return q}};
static/scripts/packed/galaxy.base.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/galaxy.frame.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/galaxy.panels.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/libs/bootstrap.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/dataset/hda-edit.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/tools.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/ui.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/visualizations/scatterplotControlForm.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/utils/config.js
+1 -1
View File
@@ -1 +1 @@
define(["libs/underscore","viz/trackster/util"],function(b,e){var c=Backbone.Model.extend({initialize:function(f){var g=this.get("key");this.set("id",g);var h=b.find(c.known_settings_defaults,function(i){return i.key===g});if(h){this.set(b.extend({},h,f))}if(this.get("type")==="color"&&!this.get("value")){this.set("value",e.get_random_color())}this.on("change:value",this.cast_value,this)},cast_value:function(){var f=this.get("type"),g=this.get("value");if(f==="float"){g=parseFloat(g)}else{if(f==="int"){g=parseInt(g,10)}}this.set("value")}},{known_settings_defaults:[{key:"name",label:"Name",type:"text",default_value:""},{key:"color",label:"Color",type:"color",default_value:null},{key:"min_value",label:"Min Value",type:"float",default_value:null},{key:"max_value",label:"Max Value",type:"float",default_value:null},{key:"mode",type:"string",default_value:this.mode,hidden:true},{key:"height",type:"int",default_value:32,hidden:true},{key:"pos_color",label:"Positive Color",type:"color",default_value:"#FF8C00"},{key:"neg_color",label:"Negative Color",type:"color",default_value:"#4169E1"},{key:"block_color",label:"Block color",type:"color",default_value:null},{key:"label_color",label:"Label color",type:"color",default_value:"black"},{key:"show_insertions",label:"Show insertions",type:"bool",default_value:false},{key:"show_counts",label:"Show summary counts",type:"bool",default_value:true},{key:"mode",type:"string",default_value:this.mode,hidden:true},{key:"reverse_strand_color",label:"Antisense strand color",type:"color",default_value:null},{key:"show_differences",label:"Show differences only",type:"bool",default_value:true},{key:"mode",type:"string",default_value:this.mode,hidden:true}]});var d=Backbone.Collection.extend({model:c,to_key_value_dict:function(){var f={};this.each(function(g){f[g.get("key")]=g.get("value")});return f},get_value:function(f){var g=this.get(f);if(g){return g.get("value")}return undefined}},{from_config_dict:function(g){var f=b.map(b.keys(g),function(h){return{key:h,value:g[h]}});return new d(f)}});var a=Backbone.View.extend({className:"config-settings-view",render:function(){var i=this.model;var f=this.$el;var h;function g(n,j){for(var r=0;r<n.length;r++){h=n[r];if(h.hidden){continue}var l="param_"+r;var v=i.values[h.key];var x=$("<div class='form-row' />").appendTo(j);x.append($("<label />").attr("for",l).text(h.label+":"));if(type==="bool"){x.append($('<input type="checkbox" />').attr("id",l).attr("name",l).attr("checked",v))}else{if(type==="text"){x.append($('<input type="text"/>').attr("id",l).val(v).click(function(){$(this).select()}))}else{if(type==="select"){var t=$("<select />").attr("id",l);for(var p=0;p<h.options.length;p++){$("<option/>").text(h.options[p].label).attr("value",h.options[p].value).appendTo(t)}t.val(v);x.append(t)}else{if(type==="color"){var w=$("<div/>").appendTo(x),s=$("<input />").attr("id",l).attr("name",l).val(v).css("float","left").appendTo(w).click(function(z){$(".bs-tooltip").removeClass("in");var y=$(this).siblings(".bs-tooltip").addClass("in");y.css({left:$(this).position().left+$(this).width()+5,top:$(this).position().top-($(y).height()/2)+($(this).height()/2)}).show();y.click(function(A){A.stopPropagation()});$(document).bind("click.color-picker",function(){y.hide();$(document).unbind("click.color-picker")});z.stopPropagation()}),q=$("<a href='javascript:void(0)'/>").addClass("icon-button arrow-circle").appendTo(w).attr("title","Set new random color").tooltip(),u=$("<div class='bs-tooltip right' style='position: absolute;' />").appendTo(w).hide(),m=$("<div class='tooltip-inner' style='text-align: inherit'></div>").appendTo(u),k=$("<div class='tooltip-arrow'></div>").appendTo(u),o=$.farbtastic(m,{width:100,height:100,callback:s,color:v});w.append($("<div/>").css("clear","both"));(function(y){q.click(function(){y.setColor(e.get_random_color())})})(o)}else{x.append($("<input />").attr("id",l).attr("name",l).val(v))}}}}if(h.help){x.append($("<div class='help'/>").text(h.help))}}}g(this.params,f);return this},render_in_modal:function(){var h=function(){hide_modal();$(window).unbind("keypress.check_enter_esc")},f=function(){this.update_from_form();hide_modal();$(window).unbind("keypress.check_enter_esc")},g=function(i){if((i.keyCode||i.which)===27){h()}else{if((i.keyCode||i.which)===13){f()}}};$(window).bind("keypress.check_enter_esc",g);if(this.$el.children().length===0){this.render()}show_modal("Configure",drawable.config.build_form(),{Cancel:h,OK:f})},update_from_form:function(){var f=this;this.collection.each(function(h,g){if(!h.get("hidden")){var j="param_"+g;var i=f.$el.find("#"+j).val();if(type==="bool"){i=container.find("#"+j).is(":checked")}h.set("value",i)}})}});return{ConfigSettingCollection:d,ConfigSettingCollectionView:a}});
define(["libs/underscore","viz/trackster/util"],function(b,e){var c=Backbone.Model.extend({initialize:function(f){var g=this.get("key");this.set("id",g);var h=b.find(c.known_settings_defaults,function(i){return i.key===g});if(h){this.set(b.extend({},h,f))}if(this.get("type")==="color"&&!this.get("value")){this.set("value",e.get_random_color())}this.on("change:value",this.cast_value,this)},cast_value:function(){var f=this.get("type"),g=this.get("value");if(f==="float"){g=parseFloat(g)}else{if(f==="int"){g=parseInt(g,10)}}this.set("value")}},{known_settings_defaults:[{key:"name",label:"Name",type:"text",default_value:""},{key:"color",label:"Color",type:"color",default_value:null},{key:"min_value",label:"Min Value",type:"float",default_value:null},{key:"max_value",label:"Max Value",type:"float",default_value:null},{key:"mode",type:"string",default_value:this.mode,hidden:true},{key:"height",type:"int",default_value:32,hidden:true},{key:"pos_color",label:"Positive Color",type:"color",default_value:"#FF8C00"},{key:"neg_color",label:"Negative Color",type:"color",default_value:"#4169E1"},{key:"block_color",label:"Block color",type:"color",default_value:null},{key:"label_color",label:"Label color",type:"color",default_value:"black"},{key:"show_insertions",label:"Show insertions",type:"bool",default_value:false},{key:"show_counts",label:"Show summary counts",type:"bool",default_value:true},{key:"mode",type:"string",default_value:this.mode,hidden:true},{key:"reverse_strand_color",label:"Antisense strand color",type:"color",default_value:null},{key:"show_differences",label:"Show differences only",type:"bool",default_value:true},{key:"mode",type:"string",default_value:this.mode,hidden:true}]});var d=Backbone.Collection.extend({model:c,to_key_value_dict:function(){var f={};this.each(function(g){f[g.get("key")]=g.get("value")});return f},get_value:function(f){var g=this.get(f);if(g){return g.get("value")}return undefined}},{from_config_dict:function(g){var f=b.map(b.keys(g),function(h){return{key:h,value:g[h]}});return new d(f)}});var a=Backbone.View.extend({className:"config-settings-view",render:function(){var i=this.model;var f=this.$el;var h;function g(n,j){for(var r=0;r<n.length;r++){h=n[r];if(h.hidden){continue}var l="param_"+r;var v=i.values[h.key];var x=$("<div class='form-row' />").appendTo(j);x.append($("<label />").attr("for",l).text(h.label+":"));if(type==="bool"){x.append($('<input type="checkbox" />').attr("id",l).attr("name",l).attr("checked",v))}else{if(type==="text"){x.append($('<input type="text"/>').attr("id",l).val(v).click(function(){$(this).select()}))}else{if(type==="select"){var t=$("<select />").attr("id",l);for(var p=0;p<h.options.length;p++){$("<option/>").text(h.options[p].label).attr("value",h.options[p].value).appendTo(t)}t.val(v);x.append(t)}else{if(type==="color"){var w=$("<div/>").appendTo(x),s=$("<input />").attr("id",l).attr("name",l).val(v).css("float","left").appendTo(w).click(function(z){$(".tooltip").removeClass("in");var y=$(this).siblings(".tooltip").addClass("in");y.css({left:$(this).position().left+$(this).width()+5,top:$(this).position().top-($(y).height()/2)+($(this).height()/2)}).show();y.click(function(A){A.stopPropagation()});$(document).bind("click.color-picker",function(){y.hide();$(document).unbind("click.color-picker")});z.stopPropagation()}),q=$("<a href='javascript:void(0)'/>").addClass("icon-button arrow-circle").appendTo(w).attr("title","Set new random color").tooltip(),u=$("<div class='tooltip right' style='position: absolute;' />").appendTo(w).hide(),m=$("<div class='tooltip-inner' style='text-align: inherit'></div>").appendTo(u),k=$("<div class='tooltip-arrow'></div>").appendTo(u),o=$.farbtastic(m,{width:100,height:100,callback:s,color:v});w.append($("<div/>").css("clear","both"));(function(y){q.click(function(){y.setColor(e.get_random_color())})})(o)}else{x.append($("<input />").attr("id",l).attr("name",l).val(v))}}}}if(h.help){x.append($("<div class='help'/>").text(h.help))}}}g(this.params,f);return this},render_in_modal:function(){var h=function(){hide_modal();$(window).unbind("keypress.check_enter_esc")},f=function(){this.update_from_form();hide_modal();$(window).unbind("keypress.check_enter_esc")},g=function(i){if((i.keyCode||i.which)===27){h()}else{if((i.keyCode||i.which)===13){f()}}};$(window).bind("keypress.check_enter_esc",g);if(this.$el.children().length===0){this.render()}show_modal("Configure",drawable.config.build_form(),{Cancel:h,OK:f})},update_from_form:function(){var f=this;this.collection.each(function(h,g){if(!h.get("hidden")){var j="param_"+g;var i=f.$el.find("#"+j).val();if(type==="bool"){i=container.find("#"+j).is(":checked")}h.set("value",i)}})}});return{ConfigSettingCollection:d,ConfigSettingCollectionView:a}});
static/scripts/packed/viz/phyloviz.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/viz/sweepster.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/viz/trackster/tracks.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/templates/compiled/template-hda-annotationArea.js
+1 -1
View File
@@ -31,7 +31,7 @@ function program3(depth0,data) {
if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
buffer += escapeExpression(stack1)
+ "-anotation-elt\" class=\"annotation-elt tooltip editable-text\"\n style=\"margin: 1px 0px 1px 0px\" title=\"";
+ "-anotation-elt\" class=\"annotation-elt editable-text\"\n style=\"margin: 1px 0px 1px 0px\" title=\"";
options = {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data};
if (stack1 = helpers.local) { stack1 = stack1.call(depth0, options); }
else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
static/scripts/templates/compiled/template-hda-downloadLinks.js
+2 -2
View File
@@ -41,7 +41,7 @@ function program1(depth0,data) {
else { stack2 = depth0.local; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
if (!helpers.local) { stack2 = blockHelperMissing.call(depth0, stack2, options); }
if(stack2 || stack2 === 0) { buffer += stack2; }
buffer += "\" class=\"icon-button disk tooltip\"></a>\n</div>\n";
buffer += "\" class=\"icon-button disk\"></a>\n</div>\n";
return buffer;
}
function program2(depth0,data) {
@@ -94,7 +94,7 @@ function program9(depth0,data) {
else { stack2 = depth0.local; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
if (!helpers.local) { stack2 = blockHelperMissing.call(depth0, stack2, options); }
if(stack2 || stack2 === 0) { buffer += stack2; }
buffer += "\" class=\"icon-button disk tooltip\"></a>\n";
buffer += "\" class=\"icon-button disk\"></a>\n";
return buffer;
}
static/scripts/templates/compiled/template-history-historyPanel.js
+2 -2
View File
@@ -8,7 +8,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
function program1(depth0,data) {
var buffer = "", stack1, options;
buffer += "\n <div id=\"history-name\" class=\"tooltip editable-text\"\n title=\"";
buffer += "\n <div id=\"history-name\" class=\"editable-text\"\n title=\"";
options = {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data};
if (stack1 = helpers.local) { stack1 = stack1.call(depth0, options); }
else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
@@ -30,7 +30,7 @@ function program2(depth0,data) {
function program4(depth0,data) {
var buffer = "", stack1, options;
buffer += "\n <div id=\"history-name\" class=\"tooltip\"\n title=\"";
buffer += "\n <div id=\"history-name\"\n title=\"";
options = {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data};
if (stack1 = helpers.local) { stack1 = stack1.call(depth0, options); }
else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
static/scripts/templates/compiled/template-user-quotaMeter-quota.js
+1 -1
View File
@@ -27,7 +27,7 @@ function program3(depth0,data) {
else { stack1 = depth0.quota_percent; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
buffer += escapeExpression(stack1)
+ "%\"></div>\n "
+ "\n <div id=\"quota-meter-text\" class=\"quota-meter-text tooltip\"\n style=\"top: 6px\"";
+ "\n <div id=\"quota-meter-text\" class=\"quota-meter-text\"\n style=\"top: 6px\"";
stack1 = helpers['if'].call(depth0, depth0.nice_total_disk_usage, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
if(stack1 || stack1 === 0) { buffer += stack1; }
buffer += ">\n ";
static/scripts/templates/compiled/template-visualization-scatterplotControlForm.js
+1 -1
View File
@@ -8,7 +8,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
buffer += "\n\n<div class=\"scatterplot-container chart-container tabbable tabs-left\">\n "
+ "\n <ul class=\"nav nav-tabs\">\n "
+ "\n <li class=\"active\"><a href=\"#data-control\" data-toggle=\"tab\" class=\"tooltip\"\n title=\"Use this tab to change which data are used\">Data Controls</a></li>\n <li><a href=\"#chart-control\" data-toggle=\"tab\" class=\"tooltip\"\n title=\"Use this tab to change how the chart is drawn\">Chart Controls</a></li>\n <li><a href=\"#stats-display\" data-toggle=\"tab\" class=\"tooltip\"\n title=\"This tab will display overall statistics for your data\">Statistics</a></li>\n <li><a href=\"#chart-display\" data-toggle=\"tab\" class=\"tooltip\"\n title=\"This tab will display the chart\">Chart</a>\n "
+ "\n <li class=\"active\"><a href=\"#data-control\" data-toggle=\"tab\"\n title=\"Use this tab to change which data are used\">Data Controls</a></li>\n <li><a href=\"#chart-control\" data-toggle=\"tab\"\n title=\"Use this tab to change how the chart is drawn\">Chart Controls</a></li>\n <li><a href=\"#stats-display\" data-toggle=\"tab\"\n title=\"This tab will display overall statistics for your data\">Statistics</a></li>\n <li><a href=\"#chart-display\" data-toggle=\"tab\"\n title=\"This tab will display the chart\">Chart</a>\n "
+ "\n <div id=\"loading-indicator\" style=\"display: none;\">\n <img class=\"loading-img\" src=\"";
if (stack1 = helpers.loadingIndicatorImagePath) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
else { stack1 = depth0.loadingIndicatorImagePath; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
static/scripts/templates/compiled/tool_search.js
+1 -1
View File
@@ -10,7 +10,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
if (stack1 = helpers.search_hint_string) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
else { stack1 = depth0.search_hint_string; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
buffer += escapeExpression(stack1)
+ "\" id=\"tool-search-query\" autocomplete=\"off\" class=\"search-query parent-width\" />\n<a id=\"search-clear-btn\" class=\"tooltip\" title=\"clear search (esc)\"> </a>\n<img src=\"";
+ "\" id=\"tool-search-query\" autocomplete=\"off\" class=\"search-query parent-width\" />\n<a id=\"search-clear-btn\" title=\"clear search (esc)\"> </a>\n<img src=\"";
if (stack1 = helpers.spinner_url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
else { stack1 = depth0.spinner_url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
buffer += escapeExpression(stack1)
static/scripts/templates/hda-templates.html
+3 -3
View File
@@ -80,11 +80,11 @@ You may be able to <a href="{{ urls.edit }}" target="galaxy_main">set it manuall
{{/each}}
</div>
<div style="float:left;" class="menubutton split popup" id="dataset-{{ id }}-popup">
<a href="{{ urls.download }}" title="{{#local}}Download{{/local}}" class="icon-button disk tooltip"></a>
<a href="{{ urls.download }}" title="{{#local}}Download{{/local}}" class="icon-button disk"></a>
</div>
{{else}}
{{! otherwise a simple icon button }}
<a href="{{ urls.download }}" title="{{#local}}Download{{/local}}" class="icon-button disk tooltip"></a>
<a href="{{ urls.download }}" title="{{#local}}Download{{/local}}" class="icon-button disk"></a>
{{/if}}
</script>
@@ -105,7 +105,7 @@ You may be able to <a href="{{ urls.edit }}" target="galaxy_main">set it manuall
{{! TODO: move to mvc/annotations.js templates, editable-text }}
<div id="{{ id }}-annotation-area" class="annotation-area" style="display: none;">
<strong>{{#local}}Annotation{{/local}}:</strong>
<div id="{{ id }}-anotation-elt" class="annotation-elt tooltip editable-text"
<div id="{{ id }}-anotation-elt" class="annotation-elt editable-text"
style="margin: 1px 0px 1px 0px" title="{{#local}}Edit dataset annotation{{/local}}">
</div>
</div>
static/scripts/templates/history-templates.html
+2 -2
View File
@@ -9,10 +9,10 @@ History panel/page - the main container for hdas (gen. on the left hand of the g
<div id="history-name-container">
{{! TODO: factor out conditional css }}
{{#if user.email}}
<div id="history-name" class="tooltip editable-text"
<div id="history-name" class="editable-text"
title="{{#local}}Click to rename history{{/local}}">{{name}}</div>
{{else}}
<div id="history-name" class="tooltip"
<div id="history-name"
title="{{#local}}You must be logged in to edit your history name{{/local}}">{{name}}</div>
{{/if}}
</div>
static/scripts/templates/tool_search.handlebars
+1 -1
View File
@@ -1,3 +1,3 @@
<input type="text" name="query" value="{{search_hint_string}}" id="tool-search-query" autocomplete="off" class="search-query parent-width" />
<a id="search-clear-btn" class="tooltip" title="clear search (esc)"> </a>
<a id="search-clear-btn" title="clear search (esc)"> </a>
<img src="{{spinner_url}}" id="search-spinner" class="search-spinner"/>
static/scripts/templates/ui-templates.html
+1 -1
View File
@@ -2,7 +2,7 @@
<div id="quota-meter" class="quota-meter progress">
<div id="quota-meter-bar" class="quota-meter-bar bar" style="width: {{quota_percent}}%"></div>
{{! TODO: remove the hardcoded style }}
<div id="quota-meter-text" class="quota-meter-text tooltip"
<div id="quota-meter-text" class="quota-meter-text"
style="top: 6px"{{#if nice_total_disk_usage}} title="Using {{nice_total_disk_usage}}"{{/if}}>
{{#local}}Using{{/local}} {{ quota_percent }}%
</div>
static/scripts/templates/visualization-templates.html
+4 -4
View File
@@ -5,13 +5,13 @@
{{! tab buttons/headers using Bootstrap }}
<ul class="nav nav-tabs">
{{! start with the data controls as the displayed tab }}
<li class="active"><a href="#data-control" data-toggle="tab" class="tooltip"
<li class="active"><a href="#data-control" data-toggle="tab"
title="Use this tab to change which data are used">Data Controls</a></li>
<li><a href="#chart-control" data-toggle="tab" class="tooltip"
<li><a href="#chart-control" data-toggle="tab"
title="Use this tab to change how the chart is drawn">Chart Controls</a></li>
<li><a href="#stats-display" data-toggle="tab" class="tooltip"
<li><a href="#stats-display" data-toggle="tab"
title="This tab will display overall statistics for your data">Statistics</a></li>
<li><a href="#chart-display" data-toggle="tab" class="tooltip"
<li><a href="#chart-display" data-toggle="tab"
title="This tab will display the chart">Chart</a>
{{! loading indicator - initially hidden }}
<div id="loading-indicator" style="display: none;">
static/scripts/utils/config.js
+3 -3
View File
@@ -156,10 +156,10 @@ var ConfigSettingCollectionView = Backbone.View.extend({
input = $('<input />').attr("id", id ).attr("name", id ).val( value ).css("float", "left")
.appendTo(container_div).click(function(e) {
// Hide other pickers.
$(".bs-tooltip").removeClass( "in" );
$(".tooltip").removeClass( "in" );
// Show input's color picker.
var tip = $(this).siblings(".bs-tooltip").addClass( "in" );
var tip = $(this).siblings(".tooltip").addClass( "in" );
tip.css( {
// left: $(this).position().left + ( $(input).width() / 2 ) - 60,
// top: $(this).position().top + $(this.height)
@@ -187,7 +187,7 @@ var ConfigSettingCollectionView = Backbone.View.extend({
new_color_icon = $("<a href='javascript:void(0)'/>").addClass("icon-button arrow-circle").appendTo(container_div)
.attr("title", "Set new random color").tooltip(),
// Color picker in tool tip style.
tip = $( "<div class='bs-tooltip right' style='position: absolute;' />" ).appendTo(container_div).hide(),
tip = $( "<div class='tooltip right' style='position: absolute;' />" ).appendTo(container_div).hide(),
// Inner div for padding purposes
tip_inner = $("<div class='tooltip-inner' style='text-align: inherit'></div>").appendTo(tip),
tip_arrow = $("<div class='tooltip-arrow'></div>").appendTo(tip),
static/scripts/viz/phyloviz.js
+2 -2
View File
@@ -401,7 +401,7 @@ var PhylovizLayoutBase = Backbone.View.extend({
* enterNodes
*/
addTooltips : function (){
$(".bs-tooltip").remove(); //clean up tooltip, just in case its listeners are removed by d3
$(".tooltip").remove(); //clean up tooltip, just in case its listeners are removed by d3
$(".node")
.attr("data-original-title", function(){
var d = this.__data__,
@@ -817,7 +817,7 @@ var SettingsMenu = UserMenuBase.extend({
* Resets the value of the phyloTree model to its default
*/
resetToDefaults : function(){
$(".bs-tooltip").remove(); // just in case the tool tip was not removed
$(".tooltip").remove(); // just in case the tool tip was not removed
var self = this;
$.each(self.phyloTree.defaults, function(key, value) {
self.phyloTree.set(key, value);
static/scripts/viz/sweepster.js
+2 -2
View File
@@ -415,7 +415,7 @@ var SweepsterTrackView = Backbone.View.extend({
icon_class: 'cross-circle',
on_click: function() {
self.$el.remove();
$('.bs-tooltip').remove();
$('.tooltip').remove();
// TODO: remove track from viz collection.
}
}
@@ -745,7 +745,7 @@ var SweepsterVisualizationView = Backbone.View.extend({
title: 'Close',
icon_class: 'cross-circle',
on_click: function() {
$('.bs-tooltip').remove();
$('.tooltip').remove();
help_div.remove();
}
}
static/scripts/viz/trackster/tracks.js
+13 -13
View File
@@ -313,7 +313,7 @@ Drawable.prototype.action_icons_def = [
css_class: "remove-icon",
on_click_fn: function(drawable) {
// Tipsy for remove icon must be deleted when drawable is deleted.
$(".bs-tooltip").remove();
$(".tooltip").remove();
drawable.remove();
}
}
@@ -641,7 +641,7 @@ extend(DrawableGroup.prototype, Drawable.prototype, DrawableCollection.prototype
title: "Show composite track",
css_class: "layers-stack",
on_click_fn: function(group) {
$(".bs-tooltip").remove();
$(".tooltip").remove();
group.show_composite_track();
}
},
@@ -741,7 +741,7 @@ extend(DrawableGroup.prototype, Drawable.prototype, DrawableCollection.prototype
}
else {
this.action_icons.composite_icon.hide();
$(".bs-tooltip").remove();
$(".tooltip").remove();
}
//
@@ -1608,7 +1608,7 @@ extend( TracksterView.prototype, DrawableCollection.prototype, {
/** Close and reset overview. */
reset_overview: function() {
// Update UI.
$(".bs-tooltip").remove();
$(".tooltip").remove();
this.overview_viewport.find(".track-tile").remove();
this.overview_viewport.height(this.default_overview_height);
this.overview_box.height(this.default_overview_height);
@@ -2020,10 +2020,10 @@ extend(DrawableConfig.prototype, {
input = $('<input />').attr("id", id ).attr("name", id ).val( value ).css("float", "left")
.appendTo(container_div).click(function(e) {
// Hide other pickers.
$(".bs-tooltip").removeClass( "in" );
$(".tooltip").removeClass( "in" );
// Show input's color picker.
var tip = $(this).siblings(".bs-tooltip").addClass( "in" );
var tip = $(this).siblings(".tooltip").addClass( "in" );
tip.css( {
// left: $(this).position().left + ( $(input).width() / 2 ) - 60,
// top: $(this).position().top + $(this.height)
@@ -2051,7 +2051,7 @@ extend(DrawableConfig.prototype, {
new_color_icon = $("<a href='javascript:void(0)'/>").addClass("icon-button arrow-circle").appendTo(container_div)
.attr("title", "Set new random color").tooltip(),
// Color picker in tool tip style.
tip = $( "<div class='bs-tooltip right' style='position: absolute;' />" ).appendTo(container_div).hide(),
tip = $( "<div class='tooltip right' style='position: absolute;' />" ).appendTo(container_div).hide(),
// Inner div for padding purposes
tip_inner = $("<div class='tooltip-inner' style='text-align: inherit'></div>").appendTo(tip),
tip_arrow = $("<div class='tooltip-arrow'></div>").appendTo(tip),
@@ -2171,7 +2171,7 @@ var FeatureTrackTile = function(track, region, resolution, canvas, data, w_scale
// Mark tile as stale, request more data, and redraw track.
tile.stale = true;
track.data_manager.get_more_data(tile_region, track.mode, tile.resolution, {}, track.data_manager.DEEP_DATA_REQ);
$(".bs-tooltip").hide();
$(".tooltip").hide();
track.request_draw();
}).dblclick(function(e) {
// Do not propogate as this would normally zoom in.
@@ -2182,7 +2182,7 @@ var FeatureTrackTile = function(track, region, resolution, canvas, data, w_scale
// Mark tile as stale, request more data, and redraw track.
tile.stale = true;
track.data_manager.get_more_data(tile_region, track.mode, tile.resolution, {}, track.data_manager.BROAD_DATA_REQ);
$(".bs-tooltip").hide();
$(".tooltip").hide();
track.request_draw();
}).dblclick(function(e) {
// Do not propogate as this would normally zoom in.
@@ -2416,7 +2416,7 @@ extend(Track.prototype, Drawable.prototype, {
track.revert_name();
}
// HACK: name change modifies icon placement, which leaves tooltip incorrectly placed.
$(".bs-tooltip").remove();
$(".tooltip").remove();
}
},
// Go to parameter exploration visualization.
@@ -2833,7 +2833,7 @@ extend(TiledTrack.prototype, Drawable.prototype, Track.prototype, {
title: "To minimize track height, not all feature rows are displayed. Click to display more rows.",
css_class: "exclamation",
on_click_fn: function(track) {
$(".bs-tooltip").remove();
$(".tooltip").remove();
// HACKish: is it always reasonble to use view to get w_scale/current resolution?
track.slotters[ track.view.resolution_px_b ].max_rows *= 2;
track.request_draw({ clear_tile_cache: true });
@@ -3098,7 +3098,7 @@ extend(TiledTrack.prototype, Drawable.prototype, Track.prototype, {
label = $("<div/>").text(track.prefs[pref_name]).make_text_editable({
num_cols: 12,
on_finish: function(new_val) {
$(".bs-tooltip").remove();
$(".tooltip").remove();
track.config.set_param_value(pref_name, new_val);
on_change();
},
@@ -3579,7 +3579,7 @@ extend(CompositeTrack.prototype, TiledTrack.prototype, {
title: "Show individual tracks",
css_class: "layers-stack",
on_click_fn: function(track) {
$(".bs-tooltip").remove();
$(".tooltip").remove();
track.show_group();
}
}
static/style/blue/base.css
+72 -67
View File
File diff suppressed because one or more lines are too long
static/style/blue/galaxy.frame.css
+1 -1
View File
@@ -86,7 +86,7 @@
{
z-index : 34010;
position : absolute;
top : 8px;
top : 2px;
right : 120px;
cursor : pointer;
color : #D0D0D0;
static/style/blue/iphone.css
+1
View File
@@ -1,4 +1,5 @@
a{text-decoration:underline}
label{font-weight:normal}
body{margin:0;font-family:Helvetica;background:#FFFFFF;color:#000000;overflow-x:hidden;-webkit-user-select:none;-webkit-text-size-adjust:none}
body>*:not(.toolbar){display:none;position:absolute;margin:0;padding:0;left:0;width:100%;min-height:372px}
body[orient="landscape"]>*:not(.toolbar){min-height:268px}
static/style/blue/library.css
+4 -3
View File
@@ -1,9 +1,10 @@
a{text-decoration:underline}
label{font-weight:normal}
.libraryRow{background-color:#ebd9b2}
.datasetHighlighted{background-color:#f9f9f9}
.libraryItemDeleted-True{font-style:italic}
div.libraryItemBody{padding:4px 4px 2px 4px}
li.folderRow,li.datasetRow{border-top:solid 1px #ddd}
li.folderRow,li.datasetRow{border-top:solid 1px #c6bfa8}
li.folderRow:hover,li.datasetRow:hover{background-color:#f9f9f9}
img.expanderIcon{padding-right:4px}
input.datasetCheckbox,li,ul{padding:0;margin:0}
@@ -15,7 +16,7 @@ pre.peek th{color:white;background:#ebd9b2}
span.expandLink{padding-left:12px;display:inline-block;vertical-align:middle;background:url(../images/silk/resultset_next.png) no-repeat}
.folderRow.expanded span.expandLink{background:url(../images/silk/resultset_bottom.png) no-repeat}
.folderRow span.rowIcon{float:left;margin-right:5px;width:16px;height:16px;display:inline-block;vertical-align:middle;background:url(../images/silk/folder.png)}
.libraryItem-error{margin-right:2px;padding:0 2px 0 2px;border:1px solid #ec3f39;background:#f9c7c5}
.libraryItem-error{margin-right:2px;padding:0 2px 0 2px;border:1px solid #dd1c15;background:#f9c7c5}
.libraryItem-queued{margin-right:2px;padding:0 2px 0 2px;border:1px solid #bfbfbf;background:#eee}
.libraryItem-running{margin-right:2px;padding:0 2px 0 2px;border:1px solid #aa6;background:#ffc}
.libraryItem-upload{margin-right:2px;padding:0 2px 0 2px;border:1px solid #1abaea;background:#a6e4f7}
.libraryItem-upload{margin-right:2px;padding:0 2px 0 2px;border:1px solid #1197c0;background:#a6e4f7}
static/style/blue/masthead.css
+1
View File
@@ -1,4 +1,5 @@
a{text-decoration:underline}
label{font-weight:normal}
body{background:#2c3143;color:#999;padding:0;border:0;margin:3px;margin-right:5px;margin-left:5px;overflow:hidden}
div.pageTitle{font-size:175%;font-weight:bold}
div.pageTitle a:link,div.pageTitle a:visited,div.pageTitle a:active,div.pageTitle a:hover{text-decoration:none}
static/style/src/less/base.less
+5 -7
View File
@@ -706,13 +706,13 @@ textarea, input[type="text"], input[type="password"] {
position: absolute;
display: none;
right: 5px;
top: 9px;
top: 8px;
}
#search-clear-btn {
position: absolute;
right: 5px;
top: 9px;
top: 8px;
display: block;
font-size: 1.4em;
text-decoration: none;
@@ -856,8 +856,8 @@ table.tabletip tbody tr:hover td {
table.colored {
border-top: solid @table-border 1px;
border-bottom: solid @table-border 1px;
border-top: solid @table-border-color 1px;
border-bottom: solid @table-border-color 1px;
}
table.colored td, table.colored th {
@@ -871,7 +871,7 @@ table.colored tr.header {
color: contrast(@complement-color-3);
background-repeat: repeat-x;
background-position: top;
border-bottom: solid @table-border 1px;
border-bottom: solid @table-border-color 1px;
font-weight: bold;
}
@@ -927,8 +927,6 @@ div.debug {
line-height: @line-height-base;
background: @table-heading-bg;
color: contrast(@table-heading-bg);
background-repeat: repeat-x;
background-position: top;
border-top: solid @table-border-color 1px;
border-bottom: solid @table-border-color 1px;
padding: 5px;
static/style/src/less/bootstrap.less
Vendored
+1 -1
View File
@@ -56,7 +56,7 @@
// Components w/ JavaScript
@import "bootstrap/modals.less";
// @import "tooltip.less";
@import "bootstrap/tooltip.less";
@import "bootstrap/popovers.less";
// @import "carousel.less";
static/style/src/less/galaxy_bootstrap.less
+1 -1
View File
@@ -59,7 +59,7 @@
// Components w/ JavaScript
@import "bootstrap/modals.less";
// @import "tooltip.less";
@import "bootstrap/tooltip.less";
@import "bootstrap/popovers.less";
// @import "carousel.less";
static/style/src/less/galaxy_bootstrap/overrides.less
-66
View File
@@ -60,70 +60,4 @@ input[type="checkbox"],input[type="radio"] {
.nav-tabs > .active > a:hover {
border: 1px solid @btn-default-border;
border-bottom-color: transparent;
}
// Tooltips -- we use the class tooltip to indicate that an element has a tooltip, so we need to define these differently
.bs-tooltip {
position: absolute;
z-index: @zindex-tooltip;
display: block;
visibility: visible;
padding: 5px;
font-size: 11px;
.opacity(0);
&.in { .opacity(80); }
&.top { margin-top: -3px; }
&.right { margin-left: 3px; }
&.bottom { margin-top: 3px; }
&.left { margin-left: -3px; }
// Wrapper for the tooltip content
.tooltip-inner {
max-width: 200px;
padding: 3px 8px;
color: @tooltip-color;
text-align: center;
text-decoration: none;
background-color: @tooltip-bg;
// .border-radius(@border-radius-base);
}
// Arrows
.tooltip-arrow {
position: absolute;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
&.top .tooltip-arrow {
bottom: 0;
left: 50%;
margin-left: -@tooltip-arrow-width;
border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
border-top-color: @tooltip-arrow-color;
}
&.right .tooltip-arrow {
top: 50%;
left: 0;
margin-top: -@tooltip-arrow-width;
border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;
border-right-color: @tooltip-arrow-color;
}
&.left .tooltip-arrow {
top: 50%;
right: 0;
margin-top: -@tooltip-arrow-width;
border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;
border-left-color: @tooltip-arrow-color;
}
&.bottom .tooltip-arrow {
top: 0;
left: 50%;
margin-left: -@tooltip-arrow-width;
border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
border-bottom-color: @tooltip-arrow-color;
}
}
static/style/src/less/galaxy_bootstrap/variables.less
+1 -1
View File
@@ -18,7 +18,7 @@
@border-default-color: lighten(black, 75%);
// When making borders for components with other colors, how much to darken
@border-darken-percent: 30%;
@border-darken-percent: 40%;
// For making state colors, how much to darken and lighten
@state-text-darken-percent: 15%;
static/style/src/less/library.less
+2 -2
View File
@@ -2,7 +2,7 @@
@import "galaxy_variables.less";
.libraryRow {
background-color: @form-heading-bg;
background-color: @table-heading-bg;
}
.datasetHighlighted {
@@ -20,7 +20,7 @@ div.libraryItemBody {
li.folderRow,
li.datasetRow
{
border-top: solid 1px #ddd;
border-top: solid 1px @table-border;
}
li.folderRow:hover,
static/style/src/less/theme/blue.less
+7 -2
View File
@@ -5,10 +5,10 @@
@layout-border-color: #999;
@form-heading-bg: #ebd9b2;
@form-border: #ebd9b2;
@form-border: darken(@form-heading-bg,20%);
@table-heading-bg: #ebd9b2;
@table-border: #ebd9b2;
@table-border-color: darken(@table-heading-bg,20%);
@link-color: #303030;
@@ -18,4 +18,9 @@
a {
text-decoration: underline;
}
// Label is used in places it probably shouldn't be (grid cells), replace with data- attributes and remove this.
label {
font-weight: normal;
}
templates/embed_base.mako
+5 -5
View File
@@ -30,8 +30,8 @@
%>
## Links for importing and viewing an item.
<a href="${h.url_for( controller=item_controller, action='imp', id=trans.security.encode_id( item.id ) )}" title="Import ${item_display_name}" class="icon-button import tooltip"></a>
<a class="icon-button go-to-full-screen tooltip" href="${display_href}" title="Go to ${item_display_name}"></a>
<a href="${h.url_for( controller=item_controller, action='imp', id=trans.security.encode_id( item.id ) )}" title="Import ${item_display_name}" class="icon-button import"></a>
<a class="icon-button go-to-full-screen" href="${display_href}" title="Go to ${item_display_name}"></a>
</%def>
<%def name="render_title( item )">
@@ -43,14 +43,14 @@
display_href = h.url_for( controller=item_controller, action='display_by_username_and_slug', username=item_user.username, slug=item_slug )
%>
<div style="float: left">
<a class="display_in_embed icon-button toggle-expand tooltip" item_id="${trans.security.encode_id( item.id )}" item_class="$item.__class__.__name__" href="${display_href}"
<a class="display_in_embed icon-button toggle-expand" item_id="${trans.security.encode_id( item.id )}" item_class="$item.__class__.__name__" href="${display_href}"
title="Show ${item_display_name} content"></a>
<a class="toggle icon-button tooltip" href="${display_href}" title="Hide ${item_display_name} content"></a>
<a class="toggle icon-button" href="${display_href}" title="Hide ${item_display_name} content"></a>
</div>
<div style="float: right;">
${self.render_item_links( item )}
</div>
<h4><a class="toggle-embed tooltip" href="${display_href}" title="Show or hide ${item_display_name} content">Galaxy ${get_class_display_name( item.__class__ )} | ${get_item_name( item )}</a></h4>
<h4><a class="toggle-embed" href="${display_href}" title="Show or hide ${item_display_name} content">Galaxy ${get_class_display_name( item.__class__ )} | ${get_item_name( item )}</a></h4>
%if hasattr( item, "annotation") and item.annotation:
<div class="annotation">${item.annotation}</div>
%endif
templates/tagging_common.mako
+1 -1
View File
@@ -77,7 +77,7 @@
%endif
## Add "add tag" button.
%if render_add_tag_button:
<img src='${h.url_for('/static/images/fugue/tag--plus.png')}' class="add-tag-button tooltip" title="Add tags"/>
<img src='${h.url_for('/static/images/fugue/tag--plus.png')}' class="add-tag-button" title="Add tags"/>
%endif
%endif
</div>
templates/webapps/galaxy/dataset/display.mako
+2 -2
View File
@@ -52,10 +52,10 @@
<%def name="render_item_links( data )">
## Provide links to save data and import dataset.
<a href="${h.url_for( controller='/dataset', action='display', dataset_id=trans.security.encode_id( data.id ), to_ext=data.ext )}" class="icon-button disk tooltip" title="Save dataset"></a>
<a href="${h.url_for( controller='/dataset', action='display', dataset_id=trans.security.encode_id( data.id ), to_ext=data.ext )}" class="icon-button disk" title="Save dataset"></a>
<a
href="${h.url_for( controller='/dataset', action='imp', dataset_id=trans.security.encode_id( data.id ) )}"
class="icon-button import tooltip"
class="icon-button import"
title="Import dataset"></a>
</%def>
templates/webapps/galaxy/requests/common/common.mako
+1 -1
View File
@@ -634,7 +634,7 @@
<th>Name</th>
%for index, field in fields_dict.items():
<th>
<a class="display tooltip" title="${field['helptext']}" >${field['label']}</a>
<a class="display" title="${field['helptext']}" >${field['label']}</a>
</th>
%endfor
<th></th>
templates/webapps/galaxy/root/history_common.mako
+31 -31
View File
@@ -19,7 +19,7 @@
</div>
<div style="float:left;" class="menubutton split popup" id="dataset-${dataset_id}-popup">
%endif
<a href="${h.url_for( controller='/dataset', action='display', dataset_id=dataset_id, to_ext=data.ext )}" title='${_("Download")}' class="icon-button disk tooltip"></a>
<a href="${h.url_for( controller='/dataset', action='display', dataset_id=dataset_id, to_ext=data.ext )}" title='${_("Download")}' class="icon-button disk"></a>
%if meta_files:
</div>
%endif
@@ -75,9 +75,9 @@
## TODO: Make these CSS, just adding a "disabled" class to the normal
## links should be enough. However the number of datasets being uploaded
## at a time is usually small so the impact of these images is also small.
<span title='${_("Display Data")}' class='icon-button display_disabled tooltip'></span>
<span title='${_("Display Data")}' class='icon-button display_disabled'></span>
%if for_editing:
<span title='Edit Attributes' class='icon-button edit_disabled tooltip'></span>
<span title='Edit Attributes' class='icon-button edit_disabled'></span>
%endif
%else:
<%
@@ -96,9 +96,9 @@
display_url = h.url_for( controller='dataset', action='display', dataset_id=dataset_id, preview=True, filename='' )
%>
%if data.purged:
<span class="icon-button display_disabled tooltip" title="Cannot display datasets removed from disk"></span>
<span class="icon-button display_disabled" title="Cannot display datasets removed from disk"></span>
%else:
<a class="icon-button display tooltip" dataset_id="${dataset_id}" title='${_("View data")}' href="${display_url}"
<a class="icon-button display" dataset_id="${dataset_id}" title='${_("View data")}' href="${display_url}"
%if for_editing:
target="galaxy_main"
%endif
@@ -108,11 +108,11 @@
## edit attr button
%if for_editing:
%if data.deleted and not data.purged:
<span title="Undelete dataset to edit attributes" class="icon-button edit_disabled tooltip"></span>
<span title="Undelete dataset to edit attributes" class="icon-button edit_disabled"></span>
%elif data.purged:
<span title="Cannot edit attributes of datasets removed from disk" class="icon-button edit_disabled tooltip"></span>
<span title="Cannot edit attributes of datasets removed from disk" class="icon-button edit_disabled"></span>
%else:
<a class="icon-button edit tooltip" title='${_("Edit attributes")}' href="${h.url_for( controller='dataset', action='edit', dataset_id=dataset_id )}" target="galaxy_main"></a>
<a class="icon-button edit" title='${_("Edit attributes")}' href="${h.url_for( controller='dataset', action='edit', dataset_id=dataset_id )}" target="galaxy_main"></a>
%endif
%endif
@@ -121,9 +121,9 @@
## delete button
%if for_editing:
%if can_edit:
<a class="icon-button delete tooltip" title='${_("Delete")}' href="${h.url_for( controller='dataset', action='delete', dataset_id=dataset_id, show_deleted_on_refresh=show_deleted_on_refresh )}" id="historyItemDeleter-${dataset_id}"></a>
<a class="icon-button delete" title='${_("Delete")}' href="${h.url_for( controller='dataset', action='delete', dataset_id=dataset_id, show_deleted_on_refresh=show_deleted_on_refresh )}" id="historyItemDeleter-${dataset_id}"></a>
%else:
<span title="Dataset is already deleted" class="icon-button delete_disabled tooltip"></span>
<span title="Dataset is already deleted" class="icon-button delete_disabled"></span>
%endif
%endif
</div>
@@ -146,26 +146,26 @@
%elif data_state == "queued":
<div>${_('Job is waiting to run')}</div>
<div>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information tooltip"></a>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information"></a>
%if for_editing:
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle"></a>
%endif
</div>
%elif data_state == "paused":
<div>
${_('Job is currently paused:')} <i>${data.display_info().strip().rstrip('.')}.</i> ${_('Use the history menu to resume.')}</div>
<div>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information tooltip"></a>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information"></a>
%if for_editing:
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle"></a>
%endif
</div>
%elif data_state == "running":
<div>${_('Job is currently running')}</div>
<div>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information tooltip"></a>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information"></a>
%if for_editing:
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle"></a>
%endif
</div>
%elif data_state == "error":
@@ -177,14 +177,14 @@
</div>
<div>
%if for_editing:
<a href="${h.url_for( controller='dataset', action='errors', id=data.id )}" target="galaxy_main" title="View or report this error" class="icon-button bug tooltip"></a>
<a href="${h.url_for( controller='dataset', action='errors', id=data.id )}" target="galaxy_main" title="View or report this error" class="icon-button bug"></a>
%endif
%if data.has_data():
${render_download_links( data, dataset_id )}
%endif
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information tooltip"></a>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information"></a>
%if for_editing:
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle"></a>
%endif
</div>
%elif data_state == "discarded":
@@ -192,9 +192,9 @@
The job creating this dataset was cancelled before completion.
</div>
<div>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information tooltip"></a>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information"></a>
%if for_editing:
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle"></a>
%endif
</div>
%elif data_state == 'setting_metadata':
@@ -202,9 +202,9 @@
%elif data_state == "empty":
<div>${_('No data: ')}<i>${data.display_info()}</i></div>
<div>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information tooltip"></a>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information"></a>
%if for_editing:
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle"></a>
%endif
</div>
%elif data_state in [ "ok", "failed_metadata" ]:
@@ -233,10 +233,10 @@
%if data.has_data():
${render_download_links( data, dataset_id )}
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information tooltip"></a>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information"></a>
%if for_editing:
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle"></a>
## Visualization icon + visualizations. Using anchor attributes is a HACK to encode needed
## information--URL base, dataset id, dbkey, visualizations--in anchor.
<%
@@ -244,7 +244,7 @@
%>
%if visualizations:
<a href="${h.url_for( controller='visualization' )}"
class="icon-button chart_curve tooltip visualize-icon"
class="icon-button chart_curve visualize-icon"
title="Visualize"
dataset_id="${dataset_id}"
%if data.dbkey != '?':
@@ -255,8 +255,8 @@
%if trans.user:
%if not display_structured:
<div style="float: right">
<a href="${h.url_for( controller='tag', action='retag', item_class=data.__class__.__name__, item_id=dataset_id )}" target="galaxy_main" title="Edit dataset tags" class="icon-button tags tooltip"></a>
<a href="${h.url_for( controller='dataset', action='annotate', id=dataset_id )}" target="galaxy_main" title="Edit dataset annotation" class="icon-button annotate tooltip"></a>
<a href="${h.url_for( controller='tag', action='retag', item_class=data.__class__.__name__, item_id=dataset_id )}" target="galaxy_main" title="Edit dataset tags" class="icon-button tags"></a>
<a href="${h.url_for( controller='dataset', action='annotate', id=dataset_id )}" target="galaxy_main" title="Edit dataset annotation" class="icon-button annotate"></a>
</div>
%endif
<div style="clear: both"></div>
@@ -266,7 +266,7 @@
</div>
<div id="${dataset_id}-annotation-area" class="annotation-area" style="display: none">
<strong>Annotation:</strong>
<div id="${dataset_id}-annotation-elt" style="margin: 1px 0px 1px 0px" class="annotation-elt tooltip editable-text" title="Edit dataset annotation"></div>
<div id="${dataset_id}-annotation-elt" style="margin: 1px 0px 1px 0px" class="annotation-elt editable-text" title="Edit dataset annotation"></div>
</div>
%endif
@@ -294,8 +294,8 @@
<br />
%endfor
%elif for_editing:
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information tooltip"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a>
<a href="${h.url_for( controller='dataset', action='show_params', dataset_id=dataset_id )}" target="galaxy_main" title='${_("View Details")}' class="icon-button information"></a>
<a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle"></a>
%endif
</div>
templates/webapps/galaxy/tool_form.mako
+2 -3
View File
@@ -322,9 +322,8 @@
%endif
%if trans.app.config.biostar_url:
<!-- BioStar links -->
<span class="pull-right"><a href="${h.url_for( controller='biostar', action='biostar_tool_question_redirect', tool_id=tool.id )}" target="_blank" class="fa-icon-question-sign tooltip" data-original-title="Ask a question about this tool"></a></span>
<!-- End of BioStar links -->
## BioStar links
<span class="pull-right"><a href="${h.url_for( controller='biostar', action='biostar_tool_question_redirect', tool_id=tool.id )}" target="_blank" class="fa-icon-question-sign" title="Ask a question about this tool"></a></span>
%endif
</div>
<div class="toolFormBody">
templates/webapps/galaxy/workflow/display.mako
+2 -2
View File
@@ -67,11 +67,11 @@
%if workflow.importable:
<a
href="${h.url_for( controller='/workflow', action='imp', id=trans.security.encode_id(workflow.id) )}"
class="icon-button import tooltip"
class="icon-button import"
title="Import workflow"></a>
<a
href="${h.url_for( controller='/workflow', action='export_to_file', id=trans.security.encode_id(workflow.id) )}"
class="icon-button disk tooltip"
class="icon-button disk"
title="Save workflow"></a>
%endif
</%def>
templates/webapps/galaxy/workflow/editor.mako
+2 -2
View File
@@ -414,7 +414,7 @@
## Workflow name.
<div id="workflow-name-area" class="form-row">
<label>Name:</label>
<span id="workflow-name" class="tooltip editable-text" title="Click to rename workflow">${h.to_unicode( stored.name ) | h}</span>
<span id="workflow-name" class="editable-text" title="Click to rename workflow">${h.to_unicode( stored.name ) | h}</span>
</div>
## Workflow tags.
<%namespace file="/tagging_common.mako" import="render_individual_tagging_element" />
@@ -436,7 +436,7 @@
## Annotation elt.
<div id="workflow-annotation-area" class="form-row">
<label>Annotation / Notes:</label>
<div id="workflow-annotation" class="tooltip editable-text" title="Click to edit annotation">
<div id="workflow-annotation" class="editable-text" title="Click to edit annotation">
%if annotation:
${h.to_unicode( annotation ) | h}
%else: