# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User rc # Date 1289918776 18000 # Node ID 94c2040e58255136741d776de8401cfb4128133b # Parent 7cc69601ca2da9b6d21f980585b59d73c0133cba More minor ui fixes in sample tracking --- a/templates/requests/common/common.mako +++ b/templates/requests/common/common.mako @@ -220,7 +220,7 @@ %endif %if can_delete_samples: ## Delete button - <td valign="top"><a class="action-button" href="${h.url_for( controller='requests_common', action='delete_sample', cntrller=cntrller, request_id=trans.security.encode_id( request.id ), sample_id=sample_widget_index )}"><img src="${h.url_for('/static/images/delete_icon.png')}" style="cursor:pointer;"/></a></td> + <td valign="top"><a class="action-button" confirm="This sample is not recoverable after deletion. Click Ok to delete." href="${h.url_for( controller='requests_common', action='delete_sample', cntrller=cntrller, request_id=trans.security.encode_id( request.id ), sample_id=sample_widget_index )}"><img src="${h.url_for('/static/images/delete_icon.png')}" style="cursor:pointer;"/></a></td> %endif </%def> --- a/templates/requests/common/edit_samples.mako +++ b/templates/requests/common/edit_samples.mako @@ -12,19 +12,22 @@ <%def name="javascripts()"> ${parent.javascripts()} ${common_javascripts()} + ${local_javascripts()} </%def> -<script type="text/javascript"> - // This function stops the form from getting submitted when return key is pressed - // This is needed in this form as the barcode scanner (when in keyboard emulation mode) - // may send a return key appended to the scanned barcode string. - function stopRKey(evt) { - var evt = (evt) ? evt : ((event) ? event : null); - var node = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null); - if ((evt.keyCode == 13) && (node.type=="text")) {return false;} - } - document.onkeypress = stopRKey -</script> +<%def name="local_javascripts()"> + <script type="text/javascript"> + // This function stops the form from getting submitted when return key is pressed + // This is needed in this form as the barcode scanner (when in keyboard emulation mode) + // may send a return key appended to the scanned barcode string. + function stopRKey(evt) { + var evt = (evt) ? evt : ((event) ? event : null); + var node = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null); + if ((evt.keyCode == 13) && (node.type=="text")) {return false;} + } + document.onkeypress = stopRKey + </script> +</%def><% from galaxy.web.framework.helpers import time_ago @@ -68,7 +71,7 @@ %if request.samples_without_library_destinations: <p> - <font color="red"><b><i>Select a target data library and folder for a sample before selecting its datasets to transfer from the sequencer</i></b></font> + <font color="red"><b><i>Select a target data library and folder for a sample before selecting it's datasets to transfer from the sequencer</i></b></font></p> %endif --- a/templates/requests/common/view_request.mako +++ b/templates/requests/common/view_request.mako @@ -59,7 +59,7 @@ %if request.samples_without_library_destinations: <p> - <font color="red"><b><i>Select a target data library and folder for a sample before selecting its datasets to transfer from the sequencer</i></b></font> + <font color="red"><b><i>Select a target data library and folder for a sample before selecting it's datasets to transfer from the sequencer</i></b></font></p> %endif