rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1 from holger1411/master 

Bringing fork up to date
This commit is contained in:
Jason King 2017-05-03 14:21:38 +09:30 committed by GitHub
parent 4cacfc082c e66835026e
commit 13d23ec063
12 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -1,4 +1,17 @@
- ** Release 0.6.0 (skipping 0.5.8 and 0.5.9 ) Apr. 21th 2017 **
- Adding WooCommerce 3.0.0 support - Big thx @typeplus
- Add npm-debug.log to .gitignore file - thx @OussamaElgoumri
- Adding swedish translation files
- Fixing problems if both forms (login and register) are present
- Adding image optimization task to gulpfile - thx @VesterDe
- Removing old and unused BS4 Alpha 5 variables
- Include call to jQuery into if block - hx @wingertjp
- phpcs fixes - thx @typeplus
- Fixing col-1 problem on my account WooCommerce page
- Updating Font Awesome imports
- ** Release 0.5.7 Feb. 13th 2017 **
- Fixing WooCommerce base layout by reverting custom woocommerce integration and switch back to default integration
- Adding /js/ folder to watcher task excluding theme.js and theme.min.js

2
footer.php
View File

@ -32,7 +32,7 @@ $container = get_theme_mod( 'understrap_container_type' );
<?php printf( // WPCS: XSS ok.
/* translators:*/
esc_html__( 'Theme: %1$s by %2$s.', 'understrap' ), $the_theme->get( 'Name' ), '<a href="http://understrap.com/">understrap.com</a>' ); ?>
esc_html__( 'Theme: %1$s by %2$s.', 'understrap' ), $the_theme->get( 'Name' ), '<a href="'.esc_url( __('http://understrap.com', 'understrap')).'">understrap.com</a>' ); ?>
(<?php printf( // WPCS: XSS ok.
/* translators:*/

8
gulpfile.js
View File

@ -88,7 +88,7 @@ gulp.task('watch-scss', ['browser-sync'], function () {
// Run:
// gulp sass
// Compiles SCSS files in CSS
gulp.task('sass', function () {
gulp.task('sass', ['minify-css'], function () {
var stream = gulp.src('./sass/*.scss')
.pipe(plumber())
.pipe(sass())
@ -243,7 +243,7 @@ gulp.task('copy-assets', ['clean-source'], function() {
// Run
// gulp dist
// Copies the files to the /dist folder for distributon
// Copies the files to the /dist folder for distributon as simple theme
gulp.task('dist', ['clean-dist'], function() {
gulp.src(['**/*','!bower_components','!bower_components/**','!node_modules','!node_modules/**','!src','!src/**','!dist','!dist/**','!dist-product','!dist-product/**','!sass','!sass/**','!readme.txt','!readme.md','!package.json','!gulpfile.js','!CHANGELOG.md','!.travis.yml','!jshintignore', '!codesniffer.ruleset.xml', '*'])
.pipe(gulp.dest('dist/'))
@ -256,9 +256,9 @@ gulp.task('clean-dist', function () {
// Run
// gulp dist-product
// Copies the files to the /dist folder for distributon
// Copies the files to the /dist-prod folder for distributon as theme with all assets
gulp.task('dist-product', ['clean-dist-product'], function() {
gulp.src(['**/*','!bower_components','!bower_components/**','!node_modules','!node_modules/**','!src','!src/**','!dist','!dist/**','!dist-product','!dist-product/**', '*'])
gulp.src(['**/*','!bower_components','!bower_components/**','!node_modules','!node_modules/**','!dist','!dist/**','!dist-product','!dist-product/**', '*'])
.pipe(gulp.dest('dist-product/'))
});

6
inc/extras.php
View File

@ -67,7 +67,7 @@ if ( ! function_exists( 'change_logo_class' ) ) {
*/
function change_logo_class( $html ) {
$html = str_replace( 'class="custom-logo"', 'class="img-responsive"', $html );
$html = str_replace( 'class="custom-logo"', 'class="img-fluid"', $html );
$html = str_replace( 'class="custom-logo-link"', 'class="navbar-brand custom-logo-link"', $html );
$html = str_replace( 'alt=""', 'title="Home" alt="logo"' , $html );
@ -98,10 +98,10 @@ if ( ! function_exists( 'understrap_post_nav' ) ) :
<?php
if ( get_previous_post_link() ) {
previous_post_link( '<span class="nav-previous float-xs-left">%link</span>', _x( '<i class="fa fa-angle-left"></i>&nbsp;%title', 'Previous post link', 'understrap' ) );
previous_post_link( '<span class="nav-previous float-sm-left">%link</span>', _x( '<i class="fa fa-angle-left"></i>&nbsp;%title', 'Previous post link', 'understrap' ) );
}
if ( get_next_post_link() ) {
next_post_link( '<span class="nav-next float-xs-right">%link</span>', _x( '%title&nbsp;<i class="fa fa-angle-right"></i>', 'Next post link', 'understrap' ) );
next_post_link( '<span class="nav-next float-sm-right">%link</span>', _x( '%title&nbsp;<i class="fa fa-angle-right"></i>', 'Next post link', 'understrap' ) );
}
?>
</div><!-- .nav-links -->

2
inc/woocommerce.php
View File

@ -10,7 +10,7 @@ if ( ! function_exists( 'woocommerce_support' ) ) {
* Declares WooCommerce theme support.
*/
function woocommerce_support() {
add_theme_support( 'woocommerce' );
add_theme_support( 'understrap' );
// Add New Woocommerce 3.0.0 Product Gallery support
add_theme_support( 'wc-product-gallery-lightbox' );

4
search.php
View File

@ -25,8 +25,10 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
<?php if ( have_posts() ) : ?>
<header class="page-header">
<h1 class="page-title"><?php printf(
/* translators:*/
<h1 class="page-title"><?php printf( esc_html__( 'Search Results for: %s', 'understrap' ),
esc_html__( 'Search Results for: %s', 'understrap' ),
'<span>' . get_search_query() . '</span>' ); ?></h1>
</header><!-- .page-header -->

10
woocommerce/cart/cart.php
View File

@ -32,10 +32,10 @@ do_action( 'woocommerce_before_cart' ); ?>
<tr>
<th class="product-remove">&nbsp;</th>
<th class="product-thumbnail">&nbsp;</th>
<th class="product-name"><?php _e( 'Product', 'woocommerce' ); ?></th>
<th class="product-price"><?php _e( 'Price', 'woocommerce' ); ?></th>
<th class="product-quantity"><?php _e( 'Quantity', 'woocommerce' ); ?></th>
<th class="product-subtotal"><?php _e( 'Total', 'woocommerce' ); ?></th>
<th class="product-name"><?php _e( 'Product', 'understrap' ); ?></th>
<th class="product-price"><?php _e( 'Price', 'understrap' ); ?></th>
<th class="product-quantity"><?php _e( 'Quantity', 'understrap' ); ?></th>
<th class="product-subtotal"><?php _e( 'Total', 'understrap' ); ?></th>
</tr>
</thead>
<tbody>
@ -56,7 +56,7 @@ do_action( 'woocommerce_before_cart' ); ?>
echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf(
'<a href="%s" class="remove" aria-label="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
esc_url( WC()->cart->get_remove_url( $cart_item_key ) ),
__( 'Remove this item', 'woocommerce' ),
__( 'Remove this item', 'understrap' ),
esc_attr( $product_id ),
esc_attr( $_product->get_sku() )
), $cart_item_key );

2
woocommerce/loop/add-to-cart.php
View File

@ -26,7 +26,7 @@ echo apply_filters( 'woocommerce_loop_add_to_cart_link',
sprintf( '<a rel="nofollow" href="%s" data-quantity="%s" data-product_id="%s" data-product_sku="%s" class="add_to_cart_button ajax_add_to_cart btn btn-outline-primary btn-block">%s</a>',
esc_url( $product->add_to_cart_url() ),
esc_attr( isset( $quantity ) ? $quantity : 1 ),
esc_attr( $product->id ),
esc_attr( $product->get_id() ),
esc_attr( $product->get_sku() ),
esc_html( $product->add_to_cart_text() )
),

2
woocommerce/myaccount/downloads.php
View File

@ -59,7 +59,7 @@ do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?>
</a>
<?php break;
case 'download-remaining' :
echo is_numeric( $download['downloads_remaining'] ) ? esc_html( $download['downloads_remaining'] ) : __( '&infin;', 'woocommerce' );
echo is_numeric( $download['downloads_remaining'] ) ? esc_html( $download['downloads_remaining'] ) : __( '&infin;', 'understrap' );
break;
case 'download-expires' : ?>
<?php if ( ! empty( $download['access_expires'] ) ) : ?>

4
woocommerce/myaccount/form-login.php
View File

@ -28,7 +28,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<?php if ( get_option( 'woocommerce_enable_myaccount_registration' ) === 'yes' ) : ?>
<div class="u-columns col2-set" id="customer_login">
<div class="u-columns col2-set row" id="customer_login">
<div class="u-column1 col-md-6">
@ -70,7 +70,7 @@ if ( ! defined( 'ABSPATH' ) ) {
</div>
<div class="u-column2 col-2">
<div class="u-column2 col-md-6">
<h2><?php _e( 'Register', 'understrap' ); ?></h2>

12
woocommerce/myaccount/my-address.php
View File

@ -25,12 +25,12 @@ $customer_id = get_current_user_id();
if ( ! wc_ship_to_billing_address_only() && wc_shipping_enabled() ) {
$get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array(
'billing' => __( 'Billing address', 'woocommerce' ),
'shipping' => __( 'Shipping address', 'woocommerce' ),
'billing' => __( 'Billing address', 'understrap' ),
'shipping' => __( 'Shipping address', 'understrap' ),
), $customer_id );
} else {
$get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array(
'billing' => __( 'Billing address', 'woocommerce' ),
'billing' => __( 'Billing address', 'understrap' ),
), $customer_id );
}
@ -39,7 +39,7 @@ $col = 1;
?>
<p>
<?php echo apply_filters( 'woocommerce_my_account_my_address_description', __( 'The following addresses will be used on the checkout page by default.', 'woocommerce' ) ); ?>
<?php echo apply_filters( 'woocommerce_my_account_my_address_description', __( 'The following addresses will be used on the checkout page by default.', 'understrap' ) ); ?>
</p>
<?php if ( ! wc_ship_to_billing_address_only() && wc_shipping_enabled() ) echo '<div class="u-columns woocommerce-Addresses col2-set addresses">'; ?>
@ -49,7 +49,7 @@ $col = 1;
<div class="u-column woocommerce-Address">
<header class="woocommerce-Address-title title">
<h3><?php echo $title; ?></h3>
<a href="<?php echo esc_url( wc_get_endpoint_url( 'edit-address', $name ) ); ?>" class="edit"><?php _e( 'Edit', 'woocommerce' ); ?></a>
<a href="<?php echo esc_url( wc_get_endpoint_url( 'edit-address', $name ) ); ?>" class="edit"><?php _e( 'Edit', 'understrap' ); ?></a>
</header>
<address>
<?php
@ -68,7 +68,7 @@ $col = 1;
$formatted_address = WC()->countries->get_formatted_address( $address );
if ( ! $formatted_address )
_e( 'You have not set up this type of address yet.', 'woocommerce' );
_e( 'You have not set up this type of address yet.', 'understrap' );
else
echo $formatted_address;
?>

4
woocommerce/myaccount/orders.php
View File

@ -107,11 +107,11 @@ do_action( 'woocommerce_before_account_orders', $has_orders ); ?>
<?php if ( 1 < $customer_orders->max_num_pages ) : ?>
<div class="woocommerce-pagination woocommerce-pagination--without-numbers woocommerce-Pagination">
<?php if ( 1 !== $current_page ) : ?>
<a class="woocommerce-button woocommerce-button--previous woocommerce-Button woocommerce-Button--previous button" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page - 1 ) ); ?>"><?php _e( 'Previous', 'woocommerce' ); ?></a>
<a class="woocommerce-button woocommerce-button--previous woocommerce-Button woocommerce-Button--previous button" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page - 1 ) ); ?>"><?php _e( 'Previous', 'understrap' ); ?></a>
<?php endif; ?>
<?php if ( intval( $customer_orders->max_num_pages ) !== $current_page ) : ?>
<a class="woocommerce-button woocommerce-button--next woocommerce-Button woocommerce-Button--next btn btn-outline-primary" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page + 1 ) ); ?>"><?php _e( 'Next', 'woocommerce' ); ?></a>
<a class="woocommerce-button woocommerce-button--next woocommerce-Button woocommerce-Button--next btn btn-outline-primary" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page + 1 ) ); ?>"><?php _e( 'Next', 'understrap' ); ?></a>
<?php endif; ?>
</div>
<?php endif; ?>