marv 0.2.0 → 0.2.1

data/layouts/default/javascripts/admin.js

@@ -1 +1 @@
-// Theme Options JavaScript goes here
+//=require 'admin'

data/layouts/default/javascripts/theme.js

@@ -1 +1 @@
-// Regular theme JavaScript goes here
+//=require 'theme'

data/layouts/default/stylesheets/_header.scss.erb

@@ -1,15 +1,15 @@
-/**
- * Theme Name: <%= config[:name] %>
+/*!
+ * Theme Name: <%= config[:name].capitalize %>
  * Theme URI: <%= config[:uri] %>
  * Author: <%= config[:author] %>
  * Author URI: <%= config[:author_uri] %>
- * Description: <%= config[:description] if config[:description] %>
- * Version: <%= config[:version_number] if config[:version_number] %>
+ * Description: <%= if config[:description] then config[:description] else 'Wordpress theme made with Marv.' end %>
+ * Version: <%= if config[:version_number] then config[:version_number] else '0.1' end %>
 <% if config[:template] -%>
  * Template: <%= config[:template] %>
 <% end -%>
- * License: <%= config[:license_name] if config[:license_name] %>
- * License URI: <%= config[:license_uri] if config[:license_uri] %>
+ * License: <%= if config[:license_name] then config[:license_name] else 'GPLv3' end %>
+ * License URI: <%= if config[:license_uri] then config[:license_uri] else 'http://www.gnu.org/copyleft/gpl.html' end %>
  * Tags: <%= config[:tags].join(", ") if config[:tags] %>
 <%- unless config[:comments].nil? || config[:comments].empty? -%>
  *

data/layouts/default/stylesheets/style.css.scss.erb

@@ -1,32 +1,4 @@
 // WordPress theme header
 @import "header";
 
-// This is your master stylesheet
-
-// Use SASS to include CSS partials
-@import "reset";
-@import "typography";
-@import "blueprint/grid";
-
-// Add some basic styling
-.clear {
-  clear: both;
-}
-
-#container {
-  @include container;
-  @include prepend(1);
-  border-left: 1px solid;
-  border-right: 1px solid;
-}
-
-#content {
-  @include column(15);
-  @include border(#555, 2px);
-}
-
-#sidebar {
-  @include column(7);
-  @include prepend(1);
-  @include last;
-}
+// This is your master stylesheet

data/layouts/default/templates/404.php.erb

@@ -1,10 +1,25 @@
 <?php get_header(); ?>
-	<h1 class="page-title">
-		<?php _e( '404: Page Not Found', '<%= theme_id %>' ); ?>
-	</h1>
-	<div>
-		<p><?php _e( 'We are terribly sorry, but the URL you typed no longer exists. It might have been moved or deleted. Try searching the site:', '<%= theme_id %>' ); ?></p>
-		<?php get_search_form(); ?>
+
+	<div class="content-wrap">
+		<div class="content content-area">
+
+			<header class="page-header">
+				<h1 class="page-title"><?php _e( "Oops! That page can't be found.", '<%= theme_id %>' ); ?></h1>
+			</header>
+
+			<div class="page-content">
+				<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', '<%= theme_id %>' ); ?></p>
+
+				<?php get_search_form(); ?>
+			</div>
+
+		</div>
+
+		<div class="site-sidebar widget-area">
+
+			<?php get_sidebar(); ?>
+
+		</div>
 	</div>
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+
+<?php get_footer(); ?>

data/layouts/default/templates/archive.php.erb

@@ -1,11 +1,39 @@
 <?php get_header(); ?>
-<div id="content" class="clear">
-	<?php if ( have_posts() ) : ?>
-		<h1 class="small-header"><?php _e( 'Blog Archives', '<%= theme_id %>' ); ?></h1>
-		<?php get_template_part( 'loop' ); ?>
-	<?php else : ?>
-		<p><?php _e( 'No posts found.', '<%= theme_id %>' ); ?></p>
-	<?php endif; ?>
-</div><!--end content-->
-<?php get_sidebar(); ?>
+
+	<div class="content-wrap">
+		<div class="content content-area">
+			<?php if ( have_posts() ) : ?>
+
+				<header class="page-header">
+					<h1 class="page-title">
+						<?php
+							if ( is_day() ) :
+								printf( __( 'Day: %s', '<%= theme_id %>' ), get_the_date() );
+							elseif ( is_month() ) :
+								printf( __( 'Month: %s', '<%= theme_id %>' ), get_the_date( 'F Y' ) );
+							elseif ( is_year() ) :
+								printf( __( 'Year: %s', '<%= theme_id %>' ), get_the_date( 'Y' ) );
+							else :
+								_e( 'Archives', '<%= theme_id %>' );
+							endif;
+						?>
+					</h1>
+				</header>
+
+				<?php while ( have_posts() ) : the_post(); ?>
+
+					<?php get_template_part( 'content', get_post_format() ); ?>
+
+				<?php endwhile; ?>
+
+				<?php <%= theme_id %>_paging_nav(); ?>
+
+			<?php else : ?>
+
+				<?php get_template_part( 'content', 'none' ); ?>
+
+			<?php endif; ?>
+		</div>
+	</div>
+
 <?php get_footer(); ?>

data/layouts/default/templates/author.php.erb

@@ -0,0 +1,36 @@
+<?php get_header(); ?>
+
+	<div class="content-wrap">
+		<div class="content content-area">
+			<?php if ( have_posts() ) : ?>
+
+				<header class="page-header">
+					<h1 class="page-title">
+						<?php
+							the_post();
+							printf( __( 'All posts by %s', '<%= theme_id %>' ), sprintf(
+									'<span class="vcard"><a class="url fn n" href="%1$s" rel="me">%2$s</a></span>',
+									esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+									get_the_author()
+							) );
+						?>
+					</h1>
+				</header>
+
+				<?php rewind_posts(); ?>
+
+				<?php while ( have_posts() ) : the_post(); ?>
+
+					<?php get_template_part( 'content', get_post_format() ); ?>
+
+				<?php endwhile;	?>
+
+			<?php else : ?>
+
+				<?php get_template_part( 'content', 'none' ); ?>
+
+			<?php endif; ?>
+		</div>
+	</div>
+
+<?php get_footer(); ?>

data/layouts/default/templates/footer.php

@@ -1,9 +1,20 @@
-	<div id="footer">
-		<p>
-			<a href="http://wordpress.org/" rel="generator">Proudly powered by WordPress</a>
-		</p>
-	</div><!--end footer-->
-</div><!--end container-->
+	</div>
+	<!-- /site-content -->
+
+	<div class="push"></div>
+
+</div>
+<!-- /site -->
+
+<footer class="site-footer">
+	<div class="footer-content">
+
+		&copy; Copyright
+
+	</div>
+</footer>
+
 <?php wp_footer(); ?>
+
 </body>
 </html>

data/layouts/default/templates/header.php

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html <?php language_attributes(); ?>>
+
+<head>
+	<meta charset="<?php bloginfo( 'charset' ); ?>" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+
+	<link rel="profile" href="http://gmpg.org/xfn/11" />
+	<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+	
+	<title><?php wp_title( '|', true, 'right' ); ?></title>
+	
+	<?php wp_head(); ?>
+</head>
+
+<body <?php body_class(); ?>>
+	
+<!-- .site -->
+<div class="site">
+	
+	<header class="site-header">
+		<nav class="navbar site-navigation">
+			<div class="navbar-header">
+				<a href="<?php echo esc_url( home_url( '/' ) ); ?>" class="navbar-brand logo"><?php bloginfo( 'name' ); ?></a>
+			    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#site-navigation">
+			      <span class="sr-only">Toggle navigation</span>
+			      <span class="icon-bar"></span>
+			      <span class="icon-bar"></span>
+			      <span class="icon-bar"></span>
+			    </button>
+			</div>
+			<?php wp_nav_menu( array(
+				'theme_location'	=> 'primary-menu',
+				'container_class'	=> 'collapse navbar-collapse',
+				'container_id'		=> 'site-navigation',
+				'items_wrap'      	=> '<ul id="%1$s" class="%2$s nav navbar-nav">%3$s</ul>',
+				'depth'           	=> 0
+			) ); ?>
+		</nav>
+	</header>
+	
+	<!-- .site-content -->
+	<div class="site-content">

data/layouts/default/templates/index.php

@@ -1,4 +1,21 @@
 <?php get_header(); ?>
-<?php get_template_part( 'loop' ); ?>
-<?php get_sidebar(); ?>
+
+	<div class="content-wrap">
+		<div class="content content-area">
+			
+			<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
+				
+				<?php get_template_part( 'content', get_post_format() ); ?>
+				
+			<?php endwhile; endif; ?>
+			
+		</div>
+		
+		<div class="site-sidebar widget-area">
+			
+			<?php get_sidebar(); ?>
+
+		</div>
+	</div>
+	
 <?php get_footer(); ?>

data/layouts/default/templates/page.php

@@ -1,14 +1,19 @@
 <?php get_header(); ?>
-	<?php the_post(); ?>
-		<div id="page-<?php the_ID(); ?>">
-			<?php if ( has_post_thumbnail() ) { ?>
-				<div>
-					<?php the_post_thumbnail(); ?>
-				</div>
-			<?php } ?>
-			<h1><?php the_title(); ?></h1>
-			<?php the_content(); ?>
+
+	<div class="content-wrap">
+		<div class="content content-area">
+			<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
+				
+				<?php get_template_part( 'content', 'page' ); ?>
+				
+			<?php endwhile; endif; ?>
 		</div>
-	<?php comments_template( '', true ); ?>
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+
+		<div class="site-sidebar widget-area">
+
+			<?php get_sidebar(); ?>
+
+		</div>
+	</div>	
+
+<?php get_footer(); ?>

data/layouts/default/templates/partials/comments.php.erb

@@ -0,0 +1,50 @@
+<?php
+	if ( post_password_required() ) {
+		return;
+	}
+?>
+
+<div id="comments" class="comments">
+	<?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(), '<%= theme_id %>' ),
+					number_format_i18n( get_comments_number() ), get_the_title() );
+			?>
+		</h2>
+
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
+			<nav id="comment-nav-above" class="navigation comment-navigation" role="navigation">
+				<h1 class="screen-reader-text"><?php _e( 'Comment navigation', '<%= theme_id %>' ); ?></h1>
+				<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', '<%= theme_id %>' ) ); ?></div>
+				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', '<%= theme_id %>' ) ); ?></div>
+			</nav>
+		<?php endif; ?>
+
+		<ol class="comment-list">
+			<?php
+				wp_list_comments( array(
+					'style'      => 'ol',
+					'short_ping' => true,
+					'avatar_size'=> 34,
+				) );
+			?>
+		</ol>
+
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
+			<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
+				<h1 class="screen-reader-text"><?php _e( 'Comment navigation', '<%= theme_id %>' ); ?></h1>
+				<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', '<%= theme_id %>' ) ); ?></div>
+				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', '<%= theme_id %>' ) ); ?></div>
+			</nav>
+		<?php endif; ?>
+
+		<?php if ( ! comments_open() ) : ?>
+			<p class="no-comments"><?php _e( 'Comments are closed.', '<%= theme_id %>' ); ?></p>
+		<?php endif; ?>
+
+	<?php endif; ?>
+
+	<?php comment_form(); ?>
+</div>

data/layouts/default/templates/partials/content-none.php.erb

@@ -0,0 +1,19 @@
+<div class="no-results not-found">
+	<header class="page-header">
+		<h1 class="page-title"><?php _e( 'Nothing Found', '<%= theme_id %>' ); ?></h1>
+	</header>
+
+	<div class="page-content">
+		<?php if( is_search() ) : ?>
+
+			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', '<%= theme_id %>' ); ?></p>
+			<?php get_search_form(); ?>
+
+		<?php else : ?>
+
+			<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', '<%= theme_id %>' ); ?></p>
+			<?php get_search_form(); ?>
+
+		<?php endif; ?>
+	</div>
+</div>

data/layouts/default/templates/partials/content-page.php

@@ -0,0 +1,9 @@
+<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="page-header">
+		<h1 class="page-title"><?php the_title(); ?></h1>
+	</header>
+
+	<div class="page-content">
+		<?php the_content(); ?>
+	</div>
+</div>

data/layouts/default/templates/partials/content-single.php

@@ -0,0 +1,9 @@
+<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="page-header">
+		<h1 class="page-title"><?php the_title(); ?></h1>
+	</header>
+
+	<div class="page-content">
+		<?php the_content(); ?>
+	</div>
+</div>

data/layouts/default/templates/partials/content.php.erb

@@ -0,0 +1,16 @@
+<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<h2 class="entry-title"><?php the_title(); ?></h2>
+	</header>
+
+	<?php if ( is_search() ) : ?>
+		<div class="entry-summary">
+			<?php the_excerpt(); ?>
+			<a href="<?php the_permalink(); ?>"><?php _e('Read more', '<%= theme_id %>') ?></a>
+		</div>
+	<?php else : ?>
+		<div class="entry-content">
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', '<%= theme_id %>' ) ); ?>
+		</div>
+	<?php endif; ?>
+</div>

data/layouts/default/templates/partials/searchform.php.erb

@@ -0,0 +1,5 @@
+<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+	<label for="s" class="assistive-text"><?php _e( 'Search', '<%= theme_id %>' ); ?></label>
+	<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', '<%= theme_id %>' ); ?>" />
+	<button type="submit" class="submit" name="submit" id="searchsubmit"><?php _e( 'Search', '<%= theme_id %>' ); ?></button>
+</form>

data/layouts/default/templates/partials/sidebar.php

@@ -0,0 +1,7 @@
+<!-- .sidebar -->
+<div class="sidebar">
+	<ul>
+		<?php dynamic_sidebar( 'sidebar' ); ?>
+	</ul>
+</div>
+<!-- /sidebar -->