marv 0.2.0 → 0.2.1

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

@@ -1,12 +1,33 @@
 <?php get_header(); ?>
-	<h1><?php printf( __( "Search results for '%s'", "<%= theme_id %>" ), get_search_query() ); ?></h1>
-	<?php if ( have_posts() ) : ?>
-		<?php get_template_part( 'loop' ); ?>
-	<?php else : ?>
-		<div>
-			<p><?php printf( __( 'Sorry, your search for "%s" did not turn up any results. Please try again.', '<%= theme_id %>' ), get_search_query());?></p>
-			<?php get_search_form(); ?>
+
+	<div class="content-wrap">
+		<div class="content content-area">
+			<?php if ( have_posts() ) : ?>
+
+				<header class="page-header">
+					<h1 class="page-title"><?php printf( __( 'Search Results for: %s', '<%= theme_id %>' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
+				</header>
+
+				<?php while ( have_posts() ) : the_post(); ?>
+
+					<?php get_template_part( 'content', 'search' ); ?>
+
+				<?php endwhile; ?>
+
+				<?php <%= theme_id %>_paging_nav(); ?>
+
+			<?php else : ?>
+
+				<?php get_template_part( 'content', 'none' ); ?>
+
+			<?php endif; ?>
 		</div>
-	<?php endif; ?>
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+
+		<div class="site-sidebar widget-area">
+
+			<?php get_sidebar(); ?>
+
+		</div>
+	</div>
+
+<?php get_footer(); ?>

data/layouts/default/templates/single.php

@@ -0,0 +1,26 @@
+<?php get_header(); ?>
+
+	<div class="content-wrap">
+		<div class="content content-area">
+			<?php while ( have_posts() ) : the_post(); ?>
+
+				<?php get_template_part( 'content', 'single' ); ?>
+
+				<?php
+					if ( comments_open() || '0' != get_comments_number() ) :
+						comments_template();
+					endif;
+				?>
+
+			<?php endwhile; ?>
+		</div>
+
+		<div class="site-sidebar widget-area">
+
+			<?php get_sidebar(); ?>
+
+		</div>
+	</div>
+
+
+<?php get_footer(); ?>

data/lib/marv/generator.rb

@@ -59,6 +59,15 @@ module Marv
       self
     end
 
+    def copy_images
+      source = File.expand_path(File.join(self.layout_path, 'images'))
+      target = File.expand_path(File.join(@project.assets_path, 'images'))
+
+      render_directory(source, target)
+
+      self
+    end
+
     def copy_templates
       source = File.expand_path(File.join(self.layout_path, 'templates'))
       target = File.expand_path(File.join(@project.source_path, 'templates'))
@@ -75,6 +84,15 @@ module Marv
       write_template(source, target)
     end
 
+    def copy_includes
+      source = File.expand_path(File.join(self.layout_path, 'includes'))
+      target = File.expand_path(File.join(@project.source_path, 'includes'))
+
+      render_directory(source, target)
+
+      self
+    end
+
     def layout_path
       @layout_path ||= File.join(Marv::ROOT, 'layouts', @layout)
     end
@@ -84,8 +102,10 @@ module Marv
       create_structure
       copy_stylesheets
       copy_javascript
+      copy_images
       copy_templates
       copy_functions
+      copy_includes
       return self
     end
 

data/marv.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hardpixel"]
@@ -33,24 +33,32 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "layouts/config/config.tt",
     "layouts/default/functions/functions.php.erb",
+    "layouts/default/images/screenshot.png",
+    "layouts/default/includes/filters-admin.php.erb",
+    "layouts/default/includes/filters.php.erb",
+    "layouts/default/includes/helpers.php.erb",
+    "layouts/default/javascripts/admin.coffee",
     "layouts/default/javascripts/admin.js",
+    "layouts/default/javascripts/theme.coffee",
     "layouts/default/javascripts/theme.js",
     "layouts/default/stylesheets/_header.scss.erb",
-    "layouts/default/stylesheets/_reset.scss",
-    "layouts/default/stylesheets/_typography.scss",
     "layouts/default/stylesheets/style.css.scss.erb",
     "layouts/default/templates/404.php.erb",
     "layouts/default/templates/archive.php.erb",
-    "layouts/default/templates/attachment.php.erb",
-    "layouts/default/templates/comments.php",
+    "layouts/default/templates/author.php.erb",
     "layouts/default/templates/footer.php",
-    "layouts/default/templates/header.php.erb",
+    "layouts/default/templates/header.php",
     "layouts/default/templates/index.php",
     "layouts/default/templates/page.php",
-    "layouts/default/templates/partials/loop.php.erb",
+    "layouts/default/templates/partials/comments.php.erb",
+    "layouts/default/templates/partials/content-none.php.erb",
+    "layouts/default/templates/partials/content-page.php",
+    "layouts/default/templates/partials/content-single.php",
+    "layouts/default/templates/partials/content.php.erb",
+    "layouts/default/templates/partials/searchform.php.erb",
+    "layouts/default/templates/partials/sidebar.php",
     "layouts/default/templates/search.php.erb",
-    "layouts/default/templates/sidebar.php",
-    "layouts/default/templates/single.php.erb",
+    "layouts/default/templates/single.php",
     "lib/guard/marv/assets.rb",
     "lib/guard/marv/config.rb",
     "lib/guard/marv/functions.rb",
@@ -65,6 +73,7 @@ Gem::Specification.new do |s|
     "lib/marv/guard.rb",
     "lib/marv/project.rb",
     "lib/marv/version.rb",
+    "marv-0.2.1.gem",
     "marv.gemspec",
     "spec/lib/marv/config_spec.rb",
     "spec/lib/marv/project_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -340,24 +340,32 @@ files:
 - features/support/env.rb
 - layouts/config/config.tt
 - layouts/default/functions/functions.php.erb
+- layouts/default/images/screenshot.png
+- layouts/default/includes/filters-admin.php.erb
+- layouts/default/includes/filters.php.erb
+- layouts/default/includes/helpers.php.erb
+- layouts/default/javascripts/admin.coffee
 - layouts/default/javascripts/admin.js
+- layouts/default/javascripts/theme.coffee
 - layouts/default/javascripts/theme.js
 - layouts/default/stylesheets/_header.scss.erb
-- layouts/default/stylesheets/_reset.scss
-- layouts/default/stylesheets/_typography.scss
 - layouts/default/stylesheets/style.css.scss.erb
 - layouts/default/templates/404.php.erb
 - layouts/default/templates/archive.php.erb
-- layouts/default/templates/attachment.php.erb
-- layouts/default/templates/comments.php
+- layouts/default/templates/author.php.erb
 - layouts/default/templates/footer.php
-- layouts/default/templates/header.php.erb
+- layouts/default/templates/header.php
 - layouts/default/templates/index.php
 - layouts/default/templates/page.php
-- layouts/default/templates/partials/loop.php.erb
+- layouts/default/templates/partials/comments.php.erb
+- layouts/default/templates/partials/content-none.php.erb
+- layouts/default/templates/partials/content-page.php
+- layouts/default/templates/partials/content-single.php
+- layouts/default/templates/partials/content.php.erb
+- layouts/default/templates/partials/searchform.php.erb
+- layouts/default/templates/partials/sidebar.php
 - layouts/default/templates/search.php.erb
-- layouts/default/templates/sidebar.php
-- layouts/default/templates/single.php.erb
+- layouts/default/templates/single.php
 - lib/guard/marv/assets.rb
 - lib/guard/marv/config.rb
 - lib/guard/marv/functions.rb
@@ -372,6 +380,7 @@ files:
 - lib/marv/guard.rb
 - lib/marv/project.rb
 - lib/marv/version.rb
+- marv-0.2.1.gem
 - marv.gemspec
 - spec/lib/marv/config_spec.rb
 - spec/lib/marv/project_spec.rb

data/layouts/default/stylesheets/_reset.scss

@@ -1,5 +0,0 @@
-/* _reset.scss
- * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
-
-@import "blueprint/reset";
-@include blueprint-global-reset;

data/layouts/default/stylesheets/_typography.scss

@@ -1,5 +0,0 @@
-/* _typography.scss
- * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
-
-@import "blueprint/typography";
-@include blueprint-typography;

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

@@ -1,32 +0,0 @@
-<?php get_header(); ?>
-	<?php the_post(); ?>
-	<h1 class="page-title"><?php the_title(); ?></h1>
-	<div>
-		<a href="<?php echo wp_get_attachment_url( $post->ID ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
-			<?php
-				if ( wp_attachment_is_image ( $post->ID ) ) {
-					$img_src = wp_get_attachment_image_src( $post->ID, 'large' );
-					$alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
-			?>
-					<img src="<?php echo esc_url( $img_src[0] ); ?>" alt="<?php esc_attr_e( $alt_text ); ?>">
-			<?php
-				} else {
-					echo basename( $post->guid );
-				}
-			?>
-		</a>
-		<?php if ( $post->post_content ) : ?>
-			<div class="description">
-				<?php the_content(); ?>
-			</div>
-		<?php endif; ?>
-		<div class="pagination clear">
-			<div class="alignleft"><?php previous_image_link( 0, __( '&larr; Previous image', '<%= theme_id %>' ) ); ?></div>
-			<div class="alignright"><?php next_image_link( 0, __( 'Next image &rarr;', '<%= theme_id %>' ) ); ?></div>
-		</div>
-		<div>
-			<a href="<?php echo get_permalink( $post->post_parent ); ?>"><?php _e( 'Return to gallery', '<%= theme_id %>' ); ?></a>
-		</div>
-	</div>
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>

data/layouts/default/templates/comments.php

@@ -1,2 +0,0 @@
-<?php
-// Default comments file goes here

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

@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html <?php language_attributes( 'html' ) ?>>
-<head>
-	<meta charset="<?php bloginfo( 'charset' ); ?>" />
-	<title><?php wp_title(); ?></title>	
-
-	<!-- WordPress -->
-	<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
-	<?php wp_head(); ?>
-</head>
-<body <?php body_class(); ?>>
-<div id="container">
-	<div id="header" class="clear">
-		<div id="title">
-			<?php if ( is_front_page() ) echo( '<h1>' ); ?>
-				<a href="<?php echo home_url(); ?>"><?php bloginfo( 'name' ); ?></a>
-			<?php if ( is_front_page() ) echo( '</h1>' ); ?>
-		</div>
-		<?php
-			wp_nav_menu(
-				array(
-					'theme_location'  => 'nav-1',
-					'container_id'    => 'navigation',
-					'container_class' => 'clear',
-					'menu_class'      => 'nav',
-					'depth'           => '2'
-					)
-				);
-		?>
-	</div><!--end header-->

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

@@ -1,36 +0,0 @@
-<?php if ( have_posts() ) : ?>
-	<?php while ( have_posts() ) : the_post(); ?>
-		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-			<div class="post-header">
-				<h2 class="post-title">
-					<a href="<?php the_permalink(); ?>" rel="bookmark">
-					  <?php the_title(); ?>
-					</a>
-				</h2>
-				<p><?php the_time( __( 'F jS, Y', '<%= theme_id %>' ) ); ?></p>
-				<p><?php the_author(); ?></p>
-				<?php if ( has_post_thumbnail() ) { ?>
-					<a href="<?php the_permalink(); ?>">
-						<?php the_post_thumbnail(); ?>
-					</a>
-				<?php } ?>
-			</div><!--end post-header-->
-			<div class="entry">
-				<?php the_content( __( 'Read more', '<%= theme_id %>' )); ?>
-				<?php edit_post_link( __( 'Edit this', '<%= theme_id %>' ), '<p>', '</p>' ); ?>
-			</div><!--end entry-->
-			<div class="post-footer">
-				<p><?php comments_popup_link( __( 'Leave a comment', '<%= theme_id %>' ), __( '1 Comment', '<%= theme_id %>' ), __( '% Comments', '<%= theme_id %>' ) ); ?></p>
-			</div><!--end post-footer-->
-		</div><!--end post-->
-	<?php endwhile; /* rewind or continue if all posts have been fetched */ ?>
-		<div class="pagination index">
-			<div class="alignleft">
-				<?php previous_posts_link( __( '&larr; Newer entries', '<%= theme_id %>' )); ?>
-			</div>
-			<div class="alignright">
-				<?php next_posts_link( __( 'Older entries &rarr;', '<%= theme_id %>' )); ?>
-			</div>
-		</div><!--end pagination-->
-	<?php else : ?>
-<?php endif; ?>

data/layouts/default/templates/sidebar.php

@@ -1,9 +0,0 @@
-<div id="sidebar">
-	<ul>
-		<?php
-			if ( ! dynamic_sidebar( 'sidebar' ) ) {
-				the_widget( 'WP_Widget_Recent_Posts', array( 'number' => 5 ), array( 'widget_id' => NULL ) );
-			}
-		?>
-	</ul>
-</div><!--end sidebar-->

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

@@ -1,30 +0,0 @@
-<?php get_header(); ?>
-	<?php if ( have_posts() ) : ?>
-		<?php while ( have_posts() ) : the_post(); ?>
-			<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-				<h1><?php the_title(); ?></h1>
-				<div>
-					<?php printf( __( 'by %s on', '<%= theme_id %>' ), get_the_author() ); ?> <?php the_date(); ?>
-				</div>
-				<div class="entry">
-					<?php if ( has_post_thumbnail() ) {
-						the_post_thumbnail();
-					} ?>
-					<?php the_content(); ?>
-					<?php edit_post_link( __( 'Edit this', '<%= theme_id %>' ), '<p>', '</p>' ); ?>
-					<?php wp_link_pages(); ?>
-				</div><!--end entry-->
-				<div class="post-footer clear">
-					<div class="tags">
-						<?php the_tags( __( 'Tags: ', '<%= theme_id %>' ), ', ', '' ); ?>
-					</div>
-					<div class="cats">
-						<?php printf( __( 'From: %s', '<%= theme_id %>' ), get_the_category_list( ', ' ) ); ?>
-					</div>
-				</div><!--end post footer-->
-			</div><!--end post-->
-		<?php endwhile; /* rewind or continue if all posts have been fetched */ ?>
-		<?php comments_template( '', true ); ?>
-	<?php endif; ?>
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>