Update README.md.

Fix bug in the [date] shortcode and improve formatting

README.md

@@ -1,5 +1,5 @@
 Trestle
-=======
+---------------------
 
 ### A handy boilerplate child theme for serious Genesis developers.
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/MickeyKay/trestle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -25,22 +25,5 @@ Here are some of Trestle's many features, check out the [Trestle Demo](http://de
 * And more!
 
 #### Settings & Usage
-* The Trestle control panel is located at **Genesis → Theme Settings**, in the **Trestle** metabox.
-* Examples and usage can all be viewed on the [Trestle Demo](http://demo.mightyminnow.com/theme/trestle/)
-
-#### To Do
-* Add ability to click off of mobile menu/search to hide menu/search.
-* Rework menu CSS for simplicity (general / primary / secondary / header)
-* Convert non-theme functionality to separate Genesis-dependant plugin
-* Add in Grunt support for:
-    * Sass
-    * Auto-ordering of CSS (CSSComb)
-    * Translation
-    * Check other themes for other ideas. . .
-* Switch to customizer for theme options instead of Genesis panel (pros? cons?)
-* Remove custom background CSS that doesn't make sense (different max-widths, etc)
-* Weird extra icons on accordions on demo site.
-* Add checkbox to control author box (along with post info/meta) output (see ES: esw-custom.php)
-* Mobile menu button setting - either:
-   * Remove (currently controlled from JS), or
-   * Pass icon/text as params to jQuery
+* All Trestle settings can be accessed via the **Customizer**.
+* Examples and usage can all be viewed on the [Trestle Demo](http://demo.mightyminnow.com/theme/trestle/)

functions.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Theme functionality
+ * Theme functionality.
  *
  * @since  1.0.0
  *
@@ -12,31 +12,31 @@
  * Required Files
 ===========================================*/
 
-// Theme functions
+// Theme functions.
 require_once dirname( __FILE__ ) . '/includes/functions/theme-functions.php';
 
-// Admin functionality
+// Admin functionality.
 require_once dirname( __FILE__ ) . '/includes/admin/admin.php';
 
-// Customizer controls
+// Customizer controls.
 require_once dirname( __FILE__ ) . '/includes/admin/customizer.php';
 
-// Shortcodes
+// Shortcodes.
 require_once dirname( __FILE__ ) . '/includes/shortcodes/shortcodes.php';
 
-// Additional sidebars
+// Additional sidebars.
 require_once dirname( __FILE__ ) . '/includes/widget-areas/widget-areas.php';
 
-// Plugin activation class
+// Plugin activation class.
 require_once dirname( __FILE__ ) . '/includes/classes/class-tgm-plugin-activation.php';
 
-// Better Font Awesome Library
+// Better Font Awesome Library.
 require_once dirname( __FILE__ ) . '/lib/better-font-awesome-library/better-font-awesome-library.php';
 
 
-add_action( 'genesis_setup' ,'trestle_theme_setup', 15 );
+add_action( 'genesis_setup', 'trestle_theme_setup', 15 );
 /**
- * Initialize Trestle
+ * Initialize Trestle.
  *
  * @since  1.0.0
  */
@@ -46,21 +46,16 @@ function trestle_theme_setup() {
 	 * Theme Setup
 	===========================================*/
 
-	// Child theme definitions (do not remove)
-	define( 'CHILD_THEME_NAME', 'Trestle' );
-	define( 'CHILD_THEME_URL', 'http://demo.mightyminnow.com/theme/trestle/' );
-	define( 'CHILD_THEME_VERSION', '1.2.0' );
+	// Child theme definitions (do not remove).
+	define( 'TRESTLE_THEME_NAME', 'Trestle' );
+	define( 'TRESTLE_THEME_URL', 'http://demo.mightyminnow.com/theme/trestle/' );
+	define( 'TRESTLE_THEME_VERSION', '2.0.0' );
+	define( 'TRESTLE_SETTINGS_FIELD', 'trestle-settings' );
 
-	// Load theme text domain
+	// Setup default theme settings.
+	trestle_settings_defaults();
+
+	// Load theme text domain.
 	load_theme_textdomain( 'trestle', get_stylesheet_directory() . '/languages' );
 
-	// Add HTML5 markup structure
-	add_theme_support( 'html5' );
-
-	// Add viewport meta tag for mobile browsers
-	add_theme_support( 'genesis-responsive-viewport' );
-
-	// Add support for footer widgets if specified in Trestle settings
-	$trestle_footer_widgets_number = esc_attr( genesis_get_option( 'trestle_footer_widgets_number' ) );
-	add_theme_support( 'genesis-footer-widgets', $trestle_footer_widgets_number );
 }

includes/admin/admin.php

@@ -7,6 +7,76 @@
  * @package Trestle
  */
 
+/**
+ * Set up Trestle default settings.
+ *
+ * @since  2.0.0
+ *
+ * @return  array  Genesis settings updated to include Trestle defaults.
+ */
+function trestle_settings_defaults() {
+
+	// Trestle default key/value pairs.
+	$trestle_defaults = array(
+		'layout'				=> 'solid',
+		'logo_url'				=> '',
+		'logo_url_mobile'		=> '',
+		'favicon_url'			=> '',
+		'nav_primary_location'	=> 'full',
+		'search_in_nav'			=> '',
+		'read_more_text'		=> __( 'Read More »', 'trestle' ),
+		'revisions_number'		=> 3,
+		'footer_widgets_number'	=> 3,
+		'external_link_icons'	=> 0,
+		'email_link_icons'		=> 0,
+		'pdf_link_icons'		=> 0,
+		'doc_link_icons'		=> 0,
+	);
+
+	// Populate Trestle settings with default values if they don't yet exist.
+	$options = get_option( TRESTLE_SETTINGS_FIELD );
+
+	// Set up an empty array if we're running for the first time.
+	if ( ! $options ) {
+		$options = array();
+	}
+
+	// Bail early if the settings match the defaults.
+	if ( $options === $trestle_defaults ) {
+		return;
+	}
+
+	// Populate any defaults that are missing.
+	foreach ( $trestle_defaults as $k => $v ) {
+
+		// Check each key to only add the missing settings.
+		if ( ! array_key_exists( $k, $options ) ) {
+			$options[$k] = $v;
+		}
+	}
+
+	// Update options with defaults.
+	update_option( TRESTLE_SETTINGS_FIELD, $options );
+
+}
+
+/**
+ * Wrapper function to get Trestle options.
+ *
+ * @since   2.0.0
+ * @uses    genesis_get_option()
+ *
+ * @return  mixed    Trestle option value.
+ */
+function trestle_get_option( $key, $setting = null, $use_cache = true ) {
+
+	// Set default to TRESTLE_SETTINGS_FIELD.
+	$setting = $setting ? $setting : TRESTLE_SETTINGS_FIELD;
+
+	return genesis_get_option( $key, $setting, false );
+
+}
+
 add_action( 'admin_enqueue_scripts', 'trestle_admin_actions' );
 /**
  * Loads admin scripts and styles.
@@ -17,47 +87,7 @@ function trestle_admin_actions() {
 
 	// Include the main stylesheet in the editor
 	add_editor_style( get_stylesheet_uri() );
-}
 
-add_filter( 'genesis_theme_settings_defaults', 'trestle_custom_defaults' );
-/**
- * Sets up Trestle default settings.
- *
- * @since  1.0.0
- *
- * @param  array  $defaults  Genesis default settings.
- * @return  array  Genesis settings updated to include Trestle defaults.
- */
-function trestle_custom_defaults( $defaults ) {
-
- 	// Trestle default key/value pairs
- 	$trestle_defaults = array(
-		'trestle_layout'                => 'solid',
-		'trestle_logo_url'              => '',
-		'trestle_logo_url_mobile'       => '',
-		'trestle_nav_primary_location'  => 'full',
-		'trestle_read_more_text'        => __( 'Read More »', 'trestle' ),
-		'trestle_revisions_number'      => 3,
-		'trestle_footer_widgets_number' => 3,
-	);
-
-	// Populate Trestle settings with default values if they don't yet exist
-	$options = get_option( GENESIS_SETTINGS_FIELD );
-
-	foreach ( $trestle_defaults as $k => $v ) {
-
-		// Add defaults to Genesis default settings array
-		$defaults[$k] = $v;
-
-		// Update actual options if they don't yet exist
-		if ( $options && ! array_key_exists( $k, $options ) )
-			$options[$k] = $v;
-	}
-
-	// Update options with defaults
-	update_option( GENESIS_SETTINGS_FIELD, $options );
-
-	return $defaults;
 }
 
 add_action( 'tgmpa_register', 'trestle_register_required_plugins' );
@@ -94,6 +124,12 @@ function trestle_register_required_plugins() {
 			'required' 	=> false,
 		),
 
+		array(
+			'name' 		=> 'Equal Height Columns',
+			'slug' 		=> 'equal-height-columns',
+			'required' 	=> false,
+		),
+
 		array(
 			'name' 		=> 'Events Manager',
 			'slug' 		=> 'events-manager',
@@ -113,8 +149,8 @@ function trestle_register_required_plugins() {
 		),
 
 		array(
-			'name' 		=> 'FancyBox for WordPress',
-			'slug' 		=> 'fancybox-for-wordpress',
+			'name' 		=> 'Easy FancyBox',
+			'slug' 		=> 'easy-fancybox',
 			'required'  => false,
 		),
 
@@ -215,7 +251,7 @@ function trestle_register_required_plugins() {
 		),
 	);
 
-	// Change this to your theme text domain, used for internationalising strings
+	// Change this to your theme text domain, used for internationalising strings.
 	$theme_text_domain = 'mightyminnow';
 
 	/**

includes/admin/customizer.js

@@ -1,137 +0,0 @@
-/**
- * JavaScript for the Customizer Preview
- *
- * @since  1.0.0
- */
-
-( function( $ ) {
-
-	// Layout
-	wp.customize( 'genesis-settings[trestle_layout]', function( value ) {
-	    value.bind( function( value ) {
-
-	    	var $body = $( 'body' );
-
-	    	switch ( value ) {
-	    		case 'solid':
-	    			$body.removeClass( 'bubble' );
-	    		break;
-	    		case 'bubble':
-	    			$body.addClass( 'bubble' );
-	    		break;
-	    	}
-
-	    });
-	});
-
-	// Custom logo
-	wp.customize( 'genesis-settings[trestle_logo_url]', function( value ) {
-	    value.bind( function( url ) {
-
-	    	var $body = $( 'body' );
-
-	        if ( 0 === $.trim( url ).length ) {
-	        	$body.removeClass( 'has-logo' );
-	            $( '.site-title a.image-link' ).remove();
-	        } else {
-	        	$body.addClass( 'has-logo' );
-	            $( '.site-title a.image-link' ).remove();
-	            $( '.site-title' ).append( '<a href="/" class="image-link"><img class="logo logo-full show" src="' + url + '" /></a>' );
-	        }
-
-	    });
-	});
-
-	// Primary Nav Location
-	wp.customize( 'genesis-settings[trestle_nav_primary_location]', function( value ) {
-	    value.bind( function( value ) {
-
-	    	var $body = $( 'body' );
-	    	var $nav = $( '.nav-primary' );
-
-	    	switch ( value ) {
-	    		case 'full':
-	    			$body.removeClass( 'nav-primary-location-header' )
-	    				 .addClass( 'nav-primary-location-full' );
-	    			$nav.remove().insertAfter( '.site-header' );
-	    		break;
-	    		case 'header':
-	    			$body.removeClass( 'nav-primary-location-full' )
-	    				 .addClass( 'nav-primary-location-header' );
-	    			$nav.remove().appendTo( '.site-header .wrap' );
-	    		break;
-	    	}
-
-	    });
-	});
-
-	// Custom Read More Link Text
-	wp.customize( 'genesis-settings[trestle_read_more_text]', function( value )  {
-		value.bind( function( value ) {
-
-			$( 'a.more-link' ).text( value );
-
-		});
-	});
-
-	// External Links
-	wp.customize( 'genesis-settings[trestle_external_link_icons]', function( value )  {
-		value.bind( function( value ) {
-
-			var $body = $( 'body' );
-
-			if ( value ) {
-	    		$body.addClass( 'external-link-icons' );
-			} else {
-	    		$body.removeClass( 'external-link-icons' );
-			}
-
-		});
-	});
-
-	// Email Links
-	wp.customize( 'genesis-settings[trestle_email_link_icons]', function( value )  {
-		value.bind( function( value ) {
-
-			var $body = $( 'body' );
-
-			if ( value ) {
-	    		$body.addClass( 'email-link-icons' );
-			} else {
-	    		$body.removeClass( 'email-link-icons' );
-			}
-
-		});
-	});
-
-	// PDF Links
-	wp.customize( 'genesis-settings[trestle_pdf_link_icons]', function( value )  {
-		value.bind( function( value ) {
-
-			var $body = $( 'body' );
-
-			if ( value ) {
-	    		$body.addClass( 'pdf-link-icons' );
-			} else {
-	    		$body.removeClass( 'pdf-link-icons' );
-			}
-
-		});
-	});
-
-	// Doc Links
-	wp.customize( 'genesis-settings[trestle_doc_link_icons]', function( value )  {
-		value.bind( function( value ) {
-
-			var $body = $( 'body' );
-
-			if ( value ) {
-	    		$body.addClass( 'doc-link-icons' );
-			} else {
-	    		$body.removeClass( 'doc-link-icons' );
-			}
-
-		});
-	});
-
-})( jQuery );

includes/admin/customizer.php

@@ -1,44 +1,27 @@
 <?php
 /**
- * Trestle Customizer Controls
+ * Trestle Customizer Controls.
  *
- * @since  1.0.0
+ * @since  2.0.0
  *
  * @package  Trestle
  */
 
-add_action( 'customize_preview_init', 'trestle_customizer_preview_js' );
-/**
- * Enqueue scripts for the site preview iframe on the customizer screen
- *
- * @since  1.0.0
- */
-function trestle_customizer_preview_js() {
-
-	wp_enqueue_script(
-		'trestle_customizer',
-		get_stylesheet_directory_uri() . '/includes/admin/customizer.js',
-		array( 'jquery', 'customize-preview' ), // Dependencies
-		null, // Version
-		true // Load in Footer
-	);
-}
-
 add_action( 'customize_register', 'trestle_customizer_controls' );
 /**
- * Register Trestle's controls
+ * Register Trestle's controls.
  *
- * @since  1.0.0
+ * @since  2.0.0
  *
- * @param  $wp_customize  The Customizer Object
+ * @param  $wp_customize  The Customizer Object.
  */
 function trestle_customizer_controls( $wp_customize ) {
 
 	/**
-	 * Trestle Settings Section
+	 * Trestle Settings Section.
 	 */
 
-	// Add the section
+	// Add the section.
 	$wp_customize->add_section(
 		'trestle_settings_section',
 		array(
@@ -47,275 +30,306 @@ function trestle_customizer_controls( $wp_customize ) {
 		)
 	);
 
-	// Layout
+	// Layout.
 	$wp_customize->add_setting(
-		'genesis-settings[trestle_layout]',
+		'trestle-settings[layout]',
 		array(
-			'default'		=> '',
-			'type'			=> 'option',
-			'transport' 	=> 'postMessage',
-			'capability'	=> 'edit_theme_options',
-		)
-	);
-	$wp_customize->add_control(
-        'trestle_layout_control',
-        array(
-            'section'   => 'trestle_settings_section',
-            'settings'  => 'genesis-settings[trestle_layout]',
-            'label'     => __( 'Layout', 'trestle' ),
-            'type'      => 'radio',
-            'choices'   => array(
-                'bubble'  => __( 'Bubble', 'trestle' ),
-                'solid'   => __( 'Solid', 'trestle' ),
-            )
-        )
-    );
-
-	// Upload a logo
-    $wp_customize->add_setting(
-        'genesis-settings[trestle_logo_url]',
-        array(
-            'default'     	=> genesis_get_option( 'trestle_logo_url' ),
-            'type'        	=> 'option',
-            'transport'   	=> 'postMessage',
-            'capability'	=> 'edit_theme_options',
-        )
-    );
-    $wp_customize->add_control(
-        new WP_Customize_Image_Control(
-            $wp_customize,
-            'trestle_logo_control',
-            array(
-                'label'      => __( 'Upload a logo', 'trestle' ),
-                'section'    => 'trestle_settings_section',
-                'settings'   => 'genesis-settings[trestle_logo_url]',
-            )
-        )
-    );
-
-    // Upload a mobile logo
-    $wp_customize->add_setting(
-        'genesis-settings[trestle_logo_url_mobile]',
-        array(
-            'default'     	=> genesis_get_option( 'trestle_logo_url_mobile' ),
-            'type'        	=> 'option',
-            'transport'   	=> 'postMessage',
-            'capability'	=> 'edit_theme_options',
-        )
-    );
-    $wp_customize->add_control(
-        new WP_Customize_Image_Control(
-            $wp_customize,
-            'trestle_mobile_logo_control',
-            array(
-               'label'      => __( 'Upload a logo for mobile', 'trestle' ),
-               'section'    => 'trestle_settings_section',
-               'settings'   => 'genesis-settings[trestle_logo_url_mobile]',
-            )
-        )
-    );
-
-    // Primary nav style
-    $wp_customize->add_setting(
-		'genesis-settings[trestle_nav_primary_location]',
-		array(
-			'default'		=> genesis_get_option( 'trestle_nav_primary_location' ),
-			'type'			=> 'option',
-			'transport' 	=> 'postMessage',
-			'capability'	=> 'edit_theme_options',
-		)
-	);
-	$wp_customize->add_control(
-        'trestle_nav_primary_location_control',
-        array(
-            'section'   => 'trestle_settings_section',
-            'settings'  => 'genesis-settings[trestle_nav_primary_location]',
-            'label'     => __( 'Menu style', 'trestle' ),
-            'type'      => 'select',
-            'choices'   => array(
-                'full'  => __( 'Full Width', 'trestle' ),
-                'header'   => __( 'Header Right', 'trestle' ),
-            )
-        )
-    );
-
-    // Blog post custom read more link text
-    $wp_customize->add_setting(
-		'genesis-settings[trestle_read_more_text]',
-		array(
-			'default'			=> genesis_get_option( 'trestle_read_more_text' ),
+			'default'			=> trestle_get_option( 'layout' ),
+			'type'				=> 'option',
+			'capability'		=> 'edit_theme_options',
+		)
+	);
+	$wp_customize->add_control(
+		'trestle_layout_control',
+		array(
+			'section'   => 'trestle_settings_section',
+			'settings'  => 'trestle-settings[layout]',
+			'label'     => __( 'Layout', 'trestle' ),
+			'type'      => 'radio',
+			'choices'   => array(
+				'bubble'  => __( 'Bubble', 'trestle' ),
+				'solid'   => __( 'Solid', 'trestle' ),
+			)
+		)
+	);
+
+	// Upload a logo.
+	$wp_customize->add_setting(
+		'trestle-settings[logo_url]',
+		array(
+			'default'     		=> trestle_get_option( 'logo_url' ),
+			'type'        		=> 'option',
+			'capability'		=> 'edit_theme_options',
+			'sanitize_callback'	=> 'esc_url_raw',
+		)
+	);
+	$wp_customize->add_control(
+		new WP_Customize_Image_Control(
+			$wp_customize,
+			'trestle_logo_control',
+			array(
+				'label'      => __( 'Upload a logo', 'trestle' ),
+				'section'    => 'trestle_settings_section',
+				'settings'   => 'trestle-settings[logo_url]',
+			)
+		)
+	);
+
+	// Upload a mobile logo.
+	$wp_customize->add_setting(
+		'trestle-settings[logo_url_mobile]',
+		array(
+			'default'     		=> trestle_get_option( 'logo_url_mobile' ),
+			'type'        		=> 'option',
+			'capability'		=> 'edit_theme_options',
+			'sanitize_callback'	=> 'esc_url_raw',
+		)
+	);
+	$wp_customize->add_control(
+		new WP_Customize_Image_Control(
+			$wp_customize,
+			'trestle_mobile_logo_control',
+			array(
+			   'label'      => __( 'Upload a mobile logo', 'trestle' ),
+			   'section'    => 'trestle_settings_section',
+			   'settings'   => 'trestle-settings[logo_url_mobile]',
+			)
+		)
+	);
+
+	// Upload a mobile logo.
+	$wp_customize->add_setting(
+		'trestle-settings[favicon_url]',
+		array(
+			'default'     		=> trestle_get_option( 'favicon_url' ),
+			'type'        		=> 'option',
+			'capability'		=> 'edit_theme_options',
+			'sanitize_callback'	=> 'esc_url_raw',
+		)
+	);
+	$wp_customize->add_control(
+		new WP_Customize_Image_Control(
+			$wp_customize,
+			'trestle_favicon_control',
+			array(
+			   'label'      => __( 'Upload a favicon', 'trestle' ),
+			   'section'    => 'trestle_settings_section',
+			   'settings'   => 'trestle-settings[favicon_url]',
+			)
+		)
+	);
+
+	// Primary nav style.
+	$wp_customize->add_setting(
+		'trestle-settings[nav_primary_location]',
+		array(
+			'default'			=> trestle_get_option( 'nav_primary_location' ),
+			'type'				=> 'option',
+			'capability'		=> 'edit_theme_options',
+		)
+	);
+	$wp_customize->add_control(
+		'trestle_nav_primary_location_control',
+		array(
+			'section'   => 'trestle_settings_section',
+			'settings'  => 'trestle-settings[nav_primary_location]',
+			'label'     => __( 'Menu style', 'trestle' ),
+			'type'      => 'select',
+			'choices'   => array(
+				'full'  	=> __( 'Full Width', 'trestle' ),
+				'header'   	=> __( 'Header Right', 'trestle' ),
+			)
+		)
+	);
+
+	// Primary nav extras.
+	$wp_customize->add_setting(
+		'trestle-settings[search_in_nav]',
+		array(
+			'default'			=> trestle_get_option( 'search_in_nav' ),
+			'type'				=> 'option',
+			'capability'		=> 'edit_theme_options',
+		)
+	);
+	$wp_customize->add_control(
+		'trestle_search_in_nav_control',
+		array(
+			'section'   => 'trestle_settings_section',
+			'settings'  => 'trestle-settings[search_in_nav]',
+			'label'     => __( 'Add search to mobile navigation', 'trestle' ),
+			'type'		=> 'checkbox',
+		)
+	);
+
+	// Blog post custom read more link text.
+	$wp_customize->add_setting(
+		'trestle-settings[read_more_text]',
+		array(
+			'default'			=> trestle_get_option( 'read_more_text' ),
 			'type'				=> 'option',
-			'transport' 		=> 'postMessage',
 			'capability'     	=> 'edit_theme_options',
 			'sanitize_callback'	=> 'wp_kses_post',
 		)
 	);
 	$wp_customize->add_control(
-        'trestle_read_more_text_control',
-        array(
-            'section'   => 'trestle_settings_section',
-            'settings'  => 'genesis-settings[trestle_read_more_text]',
-            'label'     => __( 'Custom read more link text', 'trestle' ),
-        )
-    );
-
-    // Post revisions number
-    $wp_customize->add_setting(
-		'genesis-settings[trestle_revisions_number]',
+		'trestle_read_more_text_control',
 		array(
-			'default'		=> genesis_get_option( 'trestle_revisions_number' ),
-			'type'			=> 'option',
-			'transport' 	=> 'postMessage',
-			'capability'	=> 'edit_theme_options',
+			'section'   => 'trestle_settings_section',
+			'settings'  => 'trestle-settings[read_more_text]',
+			'label'     => __( 'Custom read more link text', 'trestle' ),
+		)
+	);
+
+	// Post revisions number.
+	$wp_customize->add_setting(
+		'trestle-settings[revisions_number]',
+		array(
+			'default'			=> trestle_get_option( 'revisions_number' ),
+			'type'				=> 'option',
+			'capability'		=> 'edit_theme_options',
 		)
 	);
 	$wp_customize->add_control(
-        'trestle_revisions_number_control',
-        array(
-            'section'   => 'trestle_settings_section',
-            'settings'  => 'genesis-settings[trestle_revisions_number]',
-            'label'     => __( 'Number of post revisions', 'trestle' ),
-            'type'      => 'select',
-            'choices'   => array(
-            	'-1'    => __( 'Unlimited', 'trestle' ),
-                '0'  	=> '0',
-                '1' 	=> '1',
-                '2'		=> '2',
-                '3'		=> '3',
-                '4'		=> '4',
-                '5' 	=> '5',
-                '6'		=> '6',
-                '7' 	=> '7',
-                '8' 	=> '8',
-                '9' 	=> '9',
-                '10' 	=> '10',
-            )
-        )
-    );
-
-    // Footer Widget Areas
-    $wp_customize->add_setting(
-		'genesis-settings[trestle_footer_widgets_number]',
+		'trestle_revisions_number_control',
 		array(
-			'default'		=> genesis_get_option( 'trestle_footer_widgets_number' ),
-			'type'			=> 'option',
-			'transport' 	=> 'postMessage',
-			'capability' 	=> 'edit_theme_options',
+			'section'   => 'trestle_settings_section',
+			'settings'  => 'trestle-settings[revisions_number]',
+			'label'     => __( 'Number of post revisions', 'trestle' ),
+			'type'      => 'select',
+			'choices'   => array(
+				'-1'    => __( 'Unlimited', 'trestle' ),
+				'0'  	=> '0',
+				'1' 	=> '1',
+				'2'		=> '2',
+				'3'		=> '3',
+				'4'		=> '4',
+				'5' 	=> '5',
+				'6'		=> '6',
+				'7' 	=> '7',
+				'8' 	=> '8',
+				'9' 	=> '9',
+				'10' 	=> '10',
+			)
+		)
+	);
+
+	// Footer Widget Areas.
+	$wp_customize->add_setting(
+		'trestle-settings[footer_widgets_number]',
+		array(
+			'default'			=> trestle_get_option( 'footer_widgets_number' ),
+			'type'				=> 'option',
+			'capability' 		=> 'edit_theme_options',
 		)
 	);
 	$wp_customize->add_control(
-        'trestle_footer_widgets_number_control',
-        array(
-            'section'   => 'trestle_settings_section',
-            'settings'  => 'genesis-settings[trestle_footer_widgets_number]',
-            'label'     => __( 'Number of footer widgets', 'trestle' ),
-            'type'      => 'select',
-            'choices'   => array(
-                '0'  	=> '0',
-                '1' 	=> '1',
-                '2'		=> '2',
-                '3'		=> '3',
-                '4'		=> '4',
-                '5' 	=> '5',
-                '6'		=> '6',
-            )
-        )
-    );
-
-	// Add a label for the link icons
-    $wp_customize->add_setting(
-		'genesis-settings[trestle_link_icons_title]',
+		'trestle_footer_widgets_number_control',
 		array(
-			'default'		=> '',
-			'type'			=> 'option',
-			'capability'	=> 'edit_theme_options',
+			'section'   => 'trestle_settings_section',
+			'settings'  => 'trestle-settings[footer_widgets_number]',
+			'label'     => __( 'Number of footer widgets', 'trestle' ),
+			'type'      => 'select',
+			'choices'   => array(
+				'0'  	=> '0',
+				'1' 	=> '1',
+				'2'		=> '2',
+				'3'		=> '3',
+				'4'		=> '4',
+				'5' 	=> '5',
+				'6'		=> '6',
+			)
+		)
+	);
+
+	// Add a label for the link icons.
+	$wp_customize->add_setting(
+		'trestle-settings[link_icons_title]',
+		array(
+			'default'			=> '',
+			'type'				=> 'option',
 		)
 	);
 	$wp_customize->add_control(
 		'trestle_link_icons_title',
 		array(
 			'section'	=> 'trestle_settings_section',
-			'settings'	=> 'genesis-settings[trestle_link_icons_title]',
+			'settings'	=> 'trestle-settings[link_icons_title]',
 			'label'		=> __( 'Icon links', 'trestle' ),
 			'type'		=> 'hidden',
 		)
 	);
 
-	// External Link Icons
+	// External Link Icons.
 	$wp_customize->add_setting(
-		'genesis-settings[trestle_external_link_icons]',
+		'trestle-settings[external_link_icons]',
 		array(
-			'default'		=> genesis_get_option( 'trestle_external_link_icons' ),
-			'type'			=> 'option',
-			'transport' 	=> 'postMessage',
-			'capability'	=> 'edit_theme_options',
+			'default'			=> trestle_get_option( 'external_link_icons' ),
+			'type'				=> 'option',
+			'capability'		=> 'edit_theme_options',
 		)
 	);
 	$wp_customize->add_control(
 		'trestle_external_link_icons',
 		array(
 			'section'	=> 'trestle_settings_section',
-			'settings'	=> 'genesis-settings[trestle_external_link_icons]',
+			'settings'	=> 'trestle-settings[external_link_icons]',
 			'label'		=> __( 'Add icons to external links', 'trestle' ),
 			'type'		=> 'checkbox',
 		)
 	);
 
-	// E-mail Link Icons
+	// E-mail Link Icons.
 	$wp_customize->add_setting(
-		'genesis-settings[trestle_email_link_icons]',
+		'trestle-settings[email_link_icons]',
 		array(
-			'default'		=> genesis_get_option( 'trestle_email_link_icons' ),
-			'type'			=> 'option',
-			'transport' 	=> 'postMessage',
-			'capability'	=> 'edit_theme_options',
+			'default'			=> trestle_get_option( 'email_link_icons' ),
+			'type'				=> 'option',
+			'capability'		=> 'edit_theme_options',
 		)
 	);
 	$wp_customize->add_control(
 		'trestle_email_link_icons',
 		array(
 			'section'	=> 'trestle_settings_section',
-			'settings'	=> 'genesis-settings[trestle_email_link_icons]',
+			'settings'	=> 'trestle-settings[email_link_icons]',
 			'label'		=> __( 'Add icons to email links', 'trestle' ),
 			'type'		=> 'checkbox',
 		)
 	);
 
-	// PDF Link Icons
+	// PDF Link Icons.
 	$wp_customize->add_setting(
-		'genesis-settings[trestle_pdf_link_icons]',
+		'trestle-settings[pdf_link_icons]',
 		array(
-			'default'		=> genesis_get_option( 'trestle_pdf_link_icons' ),
-			'type'			=> 'option',
-			'transport' 	=> 'postMessage',
-			'capability'	=> 'edit_theme_options',
+			'default'			=> trestle_get_option( 'pdf_link_icons' ),
+			'type'				=> 'option',
+			'capability'		=> 'edit_theme_options',
 		)
 	);
 	$wp_customize->add_control(
 		'trestle_pdf_link_icons',
 		array(
 			'section'	=> 'trestle_settings_section',
-			'settings'	=> 'genesis-settings[trestle_pdf_link_icons]',
+			'settings'	=> 'trestle-settings[pdf_link_icons]',
 			'label'		=> __( 'Add icons to .pdf links', 'trestle' ),
 			'type'		=> 'checkbox',
 		)
 	);
 
-	// Doc Link Icons
+	// Doc Link Icons.
 	$wp_customize->add_setting(
-		'genesis-settings[trestle_doc_link_icons]',
+		'trestle-settings[doc_link_icons]',
 		array(
-			'default'		=> genesis_get_option( 'trestle_doc_link_icons' ),
-			'type'			=> 'option',
-			'transport' 	=> 'postMessage',
-			'capability' 	=> 'edit_theme_options',
+			'default'			=> trestle_get_option( 'doc_link_icons' ),
+			'type'				=> 'option',
+			'capability' 		=> 'edit_theme_options',
 		)
 	);
 	$wp_customize->add_control(
 		'trestle_doc_link_icons',
 		array(
 			'section'	=> 'trestle_settings_section',
-			'settings'	=> 'genesis-settings[trestle_doc_link_icons]',
+			'settings'	=> 'trestle-settings[doc_link_icons]',
 			'label'		=> __( 'Add icons to .doc links', 'trestle' ),
 			'type'		=> 'checkbox',
 		)

includes/functions/theme-functions.php

@@ -9,20 +9,42 @@
  * @package Trestle
  */
 
+/*===========================================
+ * Theme Setup
+===========================================*/
+add_action( 'after_setup_theme', 'trestle_add_theme_support' );
+/**
+ * Initialize Trestle defaults and theme options.
+ *
+ * @since    2.0.0
+ */
+function trestle_add_theme_support() {
+
+	// Add HTML5 markup structure.
+	add_theme_support( 'html5' );
+
+	// Add viewport meta tag for mobile browsers.
+	add_theme_support( 'genesis-responsive-viewport' );
+
+	// Add support for footer widgets if specified in Trestle settings.
+	add_theme_support( 'genesis-footer-widgets', trestle_get_option( 'footer_widgets_number' ) );
+
+}
+
 /*===========================================
  * 3rd Party Libraries
 ===========================================*/
 
 add_action( 'init', 'trestle_load_bfa' );
-/** 
+/**
  * Initialize the Better Font Awesome Library.
  *
  * @since  2.0.0
  */
 function trestle_load_bfa() {
-	
-    // Set the library initialization args
-    $args = array(
+
+	// Set the library initialization args.
+	$args = array(
 			'version'             => 'latest',
 			'minified'            => true,
 			'remove_existing_fa'  => false,
@@ -30,10 +52,10 @@ function trestle_load_bfa() {
 			'load_admin_styles'   => true,
 			'load_shortcode'      => true,
 			'load_tinymce_plugin' => true,
-    );
+	);
 
-    // Initialize the Better Font Awesome Library.
-    Better_Font_Awesome_Library::get_instance( $args );
+	// Initialize the Better Font Awesome Library.
+	Better_Font_Awesome_Library::get_instance( $args );
 
 }
 
@@ -49,26 +71,26 @@ add_action( 'wp_enqueue_scripts', 'trestle_header_actions' );
  */
 function trestle_header_actions() {
 
-	// Google fonts
+	// Google fonts.
 	wp_enqueue_style( 'theme-google-fonts', '//fonts.googleapis.com/css?family=Lato:300,400,700' );
 
-	// Theme jQuery
-	wp_enqueue_script( 'theme-jquery', get_stylesheet_directory_uri() . '/includes/js/theme-jquery.js', array( 'jquery' ), CHILD_THEME_VERSION, true );
+	// Theme jQuery.
+	wp_enqueue_script( 'theme-jquery', get_stylesheet_directory_uri() . '/includes/js/theme-jquery.js', array( 'jquery' ), TRESTLE_THEME_VERSION, true );
 
-	// Get WP uploads directory
+	// Get WP uploads directory.
 	$upload_dir = wp_upload_dir();
 	$upload_path = $upload_dir['basedir'];
 	$upload_url = $upload_dir['baseurl'];
 
-	// Custom CSS (if it exists)
+	// Custom CSS (if it exists).
 	$custom_css_file = '/trestle/custom.css';
 	if ( is_readable( $upload_path . $custom_css_file ) )
 		wp_enqueue_style( 'trestle-custom-css', $upload_url . $custom_css_file );
 
-	// Custom jQuery (if it exists)
+	// Custom jQuery (if it exists).
 	$custom_js_file = '/trestle/custom.js';
 	if ( is_readable( $upload_path . $custom_js_file ) )
-		wp_enqueue_script( 'trestle-custom-jquery', $upload_url . $custom_js_file, array( 'jquery' ), CHILD_THEME_VERSION, true );
+		wp_enqueue_script( 'trestle-custom-jquery', $upload_url . $custom_js_file, array( 'jquery' ), TRESTLE_THEME_VERSION, true );
 
 }
 
@@ -83,7 +105,9 @@ add_filter( 'genesis_pre_load_favicon', 'trestle_do_custom_favicon' );
  * @return  string  Custom favicon URL (if specified), or the default URL.
  */
 function trestle_do_custom_favicon( $favicon_url ) {
-	return genesis_get_option( 'trestle_favicon_url' ) ? genesis_get_option( 'trestle_favicon_url' ) : $favicon_url;
+
+	$trestle_favicon_url = trestle_get_option( 'favicon_url' );
+	return $trestle_favicon_url ? $trestle_favicon_url : $favicon_url;
 }
 
 /*===========================================
@@ -101,34 +125,49 @@ add_filter( 'body_class', 'trestle_body_classes' );
  */
 function trestle_body_classes( $classes ) {
 
-	// Add 'no-jquery' class to be removed by jQuery if enabled
+	// Add 'no-jquery' class to be removed by jQuery if enabled.
 	$classes[] = 'no-jquery';
 
-	// Add 'bubble' class
-	if ( 'bubble' == genesis_get_option( 'trestle_layout' ) )
+	// Add 'bubble' class.
+	if ( 'bubble' == trestle_get_option( 'layout' ) )
 		$classes[] = 'bubble';
 
-	// Add link icon classes
-	if ( genesis_get_option( 'trestle_external_link_icons' ) )
+	/**
+	 * Add link icon classes.
+	 */
+
+	if ( trestle_get_option( 'external_link_icons' ) ) {
 		$classes[] = 'external-link-icons';
-	if ( genesis_get_option( 'trestle_email_link_icons' ) )
+	}
+
+	if ( trestle_get_option( 'email_link_icons' ) ) {
 		$classes[] = 'email-link-icons';
-	if ( genesis_get_option( 'trestle_pdf_link_icons' ) )
+	}
+
+	if ( trestle_get_option( 'pdf_link_icons' ) ) {
 		$classes[] = 'pdf-link-icons';
-	if ( genesis_get_option( 'trestle_doc_link_icons' ) )
+	}
+
+	if ( trestle_get_option( 'doc_link_icons' ) ) {
 		$classes[] = 'doc-link-icons';
+	}
 
-	// Add menu style class
-	if ( genesis_get_option( 'trestle_nav_primary_location' ) )
-		$classes[] = 'nav-primary-location-' . esc_attr( genesis_get_option( 'trestle_nav_primary_location' ) );
+	// Add menu style class.
+	$nav_primary_location = esc_attr( trestle_get_option( 'nav_primary_location' ) );
+	if ( $nav_primary_location ) {
+		$classes[] = 'nav-primary-location-' . $nav_primary_location;
+	}
 
-	// Add footer widget number class
-	if ( genesis_get_option( 'trestle_footer_widgets_number' ) )
-		$classes[] = 'footer-widgets-number-' . esc_attr( genesis_get_option( 'trestle_footer_widgets_number' ) );
+	// Add footer widget number class.
+	$footer_widgets_number = esc_attr( trestle_get_option( 'footer_widgets_number' ) );
+	if ( $footer_widgets_number ) {
+		$classes[] = 'footer-widgets-number-' . $footer_widgets_number;
+	}
 
-	// Add logo class
-	if ( genesis_get_option( 'trestle_logo_url' ) || genesis_get_option( 'trestle_logo_url_mobile' ) )
+	// Add logo class.
+	if ( trestle_get_option( 'logo_url' ) || trestle_get_option( 'logo_url_mobile' ) ) {
 		$classes[] = 'has-logo';
+	}
 
 	return $classes;
 
@@ -147,17 +186,17 @@ add_filter( 'genesis_seo_title', 'trestle_do_logos', 10, 3 );
  */
 function trestle_do_logos( $title, $inside, $wrap ) {
 
-	$logo_url = genesis_get_option( 'trestle_logo_url' );
-	$logo_url_mobile = genesis_get_option( 'trestle_logo_url_mobile' );
+	$logo_url = trestle_get_option( 'logo_url' );
+	$logo_url_mobile = trestle_get_option( 'logo_url_mobile' );
 	$logo_html = '';
 
-	// Regular logo
+	// Regular logo.
 	if ( $logo_url ) {
 
-		// Default logo class
+		// Default logo class.
 		$classes = array('logo-full');
 
-		// If no mobile logo is specified, make regular logo act as mobile logo too
+		// If no mobile logo is specified, make regular logo act as mobile logo too.
 		if( ! $logo_url_mobile )
 			$classes[] = 'show';
 
@@ -168,13 +207,13 @@ function trestle_do_logos( $title, $inside, $wrap ) {
 		);
 	}
 
-	// Mobile logo
+	// Mobile logo.
 	if ( $logo_url_mobile ) {
 
-		// Default mobile logo class
+		// Default mobile logo class.
 		$classes = array('logo-mobile');
 
-		// If no regular logo is specified, make mobile logo act as regular logo too
+		// If no regular logo is specified, make mobile logo act as regular logo too.
 		if( ! $logo_url )
 			$classes[] = 'show';
 
@@ -193,12 +232,13 @@ function trestle_do_logos( $title, $inside, $wrap ) {
 		);
 	}
 
-	// Build the title
+	// Build the title.
 	$title  = genesis_html5() ? sprintf( "<{$wrap} %s>", genesis_attr( 'site-title' ) ) : sprintf( '<%s id="title">%s</%s>', $wrap, $inside, $wrap );
 	$title .= genesis_html5() ? "{$inside}</{$wrap}>" : '';
 
-	// Echo (filtered)
+	// Echo (filtered).
 	return $title;
+
 }
 
 
@@ -206,145 +246,43 @@ function trestle_do_logos( $title, $inside, $wrap ) {
  * Navigation
 ===========================================*/
 
-add_action( 'init', 'trestle_nav_modifications' );
-/**
- * Performs modifications to the primary navigation menu
- *
- * @since  1.0.0
- *
- * @see trestle_add_mobile_nav()
- * @see trestle_auto_nav_items()
- * @see trestle_custom_nav_extras()
- * @see trestle_nav_placeholder()
- */
-function trestle_nav_modifications() {
-
-	global $trestle_nav_title;
-
-	// Set title for Trestle placeholder navigation menu
-	$trestle_nav_title = __( 'Trestle Auto Nav Placeholder', 'trestle' );
-
-	// Auto-generate nav if Genesis theme setting is checked
-	if ( 1 == genesis_get_option( 'trestle_auto_nav' ) ) {
-		add_filter( 'wp_nav_menu_items', 'trestle_auto_nav_items', 9, 2 );
-	}
-
-	// Do custom nav extras
-	if ( 1 == genesis_get_option( 'trestle_custom_nav_extras' ) ) {
-		// Remove default nav extras
-		remove_filter( 'wp_nav_menu_items', 'genesis_nav_right' );
-
-		// Add custom nav extras
-		add_filter( 'wp_nav_menu_items', 'trestle_custom_nav_extras', 10, 2 );
-	}
-
-	// Create placeholder navigation menu object if needed
-	trestle_nav_placeholder();
-}
-
-add_action( 'init', 'trestle_nav_primary_location' );
+add_action( 'wp_loaded', 'trestle_nav_primary_location' );
 /**
  * Move primary navigation into the header if need be.
  *
+ * This is hooked on wp_loaded instead of init because for some reason init
+ * won't fire on the customizer preview.
+ *
  * @since  1.2.0
  */
 function trestle_nav_primary_location() {
 
-	if ( 'header' == genesis_get_option( 'trestle_nav_primary_location' ) ) {
+	if ( 'header' == trestle_get_option( 'nav_primary_location' ) ) {
 		remove_action( 'genesis_after_header', 'genesis_do_nav' );
 		add_action( 'genesis_header', 'genesis_do_nav', 12 );
 	}
 
 }
 
+add_filter( 'wp_nav_menu_items', 'trestle_custom_nav_extras', 10, 2 );
 /**
- * Auto-generates list of pages for use in the primary navigation menu.
+ * Add custom nav extras.
  *
  * @since 1.0.0
  *
- * @param string   $nav_items <li> list of navigation menu items.
- * @param stdClass $menu_args Arguments for the menu.
- * @return string  <li> list of (modified) navigation menu items.
- */
-function trestle_auto_nav_items( $nav_items, stdClass $menu_args ) {
-
-	if ( 'primary' == $menu_args->theme_location ) {
-		$args = array(
-			'depth'          => genesis_get_option( 'trestle_auto_nav_depth' ) ? genesis_get_option( 'trestle_auto_nav_depth' ) : 0,
-			'echo'           => false,
-			'show_home'      => ( genesis_get_option( 'trestle_include_home_link' ) && genesis_get_option( 'trestle_home_link_text' ) ) ? do_shortcode( genesis_get_option( 'trestle_home_link_text' ) ): genesis_get_option( 'trestle_include_home_link' ),
-			'menu_class'     => 'auto-menu'
-		);
-
-		$ul_class = 'menu genesis-nav-menu menu-primary';
-
-		$menu_args = new stdClass();
-
-		$menu_args->theme_location = 'primary';
-
-		$nav_items = wp_page_menu( $args );
-
-		// Remove opening <div class="auto-nav"><ul>
-		$nav_items = preg_replace( '/<div\s*.*auto-menu[^>]*>\s*<ul>/', '', $nav_items );
-
-		// Remove closing </ul></div>
-		$nav_items = preg_replace( '/<\/ul>\s*<\/div>/', '', $nav_items );
-	}
-
-	return $nav_items;
-}
-
-/**
- * Replaces standard Genesis navigation extras with custom input navigation extras.
- *
- * @since 1.0.0
- *
- * @param string   $nav_items <li> list of menu items.
- * @param stdClass $menu_args Arguments for the menu.
+ * @param  string   $nav_items <li> list of menu items.
+ * @param  stdClass $menu_args Arguments for the menu.
  * @return string   <li> list of menu items with custom navigation extras <li> appended.
  */
 function trestle_custom_nav_extras( $nav_items, stdClass $menu_args ) {
 
-	if ( 'primary' == $menu_args->theme_location ) {
-		$custom_text = esc_attr( genesis_get_option( 'trestle_custom_nav_extras_text' ) );
-		return $nav_items . '<li class="right custom">' . do_shortcode( genesis_get_option( 'trestle_custom_nav_extras_text' ) ) . '</li>';
+	if ( 'primary' == $menu_args->theme_location && trestle_get_option( 'search_in_nav' ) ) {
+		return $nav_items . '<li class="right custom">' . get_search_form( false ) . '</li>';
 	}
 
 	return $nav_items;
 }
 
-/**
- * Generates a placeholder navigation menu object.
- *
- * When using Trestle's auto-generated navigation feature,
- * it is necessary to ensure that some nav menu object is
- * selected as primary otherwise no navigation will be generated.
- *
- * @since 1.0.0
- */
-function trestle_nav_placeholder() {
-
-	global $trestle_nav_title;
-
-	// Create placeholder menu for 'primary' spot if auto-nav is selected - this ensures that nav extras can be used even when no custom menu is formally set to primary
-	if ( 1 == genesis_get_option( 'trestle_auto_nav' ) && ! wp_get_nav_menu_object( $trestle_nav_title ) ) {
-		wp_create_nav_menu( $trestle_nav_title );
-	}
-
-	// Assign placeholder menu to 'primary' if auto-nav is selected and there is no current primary menu
-	if ( 1 == genesis_get_option( 'trestle_auto_nav' ) && ! wp_get_nav_menu_object( $trestle_nav_title ) && ! has_nav_menu( 'primary' ) ) {
-		$menu_locations = get_theme_mod( 'nav_menu_locations' );
-		$menu_locations['primary'] = wp_get_nav_menu_object( $trestle_nav_title )->term_id;
-		set_theme_mod( 'nav_menu_locations', $menu_locations );
-	}
-
-	// Remove placeholder menu if auto-nav is disabled
-	$menus = get_registered_nav_menus();
-
-	if ( 1 != genesis_get_option( 'trestle_auto_nav' ) && wp_get_nav_menu_object( $trestle_nav_title ) && $trestle_nav_title != $menus['primary'] )
-		wp_delete_nav_menu( $trestle_nav_title );
-}
-
 
 /*===========================================
  * Posts & Pages
@@ -361,69 +299,18 @@ add_filter( 'wp_revisions_to_keep', 'trestle_update_revisions_number', 10, 2 );
  */
 function trestle_update_revisions_number( $num ) {
 
-	$trestle_revisions_number = esc_attr( genesis_get_option( 'trestle_revisions_number' ) );
+	$trestle_revisions_number = esc_attr( trestle_get_option( 'revisions_number' ) );
 
-	if ( isset( $trestle_revisions_number ) )
+	if ( isset( $trestle_revisions_number ) ) {
 		return $trestle_revisions_number;
+	}
 
 	return $num;
 }
 
-add_action( 'the_post', 'trestle_post_info_meta', 5 );
-/**
- * Manually controls display of post info/meta for all post types.
- *
- * @since 1.0.0
- *
- * @see trestle_set_page_post_type()
- * @global object $post The current $post object.
- */
-function trestle_post_info_meta() {
-
-	if ( ! is_admin() && in_the_loop() && genesis_get_option( 'trestle_manual_post_info_meta' ) ) {
-
-		global $post;
-
-		// Get post type
-		$post_type = get_post_type( $post->ID );
-
-		// Remove all Post Info & Meta
-		remove_action( 'genesis_entry_header', 'genesis_post_info', 12 );
-		remove_action( 'genesis_entry_footer', 'genesis_post_meta' );
-
-		// Single
-		if ( is_singular() ) {
-			$single_info_option = 'trestle_post_info_' . $post_type . '_single';
-			$single_meta_option = 'trestle_post_meta_' . $post_type . '_single';
-
-			// Post Info
-			if ( genesis_get_option( $single_info_option ) )
-				add_action( 'genesis_entry_header', 'genesis_post_info', 12 );
-
-			// Post Meta
-			if ( genesis_get_option( $single_meta_option ) )
-				add_action( 'genesis_entry_footer', 'genesis_post_meta' );
-		}
-
-		// Archive
-		if ( ! is_singular() ) {
-			$archive_info_option = 'trestle_post_info_' . $post_type . '_archive';
-			$archive_meta_option = 'trestle_post_meta_' . $post_type . '_archive';
-
-			// Post Info
-			if ( genesis_get_option( $archive_info_option ) )
-				add_action( 'genesis_entry_header', 'genesis_post_info', 12 );
-
-			// Post Meta
-			if ( genesis_get_option( $archive_meta_option ) )
-				add_action( 'genesis_entry_footer', 'genesis_post_meta' );
-		}
-	}
-}
-
 add_filter( 'genesis_get_image_default_args', 'trestle_featured_image_fallback' );
 /**
- * Unset Genesis default featured image fallback of 'first-attached'
+ * Unset Genesis default featured image fallback of 'first-attached'.
  *
  * This function prevents Genesis' default behavior of displaying
  * the 'first-attached' image as a post's featured image (in archive)
@@ -431,8 +318,8 @@ add_filter( 'genesis_get_image_default_args', 'trestle_featured_image_fallback'
  *
  * @since 1.0.0
  *
- * @param array $args Default Genesis image args
- * @return array Updated image args
+ * @param array $args Default Genesis image args.
+ * @return array Updated image args.
  */
 function trestle_featured_image_fallback( $args ) {
 
@@ -459,14 +346,10 @@ add_filter( 'the_content_more_link', 'trestle_read_more_link' );
  */
 function trestle_read_more_link( $default_text ) {
 
-	// Get Trestle custom "read more" link text
-	$custom_text = esc_attr( genesis_get_option( 'trestle_read_more_text' ) );
+	// Get Trestle custom "read more" link text.
+	$custom_text = esc_attr( trestle_get_option( 'read_more_text' ) );
 
-<<<<<<< HEAD
-	if ( $custom_text )	{
-=======
-	if ( $custom_text )
->>>>>>> 9de3310f116bb4f7dd5323ca40b16f2fe4160dcd
+	if ( $custom_text ) {
 		return '&hellip;&nbsp;<a class="more-link" title="' . $custom_text . '" href="' . get_permalink() . '">' . $custom_text . '</a>';
 	} else {
 		return $default_text;

includes/js/theme-jquery.js

@@ -27,7 +27,7 @@ jQuery( document ).ready( function( $ ) {
     $( 'li:first-child' ).addClass( 'first' );
     $( 'ul, ol' ).parent( 'li' ).addClass( 'parent' );
 
-    // Mobile header toggle buttons
+    // Create mobile header toggle buttons
     $( '.site-header .title-area' ).after( '<div class="toggle-buttons" />' );
     $( '.site-header .widget-area, .nav-primary' ).each( function( i ) {
 
@@ -58,7 +58,7 @@ jQuery( document ).ready( function( $ ) {
         $target.addClass( 'toggle-target-' + i );
     });
 
-    // Toggle widget areas and primary nav
+    // A widget areas and primary nav mobile toggle functionality
     $( '.site-header .toggle-button' ).click( function( event ) {
 
         // Prevent default behavior
@@ -70,11 +70,9 @@ jQuery( document ).ready( function( $ ) {
         // Get toggle button that was clicked
         $button = $( this );
 
-        //Remove focus
-        $button.blur();
-
         // Match the button to the right target
         $target = $( '.toggle-target-' + $button.attr( 'id' ).match( /\d+/ ) );
+        console.log( 'Target: ' + $target.attr('class'));
 
         // Toggle buttons
         $button.toggleClass( 'open' );
@@ -82,7 +80,11 @@ jQuery( document ).ready( function( $ ) {
 
         // Toggle targets
         $target.toggleClass( 'open' );
-        $( '[class^="toggle-target"]' ).not( $target ).removeClass( 'open' );
+        $( '[class*="toggle-target"]' ).not( $target ).removeClass( 'open' );
+
+        // Remove focus
+        $button.blur();
+
     });
 
     // Mobile navigation icons

includes/shortcodes/shortcodes.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 /**
- * Trestle shortcodes
+ * Trestle shortcodes.
  *
  * @since 1.0.0
  *
@@ -11,9 +11,9 @@
  * Shortcodes
 ===========================================*/
 
-add_filter('the_content', 'trestle_shortcode_empty_paragraph_fix');
+add_filter( 'the_content', 'trestle_shortcode_empty_paragraph_fix' );
 /**
- * Fix for empty <p> tags around shortcodes
+ * Fix for empty <p> tags around shortcodes.
  *
  * @since  1.0.0
  *
@@ -21,23 +21,22 @@ add_filter('the_content', 'trestle_shortcode_empty_paragraph_fix');
  *
  * @return  string            Updated content.
  */
-function trestle_shortcode_empty_paragraph_fix( $content )
-{   
+function trestle_shortcode_empty_paragraph_fix( $content ) {
     $array = array (
-        '<p>[' => '[', 
-        ']</p>' => ']', 
+        '<p>[' => '[',
+        ']</p>' => ']',
         ']<br />' => ']'
         );
 
-    $content = strtr($content, $array);
+    $content = strtr( $content, $array );
 
     return $content;
 }
 
 add_shortcode( 'col', 'trestle_column' );
 /**
- * Columns
- * 
+ * Columns.
+ *
  * Example:
  * [col class="one-half first no-list-margin"] Contents [/col]
  *
@@ -57,12 +56,10 @@ function trestle_column( $atts, $content = null ) {
     return '<div class="col ' . $class . '">' . do_shortcode( $content ) . '</div>';
 }
 
-
-
 add_shortcode( 'button', 'trestle_button' );
 /**
- * Button
- * 
+ * Button.
+ *
  * Example: [button href="url" title="title" target="target" class="class"]Text[/button]
  *
  * @param   array  $atts  Shortcode attributes.
@@ -79,10 +76,9 @@ function trestle_button( $atts, $content = null ) {
     return '<a class="button ' . $class . '" href="' . $href . '" title="' . $title . '" target="' . $target . '">' . do_shortcode( $content ) . '</a>';
 }
 
-
 add_shortcode( 'date', 'trestle_date' );
 /**
- * Date
+ * Date.
  *
  * Example: [date format="M d, Y"]
  *
@@ -93,10 +89,10 @@ add_shortcode( 'date', 'trestle_date' );
 function trestle_date( $atts ) {
     extract( shortcode_atts( array(
         'format' => 'M d, Y',
-    ), $format ) );
+    ), $atts ) );
 
     if ( ! $format ) {
-        $format = 'M d, Y'; 
+        $format = 'M d, Y';
     }
 
     return date( $format );
@@ -104,8 +100,8 @@ function trestle_date( $atts ) {
 
 add_shortcode( 'blockquote', 'trestle_blockquote_shortcode' );
 /**
- * Blockquote
- * 
+ * Blockquote.
+ *
  * Example: [blockquote citation=""]Content[/blockquote]
  *
  * @since   1.2.0
@@ -115,28 +111,27 @@ add_shortcode( 'blockquote', 'trestle_blockquote_shortcode' );
  * @return  string        Shortcode output.
  */
 function trestle_blockquote_shortcode( $atts, $content = null ) {
-         
-   $atts = shortcode_atts( array(
-      'citation'      => '',
-   ), $atts );
-         
-   ob_start(); ?>
-   
-   <blockquote>
-   
-   <?php if ( $content ) : ?>
-      <?php echo $content; ?>
-   <?php endif; ?>
-   
-   <?php if ( $atts['citation'] ) : ?>
-      <cite>- <?php echo $atts['citation']; ?></cite>
-   <?php endif; ?>
+    $atts = shortcode_atts( array(
+        'citation'      => '',
+    ), $atts );
 
-   </blockquote>
-   
-   <?php
-   
-   $output = ob_get_clean();
+    ob_start(); ?>
 
-   return $output;
+        <blockquote>
+
+        <?php if ( $content ) : ?>
+            <?php echo $content; ?>
+        <?php endif; ?>
+
+        <?php if ( $atts['citation'] ) : ?>
+            <cite>- <?php echo $atts['citation']; ?></cite>
+        <?php endif; ?>
+
+        </blockquote>
+
+    <?php
+
+    $output = ob_get_clean();
+
+    return $output;
 }

includes/widget-areas/widget-areas.php

@@ -1,16 +1,16 @@
 <?php
 
 /**
- * Trestle widget area registration and functionality
- *  
+ * Trestle widget area registration and functionality.
+ *
  * @since  1.0.0
- * 
+ *
  * @package Trestle
  */
 
 //add_action( 'widgets_init', 'trestle_register_widget_areas' );
 /**
- * Register custom widget areas
+ * Register custom widget areas.
  *
  * @since 1.0.0
  */

style.css

@@ -1368,15 +1368,11 @@ Site Header
 
 .site-header .widget-area {
 	width: 100%;
+	padding: 20px;
 	background-color: #eee;
 	border: 1px solid #ddd;
-	border-width: 0;
-	overflow: hidden;
-}
-
-.site-header .widget-area.open {
-	padding: 20px;
 	border-width: 1px 0;
+	overflow: hidden;
 }
 
 .site-header .search-form {
@@ -1414,23 +1410,21 @@ Site Header
 	content: "\f0c9";
 }
 
-
 .nav-primary,
-/*.site-header .nav-primary,*/
 .site-header .widget-area {
 	position: absolute;
+	z-index: -999;
 	top: 100%;
 	left: 0;
 	right: 0;
-	max-height: 0;
 	opacity: 0;
+	filter: alpha(opacity=0);
 	box-shadow: 0 4px 8px 1px rgba(0,0,0,0.4);
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-	-webkit-transition: all .5s ease, padding 0s .5s;
-	   -moz-transition: all .5s ease, padding 0s .5s;
-	    -ms-transition: all .5s ease, padding 0s .5s;
-	     -o-transition: all .5s ease, padding 0s .5s;
-	        transition: all .5s ease, padding 0s .5s;
+	-webkit-transition: opacity 0.25s ease, z-index 0s 0.25s;
+	   -moz-transition: opacity 0.25s ease, z-index 0s 0.25s;
+	    -ms-transition: opacity 0.25s ease, z-index 0s 0.25s;
+	     -o-transition: opacity 0.25s ease, z-index 0s 0.25s;
+	        transition: opacity 0.25s ease, z-index 0s 0.25s;
 }
 
 .site-container > .nav-primary {
@@ -1440,14 +1434,13 @@ Site Header
 .nav-primary.open,
 .widget-area.open {
 	z-index: 50;
-	max-height: 9999px;
 	opacity: 1;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-	-webkit-transition: opacity .5s ease, padding 0s 0s;
-	   -moz-transition: opacity .5s ease, padding 0s 0s;
-	    -ms-transition: opacity .5s ease, padding 0s 0s;
-	     -o-transition: opacity .5s ease, padding 0s 0s;
-	        transition: opacity .5s ease, padding 0s 0s;
+	filter: alpha(opacity=100);
+	-webkit-transition: z-index 0s ease, opacity 0.25s 0s;
+	   -moz-transition: z-index 0s ease, opacity 0.25s 0s;
+	    -ms-transition: z-index 0s ease, opacity 0.25s 0s;
+	     -o-transition: z-index 0s ease, opacity 0.25s 0s;
+	        transition: z-index 0s ease, opacity 0.25s 0s;
 }
 
 
@@ -1623,7 +1616,7 @@ Site Navigation
 
 .genesis-nav-menu > .right .search-form {
 	display: inline-block;
-	padding: 0;
+	padding: 8px 0;
 }
 
 .genesis-nav-menu > .right input[type="submit"] {
@@ -1682,12 +1675,6 @@ Site Navigation
 	padding: 0;
 }
 
-.site-header .nav-primary a:hover,
-.site-header .nav-primary [class*="current-"] > a,
-.site-header .nav-primary [class*="current_"] > a {
-	color: #333;
-}
-
 .site-header .right {
 	padding-right: 0;
 }
@@ -2481,7 +2468,7 @@ Media Queries
 	--------------------------------------------- */
 
 	.genesis-nav-menu > .right {
-		display: inline-block;
+		display: none;
 		float: right;
 		border-top: none;
 	}
@@ -2491,10 +2478,6 @@ Media Queries
 		margin: 0 0 0 2rem;
 	}
 
-	.genesis-nav-menu > .search form {
-		padding-right: 0;
-	}
-
 	.genesis-nav-menu > .right input[type="submit"] {
 		display: inline-block;
 	}
@@ -2570,6 +2553,16 @@ Media Queries
 		padding: 0.6em 1.2em;
 	}
 
+	.site-header .nav-primary .menu > li:last-of-type:not(.right) {
+		padding-right: 0;
+	}
+
+	.site-header .nav-primary a:hover,
+	.site-header .nav-primary [class*="current-"] > a,
+	.site-header .nav-primary [class*="current_"] > a {
+		color: #333;
+	}
+
 
 	/* Plugins
 	--------------------------------------------- */