Merge pull request #12 from c0sm1n87/master

blog redesign

Author: Cosmin

archive.php

@@ -2,45 +2,46 @@
 /**
  * The template for displaying archive pages.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @link    https://codex.wordpress.org/Template_Hierarchy
  *
  * @package Shapely
  */
 get_header(); ?>
 <?php $layout_class = ( function_exists( 'shapely_get_layout_class' ) ) ? shapely_get_layout_class() : ''; ?>
-	<div id="primary" class="col-md-9 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>"><?php
-		if ( have_posts() ) :
-
-			if ( is_home() && ! is_front_page() ) : ?>
-				<header>
-					<h1 class="page-title screen-reader-text"><?php single_post_title(); ?></h1>
-				</header>
-
-				<?php
-			endif;
-
-			/* Start the Loop */
-			while ( have_posts() ) : the_post();
-
-				/*
-				 * Include the Post-Format-specific template for the content.
-				 * If you want to override this in a child theme, then include a file
-				 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-				 */
-				get_template_part( 'template-parts/content', get_post_format() );
-
-			endwhile;
-
-			if ( function_exists( "shapely_pagination" ) ):
-				shapely_pagination();
-			endif;
-
-		else :
-
-			get_template_part( 'template-parts/content', 'none' );
-
+	<div class="row">
+		<?php
+		if ( $layout_class == 'sidebar-left' ):
+			get_sidebar();
+		endif;
+		?>
+		<div id="primary" class="col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>"><?php
+			if ( have_posts() ) :
+
+				if ( is_home() && ! is_front_page() ) : ?>
+					<header>
+						<h1 class="page-title screen-reader-text"><?php esc_html( single_post_title() ); ?></h1>
+					</header>
+
+					<?php
+				endif;
+
+				$layout_type = get_theme_mod( 'blog_layout_view', 'grid' );
+
+				get_template_part( 'template-parts/layouts/blog', $layout_type );
+
+				if ( function_exists( "shapely_pagination" ) ):
+					shapely_pagination();
+				endif;
+
+			else :
+				get_template_part( 'template-parts/content', 'none' );
+
+			endif; ?>
+		</div><!-- #primary -->
+		<?php
+		if ( $layout_class == 'sidebar-right' ):
+			get_sidebar();
 		endif; ?>
-	</div><!-- #primary -->
+	</div>
 <?php
-get_sidebar();
 get_footer();

assets/images/placeholder.jpg

@@ -1,3 +1,18 @@
+### 1.7.1
+<a href="https://github.com/puikinsh/shapely/issues">Issues</a>
+	#112 - #1 - there's nothing wrong in using abspath, it's a WordPress core define, nothing added by the theme/plugin. Changed it to incorporate MU
+			 - #2 - removed from global scope
+			 - #3 - removed custom sanitize for hex
+			 - #4 - removed shapely_sanitize_strip_slashes
+			 - #5 - escaped variable
+			 - #6 - I don't think Colorlib and WordPress are translatable
+			 - #7 - escaped where needed
+			 - #8 - removed registration of menu from socialnav.php
+			 - #9 - removed theme support for post formats
+			 - #10 - escaped where needed
+			 - #11 - translated
+			 - #12 - escaped where needed
+
 ### 1.7.0
 <a href="https://github.com/puikinsh/shapely/issues">Issues</a>
 	#79 - restyled <q> a little bit ( added a bg, set font style to italic )

assets/images/placeholder_wide.jpg

@@ -21,7 +21,6 @@
 ?>
 
 <div id="comments" class="comments-area comments  nolist">
-
 	<?php
 	// You can start editing here -- including this comment!
 	if ( have_comments() ) : ?>
@@ -45,11 +44,11 @@
 			</div><!-- .nav-links -->
 		</nav><!-- #comment-nav-above -->
 		<?php endif; // Check for comment navigation. ?>
-        
+
         <?php add_filter('comment_reply_link', 'shapely_reply_link_class'); ?>
 		<ul class="comments-list">
 			<?php
