Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Notice when the configuration may cause permalink errors

This commit is contained in:
Mike Jolley 2012-02-17 23:47:45 +00:00
parent 1a06f85b6d
commit 4925069006
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
admin/woocommerce-admin-init.php
View File

@ -68,6 +68,7 @@ function woocommerce_admin_installed_notice() {
} }
function woocommerce_admin_notices_styles() { function woocommerce_admin_notices_styles() {
// Installed notices
if ( get_option('woocommerce_installed')==1 ) { if ( get_option('woocommerce_installed')==1 ) {
wp_enqueue_style( 'woocommerce-activation', plugins_url( '/assets/css/wc-activation.css', dirname( __FILE__ ) ) ); wp_enqueue_style( 'woocommerce-activation', plugins_url( '/assets/css/wc-activation.css', dirname( __FILE__ ) ) );
@ -81,6 +82,25 @@ function woocommerce_admin_notices_styles() {
} }
} }
/**
* Notices to prevent user error
*/
add_action( 'admin_notices', 'woocommerce_admin_notices' );
function woocommerce_admin_notices() {
if (!isset($_GET['page']) || $_GET['page']!=='woocommerce') return;
// Error notice when prepending urls with shop
$shop_page_id = woocommerce_get_page_id('shop');
if ( get_option('woocommerce_prepend_shop_page_to_products')=='yes' && $shop_page_id > 0 && sizeof(get_pages("child_of=$shop_page_id")) > 0 ) {
echo '<div class="error fade"><p><strong>'.__('You have chosen to prepend product permalinks with the shop page, but the shop page has children. Child pages will show 404\'s unless changed.', 'woocommerce').'</strong></p></div>';
}
}
/** /**
* Admin Includes - loaded conditionally * Admin Includes - loaded conditionally

2
assets/css/admin.css
View File

@ -9,7 +9,7 @@
.icon32-posts-shop_coupon{background-position:-475px -6px !important;} .icon32-posts-shop_coupon{background-position:-475px -6px !important;}
.icon32-posts-product_variation{background-position:-533px -6px !important;} .icon32-posts-product_variation{background-position:-533px -6px !important;}
.icon32-woocommerce-reports{background-position:-591px -6px !important;} .icon32-woocommerce-reports{background-position:-591px -6px !important;}
.wrap.woocommerce div.updated{margin-top:10px;} .wrap.woocommerce div.updated,.wrap.woocommerce div.error{margin-top:10px;}
mark.amount{background:transparent none;color:inherit;} mark.amount{background:transparent none;color:inherit;}
#order_data{padding:0 10px 9px;}#order_data .order_data_left{width:48%;float:left;}#order_data .order_data_left h2{margin-top:11px;margin-bottom:0;} #order_data{padding:0 10px 9px;}#order_data .order_data_left{width:48%;float:left;}#order_data .order_data_left h2{margin-top:11px;margin-bottom:0;}
#order_data .order_data_left p{padding:0 !important;} #order_data .order_data_left p{padding:0 !important;}

2
assets/css/admin.less
View File

@ -57,7 +57,7 @@
background-position: -591px -6px !important; background-position: -591px -6px !important;
} }
.wrap.woocommerce div.updated { .wrap.woocommerce div.updated, .wrap.woocommerce div.error {
margin-top: 10px; margin-top: 10px;
} }
mark.amount { mark.amount {

1
readme.txt
View File

@ -93,6 +93,7 @@ Yes you can! Join in on our GitHub repository :) https://github.com/woothemes/wo
* Fixed permalinks in shortcodes * Fixed permalinks in shortcodes
* Install process tweaks (for flushing post type rules) * Install process tweaks (for flushing post type rules)
* data-min argument/option for quantity inputs * data-min argument/option for quantity inputs
* Notice when the configuration may cause permalink errors
= 1.4.3 - 16/02/2012 = = 1.4.3 - 16/02/2012 =
* Fix for variation shipping class detection * Fix for variation shipping class detection