fix include external files

creativecommons · Mar 5, 2019 · 1be9e1e · 1be9e1e
1 parent 339e728
commit 1be9e1e
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 53 deletions.
diff --git a/archive.php b/archive.php
@@ -36,8 +36,8 @@
 				the_archive_description('<div class="taxonomy-description">', '</div>');
 				?>
             </header><!-- .page-header -->
-            <?php get_template_part('template-parts/sidebar/content-above-mobile'); ?>
-            <?php get_template_part('template-parts/sidebar/content-above'); ?>
+            <?php get_template_part('template-parts/sidebar/sidebar','content-above-mobile'); ?>
+            <?php get_template_part('template-parts/sidebar/sidebar','content-above'); ?>
             <?php
 				// Start the Loop.
 			while (have_posts()) :
@@ -69,14 +69,14 @@
 		endif;
 		?>
         </main><!-- .site-main -->
-        <?php get_template_part('template-parts/sidebar/content-bottom'); ?>
+        <?php get_template_part('template-parts/sidebar/sidebar','content-bottom'); ?>
     </div>
     <div id="wrapper-sidebar" class="wrapper-sidebar">
         <?php get_sidebar(); ?>
     </div>
 </div><!-- .content-area -->
 <!-- content-below -->
-<?php get_template_part('template-parts/sidebar/content-below'); ?>
+<?php get_template_part('template-parts/sidebar/sidebar','content-below'); ?>
 <!-- END content-below -->
 
 <?php get_footer(); ?> 
diff --git a/author.php b/author.php
@@ -25,7 +25,7 @@
 ?>
 
 <!-- header-below -->
-<?php get_template_part( 'template-parts/sidebar/header-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','header-below' ); ?>
 <!-- END header-below -->
 	<div id="primary" class="content-area">
 	<div id="wrapper-main" class="wrapper-main">
@@ -75,8 +75,8 @@
 					</div>
 			  </header><!-- .page-header -->
 
-		<?php get_template_part( 'template-parts/sidebar/content-above-mobile' ); ?>
-		<?php get_template_part( 'template-parts/sidebar/content-above' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above-mobile' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above' ); ?>
 
 		<div class="bio">
 					<span class="author-first-last"><?php print $author->first_name . ' ' . $author->last_name; ?></span>
@@ -113,14 +113,14 @@
 		?>
 
 	  </main><!-- .site-main -->
