Merged in bugfix/MAW-868-catch-up-missing-code (pull request #26)

MAW-868: catch up missing code

* MAW-868: catch up missing code

wp/wp-content/themes/child-theme/functions.php

@@ -4,6 +4,35 @@
 // (Please see http://codex.wordpress.org/Child_Themes#How_to_Create_a_Child_Theme)
 //  
 
+add_action( 'pre_get_posts', function() {
+  unset( $_GET['et_pb_searchform_submit'] );
+}, 1 );
+
+add_filter( 'relevanssi_post_content', 'rlv_remove_menu', 8 );
+add_filter( 'relevanssi_pre_excerpt_content', 'rlv_remove_menu', 8 );
+function rlv_remove_menu( $content ) {
+    $content = preg_replace( '~\[et_pb_text admin_label="Accounts Menu.*?\[/et_pb_text\]~ims', '', $content );
+    $content = preg_replace( '~\[et_pb_text admin_label="Footer Menu.*?\[/et_pb_text\]~ims', '', $content );
+    $content = preg_replace( '~\[et_pb_text admin_label="Footer Address.*?\[/et_pb_text\]~ims', '', $content );
+    $content = preg_replace( '~\[et_pb_text admin_label="Footer Social.*?\[/et_pb_text\]~ims', '', $content );
+    $content = preg_replace( '~\[et_pb_text admin_label="Convenience Menu.*?\[/et_pb_text\]~ims', '', $content );
+    return $content;
+}
+
+add_filter( 'relevanssi_pre_excerpt_content', 'rlv_shortcode_attribute', 8 );
+add_filter( 'relevanssi_post_content', 'rlv_shortcode_attribute', 8 );
+
+function rlv_shortcode_attribute( $content ) {
+	return preg_replace( '/\[et_pb_blurb.*?title="(.*?)".*?\]/im', '\1 ', $content );
+}
+
+add_filter( 'et_use_dynamic_css', function() { 
+	if ( is_search() ) { 
+		return false; 
+	}
+} );
+
+
 add_action( 'wp_enqueue_scripts', 'theme_enqueue_styles' );
 function theme_enqueue_styles() {
     wp_enqueue_script('recaptcha',get_stylesheet_directory_uri().'/js/recaptcha.js',array('jquery'),false,true);
@@ -79,6 +108,13 @@ jQuery(function($){
 	});
 });
 </script>
