Added shortcode support for widget main excerpts

layers-wp · Apr 18, 2016 · b4df696 · b4df696
1 parent 3cbb22d
commit b4df696
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/core/widgets/modules/contact.php b/core/widgets/modules/contact.php
@@ -157,7 +157,7 @@ function widget( $args, $instance ) {
 								<h3 class="heading"><?php echo $instance['title']; ?></h3>
 							<?php } ?>
 							<?php if( '' != $this->check_and_return( $instance, 'excerpt' ) ) { ?>
-								<div class="excerpt"><?php echo $instance['excerpt']; ?></div>
+								<div class="excerpt"><?php echo layers_the_content( $instance['excerpt'] ); ?></div>
 							<?php } ?>
 						</div>
 					</div>
@@ -329,7 +329,7 @@ function form( $instance ){
 				<section class="layers-accordion-section layers-content">
 					<div class="layers-row layers-push-bottom clearfix">
 						<div class="layers-form-item">
-							
+
 							<?php echo $this->form_elements()->input(
 								array(
 									'type' => 'text',
@@ -340,7 +340,7 @@ function form( $instance ){
 									'class' => 'layers-text layers-large'
 								)
 							); ?>
-							
+
 							<?php $this->design_bar(
 								'top', // CSS Class Name
 								array( // Widget Object
@@ -356,10 +356,10 @@ function form( $instance ){
 									'fonts',
 								), $this, $instance )
 							); ?>
-							
+
 						</div>
 						<div class="layers-form-item">
-							
+
 							<?php echo $this->form_elements()->input(
 								array(
 									'type' => 'rte',
@@ -370,7 +370,7 @@ function form( $instance ){
 									'class' => 'layers-textarea layers-large'
 								)
 							); ?>
-							
+
 						</div>
 					</div>
 					<div class="layers-row clearfix">

diff --git a/core/widgets/modules/content.php b/core/widgets/modules/content.php
@@ -160,7 +160,7 @@ function widget( $args, $instance ) {
 								<<?php echo $heading_type; ?> class="heading"><?php echo $instance['title'] ?></<?php echo $heading_type; ?>>
 							<?php } ?>
 							<?php if( '' != $this->check_and_return( $instance, 'excerpt' ) ) { ?>
-								<div class="excerpt"><?php echo $instance['excerpt']; ?></div>
+								<div class="excerpt"><?php echo layers_the_content( $instance['excerpt'] ); ?></div>
 							<?php } ?>
 						</div>
 					</div>
@@ -187,15 +187,15 @@ function widget( $args, $instance ) {
 								}
 								// Set the background styling
 								if( !empty( $item_instance['design'][ 'background' ] ) ) $this->inline_css .= layers_inline_styles( '#' . $widget_id . '-' . $column_key , 'background', array( 'background' => $item_instance['design'][ 'background' ] ) );
-								if( !empty( $item_instance['design']['fonts'][ 'color' ] ) ) $this->inline_css .= layers_inline_styles( '#' . $widget_id . '-' . $column_key , 'color', array( 'selectors' => array( 'h5.heading a', 'h5.heading' , 'div.excerpt' , 'div.excerpt p' ) , 'color' => $item_instance['design']['fonts'][ 'color' ] ) );
-								if( !empty( $item_instance['design']['fonts'][ 'shadow' ] ) ) $this->inline_css .= layers_inline_styles( '#' . $widget_id . '-' . $column_key , 'text-shadow', array( 'selectors' => array( 'h5.heading a', 'h5.heading' , 'div.excerpt' , 'div.excerpt p' )  , 'text-shadow' => $item_instance['design']['fonts'][ 'shadow' ] ) );
+								if( !empty( $item_instance['design']['fonts'][ 'color' ] ) ) $this->inline_css .= layers_inline_styles( '#' . $widget_id . '-' . $column_key , 'color', array( 'selectors' => array( '.heading a', '.heading' , 'div.excerpt' , 'div.excerpt p' ) , 'color' => $item_instance['design']['fonts'][ 'color' ] ) );
+								if( !empty( $item_instance['design']['fonts'][ 'shadow' ] ) ) $this->inline_css .= layers_inline_styles( '#' . $widget_id . '-' . $column_key , 'text-shadow', array( 'selectors' => array( '.heading a', '.heading' , 'div.excerpt' , 'div.excerpt p' )  , 'text-shadow' => $item_instance['design']['fonts'][ 'shadow' ] ) );
 
 								// Set column margin & padding
 								if ( !empty( $item_instance['design']['advanced']['margin'] ) ) $this->inline_css .= layers_inline_styles( "#{$widget_id}-{$column_key}", 'margin', array( 'margin' => $item_instance['design']['advanced']['margin'] ) );
 								if ( !empty( $item_instance['design']['advanced']['padding'] ) ) $this->inline_css .= layers_inline_styles( "#{$widget_id}-{$column_key}", 'padding', array( 'padding' => $item_instance['design']['advanced']['padding'] ) );
 
 								if( !isset( $item_instance[ 'width' ] ) ) $item_instance[ 'width' ] = $this->column_defaults[ 'width' ];
-								
+
 								// Set the button styling
 								if ( function_exists( 'layers_pro_apply_widget_button_styling' ) ) {
 									$this->inline_css .= layers_pro_apply_widget_button_styling( $this, $item_instance, array( "#{$widget_id}-{$column_key} .button" ) );
@@ -310,12 +310,12 @@ function widget( $args, $instance ) {
 									$column_inner_classes[] = $this->check_and_return( $item_instance, 'design', 'imagealign' );
 									$column_inner_classes[] = $this->check_and_return( $item_instance, 'design', 'fonts' , 'size' );
 									$column_inner_classes = implode( ' ', $column_inner_classes );
-									
+
 									/**
 									 * Get Heading Type - for SEO
 									 */
 									$heading_type = ( isset( $item_instance['design']['fonts']['heading-type'] ) ) ? $item_instance['design']['fonts']['heading-type'] : 'h3' ;
-									
+
 									/**
 									 * Button Size.
 									 */
@@ -465,7 +465,7 @@ function form( $instance ){
 
 				<section class="layers-accordion-section layers-content">
 					<div class="layers-form-item">
-					
+
 						<?php echo $this->form_elements()->input(
 							array(
 								'type' => 'text',
@@ -476,7 +476,7 @@ function form( $instance ){
 								'class' => 'layers-text layers-large layers-input-has-controls',
 							)
 						); ?>
-						
+
 						<?php $this->design_bar(
 							'top', // CSS Class Name
 							array( // Widget Object
@@ -492,10 +492,10 @@ function form( $instance ){
 								'fonts',
 							), $this, $instance )
 						); ?>
-						
+
 					</div>
 					<div class="layers-form-item">
-					
+
 						<?php echo $this->form_elements()->input(
 							array(
 								'type' => 'rte',
@@ -506,14 +506,14 @@ function form( $instance ){
 								'class' => 'layers-textarea layers-large'
 							)
 						); ?>
-						
+
 					</div>
 				</section>
 				<section class="layers-accordion-section layers-content">
 					<div class="layers-form-item">
-					
+
 						<?php $this->repeater( 'column', $instance ); ?>
-						
+
 					</div>
 				</section>
 

diff --git a/core/widgets/modules/post.php b/core/widgets/modules/post.php
@@ -137,7 +137,7 @@ function widget( $args, $instance ) {
 			$this->inline_css .= layers_inline_styles( '#' . $widget_id, 'background', array( 'background' => $instance['design'][ 'background' ] ) );
 			$this->inline_css .= layers_inline_styles( '#' . $widget_id, 'color', array( 'selectors' => array( '.section-title .heading' , '.section-title div.excerpt' ) , 'color' => $instance['design']['fonts'][ 'color' ] ) );
 			$this->inline_css .= layers_inline_styles( '#' . $widget_id, 'background', array( 'selectors' => array( '.thumbnail-body' ) , 'background' => array( 'color' => $this->check_and_return( $instance, 'design', 'column-background-color' ) ) ) );
-			
+
 			// Apply Button Styling.
 			if ( function_exists( 'layers_pro_apply_widget_button_styling' ) ) {
 				// Apply Layers Pro Button Styling.
@@ -250,7 +250,7 @@ function widget( $args, $instance ) {
 								<h3 class="heading"><?php echo $instance['title'] ?></h3>
 							<?php } ?>
 							<?php if( '' != $this->check_and_return( $instance, 'excerpt' )  ) { ?>
-								<div class="excerpt"><?php echo $instance['excerpt']; ?></div>
+								<div class="excerpt"><?php echo layers_the_content( $instance['excerpt'] ); ?></div>
 							<?php } ?>
 						</div>
 					</div>
@@ -578,7 +578,7 @@ function form( $instance ){
 
 					<div class="layers-row layers-push-bottom">
 						<div class="layers-form-item">
-							
+
 							<?php echo $this->form_elements()->input(
 								array(
 									'type' => 'text',
@@ -589,7 +589,7 @@ function form( $instance ){
 									'class' => 'layers-text layers-large'
 								)
 							); ?>
-							
+
 							<?php $this->design_bar(
 								'top', // CSS Class Name
 								array( // Widget Object
@@ -605,10 +605,10 @@ function form( $instance ){
 									'fonts',
 								), $this, $instance )
 							); ?>
-							
+
 						</div>
 						<div class="layers-form-item">
-							
+
 							<?php echo $this->form_elements()->input(
 								array(
 									'type' => 'rte',
@@ -619,7 +619,7 @@ function form( $instance ){
 									'class' => 'layers-textarea layers-large'
 								)
 							); ?>
-							
+
 						</div>
 						<?php // Grab the terms as an array and loop 'em to generate the $options for the input
 						$terms = get_terms( $this->taxonomy , array( 'hide_empty' => false ) );