Merge branch 'relaunch' into relaunch_ry

pull/1/head
Raymond Yee 2012-09-20 10:39:56 -07:00
commit 1f6fd19918
3 changed files with 4 additions and 4 deletions

View File

@ -7,7 +7,6 @@
<link type="text/css" rel="stylesheet" href="/static/css/campaign.css" /> <link type="text/css" rel="stylesheet" href="/static/css/campaign.css" />
<link type="text/css" rel="stylesheet" href="/static/css/pledge.css" /> <link type="text/css" rel="stylesheet" href="/static/css/pledge.css" />
<script type="text/javascript" src="/static/js/reconcile_pledge.js"></script>
{% endblock %} {% endblock %}
{% block doccontent %} {% block doccontent %}

View File

@ -7,7 +7,6 @@
<link type="text/css" rel="stylesheet" href="/static/css/campaign.css" /> <link type="text/css" rel="stylesheet" href="/static/css/campaign.css" />
<link type="text/css" rel="stylesheet" href="/static/css/pledge.css" /> <link type="text/css" rel="stylesheet" href="/static/css/pledge.css" />
<script type="text/javascript" src="/static/js/reconcile_pledge.js"></script>
{% endblock %} {% endblock %}
{% block doccontent %} {% block doccontent %}

View File

@ -6,8 +6,9 @@
{% block extra_extra_head %} {% block extra_extra_head %}
<link type="text/css" rel="stylesheet" href="/static/css/campaign.css" /> <link type="text/css" rel="stylesheet" href="/static/css/campaign.css" />
<link type="text/css" rel="stylesheet" href="/static/css/pledge.css" /> <link type="text/css" rel="stylesheet" href="/static/css/pledge.css" />
<link href="/static/stripe/tag.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="/static/js/reconcile_pledge.js"></script> <script type="text/javascript" src="/static/stripe/tag.js"></script>
{% endblock %} {% endblock %}
{% block doccontent %} {% block doccontent %}
@ -33,7 +34,8 @@
<form method="POST" action="#"> <form method="POST" action="#">
{% csrf_token %} {% csrf_token %}
{{ form.non_field_errors }} {{ form.non_field_errors }}
{{form}} {{form.as_p}}
<payment key="{{STRIPE_PK}}"></payment>
<input name="cc_submit" type="submit" value="Verify Credit Card" id="cc_submit" /> <input name="cc_submit" type="submit" value="Verify Credit Card" id="cc_submit" />
</form> </form>
</div> </div>