#221

#222
#225

Author: giucu91

archive-jetpack-portfolio.php

@@ -1,39 +1,59 @@
 <?php
-get_header(); ?>
+get_header();
 
-	<div id="primary" class="content-area col-md-12 mb-xs-24">
+$layout = get_theme_mod( 'projects_layout_view', 'mansonry' );
+$layout_class = shapely_get_layout_class();
+
+$item_classes = 'post-snippet col-md-3 col-sm-6 project';
+if ( 'mansonry' == $layout ) {
+	$item_classes .= ' masonry-item';
+}
+
+?>
+	<?php
+	if ( 'sidebar-left' == $layout_class ) :
+		get_sidebar();
+	endif;
+	?>
+	<div id="primary" class="content-area col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
 		<main id="main" class="site-main" role="main">
 
 			<?php
 			if ( have_posts() ) : ?>
 
-			<header>
-				<?php
-				echo ( get_theme_mod( 'portfolio_name' ) != '' ) ? '<h1 class="post-title">' . esc_html( get_theme_mod( 'portfolio_name' ) ) . '</h1>' : '';
-				echo ( get_theme_mod( 'portfolio_description' ) != '' ) ? '<p>' . esc_html( get_theme_mod( 'portfolio_description' ) ) . '</p>' : '';
-				?>
-			</header><!-- .page-header -->
-
-			<div class="masonry-loader fixed-center">
-				<div class="col-sm-12 text-center">
-					<div class="spinner"></div>
+			<?php if ( 'mansonry' == $layout ): ?>
+				<div class="masonry-loader fixed-center">
+					<div class="col-sm-12 text-center">
+						<div class="spinner"></div>
+					</div>
 				</div>
-			</div>
-			<div class="masonry masonryFlyIn">
+			<?php endif ?>
+			
+			<div class="<?php echo 'mansonry' == $layout ? 'masonry masonryFlyIn' : '' ?>">
 				<?php
 				/* Start the Loop */
 				while ( have_posts() ) : the_post();
 					$projects_args = array(
 						'fields' => 'names',
 					);
 					$project_types = wp_get_post_terms( $post->ID, 'jetpack-portfolio-type', $projects_args );
+
+					$thumbnail_url = get_the_post_thumbnail_url( get_the_ID(), 'full' );
+					$item_style = '';
+					if ( 'mansonry' != $layout ) {
+						$item_style = 'background-image: url(' . $thumbnail_url . ')';
+					}
 				?>
 
-					<article id="post-<?php the_ID(); ?>" <?php post_class( 'post-snippet col-md-3 col-sm-6 masonry-item project' ); ?>>
-						<div class="image-tile inner-title hover-reveal text-center"><?php
+					<article id="post-<?php the_ID(); ?>" <?php post_class( $item_classes ); ?>>
+						<div class="image-tile inner-title hover-reveal text-center"  style="<?php echo $item_style ?>"><?php
 						if ( has_post_thumbnail() ) { ?>
 							<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
-								<?php the_post_thumbnail( 'medium' ); ?>
+								<?php
+								if ( 'mansonry' == $layout ){
+									the_post_thumbnail( 'medium' );
+								}
+								?>
 								<div class="title"><?php
 								the_title( '<h5 class="mb0">', '</h5>' );
 								if ( ! empty( $project_types ) ) {
@@ -57,6 +77,10 @@
 
 		</main><!-- #main -->
 	</div><!-- #primary -->
-
+	<?php
+	if ( 'sidebar-right' == $layout_class ) :
+		get_sidebar();
+	endif;
+	?>
 <?php
 get_footer();

inc/class-shapely-related-posts.php

@@ -112,9 +112,43 @@ public function get_related_posts( $post_id, $number_posts = - 1 ) {
 				'ignore_sticky_posts' => 0,
 				'posts_per_page'      => $number_posts,
 				'post__not_in'        => array( $post_id ),
-				//              'meta_key'            => '_thumbnail_id',
 			) );
 
+			if ( is_singular( 'jetpack-portfolio' ) ) {
+				unset( $args['category__in'] );
+				$args['post_type'] = 'jetpack-portfolio';
+
+				$terms_args = array(
+					'fields' => 'ids',
+				);
+				$types = wp_get_object_terms( get_the_ID(), 'jetpack-portfolio-type', $terms_args );
+				$tags = wp_get_object_terms( get_the_ID(), 'jetpack-portfolio-tag', $terms_args );
+
+				$tax_query = array();
+
+				if ( ! empty( $types ) ) {
+					array_push( $tax_query, array(
+						'taxonomy' => 'jetpack-portfolio-type',
+						'field'    => 'term_id',
+						'terms'    => $types,
+					));
+				}
+
+				if ( ! empty( $tags ) ) {
+					array_push( $tax_query, array(
+						'taxonomy' => 'jetpack-portfolio-tag',
+						'field'    => 'term_id',
+						'terms'    => $tags,
+					));
+				}
+
+				if ( ! empty( $tax_query ) ) {
+					$args['tax_query'] = $tax_query;
+				}
+
+				
+			}
+
 			$related_postquery = new WP_Query( $args );
 
 			// reset post query
@@ -129,6 +163,13 @@ public function get_related_posts( $post_id, $number_posts = - 1 ) {
 		 * @return string                    HTML markup to display related posts
 		 **/
 		function output_related_posts() {
+
+			if ( is_singular( 'jetpack-portfolio' ) ) {
+				if ( ! get_theme_mod( 'related_projects_area', true ) ) {
+					return;
+				}
+			}
+
 			// Check if related posts should be shown
 			$related_posts = $this->get_related_posts( get_the_ID(), get_option( 'posts_per_page' ) );
 
@@ -150,7 +191,11 @@ function output_related_posts() {
 			 * Heading
 			 */
 			echo '<div class="col-lg-11 col-sm-10 col-xs-12 shapely-related-posts-title">';
-			echo '<h3><span>' . esc_html__( 'Related articles ', 'shapely' ) . '</span></h3>';
+			if ( is_singular( 'jetpack-portfolio' ) ) {
+				echo '<h3><span>' . esc_html__( 'Related projects', 'shapely' ) . '</span></h3>';
+			}else{
+				echo '<h3><span>' . esc_html__( 'Related articles ', 'shapely' ) . '</span></h3>';
+			}
 			echo '</div>';
 
 			echo '</div><!--/.row-->';