This commit is contained in:
Mike Jolley 2011-12-09 22:44:03 +00:00
parent 5e7444c04c
commit 2f1eb1e975
6 changed files with 57 additions and 48 deletions

View File

@ -3,7 +3,11 @@
* External Add to Cart
*/
global $woocommerce, $product_url;
global $woocommerce;
$product_url = get_post_meta( $_product->id, 'product_url', true );
if (!$product_url) return;
?>
<?php do_action('woocommerce_before_add_to_cart_button'); ?>

View File

@ -0,0 +1,16 @@
<?php
/**
* Attributes Tab
*/
global $woocommerce, $post, $_product;
?>
<div class="panel" id="tab-attributes">
<?php $heading = apply_filters('woocommerce_product_additional_information_heading', __('Additional Information', 'woothemes')); ?>
<h2><?php echo $heading; ?></h2>
<?php $_product->list_attributes(); ?>
</div>

View File

@ -0,0 +1,16 @@
<?php
/**
* Description Tab
*/
global $woocommerce, $post;
?>
<div class="panel" id="tab-description">
<?php $heading = apply_filters('woocommerce_product_description_heading', __('Product Description', 'woothemes')); ?>
<h2><?php echo $heading; ?></h2>
<?php the_content(); ?>
</div>

View File

@ -0,0 +1,12 @@
<?php
/**
* Reviews Tab
*/
global $woocommerce, $post;
?>
<div class="panel" id="tab-reviews">
<?php comments_template(); ?>
</div>

View File

@ -66,9 +66,6 @@ add_action( 'woocommerce_grouped_add_to_cart', 'woocommerce_grouped_add_to_cart'
add_action( 'woocommerce_variable_add_to_cart', 'woocommerce_variable_add_to_cart', 30, 2 );
add_action( 'woocommerce_external_add_to_cart', 'woocommerce_external_add_to_cart', 30, 2 );
/* Product Add to Cart forms */
add_action( 'woocommerce_add_to_cart_form', 'woocommerce_add_to_cart_form_nonce', 10);
/* Pagination in loop-shop */
add_action( 'woocommerce_pagination', 'woocommerce_pagination', 10 );
add_action( 'woocommerce_pagination', 'woocommerce_catalog_ordering', 20 );

View File

@ -14,11 +14,8 @@
**/
if (!function_exists('woocommerce_output_content_wrapper')) {
function woocommerce_output_content_wrapper() {
if ( get_option('template') === 'twentyeleven' ) :
echo '<div id="primary"><div id="content" role="main">';
else :
echo '<div id="container"><div id="content" role="main">';
endif;
$id = ( get_option('template') === 'twentyeleven' ) ? 'primary' : 'container';
echo '<div id="'.$id.'"><div id="content" role="main">';
}
}
if (!function_exists('woocommerce_output_content_wrapper_end')) {
@ -119,7 +116,6 @@ if (!function_exists('woocommerce_check_product_visibility')) {
**/
if (!function_exists('woocommerce_show_product_images')) {
function woocommerce_show_product_images() {
global $post, $woocommerce;
echo '<div class="images">';
@ -327,10 +323,7 @@ if (!function_exists('woocommerce_variable_add_to_cart')) {
}
if (!function_exists('woocommerce_external_add_to_cart')) {
function woocommerce_external_add_to_cart( $post, $_product ) {
global $product_url;
$product_url = get_post_meta( $_product->id, 'product_url', true );
if ($product_url) woocommerce_get_template('single-product/add-to-cart/external.php', false);
woocommerce_get_template('single-product/add-to-cart/external.php', false);
}
}
@ -343,17 +336,6 @@ if (!function_exists('woocommerce_quantity_input')) {
}
}
/**
* Product Add to Cart forms
**/
if (!function_exists('woocommerce_add_to_cart_form_nonce')) {
function woocommerce_add_to_cart_form_nonce() {
global $woocommerce;
$woocommerce->nonce_field('add_to_cart');
}
}
/**
* Pagination
**/
@ -388,11 +370,7 @@ if (!function_exists('woocommerce_catalog_ordering')) {
'price' => __('Price', 'woothemes')
));
foreach ($catalog_orderby as $id => $name) :
echo '<option value="'.$id.'" '.selected( $_SESSION['orderby'], $id, false ).'>'.$name.'</option>';
endforeach;
foreach ($catalog_orderby as $id => $name) echo '<option value="'.$id.'" '.selected( $_SESSION['orderby'], $id, false ).'>'.$name.'</option>';
?>
</select>
</form>
@ -406,9 +384,7 @@ if (!function_exists('woocommerce_catalog_ordering')) {
**/
if (!function_exists('woocommerce_product_description_tab')) {
function woocommerce_product_description_tab() {
?>
<li><a href="#tab-description"><?php _e('Description', 'woothemes'); ?></a></li>
<?php
?><li><a href="#tab-description"><?php _e('Description', 'woothemes'); ?></a></li><?php
}
}
if (!function_exists('woocommerce_product_attributes_tab')) {
@ -429,32 +405,20 @@ if (!function_exists('woocommerce_product_reviews_tab')) {
**/
if (!function_exists('woocommerce_product_description_panel')) {
function woocommerce_product_description_panel() {
echo '<div class="panel" id="tab-description">';
$heading = apply_filters('woocommerce_product_description_heading', __('Product Description', 'woothemes'));
if ($heading) echo '<h2>' . $heading . '</h2>';
the_content();
echo '</div>';
woocommerce_get_template('single-product/tabs/description.php', false);
}
}
if (!function_exists('woocommerce_product_attributes_panel')) {
function woocommerce_product_attributes_panel() {
global $_product;
echo '<div class="panel" id="tab-attributes">';
echo '<h2>' . apply_filters('woocommerce_product_additional_information_heading', __('Additional Information', 'woothemes')) . '</h2>';
$_product->list_attributes();
echo '</div>';
woocommerce_get_template('single-product/tabs/attributes.php', false);
}
}
if (!function_exists('woocommerce_product_reviews_panel')) {
function woocommerce_product_reviews_panel() {
echo '<div class="panel" id="tab-reviews">';
comments_template();
echo '</div>';
woocommerce_get_template('single-product/tabs/reviews.php', false);
}
}
/**
* WooCommerce Product Thumbnail
**/