-		<?php get_template_part( 'template-parts/sidebar/content-bottom' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-bottom' ); ?>
 	</div>
 	<div id="wrapper-sidebar" class="wrapper-sidebar">
 		<?php get_sidebar(); ?>
 	</div>
   </div><!-- .content-area -->
   <!-- content-below -->
-	<?php get_template_part( 'template-parts/sidebar/content-below' ); ?>
+	<?php get_template_part( 'template-parts/sidebar/sidebar','content-below' ); ?>
   <!-- END content-below -->
 
 <?php get_footer(); ?>
diff --git a/category.php b/category.php
@@ -37,8 +37,8 @@
 					?>
 				</header><!-- .page-header -->
 
-				<?php get_template_part( 'template-parts/sidebar/content-above-mobile' ); ?>
-				<?php get_template_part( 'template-parts/sidebar/content-above' ); ?>
+				<?php get_template_part( 'template-parts/sidebar/sidebar','content-above-mobile' ); ?>
+				<?php get_template_part( 'template-parts/sidebar/sidebar','content-above' ); ?>
 
 				<?php
 				// Start the Loop.
@@ -71,7 +71,7 @@
 			endif;
 			?>
 	  </main><!-- .site-main -->
-		<?php get_template_part( 'template-parts/sidebar/content-bottom' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-bottom' ); ?>
 	</div>
 	<div id="wrapper-sidebar" class="wrapper-sidebar">
 		<?php get_sidebar(); ?>

diff --git a/footer.php b/footer.php
@@ -42,7 +42,7 @@
       </div>
 
       <div class="column cc-footer-contact">
-      <?php get_sidebar( 'footer-center' ); ?>
+      <?php get_template_part( 'template-parts/sidebar/sidebar','footer-center' ); ?>
       </div>
 
       <div class="column cc-footer-license">

diff --git a/front-page.php b/front-page.php
@@ -6,7 +6,7 @@
 get_header(); ?>
 
 <!-- header-below -->
-<?php get_template_part( 'template-parts/sidebar/header-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','header-below' ); ?>
 <!-- END header-below -->
 <div id="primary" class="content-area">
     <main id="main" class="site-main" role="main">
@@ -29,10 +29,10 @@
 
     </main><!-- .site-main -->
 
-    <?php get_template_part( 'template-parts/sidebar/content-bottom' ); ?>
+    <?php get_template_part( 'template-parts/sidebar/sidebar','content-bottom' ); ?>
 
 </div><!-- .content-area -->
 <!-- home-content-below -->
-    <?php get_template_part( 'template-parts/sidebar/homepage-content-widgets' ); ?>
+    <?php get_template_part( 'template-parts/sidebar/sidebar','homepage-content-widgets' ); ?>
 <!-- END home-content-below -->
 <?php get_footer(); ?>
diff --git a/functions.php b/functions.php
@@ -9,9 +9,9 @@
 /**
  * Include telated files
 */
-require TEMPLATEPATH . '/inc/taxonomies.php';
-require TEMPLATEPATH . '/inc/widgets.php';
-require TEMPLATEPATH . '/inc/blog_install.php';
+require STYLESHEETPATH . '/inc/taxonomies.php';
+require STYLESHEETPATH . '/inc/widgets.php';
+require STYLESHEETPATH . '/inc/blog_install.php';
 
 function twentysixteen_entry_meta() {
 

diff --git a/header.php b/header.php
@@ -44,7 +44,7 @@
                                 </span>
                             </div>
                             <div class="header-right-col">
-                                <?php get_sidebar( 'header-widget' ); ?>
+                                <?php get_template_part( 'template-part/sidebar/sidebar','header-widget' ); ?>
                                 <?php if ( has_nav_menu( 'secondary' ) ) : ?>
                                 <nav	 id="secondary-navigation" class="secondary-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Secondary Menu' ); ?>">
                                     <?php

diff --git a/inc/widgets.php b/inc/widgets.php
@@ -2,13 +2,13 @@
 /**
  * THEME WIDGETS
  */
-require TEMPLATEPATH . '/inc/widgets/cc-links.php';
-require TEMPLATEPATH . '/inc/widgets/cc-programs.php';
-require TEMPLATEPATH . '/inc/widgets/cc-works.php';
-require TEMPLATEPATH . '/inc/widgets/cc-videos.php';
-require TEMPLATEPATH . '/inc/widgets/cc-news.php';
-require TEMPLATEPATH . '/inc/widgets/cc-header-links.php';
-require TEMPLATEPATH . '/inc/widgets/cc-footer-links.php';
+require STYLESHEETPATH . '/inc/widgets/cc-links.php';
+require STYLESHEETPATH . '/inc/widgets/cc-programs.php';
+require STYLESHEETPATH . '/inc/widgets/cc-works.php';
+require STYLESHEETPATH . '/inc/widgets/cc-videos.php';
+require STYLESHEETPATH . '/inc/widgets/cc-news.php';
+require STYLESHEETPATH . '/inc/widgets/cc-header-links.php';
+require STYLESHEETPATH . '/inc/widgets/cc-footer-links.php';
 
 class cc_widgets {
 	private static $instance;

diff --git a/inc/widgets/cc-news.php b/inc/widgets/cc-news.php
@@ -156,7 +156,7 @@ function widget( $args, $instance ) {
 			// If we have a special feature, then it is 3 featured and 1 special feature.
 			// Otherwise, it is 4 features.
 			$have_special_feature = false;
-			$the_special_query    = cc_widgets_get_homepage_features_query( 'program', 0 );
+			$the_special_query    = cc_widgets::get_homepage_features_query( 'program', 0 );
 		if ( $the_special_query->have_posts() ) {
 			$have_special_feature = true;
 		}

diff --git a/inc/widgets/cc-programs.php b/inc/widgets/cc-programs.php
@@ -58,7 +58,7 @@ function widget( $args, $instance ) {
 				<?php
 
 				// The other features
-				$the_query = cc_widgets_get_featured_posts_by_taxonomy_query( 'program', 'highlight', $cc_programs_numposts );
+				$the_query = cc_widgets::get_featured_posts_by_taxonomy_query( 'program', 'highlight', $cc_programs_numposts );
 				while ( $the_query->have_posts() ) {
 					$the_query->the_post();
 					$hero_post_id = get_the_ID();
@@ -115,7 +115,7 @@ function widget( $args, $instance ) {
 					// If we have a special feature, then it is 3 featured and 1 special feature.
 					// Otherwise, it is 4 features.
 					$have_special_feature = false;
-					$the_special_query    = cc_widgets_get_homepage_features_query( 'program', 0 );
+					$the_special_query    = cc_widgets::get_homepage_features_query( 'program', 0 );
 				if ( $the_special_query->have_posts() ) {
 					$have_special_feature = true;
 				}

diff --git a/inc/widgets/cc-videos.php b/inc/widgets/cc-videos.php
@@ -58,7 +58,7 @@ function widget( $args, $instance ) {
 		<?php
 
 		// The other features
-			$the_query = cc_widgets_get_featured_posts_by_taxonomy_query( 'video', 'highlight', $cc_video_numposts );
+			$the_query = cc_widgets::get_featured_posts_by_taxonomy_query( 'video', 'highlight', $cc_video_numposts );
 		while ( $the_query->have_posts() ) {
 			$the_query->the_post();
 			$hero_post_id = get_the_ID();
@@ -101,7 +101,7 @@ function widget( $args, $instance ) {
 			// If we have a special feature, then it is 3 featured and 1 special feature.
 			// Otherwise, it is 4 features.
 			$have_special_feature = false;
-			$the_special_query    = cc_widgets_get_homepage_features_query( 'program', 0 );
+			$the_special_query    = cc_widgets::get_homepage_features_query( 'program', 0 );
 		if ( $the_special_query->have_posts() ) {
 			$have_special_feature = true;
 		}

diff --git a/inc/widgets/cc-works.php b/inc/widgets/cc-works.php
@@ -156,7 +156,7 @@ function widget( $args, $instance ) {
 				// If we have a special feature, then it is 3 featured and 1 special feature.
 				// Otherwise, it is 4 features.
 				$have_special_feature = false;
-				$the_special_query    = cc_widgets_get_homepage_features_query( 'program', 0 );
+				$the_special_query    = cc_widgets::get_homepage_features_query( 'program', 0 );
 			if ( $the_special_query->have_posts() ) {
 				$have_special_feature = true;
 			}

diff --git a/page-home.php b/page-home.php
@@ -23,8 +23,8 @@
 		?>
 	</div>
 	  <main id="main" class="site-main" role="main">
-		<?php get_template_part( 'template-parts/sidebar/content-above-mobile' ); ?>
-		<?php get_template_part( 'template-parts/sidebar/content-above' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above-mobile' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above' ); ?>
 		<?php
 			// Start the loop.
 		while ( have_posts() ) :
@@ -42,7 +42,7 @@
 			endwhile;
 		?>
 	  </main><!-- .site-main -->
-		<?php get_template_part( 'template-parts/sidebar/content-bottom' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-bottom' ); ?>
   </div>
 	<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
 	<div id="wrapper-sidebar" class="wrapper-sidebar">
@@ -51,7 +51,7 @@
 	<?php endif; ?>
 </div><!-- .content-area -->
 <!-- content-below -->
-<?php get_template_part( 'template-parts/sidebar/content-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','content-below' ); ?>
 <!-- END content-below -->
 
 <?php get_footer(); ?>
diff --git a/page.php b/page.php
@@ -14,7 +14,7 @@
 get_header(); ?>
 
 <!-- header-below -->
-<?php get_template_part( 'template-parts/sidebar/header-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','header-below' ); ?>
 <!-- END header-below -->
 <div id="primary" class="content-area">
   <div id="wrapper-main" class="wrapper-main">
@@ -26,8 +26,8 @@
 		?>
 	</div>
 	  <main id="main" class="site-main" role="main">
-		<?php get_template_part( 'template-parts/sidebar/content-above-mobile' ); ?>
-		<?php get_template_part( 'template-parts/sidebar/content-above' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above-mobile' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above' ); ?>
 		<?php
 			// Start the loop.
 		while ( have_posts() ) :
@@ -45,7 +45,7 @@
 			endwhile;
 		?>
 	  </main><!-- .site-main -->
-		<?php get_template_part( 'template-parts/sidebar/content-bottom' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-bottom' ); ?>
   </div>
 	<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
 	<div id="wrapper-sidebar" class="wrapper-sidebar">
@@ -54,7 +54,7 @@
 	<?php endif; ?>
 </div><!-- .content-area -->
 <!-- content-below -->
-<?php get_template_part( 'template-parts/sidebar/content-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','content-below' ); ?>
 <!-- END content-below -->
 
 <?php get_footer(); ?>
diff --git a/page_program.php b/page_program.php
@@ -52,14 +52,14 @@
 		?>
 
 	  </main><!-- .site-main -->
-	<?php get_template_part( 'template-parts/sidebar/content-bottom' ); ?>
+	<?php get_template_part( 'template-parts/sidebar/sidebar','content-bottom' ); ?>
   </div>
   <div id="wrapper-sidebar" class="wrapper-sidebar">
 	<?php get_sidebar(); ?>
   </div>
 </div><!-- .content-area -->
 <!-- content-below -->
-<?php get_template_part( 'template-parts/sidebar/content-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','content-below' ); ?>
 <!-- END content-below -->
 
 <?php get_footer(); ?>
diff --git a/single-post.php b/single-post.php
@@ -10,7 +10,7 @@
 get_header(); ?>
 
 <!-- header-below -->
-<?php get_template_part( 'template-parts/sidebar/header-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','header-below' ); ?>
 <!-- END header-below -->
 
 <div id="primary" class="content-area">
@@ -23,8 +23,8 @@
 		?>
 	</div>
 	  <main id="main" class="site-main" role="main">
-		<?php get_template_part( 'template-parts/sidebar/content-above-mobile' ); ?>
-		<?php get_template_part( 'template-parts/sidebar/content-above' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above-mobile' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above' ); ?>
 
 		<?php
 		// Start the loop.
@@ -52,14 +52,14 @@
 		endwhile;
 		?>
 	</main><!-- .site-main -->
-	<?php get_template_part( 'template-parts/sidebar/content-bottom' ); ?>
+	<?php get_template_part( 'template-parts/sidebar/sidebar','content-bottom' ); ?>
   </div>
   <div id="wrapper-sidebar" class="wrapper-sidebar">
 	<?php get_sidebar(); ?>
   </div>
 </div><!-- .content-area -->
 <!-- content-below -->
-<?php get_template_part( 'template-parts/sidebar/content-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','content-below' ); ?>
 <!-- END content-below -->
 
 <?php get_footer(); ?>
diff --git a/single.php b/single.php
@@ -19,8 +19,8 @@
 		?>
 	</div>
 	  <main id="main" class="site-main" role="main">
-		<?php get_template_part( 'template-parts/sidebar/content-above-mobile' ); ?>
-		<?php get_template_part( 'template-parts/sidebar/content-above' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above-mobile' ); ?>
+		<?php get_template_part( 'template-parts/sidebar/sidebar','content-above' ); ?>
 
 		<?php
 		// Start the loop.
@@ -60,14 +60,14 @@
 		endwhile;
 		?>
 	</main><!-- .site-main -->
-	<?php get_template_part( 'template-parts/sidebar/content-bottom' ); ?>
+	<?php get_template_part( 'template-parts/sidebar/sidebar','content-bottom' ); ?>
   </div>
   <div id="wrapper-sidebar" class="wrapper-sidebar">
 	<?php get_sidebar(); ?>
   </div>
 </div><!-- .content-area -->
 <!-- content-below -->
-<?php get_template_part( 'template-parts/sidebar/content-below' ); ?>
+<?php get_template_part( 'template-parts/sidebar/sidebar','content-below' ); ?>
 <!-- END content-below -->
 
 <?php get_footer(); ?>