wordpress-starter 0.1 → 0.2

data/templates/starter/comments.php

@@ -7,59 +7,70 @@
  * handled by a callback to starter_comment() which is
  * located in the functions.php file.
  *
- * @category  Theme
- * @package   [starter]
- * @author    [Your Name]
- * @copyright 2012 [Your Name]
+ * @package starter
+ * @since starter 1.0
  */
+?>
 
-/*
- * If the current post is protected by a password and
- * the visitor has not yet entered the password we will
- * return early without loading the comments.
- */
-if ( post_password_required() )
-	return;
+<?php
+	/*
+	 * If the current post is protected by a password and
+	 * the visitor has not yet entered the password we will
+	 * return early without loading the comments.
+	 */
+	if ( post_password_required() )
+		return;
 ?>
 
-<div id="comments" class="comments-area">
+	<div id="comments" class="comments-area">
 
 	<?php // You can start editing here -- including this comment! ?>
 
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?php
-				printf(
-					_n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'starter' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
-				);
+				printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'starter' ),
+					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
 			?>
 		</h2>
 
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+		<nav role="navigation" id="comment-nav-above" class="site-navigation comment-navigation">
+			<h1 class="assistive-text"><?php _e( 'Comment navigation', 'starter' ); ?></h1>
+			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'starter' ) ); ?></div>
+			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'starter' ) ); ?></div>
+		</nav><!-- #comment-nav-before .site-navigation .comment-navigation -->
+		<?php endif; // check for comment navigation ?>
+
 		<ol class="commentlist">
-			<?php wp_list_comments( array( 'callback' => 'starter_comment', 'style' => 'ol' ) ); ?>
-		</ol>
+			<?php
+				/* Loop through and list the comments. Tell wp_list_comments()
+				 * to use starter_comment() to format the comments.
+				 * If you want to overload this in a child theme then you can
+				 * define starter_comment() and that will be used instead.
+				 * See starter_comment() in inc/template-tags.php for more.
+				 */
+				wp_list_comments( array( 'callback' => 'starter_comment' ) );
+			?>
+		</ol><!-- .commentlist -->
 
-	<?php
-	if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ):
-		// are there comments to navigate through ?>
-		<nav id="comment-nav-below" class="navigation" role="navigation">
-			<h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'starter' ); ?></h1>
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+		<nav role="navigation" id="comment-nav-below" class="site-navigation comment-navigation">
+			<h1 class="assistive-text"><?php _e( 'Comment navigation', 'starter' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'starter' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'starter' ) ); ?></div>
-		</nav>
+		</nav><!-- #comment-nav-below .site-navigation .comment-navigation -->
 		<?php endif; // check for comment navigation ?>
 
+	<?php endif; // have_comments() ?>
+
 	<?php
-	/* If there are no comments and comments are closed, let's leave a note.
-	 * But we only want the note on posts and pages that had comments in the first place.
-	 */
-	if ( ! comments_open() && get_comments_number() ) : ?>
-		<p class="nocomments"><?php _e( 'Comments are closed.' , 'starter' ); ?></p>
+		// If comments are closed and there are comments, let's leave a little note, shall we?
+		if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
+	?>
+		<p class="nocomments"><?php _e( 'Comments are closed.', 'starter' ); ?></p>
 	<?php endif; ?>
 
-	<?php endif; // have_comments() ?>
-
 	<?php comment_form(); ?>
 
-</div>
+</div><!-- #comments .comments-area -->

data/templates/starter/content-page.php

@@ -2,23 +2,19 @@
 /**
  * The template used for displaying page content in page.php
  *
- * @category  Theme
- * @package   [starter]
- * @author    [Your Name]
- * @copyright 2012 [Your Name]
+ * @package starter
+ * @since starter 1.0
  */
 ?>
 
-	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-		<header class="entry-header">
-			<h1 class="entry-title"><?php the_title(); ?></h1>
-		</header>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+	</header><!-- .entry-header -->
 
-		<div class="entry-content">
-			<?php the_content(); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'starter' ), 'after' => '</div>' ) ); ?>
-		</div>
-		<footer class="entry-meta">
-			<?php edit_post_link( __( 'Edit', 'starter' ), '<span class="edit-link">', '</span>' ); ?>
-		</footer>
-	</article>
+	<div class="entry-content">
+		<?php the_content(); ?>
+		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'starter' ), 'after' => '</div>' ) ); ?>
+		<?php edit_post_link( __( 'Edit', 'starter' ), '<span class="edit-link">', '</span>' ); ?>
+	</div><!-- .entry-content -->
+</article><!-- #post-<?php the_ID(); ?> -->

data/templates/starter/content-single.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package starter
+ * @since starter 1.0
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+
+		<div class="entry-meta">
+			<?php starter_posted_on(); ?>
+		</div><!-- .entry-meta -->
+	</header><!-- .entry-header -->
+
+	<div class="entry-content">
+		<?php the_content(); ?>
+		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'starter' ), 'after' => '</div>' ) ); ?>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-meta">
+		<?php
+			/* translators: used between list items, there is a space after the comma */
+			$category_list = get_the_category_list( __( ', ', 'starter' ) );
+
+			/* translators: used between list items, there is a space after the comma */
+			$tag_list = get_the_tag_list( '', __( ', ', 'starter' ) );
+
+			if ( ! starter_categorized_blog() ) {
+				// This blog only has 1 category so we just need to worry about tags in the meta text
+				if ( '' != $tag_list ) {
+					$meta_text = __( 'This entry was tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'starter' );
+				} else {
+					$meta_text = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'starter' );
+				}
+
+			} else {
+				// But this blog has loads of categories so we should probably display them here
+				if ( '' != $tag_list ) {
+					$meta_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'starter' );
+				} else {
+					$meta_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'starter' );
+				}
+
+			} // end check for categories on this blog
+
+			printf(
+				$meta_text,
+				$category_list,
+				$tag_list,
+				get_permalink(),
+				the_title_attribute( 'echo=0' )
+			);
+		?>
+
+		<?php edit_post_link( __( 'Edit', 'starter' ), '<span class="edit-link">', '</span>' ); ?>
+	</footer><!-- .entry-meta -->
+</article><!-- #post-<?php the_ID(); ?> -->

data/templates/starter/content.php

@@ -1,67 +1,61 @@
 <?php
 /**
- * The default template for displaying content. Used for both single and index/archive/search.
- *
- * @category  Theme
- * @package   [starter]
- * @author    [Your Name]
- * @copyright 2012 [Your Name]
+ * @package starter
+ * @since starter 1.0
  */
 ?>
 
-	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-		<?php if ( is_sticky() && is_home() && ! is_paged() ) : ?>
-		<div class="featured-post">
-			<?php _e( 'Featured post', 'starter' ); ?>
-		</div>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'starter' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+
+		<?php if ( 'post' == get_post_type() ) : ?>
+		<div class="entry-meta">
+			<?php starter_posted_on(); ?>
+		</div><!-- .entry-meta -->
 		<?php endif; ?>
