From ddc856880a424b8fa9d18ec83fea3cdbc697efba Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Tue, 9 Dec 2014 16:20:43 +0000
Subject: [PATCH] shipping calculator. #6412

---
 templates/cart/cart-shipping.php       | 2 ++
 templates/cart/cart.php                | 2 --
 templates/cart/shipping-calculator.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/cart/cart-shipping.php b/templates/cart/cart-shipping.php
index 00d1951faee..821260d3393 100644
--- a/templates/cart/cart-shipping.php
+++ b/templates/cart/cart-shipping.php
@@ -97,5 +97,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 				echo '<p class="woocommerce-shipping-contents"><small>' . __( 'Shipping', 'woocommerce' ) . ': ' . implode( ', ', $product_names ) . '</small></p>';
 			?>
 		<?php endif; ?>
+
+		<?php woocommerce_shipping_calculator(); ?>
 	</td>
 </tr>
diff --git a/templates/cart/cart.php b/templates/cart/cart.php
index 29149ec693f..54e72c62da6 100644
--- a/templates/cart/cart.php
+++ b/templates/cart/cart.php
@@ -145,8 +145,6 @@ do_action( 'woocommerce_before_cart' ); ?>
 
 	<?php woocommerce_cart_totals(); ?>
 
-	<?php woocommerce_shipping_calculator(); ?>
-
 </div>
 
 <?php do_action( 'woocommerce_after_cart' ); ?>
diff --git a/templates/cart/shipping-calculator.php b/templates/cart/shipping-calculator.php
index ab3c0aa6e4e..995cd76eeca 100644
--- a/templates/cart/shipping-calculator.php
+++ b/templates/cart/shipping-calculator.php
@@ -19,9 +19,9 @@ if ( get_option( 'woocommerce_enable_shipping_calc' ) === 'no' || ! WC()->cart->
 
 <?php do_action( 'woocommerce_before_shipping_calculator' ); ?>
 
-<form class="shipping_calculator" action="<?php echo esc_url( WC()->cart->get_cart_url() ); ?>" method="post">
+<form class="woocommerce-shipping-calculator" action="<?php echo esc_url( WC()->cart->get_cart_url() ); ?>" method="post">
 
-	<h2><a href="#" class="shipping-calculator-button"><?php _e( 'Calculate Shipping', 'woocommerce' ); ?></a></h2>
+	<p><a href="#" class="shipping-calculator-button"><?php _e( 'Calculate Shipping', 'woocommerce' ); ?></a></p>
 
 	<section class="shipping-calculator-form">