Skip to content

Commit

Permalink
Merge pull request #838 from CA-CODE-Works/1.10.1
Browse files Browse the repository at this point in the history 
1.10.1
  • Loading branch information
@Danny-Guzman
Danny-Guzman committed Jul 18, 2023
2 parents 79cf160 + 61550c9 commit 9edfda3
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 179 deletions.
80 changes: 1 addition & 79 deletions divi/extension/includes/modules/section-carousel-fullwidth/section-carousel-fullwidth.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ public function init() {
),
);

// Custom handler: Output JS for editor preview in page footer.
add_action( 'wp_footer', array( $this, 'carousel_fix' ), 20 );
}

/**
Expand Down Expand Up @@ -266,84 +264,8 @@ public function render( $unprocessed_props, $content, $render_slug ) {
* @return string
*/
public function renderCarousel( $style ) {
$style = in_array( $style, array( 'media', 'content' ), true ) ? $style : 'content';

return sprintf( '<div class="carousel carousel-%1$s owl-carousel">%2$s</div>', $style, $this->content );
}

/**
* Renders the carousel inside a Panel Module with the appropriate bg color.
*
* @param mixed $section_bg_color Panel background color.
* @return string
*/
public function renderPanelCarousel( $section_bg_color ) {
$panel_title = $this->props['panel_title'];
$panel_heading_size = $this->props['panel_heading_size'];
$panel_show_button = $this->props['panel_show_button'];
$panel_button_text = $this->props['panel_button_text'];
$panel_button_link = $this->props['panel_button_link'];

$display_title = '';
$display_button = '';

if ( 'on' === $panel_show_button && ! empty( $panel_button_link ) ) {
$display_button = sprintf(
'<div class="options"><a href="%1$s" class="btn btn-default" target="_blank">%2$s</a></div>',
esc_url( $panel_button_link ),
! empty( $panel_button_text ) ? $panel_button_text : 'Read More'
);
}

if ( ! empty( $panel_title ) ) {
$display_title = sprintf( '<div class="panel-heading"><%1$s>%2$s</%1$s>%3$s</div>', $panel_heading_size, $panel_title, $display_button );
}

return sprintf( '%1$s<div class="panel-body"%2$s>%3$s</div>', $display_title, $section_bg_color, $this->renderCarousel( 'media' ) );
return sprintf( '<div class="carousel-inner">%1$s</div>', $this->content );
}

