1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/8e52e426487b/ changeset: 8e52e426487b user: carlfeberhard date: 2012-11-15 19:08:57 summary: tool_runner.py, rerun: allow encoded ids; history panel: move refresh out of popup, rearrange icons. affected #: 8 files
diff -r 0a1db986221074e72131afd6d16320357843c5f8 -r 8e52e426487bf732d051e538ac4cd7d352aa5065 lib/galaxy/webapps/galaxy/controllers/tool_runner.py --- a/lib/galaxy/webapps/galaxy/controllers/tool_runner.py +++ b/lib/galaxy/webapps/galaxy/controllers/tool_runner.py @@ -117,8 +117,14 @@ error( "'id' parameter is required" ); try: id = int( id ) + except: - error( "Invalid value for 'id' parameter" ) + # it's not an un-encoded id, try to parse as encoded + try: + id = trans.security.decode_id( id ) + except: + error( "Invalid value for 'id' parameter" ) + # Get the dataset object data = trans.sa_session.query( trans.app.model.HistoryDatasetAssociation ).get( id ) #only allow rerunning if user is allowed access to the dataset.
diff -r 0a1db986221074e72131afd6d16320357843c5f8 -r 8e52e426487bf732d051e538ac4cd7d352aa5065 static/scripts/mvc/dataset/hda-base.js --- a/static/scripts/mvc/dataset/hda-base.js +++ b/static/scripts/mvc/dataset/hda-base.js @@ -523,7 +523,7 @@ titleLink : Handlebars.templates[ 'template-hda-titleLink' ], hdaSummary : Handlebars.templates[ 'template-hda-hdaSummary' ], downloadLinks : Handlebars.templates[ 'template-hda-downloadLinks' ], - failedMetadata : Handlebars.templates[ 'template-hda-failedMetaData' ], + failedMetadata : Handlebars.templates[ 'template-hda-failedMetadata' ], displayApps : Handlebars.templates[ 'template-hda-displayApps' ] };
diff -r 0a1db986221074e72131afd6d16320357843c5f8 -r 8e52e426487bf732d051e538ac4cd7d352aa5065 static/scripts/mvc/history/history-panel.js --- a/static/scripts/mvc/history/history-panel.js +++ b/static/scripts/mvc/history/history-panel.js @@ -127,6 +127,7 @@ /** event map */ events : { + 'click #history-refresh' : function(){ window.location.reload(); }, 'click #history-tag' : 'loadAndDisplayTags' },
@@ -313,7 +314,7 @@ show_deletedText = ( this.storage.get( 'show_deleted' ) )?( 'Hide deleted' ):( 'Show deleted' ), show_hiddenText = ( this.storage.get( 'show_hidden' ) )?( 'Hide hidden' ):( 'Show hidden' ), menuActions = {}; - menuActions[ _l( 'refresh' ) ] = function(){ window.location.reload(); }; + //menuActions[ _l( 'refresh' ) ] = function(){ window.location.reload(); }; menuActions[ _l( 'collapse all' ) ] = function(){ historyPanel.hideAllHdaBodies(); }; menuActions[ _l( show_deletedText ) ] = function(){ historyPanel.toggleShowDeleted(); }; menuActions[ _l( show_hiddenText ) ] = function(){ historyPanel.toggleShowHidden(); };
diff -r 0a1db986221074e72131afd6d16320357843c5f8 -r 8e52e426487bf732d051e538ac4cd7d352aa5065 static/scripts/templates/compiled/template-hda-failedMetaData.js --- a/static/scripts/templates/compiled/template-hda-failedMetaData.js +++ /dev/null @@ -1,33 +0,0 @@ -(function() { - var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {}; -templates['template-hda-failedMetaData'] = template(function (Handlebars,depth0,helpers,partials,data) { - helpers = helpers || Handlebars.helpers; - var stack1, foundHelper, self=this, functionType="function", blockHelperMissing=helpers.blockHelperMissing, escapeExpression=this.escapeExpression; - -function program1(depth0,data) { - - var buffer = "", stack1, foundHelper; - buffer += "\n"; - foundHelper = helpers.local; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(2, program2, data)}); } - else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(2, program2, data)}); } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\nYou may be able to <a href=""; - stack1 = depth0.urls; - stack1 = stack1 == null || stack1 === false ? stack1 : stack1.edit; - stack1 = typeof stack1 === functionType ? stack1() : stack1; - buffer += escapeExpression(stack1) + "" target="galaxy_main">set it manually or retry auto-detection</a>.\n"; - return buffer;} -function program2(depth0,data) { - - - return "An error occurred setting the metadata for this dataset.";} - - foundHelper = helpers.warningmessagesmall; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(1, program1, data)}); } - else { stack1 = depth0.warningmessagesmall; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.warningmessagesmall) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(1, program1, data)}); } - if(stack1 || stack1 === 0) { return stack1; } - else { return ''; }}); -})(); \ No newline at end of file
diff -r 0a1db986221074e72131afd6d16320357843c5f8 -r 8e52e426487bf732d051e538ac4cd7d352aa5065 static/scripts/templates/compiled/template-history-historyPanel.js --- a/static/scripts/templates/compiled/template-history-historyPanel.js +++ b/static/scripts/templates/compiled/template-history-historyPanel.js @@ -46,104 +46,109 @@
function program7(depth0,data) {
- - return "Click to see more actions for this history";} - -function program9(depth0,data) { - var buffer = "", stack1, foundHelper; - buffer += "\n <div id="history-secondary-links" style="float: right;">\n <a id="history-tag" title=""; + buffer += "\n <a id="history-tag" title=""; + foundHelper = helpers.local; + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(8, program8, data)}); } + else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } + if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(8, program8, data)}); } + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += ""\n class="icon-button tags tooltip" target="galaxy_main" href="javascript:void(0)"></a>\n <a id="history-annotate" title=""; foundHelper = helpers.local; if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(10, program10, data)}); } else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(10, program10, data)}); } if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += ""\n class="icon-button tags tooltip" target="galaxy_main" href="javascript:void(0)"></a>\n <a id="history-annotate" title=""; - foundHelper = helpers.local; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(12, program12, data)}); } - else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(12, program12, data)}); } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += ""\n class="icon-button annotate tooltip" target="galaxy_main" href="javascript:void(0)"></a>\n </div>\n "; + buffer += ""\n class="icon-button annotate tooltip" target="galaxy_main" href="javascript:void(0)"></a>\n "; return buffer;} -function program10(depth0,data) { +function program8(depth0,data) {
return "Edit history tags";}
-function program12(depth0,data) { +function program10(depth0,data) {
return "Edit history annotation";}
+function program12(depth0,data) { + + + return "Refresh this display";} + function program14(depth0,data) {
+ + return "Click to see more actions for this history";} + +function program16(depth0,data) { + var buffer = "", stack1, foundHelper; buffer += "\n "; foundHelper = helpers.warningmessagesmall; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(15, program15, data)}); } + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(17, program17, data)}); } else { stack1 = depth0.warningmessagesmall; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.warningmessagesmall) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(15, program15, data)}); } + if (!helpers.warningmessagesmall) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(17, program17, data)}); } if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "\n "; return buffer;} -function program15(depth0,data) { +function program17(depth0,data) {
var stack1, foundHelper; foundHelper = helpers.local; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(16, program16, data)}); } + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(18, program18, data)}); } else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(16, program16, data)}); } + if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(18, program18, data)}); } if(stack1 || stack1 === 0) { return stack1; } else { return ''; }} -function program16(depth0,data) { +function program18(depth0,data) {
return "You are currently viewing a deleted history!";}
-function program18(depth0,data) { +function program20(depth0,data) {
var buffer = "", stack1, foundHelper; buffer += "\n <div id="history-tag-annotation">\n\n <div id="history-tag-area" style="display: none">\n <strong>"; foundHelper = helpers.local; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(19, program19, data)}); } - else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(19, program19, data)}); } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += ":</strong>\n <div class="tag-elt"></div>\n </div>\n\n <div id="history-annotation-area" style="display: none">\n <strong>"; - foundHelper = helpers.local; if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(21, program21, data)}); } else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(21, program21, data)}); } if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += ":</strong>\n <div id="history-annotation-container">\n <div id="history-annotation" class="tooltip editable-text"\n title=""; + buffer += ":</strong>\n <div class="tag-elt"></div>\n </div>\n\n <div id="history-annotation-area" style="display: none">\n <strong>"; foundHelper = helpers.local; if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(23, program23, data)}); } else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(23, program23, data)}); } if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += ":</strong>\n <div id="history-annotation-container">\n <div id="history-annotation" class="tooltip editable-text"\n title=""; + foundHelper = helpers.local; + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(25, program25, data)}); } + else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } + if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(25, program25, data)}); } + if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "">\n "; stack1 = depth0.annotation; - stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.program(27, program27, data),fn:self.program(25, program25, data)}); + stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.program(29, program29, data),fn:self.program(27, program27, data)}); if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "\n </div>\n </div>\n </div>\n </div>\n "; return buffer;} -function program19(depth0,data) { +function program21(depth0,data) {
return "Tags";}
-function program21(depth0,data) { +function program23(depth0,data) {
return "Annotation";}
-function program23(depth0,data) { +function program25(depth0,data) {
return "Click to edit annotation";}
-function program25(depth0,data) { +function program27(depth0,data) {
var buffer = "", stack1, foundHelper; buffer += "\n "; @@ -153,23 +158,23 @@ buffer += escapeExpression(stack1) + "\n "; return buffer;}
-function program27(depth0,data) { +function program29(depth0,data) {
var buffer = "", stack1, foundHelper; buffer += "\n <em>"; foundHelper = helpers.local; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(28, program28, data)}); } + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(30, program30, data)}); } else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(28, program28, data)}); } + if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(30, program30, data)}); } if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "</em>\n "; return buffer;} -function program28(depth0,data) { +function program30(depth0,data) {
return "Describe or add notes to history";}
-function program30(depth0,data) { +function program32(depth0,data) {
var buffer = "", stack1, foundHelper; buffer += "\n <div id="message-container">\n <div class=""; @@ -183,58 +188,64 @@ buffer += escapeExpression(stack1) + "\n </div><br />\n </div>\n "; return buffer;}
-function program32(depth0,data) { +function program34(depth0,data) {
return "You are over your disk quota.\n Tool execution is on hold until your disk usage drops below your allocated quota.";}
-function program34(depth0,data) { +function program36(depth0,data) {
return "Your history is empty. Click 'Get Data' on the left pane to start";}
buffer += "<div id="history-controls">\n <div id="history-title-area" class="historyLinks">\n\n "; - buffer += "\n <div id="history-name-container" style="float: left;">\n "; + buffer += "\n <div id="history-name-container">\n "; buffer += "\n "; stack1 = depth0.user; stack1 = stack1 == null || stack1 === false ? stack1 : stack1.email; stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data)}); if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n </div>\n\n <a id="history-action-popup" class="tooltip" title=""; - foundHelper = helpers.local; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(7, program7, data)}); } - else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(7, program7, data)}); } - if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += ""\n href="javascript:void(0);" style="float: right;">\n <span class="ficon cogs large"></span>\n </a>\n <div style="clear: both;"></div>\n </div>\n\n <div id="history-subtitle-area">\n <div id="history-size" style="float:left;">"; + buffer += "\n </div>\n </div>\n\n <div id="history-subtitle-area">\n <div id="history-size" style="float:left;">"; foundHelper = helpers.nice_size; if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{}}); } else { stack1 = depth0.nice_size; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - buffer += escapeExpression(stack1) + "</div>\n "; + buffer += escapeExpression(stack1) + "</div>\n\n <div id="history-secondary-links" style="float: right;">\n "; stack1 = depth0.user; stack1 = stack1 == null || stack1 === false ? stack1 : stack1.email; - stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(9, program9, data)}); + stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(7, program7, data)}); if(stack1 || stack1 === 0) { buffer += stack1; } - buffer += "\n <div style="clear: both;"></div>\n </div>\n\n "; + buffer += "\n <a id="history-refresh" class="tooltip" title=""; + foundHelper = helpers.local; + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(12, program12, data)}); } + else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } + if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(12, program12, data)}); } + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += ""\n href="javascript:void(0);">\n <span class="ficon refresh large"></span>\n </a>\n <a id="history-action-popup" class="tooltip" title=""; + foundHelper = helpers.local; + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(14, program14, data)}); } + else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } + if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(14, program14, data)}); } + if(stack1 || stack1 === 0) { buffer += stack1; } + buffer += ""\n href="javascript:void(0);">\n <span class="ficon cogs large"></span>\n </a>\n </div>\n <div style="clear: both;"></div>\n </div>\n\n "; stack1 = depth0.deleted; - stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(14, program14, data)}); + stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(16, program16, data)}); if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "\n\n "; buffer += "\n "; buffer += "\n "; stack1 = depth0.user; stack1 = stack1 == null || stack1 === false ? stack1 : stack1.email; - stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(18, program18, data)}); + stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(20, program20, data)}); if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "\n\n "; stack1 = depth0.message; - stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(30, program30, data)}); + stack1 = helpers['if'].call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(32, program32, data)}); if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "\n\n <div id="quota-message-container" style="display: none">\n <div id="quota-message" class="errormessage">\n "; foundHelper = helpers.local; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(32, program32, data)}); } + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(34, program34, data)}); } else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(32, program32, data)}); } + if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(34, program34, data)}); } if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "\n </div>\n </div>\n</div>\n\n<div id=""; foundHelper = helpers.id; @@ -242,9 +253,9 @@ else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1() : stack1; } buffer += escapeExpression(stack1) + "-datasets" class="history-datasets-list"></div>\n\n<div class="infomessagesmall" id="emptyHistoryMessage" style="display: none;">\n "; foundHelper = helpers.local; - if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(34, program34, data)}); } + if (foundHelper) { stack1 = foundHelper.call(depth0, {hash:{},inverse:self.noop,fn:self.program(36, program36, data)}); } else { stack1 = depth0.local; stack1 = typeof stack1 === functionType ? stack1() : stack1; } - if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(34, program34, data)}); } + if (!helpers.local) { stack1 = blockHelperMissing.call(depth0, stack1, {hash:{},inverse:self.noop,fn:self.program(36, program36, data)}); } if(stack1 || stack1 === 0) { buffer += stack1; } buffer += "\n</div>"; return buffer;});
diff -r 0a1db986221074e72131afd6d16320357843c5f8 -r 8e52e426487bf732d051e538ac4cd7d352aa5065 static/scripts/templates/hda-templates.html --- a/static/scripts/templates/hda-templates.html +++ b/static/scripts/templates/hda-templates.html @@ -54,7 +54,7 @@
<!-- ---------------------------------------------------------------------- FAILED META WARNING --> -<script type="text/template" class="template-hda" id="template-hda-failedMetaData"> +<script type="text/template" class="template-hda" id="template-hda-failedMetadata"> {{#warningmessagesmall}} {{#local}}An error occurred setting the metadata for this dataset.{{/local}} You may be able to <a href="{{ urls.edit }}" target="galaxy_main">set it manually or retry auto-detection</a>.
diff -r 0a1db986221074e72131afd6d16320357843c5f8 -r 8e52e426487bf732d051e538ac4cd7d352aa5065 static/scripts/templates/history-templates.html --- a/static/scripts/templates/history-templates.html +++ b/static/scripts/templates/history-templates.html @@ -6,7 +6,7 @@ <div id="history-title-area" class="historyLinks">
{{! history name (if any) }} - <div id="history-name-container" style="float: left;"> + <div id="history-name-container"> {{! TODO: factor out conditional css }} {{#if user.email}} <div id="history-name" class="tooltip editable-text" @@ -16,24 +16,27 @@ title="{{#local}}You must be logged in to edit your history name{{/local}}">{{name}}</div> {{/if}} </div> - - <a id="history-action-popup" class="tooltip" title="{{#local}}Click to see more actions for this history{{/local}}" - href="javascript:void(0);" style="float: right;"> - <span class="ficon cogs large"></span> - </a> - <div style="clear: both;"></div></div><div id="history-subtitle-area"><div id="history-size" style="float:left;">{{nice_size}}</div> - {{#if user.email}} + <div id="history-secondary-links" style="float: right;"> + {{#if user.email}} <a id="history-tag" title="{{#local}}Edit history tags{{/local}}" class="icon-button tags tooltip" target="galaxy_main" href="javascript:void(0)"></a><a id="history-annotate" title="{{#local}}Edit history annotation{{/local}}" class="icon-button annotate tooltip" target="galaxy_main" href="javascript:void(0)"></a> + {{/if}} + <a id="history-refresh" class="tooltip" title="{{#local}}Refresh this display{{/local}}" + href="javascript:void(0);"> + <span class="ficon refresh large"></span> + </a> + <a id="history-action-popup" class="tooltip" title="{{#local}}Click to see more actions for this history{{/local}}" + href="javascript:void(0);"> + <span class="ficon cogs large"></span> + </a></div> - {{/if}} <div style="clear: both;"></div></div>
diff -r 0a1db986221074e72131afd6d16320357843c5f8 -r 8e52e426487bf732d051e538ac4cd7d352aa5065 templates/root/alternate_history.mako --- a/templates/root/alternate_history.mako +++ b/templates/root/alternate_history.mako @@ -440,6 +440,15 @@ #history-secondary-links { }
+ /*why this is getting underlined is beyond me*/ + #history-secondary-links #history-refresh { + text-decoration: none; + } + /*too tweaky*/ + #history-annotate { + margin-right: 3px; + } + #history-tag-area, #history-annotation-area { margin: 10px 0px 10px 0px; }
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.