-		<header class="entry-header">
-			<?php the_post_thumbnail(); ?>
-			<?php if ( is_single() ) : ?>
-			<h1 class="entry-title"><?php the_title(); ?></h1>
-			<?php else : ?>
-			<h1 class="entry-title">
-				<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'starter' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
-			</h1>
-			<?php endif; // is_single() ?>
-			<?php if ( comments_open() ) : ?>
-				<div class="comments-link">
-					<?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'starter' ) . '</span>', __( '1 Reply', 'starter' ), __( '% Replies', 'starter' ) ); ?>
-				</div>
-			<?php endif; // comments_open() ?>
-		</header>
+	</header><!-- .entry-header -->
+
+	<?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">
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'starter' ) ); ?>
+		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'starter' ), 'after' => '</div>' ) ); ?>
+	</div><!-- .entry-content -->
+	<?php endif; ?>
+
+	<footer class="entry-meta">
+		<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$categories_list = get_the_category_list( __( ', ', 'starter' ) );
+				if ( $categories_list && starter_categorized_blog() ) :
+			?>
+			<span class="cat-links">
+				<?php printf( __( 'Posted in %1$s', 'starter' ), $categories_list ); ?>
+			</span>
+			<?php endif; // End if categories ?>
+
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$tags_list = get_the_tag_list( '', __( ', ', 'starter' ) );
+				if ( $tags_list ) :
+			?>
+			<span class="sep"> | </span>
+			<span class="tags-links">
+				<?php printf( __( 'Tagged %1$s', 'starter' ), $tags_list ); ?>
+			</span>
+			<?php endif; // End if $tags_list ?>
+		<?php endif; // End if 'post' == get_post_type() ?>
 
-		<?php if ( is_search() ):
-			// Only display Excerpts for Search ?>
-		<div class="entry-summary">
-			<?php the_excerpt(); ?>
-		</div>
-		<?php else : ?>
-		<div class="entry-content">
-			<?php the_content( __( 'Continue reading', 'starter' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'starter' ), 'after' => '</div>' ) ); ?>
-		</div>
+		<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+		<span class="sep"> | </span>
+		<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'starter' ), __( '1 Comment', 'starter' ), __( '% Comments', 'starter' ) ); ?></span>
 		<?php endif; ?>
 
-		<footer class="entry-meta clearfix">
-			<?php starter_entry_meta(); ?>
-			<?php edit_post_link( __( 'Edit', 'starter' ), '<span class="edit-link">', '</span>' ); ?>
-			<?php if ( is_singular() && get_the_author_meta( 'description' ) && is_multi_author() ):
-				// If a user has filled out their description and this is a multi-author blog, show a bio on their entries. ?>
-				<div class="author-info clearfix">
-					<div class="author-avatar">
-						<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'starter_author_bio_avatar_size', 68 ) ); ?>
-					</div>
-					<div class="author-description">
-						<h2><?php printf( __( 'About %s', 'starter' ), get_the_author() ); ?></h2>
-						<p><?php the_author_meta( 'description' ); ?></p>
-						<div class="author-link">
-							<a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
-								<?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'starter' ), get_the_author() ); ?>
-							</a>
-						</div>
-					</div>
-				</div>
-			<?php endif; ?>
-		</footer>
-	</article>
+		<?php edit_post_link( __( 'Edit', 'starter' ), '<span class="sep"> | </span><span class="edit-link">', '</span>' ); ?>
+	</footer><!-- .entry-meta -->
+</article><!-- #post-<?php the_ID(); ?> -->

data/templates/starter/footer.php

@@ -1,29 +1,27 @@
 <?php
 /**
- * The default template for displaying footer
+ * The template for displaying the footer.
  *
- * @category  Theme
- * @package   [starter]
- * @author    [Your Name]
- * @copyright 2012 [Your Name]
+ * Contains the closing of the id=main div and all content after
+ *
+ * @package starter
+ * @since starter 1.0
  */
 ?>
-				</div>
-				<?php get_sidebar(); ?>
-			</section>
-		</div>
-		<footer class="footer" role="contentinfo">
-			<?php do_action( 'starter_footer' ); ?>
-			<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'starter' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'starter' ); ?>"><?php printf( __( 'Proudly powered by %s', 'starter' ), 'WordPress' ); ?></a>
-		</footer>
-	</div>
-<?php
-	/* Always have wp_footer() just before the closing </body>
-	 * tag of your theme, or you will break many plugins, which
-	 * generally use this hook to reference JavaScript files.
-	 */
 
-	wp_footer();
-?>
-	</body>
+	</div><!-- #main .site-main -->
+
+	<footer id="colophon" class="site-footer" role="contentinfo">
+		<div class="site-info">
+			<?php do_action( 'starter_credits' ); ?>
+			<a href="//wordpress.org/" title="<?php esc_attr_e( 'A Semantic Personal Publishing Platform', 'starter' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'starter' ), 'WordPress' ); ?></a>
+			<span class="sep"> | </span>
+			<?php printf( __( 'Theme: %1$s by %2$s.', 'starter' ), 'starter', '<a href="//underscores.me/" rel="designer">Underscores.me</a>' ); ?>
+		</div><!-- .site-info -->
+	</footer><!-- #colophon .site-footer -->
+</div><!-- #page .hfeed .site -->
+
+<?php wp_footer(); ?>
+
+</body>
 </html>

data/templates/starter/functions.php

@@ -1,26 +1,20 @@
 <?php
 /**
- * [starter] theme functions and definitions
+ * starter functions and definitions
  *
- * For more information on hooks, actions, and filters, see http://codex.wordpress.org/Plugin_API.
- *
- * @category  Theme
- * @package   [starter]
- * @author    [Your Name]
- * @copyright 2012 [Your Name]
+ * @package starter
+ * @since starter 1.0
  */
 
-global $of_options, $data;
-
 /**
  * Set the content width based on the theme's design and stylesheet.
  *
- * Used to set the width of images and content. Should be equal to the width the theme
- * is designed for, generally via the style.css stylesheet.
+ * @since starter 1.0
  */
 if ( ! isset( $content_width ) )
-	$content_width = 540;
+	$content_width = 640; /* pixels */
 