/**
* This is a non-standard function, it outputs JS code to change items amount for carousel-media.
*
* @return void
*/
public function carousel_fix() {
?>
<script>
$ = jQuery.noConflict();

var media_carousels = $('div[class*="<?php print esc_attr( $this->slug ); ?>_"]:not(".item")');

media_carousels.each(function(index, carousel) {
if( $(carousel).hasClass('media') || $(carousel).hasClass('panel') ){
$(carousel).find('.carousel-media').owlCarousel({
responsive : true,
responsive: {
0: {
items: 1,
nav: true
},
400: {
items: 1,
nav: true
},
768: {
items: undefined === carousel.slide_amount ? 4 : carousel.slide_amount,
nav: true
},
},
margin : 10,
nav : true,
dots : false,
navText: [
'<span class="ca-gov-icon-arrow-prev" aria-hidden="true"></span>',
'<span class="ca-gov-icon-arrow-next" aria-hidden="true"></span>'
],
});
}
})
</script>
<?php
}
}
new CAWeb_Module_Fullwidth_Section_Carousel();
14 changes: 4 additions & 10 deletions divi/extension/includes/modules/section-carousel-slide/section-carousel-slide.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public function render( $unprocessed_props, $content, $render_slug ) {
global $et_pb_ca_section_carousel_style;

$et_pb_slider_item_num++;

$this->add_classname( 'item' );

$slide_image_alt = sprintf( ' alt="%1$s" ', empty( $slide_alt_text ) ? caweb_get_attachment_post_meta( $slide_image, '_wp_attachment_image_alt' ) : $slide_alt_text );
Expand All @@ -207,17 +207,11 @@ public function render( $unprocessed_props, $content, $render_slug ) {

$slide_title = ! empty( $slide_title ) ? "<$slide_title_size>$slide_title</$slide_title_size>" : '';

$hide = empty( $slide_title ) && empty( $slide_desc ) && empty( $display_button ) ? ' hidden' : '';

$content = sprintf( '<div class="content%1$s">%2$s%3$s%4$s</div>', 'content_fit' === $et_pb_ca_section_carousel_style ? $hide : '', $slide_title, $slide_desc, $display_button );

$content_container = sprintf( '<div class="content-container%1$s">%2$s</div>', 'image_fit' === $et_pb_ca_section_carousel_style ? $hide : '', $content );

$content_fit = 'content_fit' === $et_pb_ca_section_carousel_style ? sprintf( ' style="background-image: url(%1$s);"', $slide_image ) : '';
$caption = sprintf( '<div class="carousel-caption d-block">%1$s%2$s%3$s</div>', $slide_title, $slide_desc, $display_button );

$image_fit = 'image_fit' === $et_pb_ca_section_carousel_style ? sprintf( '<img src="%1$s"%2$s/>', $slide_image, $slide_image_alt ) : '';
$img = sprintf( '<img src="%1$s"%2$s class="d-block w-100"/>', $slide_image, $slide_image_alt );

$output = sprintf( '<div%1$s%2$s>%3$s%4$s</div>', $class, $content_fit, $image_fit, $content_container );
$output = sprintf( '<div class="carousel-item %1$s">%2$s%3$s</div>', 1 === $et_pb_slider_item_num ? ' active' : '', $img, $caption );
}

return $output;
Expand Down
116 changes: 27 additions & 89 deletions divi/extension/includes/modules/section-carousel/section-carousel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ public function init() {
),
);

// Custom handler: Output JS for editor preview in page footer.
add_action( 'wp_footer', array( $this, 'carousel_fix' ), 20 );
}

/**
Expand Down Expand Up @@ -240,21 +238,37 @@ public function render( $unprocessed_props, $content, $render_slug ) {
$content = $this->content;

$section_bg_color = ! empty( $section_bg_color ) ? sprintf( ' style="background: %1$s;" ', $section_bg_color ) : '';
global $et_pb_slider_item_num;

if ( 'media' === $carousel_style && 'on' === $in_panel ) {
$this->add_classname( 'panel' );
$this->add_classname( sprintf( 'panel-%1$s', $panel_layout ) );
$class = sprintf( ' class="%1$s" ', $this->module_classname( $render_slug ) );
$module_id = ! empty( $this->module_id(false) ) ? $this->module_id(false) : $this->slug . '-0';

$output = sprintf( '<div%1$s%2$s>%3$s</div></div>', $this->module_id(), $class, $this->renderPanelCarousel( $section_bg_color ) );
} else {
$this->add_classname( $carousel_style );
$this->add_classname( 'section' );
$class = sprintf( ' class="%1$s" ', $this->module_classname( $render_slug ) );
$controls = sprintf('<button class="carousel-control-prev" type="button" data-bs-target="#%1$s" data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="visually-hidden">Previous</span>
</button>
<button class="carousel-control-next" type="button" data-bs-target="#%1$s" data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="visually-hidden">Next</span>
</button>', $module_id);

$output = sprintf( '<div%1$s%2$s%3$s>%4$s</div>', $this->module_id(), $class, $section_bg_color, $this->renderCarousel( $carousel_style ) );
$indicators = '';

for($i = 0; $i < $et_pb_slider_item_num; $i++ ){
$indicators .= sprintf('<button type="button" data-bs-target="#%1$s" data-bs-slide-to="%2$s" aria-label="Slide %2$s"%3$s></button>',
$module_id, $i, ! $i ? 'class="active" aria-current="true"' : '' );

}

if( ! empty( $indicators ) ){
$indicators = sprintf('<div class="carousel-indicators">%1$s</div>', $indicators);
}

$this->add_classname( $carousel_style );
$this->add_classname( 'carousel slide' );
$class = sprintf( ' class="%1$s" ', $this->module_classname( $render_slug ) );

$output = sprintf( '<div id="%1$s"%2$s%3$s>%4$s%5$s%6$s</div>', $module_id, $class, $section_bg_color, $indicators, $this->renderCarousel( $carousel_style ), $controls );

return $output;
}

Expand All @@ -265,84 +279,8 @@ public function render( $unprocessed_props, $content, $render_slug ) {
* @return string
*/
public function renderCarousel( $style ) {
$style = in_array( $style, array( 'media', 'content' ), true ) ? $style : 'content';

return sprintf( '<div class="carousel carousel-%1$s owl-carousel">%2$s</div>', $style, $this->content );
return sprintf( '<div class="carousel-inner">%1$s</div>', $this->content );
}