+<script>
+jQuery(document).ready(function(){
+    jQuery(".pa-blog-module article").each(function(){
+        jQuery(this).children('h2,p,div').not(':first-child').wrapAll('<div class="wrap"></div>');
+  })
+})
+</script>
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 <script type="text/javascript">
   $(function(){

wp/wp-content/themes/child-theme/style.css

@@ -906,3 +906,59 @@ h5.et_pb_toggle_title:after {
 .video_cheryls_iframe:before { width: 100%; height: 60%; position: absolute; content: ""; border: 20px solid #FFFFFF; box-sizing: border-box; border-radius: 75px; left: 50px; bottom: -50px; z-index: -9;}
 
 .service_video_iframe:before { width:100%;height: 75%; position:absolute; content:"";border: 20px solid #FFFFFF;box-sizing: border-box;border-radius: 75px;right: 50px;top: 195px;z-index: -9;}
+
+/*style the wp-pagenavi pagination links*/
+
+.wp-pagenavi a,
+.wp-pagenavi span {
+    color: #000000;
+    background: #f1f3f5;
+    font-size: 1em !important;
+    line-height: 1em;
+    font-weight: bold !important;
+    padding: 0.45em 0.8em !important;
+    border-radius: 100px;
+    border: none;
+    transition: all .5s;
+}
+
+
+/*style the wp-pagenavi current page number*/
+
+.wp-pagenavi span.current {
+    background-color: #f4f5fb;
+    padding: 10px 15px;
+    line-height: 90px;
+    color: #122e76;
+    border-radius: 50px;
+}
+
+
+/*style the wp-pagenavi pagination links on hover*/
+
+.wp-pagenavi a:hover {
+    background-color: #c21b2d;
+    color: #fff;
+}
+
+
+/*style the wp-pagenavi pages text*/
+
+.wp-pagenavi .pages {
+    background: none;
+}
+.wp-pagenavi span {
+    background-color: #f4f5fb;
+    padding: 10px 15px;
+    line-height: 90px;
+    color: #122e76;
+    border-radius: 50px;
+    letter-spacing: 0px!important;
+}
+
+/*remove border and center the wp-pagenavi links*/
+
+.wp-pagenavi {
+    border-top: none;
+    text-align: center;
+}

wp/wp-content/themes/thbusiness/archive.php

@@ -8,69 +8,24 @@
  */
 
 get_header(); ?>
-<div class="col-xs-9 col-sm-9 col-md-9" style="margin-top:30px; margin-right: auto; margin-left: auto;">
+<div class="col-xs-11 col-sm-11 col-md-11" style="margin-top:30px; margin-right: auto; margin-left: auto;">
 	<section id="primary" class="content-area">
 		<main id="main" class="site-main" role="main">
 			
 		<?php if ( have_posts() ) : ?>
 
 			<header class="page-header">
-				<h1 class="page-title">
+				<h1 class="page-title"> Results</h1>
-					<?php
-						if ( is_category() ) :
-							single_cat_title();
-
-						elseif ( is_tag() ) :
-							single_tag_title();
-
-						elseif ( is_author() ) :
-							printf( __( 'Author: %s', 'thbusiness' ), '<span class="vcard">' . get_the_author() . '</span>' );
-
-						elseif ( is_day() ) :
-							printf( __( 'Day: %s', 'thbusiness' ), '<span>' . get_the_date() . '</span>' );
-
-						elseif ( is_month() ) :
-							printf( __( 'Month: %s', 'thbusiness' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'thbusiness' ) ) . '</span>' );
-
-						elseif ( is_year() ) :
-							printf( __( 'Year: %s', 'thbusiness' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'thbusiness' ) ) . '</span>' );
-
-						elseif ( is_tax( 'post_format', 'post-format-aside' ) ) :
-							_e( 'Asides', 'thbusiness' );
-
-						elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) :
-							_e( 'Galleries', 'thbusiness');
-
-						elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
-							_e( 'Images', 'thbusiness');
-
-						elseif ( is_tax( 'post_format', 'post-format-video' ) ) :
-							_e( 'Videos', 'thbusiness' );
-
-						elseif ( is_tax( 'post_format', 'post-format-quote' ) ) :
-							_e( 'Quotes', 'thbusiness' );
-
-						elseif ( is_tax( 'post_format', 'post-format-link' ) ) :
-							_e( 'Links', 'thbusiness' );
-
-						elseif ( is_tax( 'post_format', 'post-format-status' ) ) :
-							_e( 'Statuses', 'thbusiness' );
-
-						elseif ( is_tax( 'post_format', 'post-format-audio' ) ) :
-							_e( 'Audios', 'thbusiness' );
-
-						elseif ( is_tax( 'post_format', 'post-format-chat' ) ) :
-							_e( 'Chats', 'thbusiness' );
-
-						else :
-							_e( 'Archives', 'thbusiness' );
-
-						endif;
-					?>
-				</h1>
 
 			</header><!-- .page-header -->
 			<div class="row">
+				<div class="col-xs-3 col-sm-3 col-md-3"> 
+  
+
+ <?php echo do_shortcode('[searchandfilter id="46870"]'); ?>
+
+</div>
+<div class="col-xs-9 col-sm-9 col-md-9 blogpost"> 
 			<?php /* Start the Loop */ ?>
 			<?php while ( have_posts() ) : the_post(); ?>
 
@@ -84,6 +39,7 @@ get_header(); ?>
 
 			<?php endwhile; ?>
 		</div>
+	</div>
 		<div class="row justify-content-center">
 			<?php thbusiness_paging_nav(); ?>
 
@@ -97,7 +53,7 @@ get_header(); ?>
 	</section><!-- #primary -->
 
 </div><!-- .col-xs-12 col-sm-12 col-md-8 -->
-<div class="col-xs-9col-sm-9 col-md-9" style="margin:auto;">
+<!-- <div class="col-xs-9col-sm-9 col-md-9" style="margin:auto;">
-	<?php get_sidebar('footer-blog'); ?>
+	
-</div><!-- .col-xs-12 .col-sm-6 .col-md-4 -->
+</div> --><!-- .col-xs-12 .col-sm-6 .col-md-4 -->
 <?php get_footer(); ?>

wp/wp-content/themes/thbusiness/content.php

@@ -3,33 +3,62 @@
  * @package thbusiness
  */
 ?>
-<div class="col-md-4 col-sm-4 col-xs-12">
+<?php echo '<a href="'. get_permalink() . '">' ?>
+<div class="col-md-12 col-sm-12 col-xs-12">
 <article class="blogpostcol" id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+<div class="row">
+		<div class="col-md-4 blog-feat-img">
 	<?php thbusiness_featured_image(); ?>
+</div>
+	<div class="col-md-8">
+
+				<?php
+				/* translators: used between list items, there is a space after the comma */
+				$categories_list = get_the_category_list( __( ', ', 'thbusiness' ) );
+				if ( $categories_list && thbusiness_categorized_blog() ) :
+			?>
+			<span class="cat-links">
+				<?php echo $categories_list; ?>
+			</span>
+			<?php endif; // End if categories ?>
+			</span>
 	<header class="entry-header" id="blogentry">
 		<?php the_title( sprintf( '<h2 class="blog-title" id="blogtitle"><a href="%s" rel="bookmark">', esc_url( get_permalink()) ), '</a></h2>' ); ?>
 
 		<?php if ( 'post' == get_post_type() ) : ?>
 		<div class="entry-meta" id="blogmeta">
-			<?php thbusiness_posted_on(); 
+			<?php //thbusiness_posted_on(); 
 			if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
 			<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'thbusiness' ), __( '1 Comment', 'thbusiness' ), __( '% Comments', 'thbusiness' ) ); ?></span>
 			<?php endif; ?>
 		</div><!-- .entry-meta -->
 		<?php endif; ?>
 	</header><!-- .entry-header -->
