Update templates for WooCommerce 3.6

Author: nicomollet

CHANGELOG.md

@@ -1,3 +1,4 @@
+* **Tweak** - Update templates for WooCommerce 3.6
 * **Tweak** - Archives: add link to post thumbnail
 
 ### 0.5.4: April 12th, 2019

content-product.php

@@ -13,12 +13,10 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.4.0
+ * @version 3.6.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
 
 global $product;
 

woocommerce/global/form-login.php

@@ -13,7 +13,7 @@
  * @see           https://docs.woocommerce.com/document/template-structure/
  * @author        WooThemes
  * @package       WooCommerce/Templates
- * @version       3.3.0
+ * @version       3.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -36,14 +36,14 @@
 			<div class="form-group">
 				<label for="username" class="control-label"><?php _e( 'Username or email', 'woocommerce' ); ?> <span class="required">*</span></label>
 				<div class="form-input">
-				<input type="text" class="form-control" name="username" id="username" />
+				<input type="text" class="form-control" name="username" id="username" autocomplete="username" />
 
 				</div>
 			</div>
 			<div class="form-group">
 				<label for="password" class="control-label"><?php _e( 'Password', 'woocommerce' ); ?> <span class="required">*</span></label>
 				<div class="form-input">
-					<input class="form-control" type="password" name="password" id="password" />
+					<input class="form-control" type="password" name="password" id="password" autocomplete="current-password" />
 				</div>
 			</div>
 
@@ -52,10 +52,10 @@
 			<div class="form-group">
 				<div class="form-actions">
 					<?php wp_nonce_field( 'woocommerce-login' ); ?>
-					<input type="submit" class="btn btn-primary" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>" />
+					<button type="submit" class="btn btn-primary woocommerce-button button woocommerce-form-login__submit" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>"><?php esc_html_e( 'Login', 'woocommerce' ); ?></button>
 					<input type="hidden" name="redirect" value="<?php echo esc_url( $redirect ) ?>" />
 					<label class="woocommerce-form__label woocommerce-form__label-for-checkbox inline">
-						<input class="woocommerce-form__input woocommerce-form__input-checkbox btn btn-primary" name="rememberme" type="checkbox" id="rememberme" value="forever" />
+						<input class="woocommerce-form__input woocommerce-form__input-checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" />
 						<span><?php _e( 'Remember me', 'woocommerce' ); ?></span>
 					</label>
 				</div>
@@ -69,7 +69,6 @@
 				</div>
 			</div>
 
-
 			<?php do_action( 'woocommerce_login_form_end' ); ?>
 		</div>
 	</div>

woocommerce/myaccount/form-login.php

@@ -13,26 +13,22 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.5.0
+ * @version 3.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
 }
 
-?>
-
-<?php wc_print_notices(); ?>
-
-<?php do_action( 'woocommerce_before_customer_login_form' ); ?>
+do_action( 'woocommerce_before_customer_login_form' ); ?>
 
 <?php if ( get_option( 'woocommerce_enable_myaccount_registration' ) === 'yes' ) : ?>
 
 <div class="u-columns col2-set" id="customer_login">
 
 	<div class="u-column1 col-1">
 
-		<?php endif; ?>
+<?php endif; ?>
 
 
 		<div class="panel panel-primary">
@@ -48,7 +44,7 @@
 
 						<label for="username" class="control-label"><?php esc_html_e( 'Username or email address', 'woocommerce' ); ?> <span class="required">*</span></label>
 						<div class="form-input">
-							<input type="text" class="woocommerce-Input woocommerce-Input--text form-control" name="username" id="username" autocomplete="username" value="<?php echo ( ! empty( $_POST['username'] ) ) ? esc_attr( $_POST['username'] ) : ''; ?>" />
+							<input type="text" class="woocommerce-Input woocommerce-Input--text form-control" name="username" id="username" autocomplete="username" value="<?php echo ( ! empty( $_POST['username'] ) ) ? esc_attr( wp_unslash( $_POST['username'] ) ) : ''; ?>" />
 						</div>
 
 					</div>
@@ -64,7 +60,7 @@
 
 					<div class="form-group">
 						<div class="form-actions">
-							<label class="woocommerce-form__label woocommerce-form__label-for-checkbox inline">
+							<label class="woocommerce-form__label woocommerce-form__label-for-checkbox woocommerce-form-login__rememberme inline">
 								<input class="woocommerce-form__input woocommerce-form__input-checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php esc_html_e( 'Remember me', 'woocommerce' ); ?></span>
 							</label>
 						</div>
@@ -73,8 +69,7 @@
 					<div class="form-group">
 						<div class="form-actions">
 							<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
-							<input type="submit" class="woocommerce-Button btn btn-primary" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>" />
-
+							<button type="submit" class="woocommerce-button button woocommerce-form-login__submit btn btn-primary" name="login" value="<?php esc_attr_e( 'Log in', 'woocommerce' ); ?>"><?php esc_html_e( 'Log in', 'woocommerce' ); ?></button>
 						</div>
 					</div>
 
@@ -135,13 +130,17 @@
 							</div>
 						</div>
 
+					<?php else : ?>
+
+						<p><?php esc_html_e( 'A password will be sent to your email address.', 'woocommerce' ); ?></p>
+
 					<?php endif; ?>
 
 					<?php do_action( 'woocommerce_register_form' ); ?>
 
 					<div class="form-actions">
 						<?php wp_nonce_field( 'woocommerce-register', 'woocommerce-register-nonce' ); ?>
-						<input type="submit" class="woocommerce-Button btn btn-primary" name="register" value="<?php esc_attr_e( 'Register', 'woocommerce' ); ?>" />
+						<button type="submit" class="woocommerce-Button  btn btn-primary" name="register" value="<?php esc_attr_e( 'Register', 'woocommerce' ); ?>"><?php esc_html_e( 'Register', 'woocommerce' ); ?></button>
 					</div>
 
 					<?php do_action( 'woocommerce_register_form_end' ); ?>