+if ( ! function_exists( 'starter_setup' ) ) :
 /**
  * Sets up theme defaults and registers support for various WordPress features.
  *
@@ -28,1184 +22,94 @@ if ( ! isset( $content_width ) )
  * before the init hook. The init hook is too late for some features, such as indicating
  * support post thumbnails.
  *
- * To override starter_setup() in a child theme, add your own starter_setup to your child theme's
- * functions.php file.
- *
- * @uses add_theme_support() To add support for post thumbnails, automatic feed links and Post Formats.
- * @uses register_nav_menus() To add support for navigation menus.
- * @uses add_custom_background() To add support for a custom background.
- * @uses add_editor_style() To style the visual editor.
- * @uses load_theme_textdomain() For translation/localization support.
- * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
- *
- * @since [starter] 1.0
+ * @since starter 1.0
  */
 function starter_setup() {
-	// SET THEME LANGUAGES DIRECTORY
-	// Theme translations can be filed in the my_theme/languages/ directory
-	load_theme_textdomain( 'starter', get_template_directory() . '/languages' );
-
-	// This theme styles the visual editor with editor-style.css to match the theme style.
-	add_editor_style( 'stylesheets/editor-style.css' );
-
-	// Adds support for rss links
-	add_theme_support( 'automatic-feed-links' );
-
-	// Add support for a variety of post formats (http://codex.wordpress.org/Post_Formats)
-	// Child Themes inherit the post formats defined by the parent theme
-	add_theme_support( 'post-formats', array( 'aside', 'gallery', 'link', 'image', 'quote', 'status', 'video', 'audio', 'chat' ) );
-
-	// Add post thumbnails (http://codex.wordpress.org/Post_Thumbnails)
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 670, 230, true ); // Default Thumbnail Image
-
-	// Register wp_nav_menu() menus (http://codex.wordpress.org/Function_Reference/register_nav_menus)
-	register_nav_menu( 'primary', __( 'Primary menu', 'starter' ) );
-
-	/*------------------------------------------*/
-	/* Options Framework
-	/*------------------------------------------*/
-	locate_template( 'options.php', true );
-	locate_template( 'admin/index.php', true );
-
-	do_action( 'starter_setup' );
-}
-
-add_action( 'after_setup_theme', 'starter_setup' );
-
-/**
- * Some cleanup
- *
- * @since [starter] 1.0
- * @return void
- */
-function starter_init() {
-	// autolinks in comments
-	remove_filter( 'comment_text', 'make_clickable', 9 );
-
-	// Display the links to the general feeds: Post and Comment Feed
-	remove_action( 'wp_head', 'feed_links', 2 );
-
-	// Display the links to the extra feeds such as category feeds
-	remove_action( 'wp_head', 'feed_links_extra', 3 );
-
-	// Display the link to the Really Simple Discovery service endpoint, EditURI link
-	remove_action( 'wp_head', 'rsd_link' );
-
-	// Display the link to the Windows Live Writer manifest file.
-	remove_action( 'wp_head', 'wlwmanifest_link' );
-	remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0 );
-
-	// index link
-	remove_action( 'wp_head', 'index_rel_link' );
-
-	// prev link
-	remove_action( 'wp_head', 'parent_post_rel_link', 10, 0 );
-
-	// start link
-	remove_action( 'wp_head', 'start_post_rel_link', 10, 0 );
-
-	// Display relational links for the posts adjacent to the current post.
-	remove_action( 'wp_head', 'adjacent_posts_rel_link', 10, 0 );
-
-	// Display the XHTML generator that is generated on the wp_head hook, WP version
-	remove_action( 'wp_head', 'wp_generator' );
-	remove_action( 'wp_head', 'wp_shortlink_wp_head', 10, 0 );
-
-	// remove jetpack open graph tags
-	remove_action( 'wp_head', 'jetpack_og_tags' );
-
-	add_filter( 'use_default_gallery_style', '__return_null' );
-
-	/* Custom oEmbed Providers */
-
-	// Add Soundcloud oEmbed
-	wp_oembed_add_provider( '#http://(www\.)?soundcloud\.com/.*#i', 'http://soundcloud.com/oembed', true );
-
-	// Add Kickstarter oEmbed
-	wp_oembed_add_provider( '#http://(www\.)?kickstarter\.com/projects/.*#i', 'http://www.kickstarter.com/services/oembed', true );
-
-	// Add Instagram oEmbed
-	wp_oembed_add_provider( '#http://(www\.)?instagr(am)?\.(am|com)/.*#i', 'http://api.instagram.com/oembed', true );
-
-	// Add Slideshare oEmbed
-	wp_oembed_add_provider( '#http://(www\.)?slideshare\.net/.*#i', 'http://api.embed.ly/v1/api/oembed', true );
-}
-
-add_action( 'init', 'starter_init' );
-
-/**
- * Remove the WordPress version from RSS feeds
- */
-add_filter( 'the_generator', '__return_false' );
-
-/**
- * Adds custom scripts to theme header
- *
- * @since [starter] 1.0
- * @return void
- */
-function starter_enqueue_scripts() {
-	$theme   = wp_get_theme();
-	$version = $theme['Version'];
-
-	wp_deregister_script( 'jquery' );
-	wp_register_script( 'jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js', false, '1.8.3' );
 
 	/**
-	 *  We add some JavaScript to pages with the comment form
-	 * to support sites with threaded comments (when in use).
+	 * Custom template tags for this theme.
 	 */
-	if ( is_singular() and comments_open() and get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
-	}
-
-	wp_enqueue_script( 'modernizr', get_template_directory_uri() . '/javascripts/modernizr.min.js', false, '2.6.2' );
-	wp_enqueue_script( 'app', get_template_directory_uri() . '/javascripts/app.js', array( 'jquery' ), $version, true );
-}
-
-add_action( 'wp_enqueue_scripts', 'starter_enqueue_scripts' );
-
-/**
- * Adds custom styles to theme header
- *
- * @since [starter] 1.0
- * @return void
- */
-function starter_enqueue_styles() {
-	$theme   = wp_get_theme();
-	$version = $theme['Version'];
-
-	wp_enqueue_style( 'app', get_stylesheet_uri(), false, $version, 'all' );
-}
-
-add_action( 'wp_enqueue_scripts', 'starter_enqueue_styles' );
-
-/**
- * Makes some changes to the <title> tag, by filtering the output of wp_title().
- *
- * If we have a site description and we're viewing the home page or a blog posts
- * page (when using a static front page), then we will add the site description.
- *
- * If we're viewing a search result, then we're going to recreate the title entirely.
- * We're going to add page numbers to all titles as well, to the middle of a search
- * result title and the end of all other titles.
- *
- * The site title also gets added to all titles.
- *
- * @since [starter] 1.0
- *
- * @param string $title Title generated by wp_title()
- * @param string $separator The separator passed to wp_title(). Base theme uses a vertical bar, "|", as a separator in header.php.
- * @return string The new title, ready for the <title> tag.
- */
-function starter_filter_wp_title( $title, $separator ) {
-	// Don't affect wp_title() calls in feeds.
-	if ( is_feed() or function_exists( 'get_wpseo_options' ) )
-		return $title;
-
-	// The $paged global variable contains the page number of a listing of posts.
-	// The $page global variable contains the page number of a single post that is paged.
-	// We'll display whichever one applies, if we're not looking at the first page.
-	global $paged, $page, $post;
-
-	if ( is_search() ) {
-		// If we're a search, let's start over:
-		$title = sprintf( __( 'Search results for %s', 'starter' ), '"' . get_search_query() . '"' );
-		// Add a page number if we're on page 2 or more:
-		if ( $paged >= 2 ) {
-			$title .= " $separator " . sprintf( __( 'Page %s', 'starter' ), $paged );
-		}
-		// Add the site name to the end:
-		$title .= " $separator " . get_bloginfo( 'name', 'display' );
-		// We're done. Let's send the new title back to wp_title():
-		return $title;
-	}
-
-	$return = array();
-
-	if ( $title != '' ) {
-		$return[] = str_replace( " $separator ", '', apply_filters( 'the_category', $title ) );
-	}
-
-	if ( is_single() ) {
-		if ( get_post_meta( $post->ID, 'title', true ) ) {
-			$return[] = stripslashes( get_post_meta( $post->ID, 'seo_title', true ) );
-		}
-		elseif ( ! in_array( $post->post_type, array( 'post', 'page', 'attachment' ) ) ) {
-			$post_type_obj = get_post_type_object( $post->post_type );
-			$return[] = apply_filters( 'post_type_archive_title', $post_type_obj->labels->name );
-		}
-	}
-
-	// Add a page number if necessary:
-	if ( $paged >= 2 or $page >= 2 ) {
-		$return[] = sprintf( __( 'Page %s', 'starter' ), max( $paged, $page ) );
-	}
-
-	// Add the site name to the end:
-	$return[] = get_bloginfo( 'name', 'display' );
-
-	// If we have a site description and we're on the home/front page, add the description:
-	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description and ( is_home() or is_front_page() ) ) {
-		$return[] = $site_description;
-	}
-
-	// Return the new title to wp_title():
-	return implode( " $separator ", $return );
-}
-
-add_filter( 'wp_title', 'starter_filter_wp_title', 10, 3 );
-
-/**
- * Adds code to header
- *
- * @since [starter] 1.0
- * @return string misc
- */
-function starter_header() {
-	?>
-	<!-- For third-generation iPad with high-resolution Retina display: -->
-	<link rel="apple-touch-icon-precomposed" sizes="144x144" href="apple-touch-icon-144x144-precomposed.png?1333401433">
-	<!-- For iPhone with high-resolution Retina display: -->
-	<link rel="apple-touch-icon-precomposed" sizes="114x114" href="apple-touch-icon-114x114-precomposed.png?1333401433">
-	<!-- For first- and second-generation iPad: -->
-	<link rel="apple-touch-icon-precomposed" sizes="72x72" href="apple-touch-icon-72x72-precomposed.png?1333401433">
-	<!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
-	<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png?1333401433">
-	<!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
-	<link rel="shortcut icon" href="favicon.ico?1333401433" type="image/x-icon" />
-	<?php
-	do_action( 'starter_header' );
-}
-
-add_action( 'wp_head', 'starter_header', 10 );
-
-/**
- * Adds code to footer
- *
- * @since [starter] 1.0
- * @return string misc
- */
-function starter_footer() {}
-
-add_action( 'wp_footer', 'starter_footer', 10 );
-
-/**
- * Defines widget areas
- *
- * @since [starter] 1.0
- * @return void
- */
-function starter_widgets_init() {
-	register_sidebar(
-		array(
-			'name'          => __( 'Primary widget area', 'starter' ),
-			'id'            => 'primary-widget-area',
-			'description'   => __( '', 'starter' ),
-			'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
-			'after_widget'  => '</li>',
-			'before_title'  => '<h3 class="widget-title">',
-			'after_title'   => '</h3>',
-		)
-	);
-}
-
-add_action( 'widgets_init', 'starter_widgets_init' );
-
-/**
- * Clean up output of stylesheet <link> tags
- *
- * @since [starter] 1.0
- */
-function starter_clean_style_tag( $input ) {
-	preg_match_all( "!<link rel='stylesheet'\s?(id='[^']+')?\s+href='(.*)' type='text/css' media='(.*)' />!", $input, $matches );
-	// Only display media if it's print
-	$media = $matches[3][0] == 'print' ? ' media="print"' : '';
-
-	return '<link rel="stylesheet" href="' . $matches[ 2 ][ 0 ] . '"' . $media . '>' . "\n";
-}
-
-add_filter( 'style_loader_tag', 'starter_clean_style_tag' );
-
-/**
- * Remove unnecessary self-closing tags
- *
- * @since [starter] 1.0
- */
-function starter_remove_self_closing_tags( $input ) {
-	return str_replace( ' />', '>', $input );
-}
-
-add_filter( 'get_avatar',          'starter_remove_self_closing_tags' ); // <img />
-add_filter( 'comment_id_fields',   'starter_remove_self_closing_tags' ); // <input />
-add_filter( 'post_thumbnail_html', 'starter_remove_self_closing_tags' ); // <img />
-
-/**
- * Wrap embedded media as suggested by Readability
- *
- * @link https://gist.github.com/965956
- * @link http://www.readability.com/publishers/guidelines#publisher
- * @since [starter] 1.0
- */
-function starter_embed_wrap( $cache, $url, $attr = '', $post_ID = '' ) {
-	return '<div class="entry-content-asset">' . $cache . '</div>';
-}
-
-add_filter( 'embed_oembed_html', 'starter_embed_wrap', 10, 4 );
-add_filter( 'embed_googlevideo', 'starter_embed_wrap', 10, 2 );
-
-/**
- * Remove height/width attributes on images so they can be responsive
- *
- * @since [starter] 1.0
- */
-function starter_remove_thumbnail_dimensions( $html, $id, $alt, $title ) {
-	return preg_replace(
-		array(
-			'/\s+width="\d+"/i',
-			'/\s+height="\d+"/i',
-			'/alt=""/i',
-		),
-		array(
-			'',
-			'',
-			'',
-			'alt="' . $title . '"',
-		),
-		$html
-	);
-}
-
-add_filter( 'post_thumbnail_html', 'starter_remove_thumbnail_dimensions', 10, 4 );
-add_filter( 'image_send_to_editor', 'starter_remove_thumbnail_dimensions', 10, 4 );
-add_filter( 'get_image_tag', 'starter_remove_thumbnail_dimensions', 10, 4 );
-
-/**
- * Clean the output of attributes of images in editor.
- *
- * @link http://www.sitepoint.com/wordpress-change-img-tag-html/
- * @since [starter] 1.0
- */
-function starter_image_tag_class( $class, $id, $align, $size ) {
-	$align = 'align' . esc_attr( $align );
-	return $align;
-}
-
-add_filter( 'get_image_tag_class', 'starter_image_tag_class', 0, 4 );
-
-/**
- * Add thumbnail class to thumbnail links
- *
- * @since [starter] 1.0
- */
-function starter_add_class_attachment_link( $html ) {
-	$postid = get_the_ID();
-	$html   = str_replace( '<a', '<a class="thumbnail"', $html );
-
-	return $html;
-}
-
-add_filter( 'wp_get_attachment_link', 'starter_add_class_attachment_link', 10, 1 );
-
-/**
- * Filter in a link to a content ID attribute for the next/previous image links on image attachment pages
- *
- * @since [starter] 1.0
- */
-function starter_enhanced_image_navigation( $url, $id ) {
-	if ( ! is_attachment() && ! wp_attachment_is_image( $id ) )
-		return $url;
-
-	$image = get_post( $id );
-	if ( ! empty( $image->post_parent ) && $image->post_parent != $id )
-		$url .= '#main';
-
-	return $url;
-}
-
-add_filter( 'attachment_link', 'starter_enhanced_image_navigation', 10, 2 );
-
-/**
- * Replace various active menu class names with "active"
- * Remove the id="" on nav menu items
- * Return 'menu-slug' for nav menu classes
- *
- * @since [starter] 1.0
- */
-function starter_wp_nav_menu_class( $classes, $item ) {
-	$slug    = sanitize_title( $item->title );
-	$classes = preg_replace( '/(current(-menu-|[-_]page[-_])(item|parent|ancestor))/', 'active', $classes );
-	$classes = preg_replace( '/^((menu|page)[-_\w+]+)+/', '', $classes );
-
-	$classes[] = 'menu-' . $slug;
-
-	return array_filter( array_unique( $classes ), 'is_element_empty' );
-}
-
-add_filter( 'nav_menu_css_class', 'starter_wp_nav_menu_class', 10, 2 );
-add_filter( 'nav_menu_item_id', '__return_null' );
-
-/**
- * Check if $element is empty
- *
- * @since [starter] 1.0
- */
-function is_element_empty( $element ) {
-	$element = trim( $element );
-
-	return ( bool ) ! empty( $element );
-}
-
-/**
- * Create a graceful fallback to wp_page_menu
- *
- * @since [starter] 1.0
- */
-function starter_page_menu() {
-
-	$args = array(
-		'sort_column' => 'menu_order, post_title',
-		'menu_class'  => 'nav-menu',
-		'include'     => '',
-		'exclude'     => '',
-		'echo'        => true,
-		'show_home'   => false,
-		'link_before' => '',
-		'link_after'  => '',
-	);
-
-	wp_page_menu( $args );
-}
-
-/**
- * Adds extra info to language attributes string
- *
- * @since [starter] 1.0
- */
-function starter_language_attributes() {
-	$attr   = array();
-	$output = '';
-
-	if ( function_exists( 'is_rtl' ) ) {
-		if ( is_rtl() == 'rtl' ) {
-			$attr[] = 'dir="rtl"';
-		}
-	}
-
-	$lang = get_bloginfo( 'language' );
-
-	if ( $lang and $lang !== 'en-US' ) {
-		$attr[] = "lang=\"$lang\"";
-	}
-	else {
-		$attr[] = 'lang="en"';
-	}
-
-	return implode( ' ', $attr );
-}
-
-add_filter( 'language_attributes', 'starter_language_attributes' );
-
-/**
- * remove the p from around imgs
- *
- * @link https://gist.github.com/975026
- * @since [starter] 1.0
- */
-function starter_filter_ptags_on_images( $content ) {
-	// Replace br tags inside figures
-	$content = preg_replace( '/(<figure .*>)?<br\s?\/?>\s*(<a .*>)?\s*(<img .* \/>)\s*(<\/a>)?\s*/iU', '\1\2\3\4', $content );
-	// do a regular expression replace...
-	// find all p tags that have just
-	// <p>maybe some white space<img all stuff up to /> then maybe whitespace </p>
-	// replace it with just the image tag...
-	$content = preg_replace( '/<p>\s*(<a .*>)?\s*(<img .* \/>)\s*(<\/a>)?\s*<\/p>/iU', '\1\2\3', $content );
-	// now pass that through and do the same for iframes...
-	return preg_replace( '/<p>\s*(<iframe .*>*.<\/iframe>)\s*<\/p>/iU', '\1', $content );
-}
-
-add_filter( 'the_content', 'starter_filter_ptags_on_images' );
-
-/**
- * Adds browser detection body class
- * Adds extra classes to body tag on custom taxonomies
- *
- * @since [starter] 1.0
- */
-function starter_body_classes( $classes ) {
-	global $wp_query, $is_lynx, $is_gecko, $is_IE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone;
-
-	if ( isset( $wp_query->query_vars['taxonomy'] ) or isset( $wp_query->query_vars['term'] ) ) {
-		array_push( $classes, 'custom-taxonomy-archive', 'custom-taxonomy-' . ( isset( $wp_query->query_vars[ 'taxonomy' ] ) ? get_query_var( 'taxonomy' ) : get_query_var( 'term' ) ) . '-archive' );
-	}
-
-	if ( $is_lynx ) $classes[]       = 'lynx';
-	elseif ( $is_gecko ) $classes[]  = 'gecko';
-	elseif ( $is_opera ) $classes[]  = 'opera';
-	elseif ( $is_NS4 ) $classes[]    = 'ns4';
-	elseif ( $is_safari ) $classes[] = 'safari';
-	elseif ( $is_chrome ) $classes[] = 'chrome';
-	elseif ( $is_IE ) $classes[]     = 'ie';
-	else $classes[]                  = 'unknown';
-
-	if ( $is_iphone ) $classes[] = 'iphone';
-
-	// Add post/page slug
-	if ( is_single() or is_page() and ! is_front_page() ) {
-		$classes[] = basename( get_permalink() );
-	}
-
-	// Remove unnecessary classes
-	$home_id_class  = 'page-id-' . get_option( 'page_on_front' );
-	$remove_classes = array(
-		'page-template-default',
-		$home_id_class,
-	);
+	require( get_template_directory() . '/inc/template-tags.php' );
 
-	$classes = array_diff( $classes, $remove_classes );
-
-	return $classes;
-}
-
-add_filter( 'body_class', 'starter_body_classes' );
-
-/**
- * Modifies output of custom post formats.
- *
- * @since [starter] 1.0
- */
-function starter_custom_content( $content ) {
-	/* Check if we're displaying a 'quote' post. */
-	if ( has_post_format( 'quote' ) ) {
-		/* Match any <blockquote> elements. */
-		preg_match( '/<blockquote.*?>/', $content, $matches );
-
-		/* If no <blockquote> elements were found, wrap the entire content in one. */
-		if ( empty( $matches ) ) {
-			$content = "<blockquote>{$content}</blockquote>";
-		}
-	}
-	elseif ( has_post_format( 'aside' ) and ! is_singular() ) {
-		preg_match( '/<p>(.*?)<\/p>(?!\s*<p>)/', $content, $matches );
-
-		$content = str_replace( $matches[1], $matches[1] . ' <a href="' . get_permalink() . '">&#8734;</a>', $content );
-	}
-
-	return $content;
-}
-
-add_filter( 'the_content', 'starter_custom_content' );
-
-/**
- * Remove <p> and <br /> in the shortcodes
- *
- * @since [starter] 1.0
- */
-function starter_shortcode_empty_paragraph_fix( $content ) {
-	$array = array(
-		'<p>['    => '[',
-		']</p>'   => ']',
-		']<br />' => ']',
-	);
-
-	// replace the strings in the $content
-	$content = strtr( $content, $array );
-
-	return $content;
-}
-
-add_filter( 'the_content', 'starter_shortcode_empty_paragraph_fix' );
-
-/**
- * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
- *
- * Create your own starter_entry_meta() to override in a child theme.
- *
- * @since [starter] 1.0
- */
-function starter_entry_meta() {
-	// Translators: used between list items, there is a space after the comma.
-	$categories_list = get_the_category_list( __( ', ', 'starter' ) );
-
-	// Translators: used between list items, there is a space after the comma.
-	$tag_list = get_the_tag_list( '', __( ', ', 'starter' ) );
-
-	$date = sprintf(
-		'<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() )
-	);
-
-	$author = sprintf(
-		'<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'starter' ), get_the_author() ) ),
-		get_the_author()
-	);
-
-	// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
-	if ( $tag_list ) {
-		$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'starter' );
-	}
-	elseif ( $categories_list ) {
-		$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'starter' );
-	}
-	else {
-		$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'starter' );
-	}
-
-	printf(
-		$utility_text,
-		$categories_list,
-		$tag_list,
-		$date,
-		$author
-	);
-}
-
-/**
- * Returns a "Continue Reading" link for excerpts
- *
- * @since [starter] 1.0
- */
-function starter_continue_reading_link() {
-	$read_more_link = ' <a href="' . get_permalink() . '" class="more-link">' . __( 'Continue reading', 'starter' ) . '</a>';
-
-	return $read_more_link;
-}
-
-/**
- * Replaces "[...]" (appended to automatically generated excerpts ) with starter_continue_reading_link().
- *
- * To override this in a child theme, remove the filter and add your own
- * function tied to the excerpt_more filter hook.
- *
- * @since [starter] 1.0
- */
-function starter_auto_excerpt_more( $more ) {
-	return starter_continue_reading_link();
-}
-
-add_filter( 'excerpt_more', 'starter_auto_excerpt_more' );
-add_filter( 'the_content_more_link', 'starter_auto_excerpt_more' );
-
-/**
- * Adds a pretty "Continue Reading" link to custom post excerpts.
- *
- * To override this link in a child theme, remove the filter and add your own
- * function tied to the get_the_excerpt filter hook.
- *
- * @since [starter] 1.0
- */
-function starter_custom_excerpt_more( $output ) {
-	if ( has_excerpt() and ! is_attachment() ) {
-		$output .= starter_continue_reading_link();
-	}
-	return $output;
-}
-
-add_filter( 'get_the_excerpt', 'starter_custom_excerpt_more' );
-
-/**
- * Adds nofollow rel atribute to content links
- *
- * @since [starter] 1.0
- */
-function starter_nofollow_links_in_post( $text ) {
-	global $post;
-
-	if ( get_post_meta( $post->ID, 'nofollow_links', true ) ) {
-		preg_match_all( '/<a.*? href=\"(.*? )\".*?>(.*? )<\/a>/i', $text, $links );
-		$match_count = count( $links[0] );
-
-		for ( $i = 0; $i < $match_count; ++$i ) {
-			if ( ! preg_match( '/rel=[\"\']*nofollow[\"\']*/', $links[0][$i] ) ) {
-				preg_match_all( '/<a.*? href=\"(.*? )\"(.*? )>(.*? )<\/a>/i', $links[0][$i], $link_text );
-
-				$search  = '>'.$link_text[3][0].'</a>';
-				$replace = ' rel="nofollow">'.$link_text[3][0].'</a>';
-
-				$text = str_replace( $search, $replace, $text );
-			}
-		}
-	}
-
-	return $text;
-}
-
-add_action( 'the_content', 'starter_nofollow_links_in_post' );
-
-/**
- * Custom tag clould args
- *
- * @since [starter] 1.0
- */
-function starter_widget_tag_cloud_args( $args ) {
-	$args['number']   = 20; // show less tags
-	$args['largest']  = 13; // make largest and smallest the same
-	$args['smallest'] = 13;
-	$args['unit']     = 'px';
-	$args['format']   = 'list'; // ul with a class of wp-tag-cloud
-	// $args['exclude']  = array(20, 80, 92); // exclude tags by ID
-	// $args['taxonomy'] = array('post_tag', 'ingredients'); // add post tags and ingredients taxonomy
-
-	return $args;
-}
-
-add_filter( 'widget_tag_cloud_args', 'starter_widget_tag_cloud_args' );
-
-/**
- * Filter tag clould output so that it can be styled by CSS
- *
- * @since [starter] 1.0
- */
-function starter_add_tag_class( $taglinks ) {
-	$tags  = explode( '</a>', $taglinks );
-	$regex = "#(.*tag-link[-])(.*)(' title.*)#e";
-	foreach ( $tags as $tag ) {
-		$tagn[] = preg_replace( $regex, "('$1$2 label tag-'.get_tag($2)->slug.'$3')", $tag );
-	}
-
-	return implode( '</a>', $tagn );
-}
-
-add_filter( 'wp_tag_cloud', 'starter_add_tag_class' );
-
-/**
- * Outputs WP Pagenavi pagination or wordpress navigation
- *
- * @since [starter] 1.0
- */
-function pagination( $query = false ) {
-	global $wp_query;
-
-	if ( is_single() ) {
-		?>
-		<nav id="comment-nav-below" class="navigation" role="navigation">
-			<h1 class="assistive-text section-heading"><?php _e( 'Post Navigation', 'starter' ); ?></h1>
-		<?php
-		if ( $previous = get_previous_post() ):?>
-				<div class="nav-previous alignleft">
-					<a href="<?php echo get_permalink( $previous );?>" title="<?php printf( __( 'Permalink to %s', 'starter' ), get_the_title( $previous ) );?>"><?php _e( 'Previous', 'starter' ); ?></a>
-				</div>
-			<?php endif;?>
-		<?php
-		if ( $next = get_next_post() ):?>
-				<div class="nav-next alignright">
-					<a href="<?php echo get_permalink( $next );?>" title="<?php printf( __( 'Permalink to %s', 'starter' ), get_the_title( $next ) );?>"><?php _e( 'Next', 'starter' ); ?></a>
-				</div>
-			<?php endif;?>
-		</nav>
-	<?php
-	} else {
-		if ( $wp_query->max_num_pages > 1 ) {
-			if ( function_exists( 'wp_pagenavi' ) ) {
-				$args = array( 'options' => PageNavi_Core::$options->get_defaults() );
-
-				if ( $query ) {
-					$args[ 'query' ] = $query;
-				}
-
-				wp_pagenavi( $args );
-			} else {
-				//get_template_part( 'templates/pager' );
-				$big = 999999999; // This needs to be an unlikely integer
-
-				// For more options and info view the docs for paginate_links()
-				// http://codex.wordpress.org/Function_Reference/paginate_links
-				$paginate_links = paginate_links(
-					array(
-						'base'      => str_replace( $big, '%#%', get_pagenum_link( $big ) ),
-						'current'   => max( 1, get_query_var( 'paged' ) ),
-						'total'     => $wp_query->max_num_pages,
-						'mid_size'  => 5,
-						'prev_next' => True,
-						'prev_text' => __( '&larr;' ),
-						'next_text' => __( '&rarr;' ),
-						'type'      => 'list',
-					)
-				);
-
-				// Display the pagination if more than one page is found
-				if ( $paginate_links ) {
-					echo $paginate_links;
-				}
-			}
-		}
-	}
-}
-
-add_action( 'pagination', 'pagination' );
-
-/**
- * Template for comments and pingbacks.
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since [starter] 1.0
- */
-function starter_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) {
-		case 'pingback' :
-		case 'trackback' :
-			// Display trackbacks differently than normal comments.
-			?>
-			<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
-				<p><?php _e( 'Pingback:', 'starter' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'starter' ), '<span class="edit-link">', '</span>' ); ?></p>
-			<?php
-		break;
-		default :
-			// Proceed with normal comments.
-			global $post;
-			?>
-			<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
-				<article id="comment-<?php comment_ID(); ?>" class="comment">
-					<header class="comment-meta comment-author vcard clearfix">
-			<?php
-				echo get_avatar( $comment, 44 );
-				printf(
-					'<cite class="fn">%1$s %2$s</cite>',
-					get_comment_author_link(),
-					// If current post author is also comment author, make it known visually.
-					( $comment->user_id === $post->post_author ) ? '<span> ' . __( 'Post author', 'starter' ) . '</span>' : ''
-				);
-				printf(
-					'<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
-					esc_url( get_comment_link( $comment->comment_ID ) ),
-					get_comment_time( 'c' ),
-					/* translators: 1: date, 2: time */
-					sprintf( __( '%1$s at %2$s', 'starter' ), get_comment_date(), get_comment_time() )
-				);
-			?>
-			</header>
-
-			<?php
-			if ( '0' == $comment->comment_approved ):
-				?>
-				<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'starter' ); ?></p>
-			<?php endif; ?>
-
-			<section class="comment-content comment clearfix">
-				<?php comment_text(); ?>
-			</section>
-
-			<div class="reply">
-				<?php edit_comment_link( __( 'Edit', 'starter' ), '<span class="edit-link">', '</span> / ' ); ?>
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'starter' ), 'after' => ' <span>&darr;</span>', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-			</div>
-			</article>
-			<?php
-			break;
-	} // end comment_type check
-}
-
-/**
- * Redirect to post when search query returns single result
- *
- * @see http://wpsnipp.com/index.php/functions-php/redirect-to-post-when-search-query-returns-single-result/
- * @since [starter] 1.0
- */
-function starter_single_result() {
-	if ( is_search() ) {
-		global $wp_query;
-		if  ( $wp_query->post_count == 1 ) {
-			wp_redirect( get_permalink( $wp_query->posts['0']->ID ) );
-		}
-	}
-}
-add_action( 'template_redirect', 'starter_single_result' );
-
-/**
- * Add postMessage support for site title and description for the Theme Customizer.
- *
- * @since [starter] 1.0
- *
- * @param WP_Customize_Manager $wp_customize Theme Customizer object.
- * @return void
- */
-function starter_customize_register( $wp_customize ) {
-	$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
-}
-add_action( 'customize_register', 'starter_customize_register' );
-
-/* SHORTCODES */
-
-// Allow shortcodes in widgets
-add_filter( 'widget_text', 'do_shortcode' );
-
-/**
- * The supported attributes for the shortcode are 'id', 'align', 'width', and 'caption'.
- *
- * @since [starter] 1.0
- */
-function starter_shortcode_caption( $atts, $content = null ) {
-	extract(
-		shortcode_atts(
-			array(
-				'id'		=> '',
-				'align'		=> 'alignnone',
-				'width'		=> '',
-				'caption'	=> '',
-			), $atts
-		)
-	);
-
-	if ( 1 > ( int ) $width )
-		return $content;
-
-	if ( empty( $caption ) ) {
-		preg_match( '/(<img[^>]+>)[ ]?(.*)/i', $content, $match );
-		$content = $match[1];
-		$caption = $match[2];
-	}
-
-	if ( $id ) {
-		$idtag = 'id="' . esc_attr( $id ) . '" ';
-	}
-
-	$out[] = '<figure ' . $idtag . 'aria-describedby="figcaption_' . $id . '" class="post-image wp-caption ' . $align . '">';
-	$out[] = do_shortcode( $content );
-	$out[] = '<figcaption id="figcaption_' . $id . '" class="caption wp-caption-text">' . wpautop( wptexturize( $caption ) ) . '</figcaption>';
-	$out[] = '</figure>';
-
-	return implode( "\n", $out );
-}
-
-add_shortcode( 'wp_caption', 'starter_shortcode_caption' );
-add_shortcode( 'caption', 'starter_shortcode_caption' );
-
-
-/* ADMIN STUFF */
-
-/**
- * Remove unnecessary dashboard widgets
- *
- * @link http://www.deluxeblogtips.com/2011/01/remove-dashboard-widgets-in-wordpress.html
- * @since [starter] 1.0
- */
-function starter_remove_dashboard_widgets() {
-	// Incoming Links Widget
-	remove_meta_box( 'dashboard_incoming_links', 'dashboard', 'normal' );
-
-	// Plugins Widget
-	remove_meta_box( 'dashboard_plugins', 'dashboard', 'normal' );
-
-	remove_meta_box( 'dashboard_primary', 'dashboard', 'normal' );
-	remove_meta_box( 'dashboard_secondary', 'dashboard', 'normal' );
-
-	// Sitepress WPML Plugin Widget
-	remove_meta_box( 'icl_dashboard_widget', 'dashboard', 'normal' );
-
-	// Yoast's SEO Plugin Widget
-	remove_meta_box( 'yoast_db_widget', 'dashboard', 'normal' );
-}
-
-add_action( 'admin_init', 'starter_remove_dashboard_widgets' );
-
-/**
- * Adds custom menu to admin bar
- *
- * @since [starter] 1.0
- */
-function starter_bar_menu( $wp_admin_bar ) {
-	if ( ! is_super_admin() or ! is_admin_bar_showing() )
-		return;
+	/**
+	 * Custom functions that act independently of the theme templates
+	 */
+	require( get_template_directory() . '/inc/extras.php' );
 
 	/**
-	 * Change "Howdy"
+	 * Custom Theme Options
 	 */
-	// get the node that contains "howdy"
-	$my_account = $wp_admin_bar->get_node( 'my-account' );
-	// change the "howdy"
-	$my_account->title = str_replace( 'Howdy,', __( 'Hi,', 'starter' ), $my_account->title );
-	// remove the original node
-	$wp_admin_bar->remove_node( 'my-account' );
-	// add back our modified version
-	$wp_admin_bar->add_node( $my_account );
+	//require( get_template_directory() . '/inc/theme-options/theme-options.php' );
 
 	/**
-	 * Removing the "W" menu
-	 * I have nothing against it, but I *never* use it
+	 * Make theme available for translation
+	 * Translations can be filed in the /languages/ directory
+	 * If you're building a theme based on starter, use a find and replace
+	 * to change 'starter' to the name of your theme in all the template files
 	 */
-	$wp_admin_bar->remove_menu( 'wp-logo' );
+	load_theme_textdomain( 'starter', get_template_directory() . '/languages' );
 
 	/**
-	 * Create a "Favorites" menu
-	 * First, just create the parent menu item
+	 * Add default posts and comments RSS feed links to head
 	 */
-	$wp_admin_bar->add_menu(
-		array(
-			'id'  => 'favorites',
-			'parent' => 'top-secondary', // puts it on the right-hand side
-			'title'  => __( 'Favorites', 'starter' ),
-		)
-	);
+	add_theme_support( 'automatic-feed-links' );
 
 	/**
-	 * Then add links to it
-	 * This link goes to the All Settings page,
-	 * so only show it to users that have appropriate privileges
+	 * Enable support for Post Thumbnails
 	 */
-	if ( current_user_can( 'manage_options' ) ) {
-		$wp_admin_bar->add_menu(
-			array(
-				'id'  => 'all-settings',
-				'parent' => 'favorites',
-				'title'  => __( 'Options', 'starter' ),
-				'href'  => admin_url( 'options.php' ),
-			)
-		);
-	}
+	add_theme_support( 'post-thumbnails' );
 
-	// This one goes to the list of the current user's posts
-	$wp_admin_bar->add_menu(
-		array(
-			'id'  => 'my-posts',
-			'parent' => 'favorites',
-			'title'  => __( 'My Posts', 'starter' ),
-			'href'  => admin_url( 'edit.php?post_type=post&author=' . get_current_user_id() ),
-		)
-	);
+	/**
+	 * This theme uses wp_nav_menu() in one location.
+	 */
+	register_nav_menus( array(
+		'primary' => __( 'Primary Menu', 'starter' ),
+	) );
 
-	// MySQL query and script execution timer output
-	$wp_admin_bar->add_menu(
-		array(
-			'id'  => 'do_query_bar',
-			'parent' => 'top-secondary', // puts it on the right-hand side
-			'title'  => get_num_queries() . 'Q - ' . timer_stop() . 's', // link title
-			'href'  => '#',
-			'meta'  => false,
-		)
-	);
+	/**
+	 * Add support for the Aside Post Formats
+	 */
+	add_theme_support( 'post-formats', array( 'aside', ) );
 }
