Merge remote branch '4p/master' into snapshots

This commit is contained in:
Anthony Young
2011-07-27 12:42:36 -07:00
10 changed files with 20 additions and 68 deletions

View File

@@ -1,12 +1,10 @@
<form id="keypair_form" method="post">
<fieldset>
{% csrf_token %}
{% for hidden in form.hidden_fields %}{{ hidden }}{% endfor %}
{% for field in form.visible_fields %}
{{ field.label_tag }}
{{ field.errors }}
{{ field }}
{% endfor %}
<input type="submit" value="Create Keypair" class="large-rounded" />
</fieldset>
{% csrf_token %}
{% for hidden in form.hidden_fields %}{{ hidden }}{% endfor %}
{% for field in form.visible_fields %}
{{ field.label_tag }}
{{ field.errors }}
{{ field }}
{% endfor %}
<input type="submit" value="Create Keypair" class="large-rounded" />
</form>

View File

@@ -13,7 +13,6 @@
$("form input[type='submit']").click(function(e){
$("form").hide("fast")
$(".dash_block h3").show("fast")
e.preventDefault()
})
})
</script>