Merge pull request #61 from smartcatdev/updates

Updates
smartcatdev · Dec 10, 2018 · c847641 · c847641
2 parents add0ebf + 1464b26
commit c847641
Show file tree

Hide file tree

Showing 11 changed files with 145 additions and 38 deletions.
diff --git a/assets/css/buildr.css b/assets/css/buildr.css
@@ -1314,7 +1314,7 @@ form label {
     margin-bottom: 10px;
 }
 
-form input:not([type="submit"]), 
+form input:not([type="submit"]),
 form textarea {
     width: 100% !important;
     border: thin solid #cacaca;
@@ -1328,6 +1328,13 @@ form textarea {
     box-shadow: none;
 }
 
+#edd_checkout_form_wrap input[type=radio] {
+    width: auto !important;
+}
+#edd_checkout_form_wrap form label {
+    width: auto !important;
+}
+
 #pre-footer form input:not([type="submit"]), 
 #pre-footer form textarea {
     background: #333;
@@ -2254,7 +2261,7 @@ div#edd-gallery-wrap .slick-arrow:hover {
     }
 }
 
-.buildr-single-edd-product .edd_price_options input[type="radio"] {
+body.single-download.single .edd_price_options input[type="radio"] {
     display: inline-block !important;
     width: auto !important;
     margin: 0 10px 0 0 !important;
@@ -2321,9 +2328,16 @@ table#edd_purchase_receipt_products.edd-table td {
 }
 
 #edd_checkout_form_wrap legend {
-    padding: 10px 15px;
-    border: 1px solid #eeeeee;
-    background: #fafafa;
+    border: none;
+    font-weight: 400;
+}
+
+#edd_checkout_form_wrap #edd-login-account-wrap {
+    font-weight: 600;
+}
+
+#edd_checkout_user_info p {
+    margin-bottom: 15px;
 }
 
 table#edd_sl_license_keys,
