Merge branch 'master' into master

hosting/templates/hosting/payment.html

@@ -1,6 +1,6 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 i18n %}
-{% block content %} 
+{% block content %}
 <!-- Credit card form -->
 <div>
 	<div class="payment-container">
@@ -32,7 +32,7 @@
 						</div>
 					</div>
 				</form>
-				
+
 			</div>
 			<div class="col-xs-12 col-md-4  billing">
 				<h3><b>{%trans "Billing Address"%}</b></h3>
@@ -64,6 +64,7 @@
                         <h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
                         <input type="hidden" name="credit_card_needed" value="false"/>
                       </form>
+
 		       <div class="row">
 			       <br>
 			       <div>
@@ -72,6 +73,10 @@
                       <div class="col-xs-6 pull-right">
                         <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" id="payment_button_with_creditcard" class="btn btn-success" type="submit">
 							 {% trans "Place Order" %}
+                      <div class="col-xs-6">
+                        <button id="payment_button_with_creditcard" class="btn btn-success btn-sm btn-block" type="submit">
+							 {% trans "Submit Payment" %}
+
 					   </button>
                      </div>
 				</div>
@@ -145,7 +150,7 @@
 	                        </div>
 	                        {% endif %}
 
-                           
+
 	                    </form>
                     {% endif %}
 
@@ -160,7 +165,7 @@
 <!-- stripe key data -->
 {% if stripe_key %}
 {% get_current_language as LANGUAGE_CODE %}
-<script type="text/javascript"> 
+<script type="text/javascript">
 
 
      (function () {
@@ -171,7 +176,7 @@
 {%endif%}
 
 {% if credit_card_data.last4 and credit_card_data.cc_brand %}
-<script type="text/javascript"> 
+<script type="text/javascript">
      (function () {window.hasCreditcard = true;})();
 </script>