3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/aa1f96836c8e/ Changeset: aa1f96836c8e User: dannon Date: 2013-09-27 17:33:44 Summary: Remove toolForm styling from cloudlaunch form -- the border looked bad in this context. Affected #: 1 file diff -r fd9270d776525fafacc2ddd8e0171483b579381c -r aa1f96836c8ef7412bfa72687299d10c5765c8ad templates/webapps/galaxy/cloud/index.mako --- a/templates/webapps/galaxy/cloud/index.mako +++ b/templates/webapps/galaxy/cloud/index.mako @@ -183,7 +183,7 @@ <div class="page-container" style="padding: 10px;"><div id="loading_indicator"></div><h2>Launch a Galaxy Cloud Instance</h2> - <div id="launchFormContainer" class="toolForm"> + <div id="launchFormContainer"><form id="cloudlaunch_form" action="${h.url_for( controller='/cloudlaunch', action='launch_instance')}" method="post"><p>To launch a Galaxy Cloud Cluster, enter your AWS Secret https://bitbucket.org/galaxy/galaxy-central/commits/9ed12e2315ce/ Changeset: 9ed12e2315ce User: dannon Date: 2013-09-27 17:57:11 Summary: Use bindings for ajaxStart/ajaxStop in cloudlaunch to be compliant with jquery1.9 Affected #: 1 file diff -r aa1f96836c8ef7412bfa72687299d10c5765c8ad -r 9ed12e2315ce2f6fe1eb845a8f2a21a4ca0e470b templates/webapps/galaxy/cloud/index.mako --- a/templates/webapps/galaxy/cloud/index.mako +++ b/templates/webapps/galaxy/cloud/index.mako @@ -118,10 +118,10 @@ }); } }); - $('#loading_indicator').ajaxStart(function(){ - $(this).show('fast'); + $(document).ajaxStart(function(){ + $('#loading_indicator').show('fast'); }).ajaxStop(function(){ - $(this).hide('fast'); + $('#loading_indicator').hide('fast'); }); $('form').ajaxForm({ type: 'POST', https://bitbucket.org/galaxy/galaxy-central/commits/dd2d48ae00ad/ Changeset: dd2d48ae00ad User: dannon Date: 2013-09-27 18:08:58 Summary: Update cloudlaunch form to properly clear error messages, as well as preventing submisison without either a cluster name or existing instance specified. Affected #: 1 file diff -r 9ed12e2315ce2f6fe1eb845a8f2a21a4ca0e470b -r dd2d48ae00ad5085fb05719b4c94b0573f4ff663 templates/webapps/galaxy/cloud/index.mako --- a/templates/webapps/galaxy/cloud/index.mako +++ b/templates/webapps/galaxy/cloud/index.mako @@ -127,28 +127,30 @@ type: 'POST', dataType: 'json', beforeSubmit: function(data, form){ - if ($('#id_password').val() != $('#id_password_confirm').val()){ - //Passwords don't match. - form.prepend('<div class="errormessage">Passwords do not match</div>'); - return false; - }else{ - //Clear errors - $('.errormessage').remove() - //Hide the form, show pending box with spinner. - $('#launchFormContainer').hide('fast'); - $('#responsePanel').show('fast'); - } - //Dig up zone info for selected cluster, set hidden input. - //This is not necessary to present to the user though the interface may prove useful. + // Dig up zone info for selected cluster, set hidden input. + // This is not necessary to present to the user though the interface may prove useful. var ei_val = _.find(data, function(f_obj){return f_obj.name === 'existing_instance'}); if( ei_val && (ei_val.value !== "New Cluster")){ var cluster = _.find(cloudlaunch_clusters, function(cluster){return cluster.name === ei_val.value}); var zdata = _.find(data, function(f_obj){return f_obj.name === 'zone'}); zdata.value = cluster.zone; + }else if($('#id_cluster_name').val() === ''){ + // If we're not using an existing cluster, this must be set. + form.prepend('<div class="errormessage">You must specify a cluster name</div>'); + return false; } + if ($('#id_password').val() != $('#id_password_confirm').val()){ + //Passwords don't match. + form.prepend('<div class="errormessage">Passwords do not match</div>'); + return false; + } + // Lastly, clear errors and flip to the response panel. + $('.errormessage').remove() + $('#launchFormContainer').hide('fast'); + $('#responsePanel').show('fast'); }, success: function(data){ - //Success Message, link to key download if required, link to server itself. + // Success Message, link to key download if required, link to server itself. $('#launchPending').hide('fast'); //Set appropriate fields (dns, key, ami) and then display. if(data.kp_material_tag){ 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.