marv 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+== 0.2.1 ==
+- New default project layout
+
 == 0.2.0 ==
 - Fix errors
 

data/README.md

@@ -2,7 +2,7 @@
 
 Marv is a toolkit for bootstrapping and developing WordPress themes using Sass, LESS, and CoffeeScript.
 
-Current Version: **0.1.1**
+[![Gem Version](https://badge.fury.io/rb/marv.svg)](http://badge.fury.io/rb/marv)
 
 -----
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/layouts/config/config.tt

@@ -1,4 +1,4 @@
-# WordPress theme information is stored in source/assets/stylesheets/_header.scss as of Marv version 0.5
+# WordPress theme information is stored in source/assets/stylesheets/_header.scss
 
 # JavaScript compression
 # config[:compress_js] = false
@@ -16,4 +16,5 @@
 # end
 
 # You can also include additional Compass frameworks by requiring them:
-# require 'stitch'
+# require 'boubon'
+# require 'neat'

data/layouts/default/functions/functions.php.erb

@@ -1,34 +1,152 @@
 <?php
 
-add_action( 'wp_enqueue_scripts', '<%= theme_id %>_enqueue_scripts' );
+// Block direct access
+if( ! defined( 'ABSPATH' ) ) exit;
 
-if ( ! function_exists( '<%= theme_id %>_enqueue_scripts' ) ) :
+// Set content_width
+if ( ! isset( $content_width ) ) {
+	$content_width = 640;
+}
 
-/**
-* Add theme styles and scripts here
-*/
-function <%= theme_id %>_enqueue_scripts() {
+// Scaffold setup
+if( ! function_exists( '<%= theme_id %>_setup' ) ) :
+
+	/**
+	 * Sets up theme defaults and registers support for various WordPress features.
+	 *
+	 * Note that this function is hooked into the after_setup_theme hook, which
+	 * runs before the init hook. The init hook is too late for some features, such
+	 * as indicating support for post thumbnails.
+	 */
+	function <%= theme_id %>_setup()
+	{
+		// Textdomain
+		load_theme_textdomain( '<%= theme_id %>', get_template_directory() . '/includes/languages' );
+		load_child_theme_textdomain( '<%= theme_id %>', get_stylesheet_directory() . '/includes/languages' );
+
+		// Theme support
+		add_theme_support( 'menus' );
+		add_theme_support( 'post-thumbnails' );
+		add_theme_support( 'automatic-feed-links' );
+		add_theme_support( 'post-formats', array( /* 'aside', 'link', 'gallery', 'status', 'quote', 'image' */ ) );
+		add_theme_support( 'html5', array( 'search-form', 'comment-form', 'comment-list' ) );
+
+		// Editor
+		add_editor_style( 'assets/css/editor-style.css' );
 
-	if ( ! is_admin() ) {
-		wp_enqueue_style(
-			'<%= theme_id %>-style',
-			get_bloginfo( 'stylesheet_url' )
-		);
+		// Menus
+		register_nav_menus( array(
+			'primary-menu'		=> __( 'Primary', '<%= theme_id %>' ),
+			'secondary-menu'	=> __( 'Secondary', '<%= theme_id %>' ),
+			'footer-menu'		=> __( 'Footer', '<%= theme_id %>' )
+		) );
 	}
 
+endif;
+
+add_action( 'after_setup_theme', '<%= theme_id %>_setup' );
+
+/**
+ * Init for theme child
+ */
+function <%= theme_id %>_child_init() {
+	do_action( '<%= theme_id %>_child_init' );
 }
 
-endif; // <%= theme_id %>_enqueue_scripts
+add_action( 'after_setup_theme', '<%= theme_id %>_child_init' );
 
-add_action( 'after_setup_theme', '<%= theme_id %>_setup' );
+/**
+ * Enqueue scripts and styles.
+ */
+function <%= theme_id %>_styles_scripts()
+{
+	// Styles
+	add_action( 'wp_enqueue_scripts', 	'<%= theme_id %>_register_styles' );
+	add_action( 'wp_enqueue_scripts', 	'<%= theme_id %>_enqueue_styles' );
+
+	// Scripts
+	add_action( 'wp_enqueue_scripts', 	'<%= theme_id %>_register_scripts' );
+	add_action( 'wp_enqueue_scripts', 	'<%= theme_id %>_enqueue_scripts' );
+
+	// Admin scripts
+	add_action( 'admin_enqueue_scripts', 	'<%= theme_id %>_register_admin_scripts' );
+	add_action( 'admin_enqueue_scripts', 	'<%= theme_id %>_enqueue_admin_scripts' );
+}
+
+add_action( 'init', '<%= theme_id %>_styles_scripts' );
 
-if ( ! function_exists( '<%= theme_id %>_setup' ) ) :
+/**
+ * Register styles.
+ */
+function <%= theme_id %>_register_styles()
+{
+	// Theme
+	wp_register_style( 'style', get_stylesheet_directory_uri() . '/style.css', '', '', 'screen' );
+}
+
+/**
+ * Enqueue styles.
+ */
+function <%= theme_id %>_enqueue_styles()
+{
+	wp_enqueue_style( 'style' );
+}
 
 /**
-* Set up your theme here
-*/
-function <%= theme_id %>_setup() {
-	add_theme_support( 'post-thumbnails' );
+ * Register scripts
+ */
+function <%= theme_id %>_register_scripts()
+{
+	// Theme
+	wp_register_script( 'theme', get_stylesheet_directory_uri() . '/javascripts/theme.js', array( 'jquery' ), '', true );
 }
 
-endif; // <%= theme_id %>_setup
+/**
+ * Enqueue scripts
+ */
+function <%= theme_id %>_enqueue_scripts()
+{
+	wp_enqueue_script( 'theme' );
+
+	if ( is_singular() && get_option( 'thread_comments' ) ) {
+		wp_enqueue_script( 'comment-reply' );
+	}
+}
+
+/**
+ * Register admin scripts
+ */
+function <%= theme_id %>_register_admin_scripts()
+{
+	// Admin
+	wp_register_script( 'admin', get_stylesheet_directory_uri() . '/javascripts/admin.js', array( 'jquery' ), '', true );
+}
+
+/**
+ * Enqueue admin scripts
+ */
+function <%= theme_id %>_enqueue_admin_scripts()
+{
+	wp_enqueue_script( 'admin' );
+}
+
+/**
+ * Allow automatic updates
+ */
+add_filter( 'automatic_updates_is_vcs_checkout', '__return_false' );
+
+/**
+ * All theme filters
+ */
+require get_template_directory() . '/includes/filters.php';
+
+/**
+ * All theme filters for admin
+ */
+require get_template_directory() . '/includes/filters-admin.php';
+
+/**
+ * Helper functions
+ */
+require get_template_directory() . '/includes/helpers.php';
+

data/layouts/default/includes/filters-admin.php.erb

@@ -0,0 +1,62 @@
+<?php
+
+// Block direct access
+if( ! defined( 'ABSPATH' ) ) exit;
+
+// Only in admin
+if( ! is_admin() ) return;
+
+/**
+ * Remove contactmethods
+ */
+function <%= theme_id %>_edit_contactmethods( $methods )
+{
+	unset( $methods['aim'] );
+	unset( $methods['jabber'] );
+	unset( $methods['yim'] );
+
+	return $methods;
+}
+
+add_filter( 'user_contactmethods', '<%= theme_id %>_edit_contactmethods' );
+
+/**
+ * Add MCE
+ */
+function <%= theme_id %>_enable_more_buttons( $buttons )
+{
+	$buttons[] = 'hr';
+
+	return $buttons;
+}
+
+add_filter( 'mce_buttons', '<%= theme_id %>_enable_more_buttons' );
+
+/**
+ * Remove menu items
+ */
+function <%= theme_id %>_remove_menu_pages()
+{
+	remove_menu_page( 'link-manager.php' );
+}
+
+add_action( 'admin_menu', '<%= theme_id %>_remove_menu_pages' );
+
+/**
+ * Remove dashboard widgets
+ */
+function <%= theme_id %>_remove_dashboard_widgets()
+{
+	global $wp_meta_boxes;
+
+	unset( $wp_meta_boxes['dashboard']['normal']['core']['dashboard_incoming_links'] );
+	unset( $wp_meta_boxes['dashboard']['normal']['core']['dashboard_plugins'] );
+	unset( $wp_meta_boxes['dashboard']['side']['core']['dashboard_recent_drafts'] );
+	unset( $wp_meta_boxes['dashboard']['normal']['core']['dashboard_recent_comments'] );
+	unset( $wp_meta_boxes['dashboard']['side']['core']['dashboard_primary'] );
+	unset( $wp_meta_boxes['dashboard']['side']['core']['dashboard_secondary'] );
+	// unset( $wp_meta_boxes['dashboard']['side']['core']['dashboard_right_now'] );
+	// unset( $wp_meta_boxes['dashboard']['side']['core']['dashboard_quick_press'] );
+}
+
+add_action( 'wp_dashboard_setup', '<%= theme_id %>_remove_dashboard_widgets' );

data/layouts/default/includes/filters.php.erb

@@ -0,0 +1,118 @@
+<?php
+
+// Block direct access
+if( ! defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Independent filters
+ */
+add_filter( 'widget_text', 'do_shortcode' );
+
+/**
+ * Body classes
+ */
+function <%= theme_id %>_body_class( $classes )
+{
+    global $is_gecko, $is_IE, $is_opera, $is_safari, $is_chrome;
+
+    if( $is_gecko )      	$classes[] = 'gecko';
+    elseif( $is_opera )  	$classes[] = 'opera';
+    elseif( $is_safari )	$classes[] = 'safari';
+    elseif( $is_lynx )      $classes[] = 'lynx';
+    elseif( $is_chrome )	$classes[] = 'chrome';
+    elseif( $is_NS4 )       $classes[] = 'ns4';
+    elseif( $is_IE )		$classes[] = 'ie';
+    else               		$classes[] = 'unknown-browser';
+    if( $is_iphone )        $classes[] = 'iphone';
+
+    if( is_singular() ) {
+    	global $post;
+        foreach( ( get_the_category( $post->ID ) ) as $category ) {
+            $classes[] = 'term-' . $category->category_nicename;
+        }
+
+        $classes[] = 'singular';
+    }
+
+    if( is_multi_author() ) {
+		$classes[] = 'group-blog';
+    }
+
+	if( is_archive() || is_search() || is_home() ) {
+		$classes[] = 'list-view';
+    }
+
+    return $classes;
+}
+
+add_filter( 'body_class', '<%= theme_id %>_body_class' );
+
+/**
+ * Remove generator
+ */
+function <%= theme_id %>_cleanup_head()
+{
+    remove_action('wp_head', 'feed_links', 2);
+    remove_action('wp_head', 'feed_links_extra', 3);
+    remove_action('wp_head', 'rsd_link');
+    remove_action('wp_head', 'wlwmanifest_link');
+    remove_action('wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0);
+    remove_action('wp_head', 'wp_generator');
+    remove_action('wp_head', 'wp_shortlink_wp_head', 10, 0);
+}
+
+add_action( 'init', '<%= theme_id %>_cleanup_head' );
+
+/**
+ * WP title
+ */
+function <%= theme_id %>_wp_title( $title, $sep )
+{
+	global $paged, $page;
+
+	if ( is_feed() ) {
+		return $title;
+    }
+
+	// Add the site name.
+	$title .= get_bloginfo( 'name' );
+
+	// Add the site description for the home/front page.
+	$site_description = get_bloginfo( 'description', 'display' );
+	if ( $site_description && ( is_home() || is_front_page() ) ) {
+		$title = "$title $sep $site_description";
+    }
+
+	// Add a page number if necessary.
+	if ( $paged >= 2 ) {
+		$title = "$title $sep " . sprintf( __( 'Page %s', '<%= theme_id %>' ), max( $paged, $page ) );
+    }
+
+	return $title;
+}
+
+add_filter( 'wp_title', '<%= theme_id %>_wp_title', 10, 2 );
+
+/**
+ * Nav object classes
+ */
+function <%= theme_id %>_add_extra_menu_classes( $objects )
+{
+    $objects[1]->classes[] = 'first';
+    $objects[count( $objects )]->classes[] = 'last';
+
+    return $objects;
+}
+
+add_filter( 'wp_nav_menu_objects', 	'<%= theme_id %>_add_extra_menu_classes' );
+
+/**
+ * Add favicon
+ */
+function <%= theme_id %>_favicon()
+{
+    echo '<link rel="shortcut icon" href="' . get_stylesheet_directory_uri() . '/images/favicon.png" type="image/png">';
+}
+
+add_action( 'wp_head', '<%= theme_id %>_favicon' );
+

data/layouts/default/includes/helpers.php.erb

@@ -0,0 +1,132 @@
+<?php
+
+// Block direct access
+if( ! defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Helper function to generate normal pagination
+ */
+function <%= theme_id %>_paging_nav( $pages = '', $range = 2 )
+{
+    $showitems = ( $range * 2 ) + 1;
+
+    global $paged;
+    if( empty( $paged ) ) {
+        $paged = 1;
+    }
+
+    if( $pages == '' ) {
+        global $wp_query;
+        $pages = $wp_query->max_num_pages;
+        if( ! $pages ) {
+            $pages = 1;
+        }
+    }
+
+    if( 1 != $pages ) {
+        echo '<div class="pagination">';
+            if( $paged > 2 && $paged > $range + 1 && $showitems < $pages ) {
+                echo '<a href="' . get_pagenum_link( 1 ) . '">&laquo;</a>';
+            }
+
+            if( $paged > 1 && $showitems < $pages ) {
+                echo '<a href="' . get_pagenum_link( $paged - 1 ) . '">&lsaquo;</a>';
+            }
+
+            for ( $i = 1; $i <= $pages; $i++ ) {
+                if ( 1 != $pages && ( ! ( $i >= $paged + $range + 1 || $i <= $paged - $range - 1 ) || $pages <= $showitems )) {
+                    echo ( $paged == $i ) ? '<span class="current">' . $i . '</span>' : '<a href="' . get_pagenum_link( $i ) . '" class="inactive" >' . $i . '</a>';
+                }
+            }
+
+            if ( $paged < $pages && $showitems < $pages ) {
+                echo '<a href="' . get_pagenum_link( $paged + 1 ) . '">&rsaquo;</a>';
+            }
+
+            if ( $paged < $pages - 1 && $paged + $range - 1 < $pages && $showitems < $pages ) {
+                echo '<a href="' . get_pagenum_link($pages) . '">&raquo;</a>';
+            }
+        echo '</div>';
+     }
+}
+
+/**
+ * Inserts a new key/value before the key in the array.
+ *
+ * @param $key The key to insert before.
+ * @param $array An array to insert in to.
+ * @param $new_key The key to insert.
+ * @param $new_value An value to insert.
+ *
+ * @return The new array if the key exists, FALSE otherwise.
+ *
+ * @see array_insert_after()
+ */
+function array_insert_before( $key, array &$array, $new_key, $new_value )
+{
+    if (array_key_exists($key, $array)) {
+        $new = array();
+        foreach ($array as $k => $value) {
+            if ($k === $key) {
+                $new[$new_key] = $new_value;
+            }
+
+            $new[$k] = $value;
+        }
+        return $new;
+    }
+
+    return false;
+}
+
+/**
+ * Inserts a new key/value after the key in the array.
+ *
+ * @param $key The key to insert after.
+ * @param $array An array to insert in to.
+ * @param $new_key The key to insert.
+ * @param $new_valueAn value to insert.
+ *
+ * @return The new array if the key exists, FALSE otherwise.
+ *
+ * @see array_insert_before()
+ */
+function array_insert_after( $key, array &$array, $new_key, $new_value )
+{
+    if (array_key_exists($key, $array)) {
+        $new = array();
+        foreach ($array as $k => $value) {
+            $new[$k] = $value;
+            if ($k === $key) {
+                $new[$new_key] = $new_value;
+            }
+        }
+        return $new;
+    }
+
+    return false;
+}
+
+/**
+ * Flattens a multi-dimensional array to a normal array
+ *
+ * @param $array Multidimensional array
+ *
+ * @return The new array
+ */
+function array_flatten( $array )
+{
+    if( ! is_array( $array ) ) {
+        return false;
+    }
+
+    $result = array();
+    foreach( $array as $key => $value ) {
+        if( is_array( $value ) ) {
+            $result = array_merge($result, array_flatten($value));
+        } else {
+            $result[$key] = $value;
+        }
+    }
+    return $result;
+}