-
-add_action( 'admin_bar_menu', 'starter_bar_menu', '1000' );
+endif; // starter_setup
+add_action( 'after_setup_theme', 'starter_setup' );
 
 /**
- * This simple hack will remove the AIM, Yahoo and Jabber fields and will replace them with a bunch of other social network profiles.
+ * Register widgetized area and update sidebar with default widgets
  *
- * @since [starter] 1.0
+ * @since starter 1.0
  */
-function starter_user_contactmethods( $contactmethods ) {
-	unset( $contactmethods['aim'], $contactmethods['yim'], $contactmethods['jabber'] );
-
-	// Add Location
-	$contactmethods['user_location'] = __( 'Location', 'starter' );
-
-	// Add Facebook
-	$contactmethods['user_fb'] = __( 'Facebook', 'starter' );
-
-	// Add Pinterest
-	$contactmethods['user_pt'] = __( 'Pinterest', 'starter' );
-
-	// Add Twitter
-	$contactmethods['user_tw'] = __( 'Twitter', 'starter' );
-
-	// Add Linkedin
-	$contactmethods['user_lk'] = __( 'Linkedin', 'starter' );
-
-	// Add Github
-	$contactmethods['user_gh'] = __( 'Github', 'starter' );
-
-	// Add Google+
-	$contactmethods['google_profile'] = __( 'Google+ profile', 'starter' );
-
-	return $contactmethods;
+function starter_widgets_init() {
+	register_sidebar( array(
+		'name' => __( 'Sidebar', 'starter' ),
+		'id' => 'sidebar-1',
+		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+		'after_widget' => '</aside>',
+		'before_title' => '<h1 class="widget-title">',
+		'after_title' => '</h1>',
+	) );
 }
-
-add_filter( 'user_contactmethods', 'starter_user_contactmethods' );
+add_action( 'widgets_init', 'starter_widgets_init' );
 
 /**
- * Adds previous/next links to post edition window
- *
- * @since [starter] 1.0
+ * Enqueue scripts and styles
  */
-function starter_add_navigation_edit_posts() {
-	if ( isset( $_GET['post'] ) and isset( $_GET['action'] ) and $_GET['action'] == 'edit' ) {
-		global $post;
-
-		$args = array(
-			'public'   => true,
-			'_builtin' => false,
-		);
-		$output   = 'names'; // names or objects, note names is the default
-		$operator = 'and'; // 'and' or 'or'
-
-		$post_types = get_post_types( $args, $output, $operator );
-
-		$post_types['post'] = 'post';
-		$post_types['page'] = 'page';
+function starter_scripts() {
+	wp_enqueue_style( 'style', get_stylesheet_uri() );
 
-		if ( is_object( $post ) and in_array( $post->post_type, $post_types ) ) {
-			$wtf = array( true, false );
-			foreach ( $wtf as $prev ) {
-				$p = get_adjacent_post( false, '', $prev );
+	wp_enqueue_script( 'small-menu', get_template_directory_uri() . '/javascripts/small-menu.js', array( 'jquery' ), '20120206', true );
 
-				if ( ! empty( $p ) ) {
-					echo '<script>
-					jQuery(function($) {
-						$(".wrap h2" )
-						.append(\'<a class="add-new-h2" href="' . admin_url( 'post.php?action=edit&post=' . $p->ID ) . '" title="' . __( 'Editar', 'starter' ) . ' ' . apply_filters( 'the_title', $p->post_title ) . '">' . ( $prev ? '&laquo; ' : '' ) . apply_filters( 'the_title', $p->post_title ) . ( ! $prev ? ' &raquo;' : '' ) . '</a>\' );
-					});
-					</script>';
-				}
-			}
-		}
+	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
+		wp_enqueue_script( 'comment-reply' );
 	}
-}
-
-add_action( 'admin_head', 'starter_add_navigation_edit_posts' );
-
-/**
- * Custom Login Logo Support
- *
- * @since [starter] 1.0
- */
-function starter_custom_login_logo() {
-	echo '<style type="text/css">
-		h1 a { background-image:url(' . get_template_directory_uri() . '/images/login-logo.png) !important; }
-	</style>';
-}
-
-add_action( 'login_head', 'starter_custom_login_logo' );
-
-/**
- * Custom Login URL
- *
- * @since [starter] 1.0
- */
-function starter_wp_login_url() {
-	return home_url();
-}
-
-add_filter( 'login_headerurl', 'starter_wp_login_url' );
 
-/**
- * Custom Login Title
- *
- * @since [starter] 1.0
- */
-function starter_wp_login_title() {
-	return get_option( 'blogname' );
+	if ( is_singular() && wp_attachment_is_image() ) {
+		wp_enqueue_script( 'keyboard-image-navigation', get_template_directory_uri() . '/javascripts/keyboard-image-navigation.js', array( 'jquery' ), '20120202' );
+	}
 }
-
-add_filter( 'login_headertitle', 'starter_wp_login_title' );
+add_action( 'wp_enqueue_scripts', 'starter_scripts' );
 
 /**
- * Custom Backend Footer
- *
- * @since [starter] 1.0
+ * Implement the Custom Header feature
  */
-function starter_custom_admin_footer() {
-	$credits = '<span id="footer-thankyou">Crafted by <a href="//alexsancho.name" target="_blank">Alex Sancho</a></span>.';
-
-	echo apply_filters( 'starter_custom_admin_footer', $credits );
-}
-
-// adding it to the admin area
-add_filter( 'admin_footer_text', 'starter_custom_admin_footer' );
+//require( get_template_directory() . '/inc/custom-header.php' );