/**
* Renders the carousel inside a Panel Module with the appropriate bg color.
*
* @param mixed $section_bg_color Panel background color.
* @return string
*/
public function renderPanelCarousel( $section_bg_color ) {
$panel_title = $this->props['panel_title'];
$panel_heading_size = $this->props['panel_heading_size'];
$panel_show_button = $this->props['panel_show_button'];
$panel_button_text = $this->props['panel_button_text'];
$panel_button_link = $this->props['panel_button_link'];

$display_title = '';
$display_button = '';

if ( 'on' === $panel_show_button && ! empty( $panel_button_link ) ) {
$display_button = sprintf(
'<div class="options"><a href="%1$s" class="btn btn-default" target="_blank">%2$s</a></div>',
esc_url( $panel_button_link ),
! empty( $panel_button_text ) ? $panel_button_text : 'Read More'
);
}

if ( ! empty( $panel_title ) ) {
$display_title = sprintf( '<div class="panel-heading"><%1$s>%2$s</%1$s>%3$s</div>', $panel_heading_size, $panel_title, $display_button );
}

return sprintf( '%1$s<div class="panel-body"%2$s>%3$s</div>', $display_title, $section_bg_color, $this->renderCarousel( 'media' ) );
}

/**
* This is a non-standard function, it outputs JS code to change items amount for carousel-media.
*
* @return void
*/
public function carousel_fix() {
?>
<script>
$ = jQuery.noConflict();

var media_carousels = $('div[class*="<?php print esc_attr( $this->slug ); ?>_"]:not(".item")');

media_carousels.each(function(index, carousel) {
if( $(carousel).hasClass('media') || $(carousel).hasClass('panel') ){
$(carousel).find('.carousel-media').owlCarousel({
responsive : true,
responsive: {
0: {
items: 1,
nav: true
},
400: {
items: 1,
nav: true
},
768: {
items: undefined === carousel.slide_amount ? 4 : carousel.slide_amount,
nav: true
},
},
margin : 10,
nav : true,
dots : false,
navText: [
'<span class="ca-gov-icon-arrow-prev" aria-hidden="true"></span>',
'<span class="ca-gov-icon-arrow-next" aria-hidden="true"></span>'
],
});
}
})
</script>
<?php
}
}
new CAWeb_Module_Section_Carousel();
2 changes: 1 addition & 1 deletion parts/5.5/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ class="btn btn-xs collapsed btn-primary"
<?php
}
?>
<div id="head-search" class="search-container hidden-print<?php print esc_attr( $caweb_search_class ); ?>" role="region" aria-label="Search Expanded">
<div id="head-search" class="search-container hidden-print in<?php print esc_attr( $caweb_search_class ); ?>" role="region" aria-label="Search Expanded">
<?php
if ( 'page-templates/searchpage.php' !== get_page_template_slug( get_the_ID() ) ) {
get_template_part( "parts/$caweb_template_version/search" );
Expand Down

0 comments on commit 9edfda3

Please sign in to comment.