-				wp_list_comments( array(                    
+				wp_list_comments( array(
 					'style'      => 'ol',
 					'short_ping' => true,
 					'avatar_size'=> 75,
@@ -82,7 +81,7 @@
 		<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'shapely' ); ?></p>
 	<?php
 	endif;
-    
+
     /* comment form */
     $comments_args = ( function_exists( 'shapely_custom_comment_form' ) ) ? shapely_custom_comment_form() : '';
 	comment_form($comments_args);

changelog.txt

@@ -11,13 +11,13 @@
 
 ?>
 
-</div><!-- row -->
 </div><!-- #main -->
 </section><!-- section -->
 
 <div class="footer-callout">
 	<?php shapely_footer_callout(); ?>
 </div>
+
 <footer id="colophon" class="site-footer footer bg-dark" role="contentinfo">
 	<div class="container footer-inner">
 		<div class="row">
@@ -26,9 +26,12 @@
 
 		<div class="row">
 			<div class="site-info col-sm-6">
-				<div
-					class="copyright-text"><?php echo wp_kses_post( get_theme_mod( 'shapely_footer_copyright' ) ); ?></div>
-				<div class="footer-credits"><?php shapely_footer_info(); ?></div>
+				<div class="copyright-text">
+					<?php echo wp_kses_post( get_theme_mod( 'shapely_footer_copyright' ) ); ?>
+				</div>
+				<div class="footer-credits">
+					<?php shapely_footer_info(); ?>
+				</div>
 			</div><!-- .site-info -->
 			<div class="col-sm-6 text-right">
 				<?php shapely_social_icons(); ?>
@@ -44,4 +47,4 @@ class="copyright-text"><?php echo wp_kses_post( get_theme_mod( 'shapely_footer_c
 <?php wp_footer(); ?>
 
 </body>
-</html>
+</html>

comments.php

@@ -36,6 +36,14 @@ function shapely_setup() {
 			'flex-width' => true,
 		) );
 
+		add_theme_support( 'custom-header', apply_filters( 'shapely_custom_header_args', array(
+			'default-image'          => '',
+			'default-text-color'     => '000000',
+			'width'                  => 1900,
+			'height'                 => 225,
+			'flex-width'             => true
+		) ) );
+
 		/*
 		 * Let WordPress manage the document title.
 		 * By adding theme support, we declare that this theme does not use a
@@ -53,7 +61,8 @@ function shapely_setup() {
 
 		// This theme uses wp_nav_menu() in one location.
 		register_nav_menus( array(
-			                    'primary' => esc_html__( 'Primary', 'shapely' ),
+			                    'primary'     => esc_html__( 'Primary', 'shapely' ),
+			                    'social-menu' => esc_html__( 'Social Menu', 'shapely' ),
 		                    ) );
 
 		/*
@@ -68,18 +77,6 @@ function shapely_setup() {
 			'caption',
 		) );
 
-		/*
-		 * Enable support for Post Formats.
-		 * See https://developer.wordpress.org/themes/functionality/post-formats/
-		 */
-		add_theme_support( 'post-formats', array(
-			'aside',
-			'image',
-			'video',
-			'quote',
-			'link',
-		) );
-
 		// Set up the WordPress core custom background feature.
 		add_theme_support( 'custom-background', apply_filters( 'shapely_custom_background_args', array(
 			'default-color' => 'ffffff',
@@ -92,16 +89,18 @@ function shapely_setup() {
 		 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
 		 */
 		add_theme_support( 'post-thumbnails' );
-
-		add_image_size( 'shapely-featured', 848, 566, true );
+		add_image_size( 'shapely-full', 1110, 530, true );
+		add_image_size( 'shapely-featured', 730, 350, true );
+		add_image_size( 'shapely-grid', 350, 300, true );
 
 		add_theme_support( 'customize-selective-refresh-widgets' );
 		// Welcome screen
 		if ( is_admin() ) {
 			global $shapely_required_actions, $shapely_recommended_plugins;
 
 			$shapely_recommended_plugins = array(
-				'fancybox-for-wordpress' => array( 'recommended' => false )
+				'wordpress-seo'          => array( 'recommended' => true ),
+				'fancybox-for-wordpress' => array( 'recommended' => false ),
 			);
 
 			/*
@@ -112,6 +111,14 @@ function shapely_setup() {
 			 * plugin_slug - the plugin's slug (used for installing the plugin)
 			 *
 			 */
+			$path = WPMU_PLUGIN_DIR . '/shapely-companion/inc/views/shapely-demo-content.php';
+			if ( ! file_exists( $path ) ) {
+				$path = WP_PLUGIN_DIR . '/shapely-companion/inc/views/shapely-demo-content.php';
+				if ( ! file_exists( $path ) ) {
+					$path = false;
+				}
+			}
+
 			$shapely_required_actions = array(
 				array(
 					"id"          => 'shapely-req-ac-install-companion-plugin',
@@ -128,17 +135,10 @@ function shapely_setup() {
 					"plugin_slug" => 'jetpack'
 				),
 				array(
-					"id"          => 'shapely-req-ac-install-wp-yoast-plugin',
-					"title"       => Shapely_Notify_System::shapely_yoast_title(),
-					'description' => Shapely_Notify_System::shapely_yoast_description(),
-					"check"       => Shapely_Notify_System::shapely_has_plugin( 'wordpress-seo' ),
-					"plugin_slug" => 'wordpress-seo'
-				),
-				array(
-					"id"          => 'shapely-req-import-content',
-					"title"       => esc_html__( 'Import content', 'shapely' ),
-					"external"    => ABSPATH . 'wp-content/plugins/shapely-companion/inc/views/shapely-demo-content.php',
-					"check"       => Shapely_Notify_System::shapely_check_import_req(),
+					"id"       => 'shapely-req-import-content',
+					"title"    => esc_html__( 'Import content', 'shapely' ),
+					"external" => $path,
+					"check"    => Shapely_Notify_System::shapely_check_import_req(),
 				),
 
 			);
@@ -202,6 +202,27 @@ function shapely_widgets_init() {
 
 add_action( 'widgets_init', 'shapely_widgets_init' );
 
+/**
+ * Hides the custom post template for pages on WordPress 4.6 and older
+ *
+ * @param array $post_templates Array of page templates. Keys are filenames, values are translated names.
+ *
+ * @return array Filtered array of page templates.
+ */
+function shapely_exclude_page_templates( $post_templates ) {
+
+	if ( version_compare( $GLOBALS['wp_version'], '4.7', '<' ) ) {
+		unset( $post_templates['page-templates/full-width.php'] );
+		unset( $post_templates['page-templates/no-sidebar.php'] );
+		unset( $post_templates['page-templates/sidebar-left.php'] );
+		unset( $post_templates['page-templates/sidebar-right.php'] );
+	}
+
+	return $post_templates;
+}
+
+add_filter( 'theme_page_templates', 'shapely_exclude_page_templates' );
+
 /**
  * Enqueue scripts and styles.
  */
@@ -241,17 +262,20 @@ function shapely_scripts() {
 	if ( is_page_template( 'template-home.php' ) ) {
 		wp_enqueue_script( 'shapely-parallax', get_template_directory_uri() . '/js/parallax.min.js', array( 'jquery' ), '20160115', true );
 	}
+	/**
+	 * OwlCarousel Library
+	 */
+	wp_enqueue_script( 'owl.carousel', get_template_directory_uri() . '/js/owl-carousel/owl.carousel.min.js', array( 'jquery' ), '20160115', true );
+	wp_enqueue_style( 'owl.carousel', get_template_directory_uri() . '/js/owl-carousel/owl.carousel.min.css' );
+	wp_enqueue_style( 'owl.carousel', get_template_directory_uri() . '/js/owl-carousel/owl.theme.default.css' );
 
 	wp_enqueue_script( 'shapely-scripts', get_template_directory_uri() . '/js/shapely-scripts.js', array( 'jquery' ), '20160115', true );
+
+	wp_enqueue_style( 'shapely-scss', get_template_directory_uri() . '/assets/css/style.css' );
 }
 
 add_action( 'wp_enqueue_scripts', 'shapely_scripts' );
 
-/**
- * Implement the Custom Header feature.
- */
-require get_template_directory() . '/inc/custom-header.php';
-
 /**
  * Custom template tags for this theme.
  */
@@ -283,19 +307,9 @@ function shapely_scripts() {
 require get_template_directory() . '/inc/socialnav.php';
 
 /**
- * Load Metboxes
+ * Load related posts
  */
-require get_template_directory() . '/inc/metaboxes.php';
-
-/* Globals */
-global $shapely_site_layout;
-$shapely_site_layout = array(
-	'pull-right' => esc_html__( 'Left Sidebar', 'shapely' ),
-	'side-right' => esc_html__( 'Right Sidebar', 'shapely' ),
-	'no-sidebar' => esc_html__( 'No Sidebar', 'shapely' ),
-	'full-width' => esc_html__( 'Full Width', 'shapely' )
-);
-
+require get_template_directory() . '/inc/class-shapely-related-posts.php';
 
 /**
  * Load the system checks ( used for notifications )

footer.php

@@ -62,7 +62,7 @@
 				<?php shapely_top_callout(); ?>
 			</div>
 		<?php endif; ?>
+
 		<section class="content-area <?php echo ( get_theme_mod( 'top_callout', true ) ) ? '' : ' pt0 ' ?>">
 			<div id="main" class="<?php echo ( ! is_page_template( 'template-home.php' ) ) ? 'container' : ''; ?>"
-			     role="main">
-				<div class="row">
+			     role="main">

functions.php

@@ -64,7 +64,17 @@ public static function shapely_check_plugin_is_installed( $slug ) {
 			if ( $slug === 'wordpress-seo' ) {
 				$slug2 = 'wp-seo';
 			}
-			if ( file_exists( ABSPATH . 'wp-content/plugins/' . $slug . '/' . $slug2 . '.php' ) ) {
+
+			$path = WPMU_PLUGIN_DIR . '/' . $slug . '/' . $slug2 . '.php';
+			if ( ! file_exists( $path ) ) {
+				$path = WP_PLUGIN_DIR . '/' . $slug . '/' . $slug2 . '.php';
+
+				if ( ! file_exists( $path ) ) {
+					$path = false;
+				}
+			}
+
+			if ( file_exists( $path ) ) {
 				return true;
 			}
 
@@ -79,7 +89,16 @@ public static function shapely_check_plugin_is_active( $slug ) {
 			if ( $slug === 'wordpress-seo' ) {
 				$slug2 = 'wp-seo';
 			}
-			if ( file_exists( ABSPATH . 'wp-content/plugins/' . $slug . '/' . $slug2 . '.php' ) ) {
+
+			$path = WPMU_PLUGIN_DIR . '/' . $slug . '/' . $slug2 . '.php';
+			if ( ! file_exists( $path ) ) {
+				$path = WP_PLUGIN_DIR . '/' . $slug . '/' . $slug2 . '.php';
+				if ( ! file_exists( $path ) ) {
+					$path = false;
+				}
+			}
+
+			if ( file_exists( $path ) ) {
 				include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 
 				return is_plugin_active( $slug . '/' . $slug2 . '.php' );