-
+<?php
+				/* translators: used between list items, there is a space after the comma */
+				$tags_list = get_the_tag_list( '', __( ', ', 'thbusiness' ) );
+				if ( $tags_list ) :
+			?>
+			<span class="tags-links">
+				<?php echo $tags_list; ?>
+			</span>
+			<?php endif; // End if $tags_list ?>
 	<?php if ( is_search() ) : // Only display Excerpts for Search ?>
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->
 	<?php else : ?>
+
 	<div class="entry-content" id="blogcontent">
 		<?php the_excerpt(); ?>
 		<?php
-			echo '<div><a class="moretag" id="blogread" href="'. get_permalink( get_the_ID() ) . '">' . __( 'Read More ', 'thbusiness') . '</a></div>'; 
+			// echo '<div><a class="moretag" id="blogread" href="'. get_permalink( get_the_ID() ) . '">' . __( 'Read More ', 'thbusiness') . '</a></div>'; 
 		?>
 	</div><!-- .entry-content -->
+			
+</div>
+
+</div>
 	<?php endif; ?>
 
 	<footer class="entry-footer" id="blogfooter">
@@ -57,4 +86,4 @@
 
 		<?php edit_post_link( __( 'Edit', 'thbusiness' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-footer -->
-</article><!-- #post-## --></div>
+</article><!-- #post-## --></div> <?php echo '</a>'; ?>

wp/wp-content/themes/thbusiness/functions.php

@@ -833,6 +833,14 @@ function jsVariables(){
     var enddate = new Date(d.getFullYear(), d.getMonth()+1,1);
 </script>
 
+<script>
+jQuery(document).ready(function(){
+    jQuery(".pa-blog-module article").each(function(){
+        jQuery(this).children('h2,p,div').not(':first-child').wrapAll('<div class="wrap"></div>');
+  })
+})
+</script>
+
 <?php
 }
 
@@ -974,7 +982,7 @@ if ($salesforceEnvironment == 'development') {
 
 } elseif ($salesforceEnvironment == 'staging') {
     update_option( 'default_campaign', '7011I000000dF9n');
-    update_option( 'sfdc_oid', '00DDh0000009Umu' );
+    update_option( 'sfdc_oid', '00D8C0000004aiW' );
     update_option( 'webtolead_url', 'https://test.salesforce.com/servlet/servlet.WebToLead' );
 
     $Campaign_ID = get_option('default_campaign');

wp/wp-content/themes/thbusiness/layouts/landing-page-bloghome.php

@@ -11,10 +11,11 @@ get_header();?>
 
   <div class="container">
 <section id="blog">
-<h1 class="page-title">Medical Alert Blog</h1>
-  <div class="col-xs-12 col-sm-12 col-md-12 blogpost">
  
 
+<h1 class="page-title">Medical Alert Blog</h1>
+<!--   <div class="col-xs-12 col-sm-12 col-md-12 blogpost">
+
  
           <div class="row">
            <div class="owl-carousel owl-theme">
@@ -53,27 +54,34 @@ get_header();?>
         </div>
         <div class="row">
         </div>
-     </div> 
+     </div>  -->
 
 
+<div class="row">
+<div class="col-xs-3 col-sm-3 col-md-3"> 
   
 
+ <?php echo do_shortcode('[searchandfilter id="46870"]'); ?>
+
+</div>
 
 
-<div class="blogpost"> 
+<div class="col-xs-9 col-sm-9 col-md-9 blogpost"> 
-  <div class="row">
+
 
     <?php
       global $wp_query, $paged;
       $paged = ( get_query_var( 'paged' ) ) ? get_query_var( 'paged' ) : 1;
-      $wp_query = new WP_Query(array('post_type' => 'post', 'posts_per_page' => 6, 'cat' => -61,  'paged' => $paged));
+      //$wp_query = new WP_Query(array('post_type' => 'post', 'posts_per_page' => 6, 'cat' => -61,  'paged' => $paged));
+      $wp_query = new WP_Query(array('post_type' => 'post', 'paged' => $paged));
 
         while ($wp_query->have_posts()) : $wp_query->the_post(); ?>
 
     <?php get_template_part('content'); ?>
         <?php endwhile;  ?>
     <?php wp_reset_postdata(); ?>
-  </div>
+
+</div>
 </div>
 
 <div class="row">

wp/wp-content/themes/thbusiness/search.php

@@ -43,6 +43,6 @@ get_header(); ?>
 
 </div><!-- .col-xs-12 col-sm-12 col-md-8 -->
 <div class="col-xs-12 col-sm-6 col-md-4">
-	<?php get_sidebar(); ?>
+	
 </div><!-- .col-xs-12 .col-sm-6 .col-md-4 -->
 <?php get_footer(); ?>

wp/wp-content/themes/thbusiness/single.php

@@ -31,6 +31,6 @@ get_header(); ?>
 
 </div><!-- .col-xs-12 col-sm-6 col-md-8 -->
 <div class="col-xl-8 col-md-9 col-xs-9" style="margin:0px auto;">
-<?php get_sidebar('footer-blog'); ?>
+
 </div><!-- .col-xs-12 .col-sm-6 .col-md-4 -->
-<?php get_footer('blog'); ?>
+<?php get_footer(''); ?>

wp/wp-content/themes/thbusiness/style.css

@@ -365,8 +365,8 @@ a.call-to-action-wdg-button:visited {color: #fff;}
 .author:before, .comments-link:before {margin: 0 15px 0 20px;font-weight: 400;display: inline-block;font-family: FontAwesome;}
 .author:before {content: "\f007";}
 .comments-link:before {content: "\f0e6";font-size: 12px;}
-.cat-links:before {content: "\f07c";display: inline-block;font-family: FontAwesome;font-weight: 400;margin: 0 10px 0 0;}
+/*.cat-links:before {content: "\f07c";display: inline-block;font-family: FontAwesome;font-weight: 400;margin: 0 10px 0 0;}
-.tags-links:before {content: "\f02c";display: inline-block;font-family: FontAwesome;font-weight: 400;margin: 0 10px 0 18px;}
+.tags-links:before {content: "\f02c";display: inline-block;font-family: FontAwesome;font-weight: 400;margin: 0 10px 0 18px;}*/
 .th-post-permalink:before {content: "\f0c1";display: inline-block;font-family: FontAwesome;font-weight: 400;margin: 0 15px;}
 .meta-nav-next:after {content: "\f061";display: inline-block;font-family: FontAwesome;margin: 0 0 3px 10px;}
 .edit-link:before {content: "\f044";display: inline-block;font-family: FontAwesome;margin: 0 10px 0 18px;}
@@ -709,8 +709,12 @@ p.sub-callout {margin-top: 0;color: #354052;font-family: 'Source Sans Pro', sans
 
 
 /*** BLOG STYLES */
-.blogpost {margin: 30px 0px; margin-left:auto; margin-right:auto;}
+.blogpost {margin: 10px 0px 30px; margin-left:auto; margin-right:auto;}
-.blogpostcol{border: solid 1px #ededed;margin: 20px 0 20px 0;/*height: 550px;*/}
+.sf-input-checkbox {vertical-align: top;}
+.sf-label-checkbox {width:94% !important;}
+.blogpostcol{border: solid 1px #ededed;margin: 0px 0 30px 0; box-shadow: 0px 12px 0px 0px rgb(160 190 212 / 20%) !important;
+    border-radius: 6px;}
+.blogpostcol:hover { box-shadow: 0px 12px 0px 0px rgb(194 27 45 / 20%) !important; border-radius: 6px; border: 1px solid #d3d3d3 !important;}
 #blogread {background: #002f5e;float: left; margin: 10px 0px; font-size: 14px;}
 .entry-header{margin: 20px 5px 10px 5px;}
 h1#blogtitle a{color: #002f5e !important;font-size: 20px;line-height: 30px;font-weight: 700;text-overflow: ellipsis;white-space: normal;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
@@ -1344,3 +1348,12 @@ span.author.vcard {display:none;}
 
  .et-db #et-boc .et-l .et_pb_menu--with-logo .et_pb_menu__menu>nav>ul>li>a { padding:15px 0px !important;}
 
+ .blog-feat-img img {object-fit: cover; height: 245px;}
+
+.blog-feat-img .article-preview-image {margin-bottom:0px;}
+
+.blogpost .tags-links {margin-left:10px;}
+
+.searchandfilter label { width:100%;}
+.searchandfilter ul {margin:0px;}
+