@@ -2346,4 +2360,46 @@ form#edd_sl_license_add_site_form input.edd-input {
 
 a.edd-manage-license-back {
     margin-bottom: 30px;
-}
+}
+
+
+
+/* -----------------------------------------------------------------------------
+ * EDD Shortcode HTML
+ * -------------------------------------------------------------------------- */
+#edd_profile_editor_form{
+    background-color: transparent;
+    font-size: 1.4rem;
+    border-collapse: inherit;
+    border-spacing: 0;
+    border: 3px solid #eaeaea;
+    border-radius: 4px;
+    max-width: 100%;
+    width: 100%;
+}
+
+#edd_profile_editor_form fieldset>p {
+    padding: 0 30px;
+    margin-bottom: 0
+}
+
+#edd_profile_editor_form fieldset>p:last-of-type{
+    margin-bottom: 15px;
+}
+
+#edd_profile_editor_form fieldset>legend {
+    display: block;
+    background: #f5f5f5;
+    color: #555;
+    font-size: 1.6rem;
+    line-height: 20px;
+    font-weight: 500;
+    padding: 10px;
+    border-bottom: 3px solid #eaeaea;
+    margin-bottom: 30px;
+}
+
+#edd_profile_editor_form fieldset:not(:first-of-type)>legend {
+    border-top: 3px solid #eaeaea;
+}
+
diff --git a/inc/functions-general.php b/inc/functions-general.php
@@ -58,7 +58,7 @@ function buildr_pingback_header() {
     function buildr_setup() {
 
         if( !defined( 'BUILDR_VERSION' ) ) :
-            define( 'BUILDR_VERSION', '1.3.1' );
+            define( 'BUILDR_VERSION', '1.3.2' );
         endif;
 
         /*

diff --git a/readme.txt b/readme.txt
@@ -33,6 +33,9 @@ Buildr includes support for Infinite Scroll in Jetpack.
 
 == Changelog ==
 
+= 1.3.2
+* Improvements for EDD and Woo
+
 = 1.3.1
 * Updated screenshot
 * Updated defaults

diff --git a/single-download.php b/single-download.php
@@ -19,9 +19,57 @@
 
             endwhile; // End of the loop.
             ?>
-            
+
         </main><!-- #main -->
-
+
+        <div class="sidebar-wrap post below">
+
+            <div id="edd-header-wrap-wrapper">
+
+            <div id="edd-header-wrap-blurb">
+
+                <?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_CATEGORY, true ) ) : ?>
+
+                    <span class="product-category">
+                        <?php echo esc_html( get_post_meta( get_the_ID(), BUILDR_META::EDD_CATEGORY, true ) ); ?>
+                    </span>
+
+                <?php endif; ?>
+
+                <?php the_title( '<h3 class="product_title entry-title">Buy ', ' today!</h3>' ); ?>
+
+                <span class="small-divider dark"></span>
+
+                <div class="edd-buttons">
+
+                    <div class="product-buttons">
+
+                        <?php echo edd_get_purchase_link( array(
+                            'download_id'       => get_the_ID(),
+                            'price'             => false,
+                            'direct'            => false,
+                            'class'             => 'primary',
+                        ) ); ?>
+
+                        <?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_LABEL, true ) && get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_URL, true ) ) : ?>
+
+                            <a class="button secondary" href="<?php echo esc_url( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_URL, true ) ); ?>" <?php echo get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_TARGET, true ) != 'same' ? ' target="_BLANK" ' : ''; ?>>
+                                <?php echo esc_html( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_LABEL, true ) ); ?>
+                            </a>
+
+                        <?php endif; ?>
+
+                    </div>
+
+                    <div class="clear"></div>
+
+                </div>
+
+        </div>
+            </div>
+            </div>
+
+
     </div><!-- #primary -->
 
 <?php

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Author: Smarcat
 Author URI: https://smartcatdesign.net
 Theme URI: http://buildr.preset1.smartcatthemes.com
 Description: Build a professional site for yourself, for one client, or for all your clients using Buildr, without touching a line of code. A highly customizable theme which packs tons of premium features in a free theme. 3 navbar menu styles, custom header, 3 blog styles, customizable colors, fonts and so much more! Buildr comes with a free companion plugin which includes many drag & drop widgets that you can use to build your pages any way you like, as well as 3 pre-designed presets that you can install with one click, saving you time, and providing you with a professionally desined site to start from. Lastly, Buildr is integrated with WooCommerce and Easy Digital Downloads with beautiful and unique templates for either.
-Version: 1.3.1
+Version: 1.3.2
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: buildr

diff --git a/template-parts/content-download.php b/template-parts/content-download.php
@@ -22,25 +22,25 @@
                 <div class="col-sm-12">
 
                     <div id="edd-header-wrap-wrapper">
-                        
+
                         <div id="edd-header-wrap-blurb">
 
                             <?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_CATEGORY, true ) ) : ?>
-                                
+
                                 <span class="product-category">
                                     <?php echo esc_html( get_post_meta( get_the_ID(), BUILDR_META::EDD_CATEGORY, true ) ); ?>
                                 </span>
-                            
+
                             <?php endif; ?>
-                            
+
                             <?php the_title( '<h1 class="product_title entry-title">', '</h1>' ); ?>
 
                             <span class="small-divider dark"></span>
-                            
+
                             <?php if ( function_exists( 'edd_price' ) ) : ?>
-                            
+
                                 <?php $sale_price = get_post_meta( get_the_ID(), 'edd_sale_price', true ); ?>
-                                
+
                                 <div class="price <?php echo isset( $sale_price ) && !empty( $sale_price ) && ! edd_has_variable_prices( get_the_ID() ) ? 'on-sale' : ''; ?> ">
                                     <?php if ( edd_has_variable_prices( get_the_ID() ) ) :
                                         echo edd_price_range( get_the_ID() );
@@ -50,48 +50,48 @@
                                 </div>
 
                             <?php endif; ?>
-                            
+
                             <?php the_excerpt(); ?>
-                            
+
                             <div class="edd-buttons">
-                            
+
                                 <div class="product-buttons">
-                                    
+
                                     <?php echo edd_get_purchase_link( array(
                                         'download_id'       => get_the_ID(),
                                         'price'             => false,
                                         'direct'            => false,
                                         'class'             => 'primary',
                                     ) ); ?>
-                                    
+
                                     <?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_LABEL, true ) && get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_URL, true ) ) : ?>
-                                    
+
                                         <a class="button secondary" href="<?php echo esc_url( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_URL, true ) ); ?>" <?php echo get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_TARGET, true ) != 'same' ? ' target="_BLANK" ' : ''; ?>>
                                             <?php echo esc_html( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_LABEL, true ) ); ?>
                                         </a>
-                                    
+
                                     <?php endif; ?>
-                                    
+
                                 </div>
-                                
+
                                 <div class="clear"></div>
 
                             </div>
-                            
+
                         </div>
-                        
+
                         <?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_VIDEO_ID, true ) ) : ?>
-                        
+
                             <iframe class="edd-product-video" id="ytplayer" type="text/html" width="640" height="360"
                             src="https://www.youtube.com/embed/<?php echo esc_attr( get_post_meta( get_the_ID(), BUILDR_META::EDD_VIDEO_ID, true ) ); ?>?autoplay=<?php echo get_post_meta( get_the_ID(), BUILDR_META::EDD_VIDEO_AUTOPLAY, true ) == 'autoplay' ? 1 : 0; ?>"
                             frameborder="0"></iframe>
-                        
+
                         <?php else : ?>
 
                             <?php buildr_output_edd_product_gallery( $edd_gallery ); ?>
-                        
+
                         <?php endif; ?>
-                        
+
                     </div>
 
                 </div>

diff --git a/woocommerce/archive-product.php b/woocommerce/archive-product.php
@@ -13,7 +13,7 @@
  * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     3.3.0
+ * @version     3.4.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {

diff --git a/woocommerce/cart/mini-cart.php b/woocommerce/cart/mini-cart.php
@@ -15,7 +15,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.3.0
+ * @version 3.5.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;

diff --git a/woocommerce/content-product.php b/woocommerce/content-product.php
@@ -13,7 +13,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.0.0
+ * @version 3.4.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {

diff --git a/woocommerce/content-widget-product.php b/woocommerce/content-widget-product.php
@@ -12,7 +12,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.3.0
+ * @version 3.5.2
  */
 
 if ( ! defined( 'ABSPATH' ) ) {

diff --git a/woocommerce/single-product-reviews.php b/woocommerce/single-product-reviews.php
@@ -1,4 +1,4 @@
-<?php
+    <?php
 /**
  * Display single product reviews (comments)
  *
@@ -13,7 +13,7 @@
  * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     3.2.0
+ * @version     3.5.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly