← All changes | inc/block-posts-config/class-bs-post.php +66 -42 2.6.1 → 2.7.3 View file →

		@@ -91,11 +91,10 @@
91	91	if (isset($attributes['className'])) {
92	92	$class .= ' ' . $attributes['className'];
93	93	}
94	94
95		- $animation_class = '';
96	95	if( $attributes['animation']){
97		- $animation_class='blockspare-block-animation';
	96	+ $class .=' blockspare-block-animation';
98	97	}
99	98
100	99
101	100
		@@ -101,24 +100,24 @@
101	100
102	101	$list_layout_class = $design;
103	102	$listgridClass = $blockclass . " " ;
104	103
105		- if($blockName=='' ){
106		- $listgridClass .= "column-" . $attributes['columns'];
107		- }
	104	+ // if($blockName=='' ){
	105	+ // $listgridClass .= "column-" . $attributes['columns'];
	106	+ // }
108	107
109	108
110	109	/* Layout orientation class */
111		- $grid_class = $blockuniqueclass . ' blockspare-posts-block-latest-post-wrap ' . $listgridClass . ' ' . $list_layout_class.' '.$animation_class ;
112		-
	110	+ $grid_class = 'blockspare-posts-block-latest-post-wrap ' . $listgridClass . ' ' . $list_layout_class ;
	111	+ $class .= ' ' . $blockuniqueclass;
113	112	$category_class = 'blockspare-posts-block-post-category';
114	113
115	114	if($attributes['categoryLayoutOption'] =='none'){
116	115	$category_class .= ' has-no-category-style';
117		- }?>
118		- <div class="<?php echo esc_attr($class);?>">
	116	+ } ?>
	117	+ <!-- <div class="<?php echo esc_attr($class);?>" blockspare-animation=<?php echo esc_attr( $attributes['animation'] )?>> -->
119	118	<section class="blockspare-posts-block-post-wrap">
120		- <div class="<?php echo esc_attr($grid_class);?>" blockspare-animation=<?php echo esc_attr( $attributes['animation'] )?>>
	119	+ <div class="<?php echo esc_attr($grid_class);?>" >
121	120	<?php while ($grid_query->have_posts()) {
122	121	$grid_query->the_post();
123	122
124	123	/* Setup the post ID */
		@@ -187,23 +186,30 @@
187	186	<?php blockspare_post_image($attributes,$post_id,$category_class,$blockName, $className);?>
188	187	<?php blockspare_post_content($attributes,$post_id,$category_class,$blockName, $className);?>
189	188	</div>
190	189
191		- <?php }?>
	190	+ <?php } ?>
192	191
193	192	</div>
194	193	<?php
195		- if($attributes['enablePagination']=='true' && $grid_query->max_num_pages >1){ ?>
196		- <div class="bs_blockspare_loadmore blockspare-readmore-wrapper" data-layout="<?php echo $layoutClass; ?>" block-name="tile" data-page='2' blockspare-att=<?php echo "'" . wp_kses_post(wp_json_encode($attributes))."'";?> max-paged="<?php echo $grid_query->max_num_pages;?>">
	194	+ if($attributes['enablePagination']=='true' && $grid_query->max_num_pages >1){
	195	+ $loadmore_class = '';
	196	+ if($attributes['loadMoreStyle']){
	197	+ $loadmore_class = $attributes['loadMoreStyle'];
	198	+ }
	199	+ if($attributes['loadMoreAlignment']){
	200	+ $loadmore_class .= ' bs_blockspare_loadmore_' . $attributes['loadMoreAlignment'];
	201	+ }
	202	+ ?>
	203	+ <div class="bs_blockspare_loadmore blockspare-readmore-wrapper <?php echo esc_attr($loadmore_class);?>" data-layout="<?php echo $layoutClass; ?>" block-name="<?php echo esc_attr($blockName)?>" data-page='2' blockspare-att=<?php echo "'" . wp_kses_post(wp_json_encode($attributes))."'";?> max-paged="<?php echo $grid_query->max_num_pages;?>">
197	204	<a href="#" class="blockspare-readmore">
198		- <div class="ajax-loader"></div>
199		- <span class="load-btn"><?php echo($attributes['loadMoreText']); ?></span>
	205	+ <div class="load-btn "><?php echo($attributes['loadMoreText']); ?><span class="ajax-loader"></span></div>
200	206	</a>
201	207	</div><?php
202	208	}
203	209	?>
204	210	</section>
205		- </div>
	211	+ <!-- </div> -->
206	212	<?php }
207	213
208	214	wp_reset_postdata();
209	215
		@@ -235,9 +241,10 @@
235	241	}
236	242
237	243
238	244
239		- if(isset($attributes['enableFeatureImage']) && $attributes['enableFeatureImage'] == true){
	245	+
	246	+ if(isset($attributes['enableFeatureImage']) && $attributes['enableFeatureImage'] == 'true'){
240	247	?>
241	248	<figure class="blockspare-posts-block-post-img">
242	249	<a href="<?php echo esc_url(get_permalink($post_id));?>" rel="bookmark" aria-hidden="true"
243	250	tabindex="-1">
		@@ -244,19 +251,19 @@
244	251	<?php
245	252	if(has_post_thumbnail($post_id)){
246	253
247	254	echo wp_kses_post(wp_get_attachment_image($post_thumb_id, $post_thumb_size, '', ["class" => 'hover-child']));
248		- }else{?>
	255	+ }else{ ?>
249	256	<div class="bs-no-thumbnail-img"> </div>
250	257	<?php } ?>
251	258	</a>
252		- <?php if ($attributes['displayPostCategory'] && $content_order==true){?>
	259	+ <?php if ($attributes['displayPostCategory'] =='true'&& $content_order==true){ ?>
253	260	<!-- Category -->
254	261	<div class="<?php echo esc_attr($cat_class);?>">
255	262	<?php blockspare_get_cat_tax_tags($attributes['taxType'],$post_id);?>
256	263	</div>
257	264	<!-- Category -->
258		- <?php }?>
	265	+ <?php } ?>
259	266	</figure>
260	267	<?php
261	268	}
262	269
		@@ -277,15 +284,24 @@
277	284	<div class="blockspare-posts-block-post-content <?php echo esc_attr($className); ?> <?php echo esc_attr($attributes['contentOrder']); ?> <?php echo esc_attr($attributes['titleOnHover'])?>">
278	285	<div class="blockspare-posts-block-bg-overlay"></div>
279	286	<!-- blockspare-posts-block-post-grid-header -->
280	287	<header class="blockspare-posts-block-post-grid-header">
281		- <?php if ($attributes['displayPostCategory'] && $content_order ==false) {?>
	288	+ <!--display category when feature image is disable -->
	289	+ <?php if ($attributes['displayPostCategory']=='true' && $attributes['enableFeatureImage']!='true') {?>
282	290	<!-- Category -->
283	291	<div class="<?php echo esc_attr($cat_class);?>">
284		- <?php blockspare_get_cat_tax_tags($attributes['taxType'],$post_id);?>
	292	+ <?php blockspare_get_cat_tax_tags($attributes['taxType'],$post_id,$attributes['postType']);?>
285	293	</div>
286	294	<!-- Category -->
287		- <?php }?>
	295	+ <?php }?>
	296	+ <!--display category when feature image is enable-->
	297	+ <?php if ($attributes['displayPostCategory']=='true' && $attributes['enableFeatureImage']=='true' && $content_order ==false) {?>
	298	+ <!-- Category -->
	299	+ <div class="<?php echo esc_attr($cat_class);?>">
	300	+ <?php blockspare_get_cat_tax_tags($attributes['taxType'],$post_id,$attributes['postType']);?>
	301	+ </div>
	302	+ <!-- Category -->
	303	+ <?php }?>
288	304	<!-- blockspare-posts-block-post-grid-title -->
289	305
290	306	<h4 class="blockspare-posts-block-post-grid-title">
291	307	<a href="<?php echo esc_url(get_permalink($post_id)); ?>" class="blockspare-posts-block-title-link"
		@@ -298,9 +314,9 @@
298	314
299	315	<!-- blockspare-posts-block-post-grid-byline -->
300	316	<div class="blockspare-posts-block-post-grid-byline">
301	317	<!-- blockspare-posts-block-post-grid-author -->
302		- <?php if (isset($attributes['displayPostAuthor']) && $attributes['displayPostAuthor'] =='true') {?>
	318	+ <?php if (isset($attributes['displayPostAuthor']) && $attributes['displayPostAuthor'] =='true') { ?>
303	319	<div class="blockspare-posts-block-post-grid-author">
304	320	<!-- <a class="blockspare-posts-block-text-link" href="<?php echo esc_url(get_author_posts_url(get_the_author_meta('ID')));?>"
305	321	itemprop="url" rel="author">
306	322	<span itemprop="name">
		@@ -313,28 +329,21 @@
313	329	$blockspare_get_multiauthor= new BlocksapreMultiAuthorForFrontend();
314	330	$blockspare_get_multiauthor->blockspare_front_by_author($post_id,$attributes['authorIcon'],$author_id);
315	331	?>
316	332	</div>
317		- <?php }?>
	333	+ <?php } ?>
318	334	<!-- blockspare-posts-block-post-grid-author -->
319	335
320	336	<!-- blockspare-posts-block-post-grid-date -->
321		- <?php if(isset($attributes['displayPostDate']) && $attributes['displayPostDate'] =='true') {?>
322		- <time datetime="<?php echo esc_attr(get_the_date('c', $post_id));?>"
323		- class="blockspare-posts-block-post-grid-date" itemprop="datePublished">
324		- <i class="<?php echo esc_attr($attributes['dateIcon']);?>"></i>
325		- <?php echo esc_html(get_the_date('', $post_id));?>
326		- </time>
327		- <?php }?>
	337	+ <?php if(isset($attributes['displayPostDate']) && $attributes['displayPostDate'] =='true') { ?>
	338	+ <time datetime="<?php echo esc_attr(get_the_date('c', $post_id));?>" class="blockspare-posts-block-post-grid-date" itemprop="datePublished"><i class="<?php echo esc_attr($attributes['dateIcon']);?>"></i><?php echo esc_html(get_the_date('', $post_id));?></time>
	339	+ <?php } ?>
328	340	<!-- blockspare-posts-block-post-grid-date -->
329	341
330	342	<!-- comment_count -->
331		- <?php if($attributes['enableComment'] =='true'){?>
332		- <span class="comment_count">
333		- <i class='<?php echo esc_attr($attributes['commentIcon']);?>'></i>
334		- <?php echo esc_html(get_comments_number($post_id)); ?>
335		- </span>
336		- <?php }?>
	343	+ <?php if($attributes['enableComment'] =='true'){ ?>
	344	+ <span class="comment_count"><i class='<?php echo esc_attr($attributes['commentIcon']);?>'></i><?php echo esc_html(get_comments_number($post_id)); ?></span>
	345	+ <?php } ?>
337	346	<!-- comment_count -->
338	347	</div>
339	348	<!-- blockspare-posts-block-post-grid-byline -->
340	349	</header>
		@@ -343,9 +352,9 @@
343	352	<?php
344	353	$excerpt = blockspare_excerpt ($post_id,$attributes['excerptLength']);
345	354	$new_excerpt = apply_filters( 'the_excerpt', $excerpt );?>
346	355	<!-- blockspare-posts-block-post-grid-excerpt -->
347		- <?php if ($attributes['displayPostExcerpt'] && $new_excerpt != null) { ?>
	356	+ <?php if ($attributes['displayPostExcerpt']=='true' && $new_excerpt != null) { ?>
348	357	<div class="blockspare-posts-block-post-grid-excerpt">
349	358	<!-- blockspare-posts-block-post-grid-excerpt-content -->
350	359	<?php if (isset($attributes['displayPostExcerpt']) && $attributes['displayPostExcerpt'] =='true') { ?>
351	360	<div class="blockspare-posts-block-post-grid-excerpt-content">
		@@ -350,9 +359,9 @@
350	359	<?php if (isset($attributes['displayPostExcerpt']) && $attributes['displayPostExcerpt'] =='true') { ?>
351	360	<div class="blockspare-posts-block-post-grid-excerpt-content">
352	361	<?php echo wp_kses_post($excerpt); ?>
353	362	</div>
354		- <?php }?>
	363	+ <?php } ?>
355	364	<!-- blockspare-posts-block-post-grid-excerpt-content -->
356	365	<!-- blockspare-posts-block-post-grid-more-link -->
357	366	<?php if (isset($attributes['displayPostLink']) && $attributes['displayPostLink'] =='true') { ?>
358	367	<p>
		@@ -360,12 +369,12 @@
360	369	href="<?php echo esc_url(get_permalink($post_id)); ?>" rel="bookmark">
361	370	<span><?php echo esc_html($attributes['readMoreText']); ?></span>
362	371	</a>
363	372	</p>
364		- <?php }?>
	373	+ <?php } ?>
365	374	<!-- blockspare-posts-block-post-grid-more-link -->
366	375	</div>
367		- <?php }?>
	376	+ <?php } ?>
368	377	<!-- blockspare-posts-block-post-grid-excerpt -->
369	378
370	379	</div>
371	380	<?php }
		@@ -380,9 +389,21 @@
380	389	return $fonts;
381	390
382	391	}
383	392
	393	+ function bscheckFontfamilyWeight($fontFamilyWeight){
384	394
	395	+
	396	+
	397	+ $fontsweight = '';
	398	+ if($fontFamilyWeight!='' && $fontFamilyWeight !="undefined"){
	399	+ $fontsweight = 'font-weight:'.$fontFamilyWeight;
	400	+ }
	401	+ return $fontsweight;
	402	+
	403	+ }
	404	+
	405	+
385	406	function blockspare_excerpt($post_id,$length=''){
386	407	$excerpt = get_post_field(
387	408	'post_excerpt',
388	409	$post_id,
		@@ -388,13 +409,16 @@
388	409	$post_id,
389	410	'display'
390	411	);
391	412
	413	+ $excerpt =preg_replace( '~^(\s*(?:&nbsp;)?)*~i', '', $excerpt );
	414	+
392	415	if ( empty( $excerpt ) ) {
393	416	$excerpt = preg_replace(
394	417	array(
395	418	'/\<figcaption>.*\<\/figcaption>/',
396	419	'/\[caption.*\[\/caption\]/',
	420	+ '`[[^]]*]`'
397	421	),
398	422	'',
399	423	get_the_content()
400	424	);