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

fixes for tool search clear-btn (to use templating); added bootstrap.js to tool menu iframe

Browse Source
This commit is contained in:
Carl Eberhard
2012-08-02 16:43:59 -04:00
parent 2170247eb8
commit 6337e6565b
6 changed files with 166 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/june_2007_style/base.less
+8 -2
View File
@@ -757,8 +757,14 @@ textarea, input[type="text"], input[type="password"] {
.search-spinner {
position: absolute;
display: none;
right: 8px;
top: 10px;
right: 5px;
top: 9px;
}
#search-clear-btn {
position: absolute;
right: 4px;
top: 8px;
}
// Messages
static/june_2007_style/blue/base.css
+150 -150
View File
File diff suppressed because one or more lines are too long
static/scripts/mvc/tools.js
+1 -1
View File
@@ -559,7 +559,7 @@ var ToolSearchView = Backbone.View.extend({
query_changed: function( evData ) {
// check for the 'clear key' (ESC) first
if( ( this.model.attributes.clear_key )
&& ( this.model.attributes.clear_key == evData.which ) ){
&& ( this.model.attributes.clear_key === evData.which ) ){
this.clear();
return false;
}
static/scripts/templates/compiled/tool_search.js
+2 -6
View File
@@ -9,14 +9,10 @@ templates['tool_search'] = template(function (Handlebars,depth0,helpers,partials
foundHelper = helpers.search_hint_string;
if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{}}); }
else { stack1 = depth0.search_hint_string; stack1 = typeof stack1 === functionType ? stack1() : stack1; }
buffer += escapeExpression(stack1) + "\" id=\"tool-search-query\" autocomplete=\"off\" class=\"search-query parent-width\" />\n<img src=\"";
foundHelper = helpers.clear_btn_url;
if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{}}); }
else { stack1 = depth0.clear_btn_url; stack1 = typeof stack1 === functionType ? stack1() : stack1; }
buffer += escapeExpression(stack1) + "\" id=\"search-clear-btn\" class=\"search-clear-btn\"/>\n<img src=\"";
buffer += escapeExpression(stack1) + "\" id=\"tool-search-query\" autocomplete=\"off\" class=\"search-query parent-width\" />\n<a id=\"search-clear-btn\" class=\"icon-button cross-circle tooltip\" title=\"clear search (esc)\"> </a>\n<img src=\"";
foundHelper = helpers.spinner_url;
if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{}}); }
else { stack1 = depth0.spinner_url; stack1 = typeof stack1 === functionType ? stack1() : stack1; }
buffer += escapeExpression(stack1) + "\" id=\"search-spinner\" class=\"search-spinner\"/>\n";
buffer += escapeExpression(stack1) + "\" id=\"search-spinner\" class=\"search-spinner\"/>";
return buffer;});
})();
static/scripts/templates/tool_search.handlebars
+2 -2
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" />
<img src="{{clear_btn_url}}" id="search-clear-btn" class="search-clear-btn"/>
<img src="{{spinner_url}}" id="search-spinner" class="search-spinner"/>
<a id="search-clear-btn" class="icon-button cross-circle tooltip" title="clear search (esc)"> </a>
<img src="{{spinner_url}}" id="search-spinner" class="search-spinner"/>
templates/root/tool_menu.mako
+3 -2
View File
@@ -17,7 +17,7 @@
<%def name="javascripts()">
${parent.javascripts()}
${h.templates( "tool_link", "panel_section", "tool_search" )}
${h.js( "galaxy.base", "json2", "autocomplete_tagging", "mvc/tools" )}
${h.js( "galaxy.base", "json2", "autocomplete_tagging", "mvc/tools", "bootstrap" )}
<%
# Set up for creating tool panel.
@@ -34,7 +34,6 @@
$(function() {
// Set up search.
tool_search = new ToolSearch( {spinner_url: "${h.url_for('/static/images/loading_small_white_bg.gif')}",
clear_btn_url: "${h.url_for('/static/images/fugue/cross-circle-bw.png')}",
search_url: "${h.url_for( controller='root', action='tool_search' )}",
hidden: ${tool_search_hidden} } );
@@ -66,6 +65,8 @@
JSON.stringify({"search_active" : search_active}));
});
*/
$( '.tooltip' ).tooltip();
// TODO: is this necessary?
$( "a[minsizehint]" ).click( function() {