* Add SSN style for Custom Post Type Parents plugin.

* Remove general input/button 100% width for sidebar.

README.md

@@ -0,0 +1,46 @@
+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)
+
+### [View Demo →](http://demo.mightyminnow.com/theme/trestle/)
+
+#### Intro
+Trestle takes a lot of the grunt work out of building sites using the Genesis Framework, providing quick and easy-to-implement solutions to common problems and repetitive tasks. We’ve taken Genesis’ rock-solid foundation, integrated mobile-first CSS, responsive navigation, a full-featured settings panel, and much more. Download. Install. Enjoy.
+
+#### Features
+Here are some of Trestle's many features, check out the [Trestle Demo](http://demo.mightyminnow.com/theme/trestle/) for a full list.
+* Responsive navigation menu
+* Mobile first CSS
+* Custom control over post info and meta
+* Multiple page layouts
+* Auto-generating primary navigation
+* Ability to auto-install your favorite plugins
+* Helpful theme jQuery
+* Compatibility with Genesis Extender plugin
+* Optional link icons
+* Built-in shortcodes (columns, buttons, Font Awesome, etc)
+* Front-end styles appear in editor as well
+* 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

functions.php

@@ -1,41 +1,49 @@
 <?php
 
 /**
- * Trestle theme functionality
+ * Theme functionality
  *  
  * @since  1.0.0
  * 
  * @package Trestle
  */
 
+/*===========================================
+ * Required Files
+===========================================*/
+
+// Theme functions
+require_once dirname( __FILE__ ) . '/includes/functions/theme-functions.php';
+
+// Admin functionality
+require_once dirname( __FILE__ ) . '/includes/admin/admin.php';
+
+// Shortcodes
+require_once dirname( __FILE__ ) . '/includes/shortcodes/shortcodes.php';
+
+// Additional sidebars
+require_once dirname( __FILE__ ) . '/includes/widget-areas/widget-areas.php';
+
+// Plugin activation class
+require_once dirname( __FILE__ ) . '/includes/classes/class-tgm-plugin-activation.php';
+
+
 add_action( 'genesis_setup' ,'trestle_theme_setup', 15 );
+/**
+ * Initialize Trestle
+ *
+ * @since  1.0.0
+ */
 function trestle_theme_setup() {
 
 	/*===========================================
-	 * Required Files
+	 * Theme Setup
-	===========================================*/
-	
-	// Trestle theme functions
-	require_once dirname( __FILE__ ) . '/lib/functions/theme-functions.php';
-
-	// Admin functionality
-	require_once dirname( __FILE__ ) . '/lib/admin/admin.php';
-	
-	// Shortcodes
-	require_once dirname( __FILE__ ) . '/lib/shortcodes/shortcodes.php';
-	
-	// Plugin activation class
-	require_once dirname( __FILE__ ) . '/lib/classes/class-tgm-plugin-activation.php';
-
-
-	/*===========================================
-	 * Trestle 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.0.0' );
+	define( 'CHILD_THEME_VERSION', '1.2.0' );
 
 	// Load theme text domain
 	load_theme_textdomain( 'trestle', get_stylesheet_directory() . '/languages' );
@@ -46,57 +54,8 @@ function trestle_theme_setup() {
 	// Add viewport meta tag for mobile browsers
 	add_theme_support( 'genesis-responsive-viewport' );
 
-	// Add support for custom background
-	add_theme_support( 'custom-background' );
-
 	// 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 );
 
-
+}
-	/*===========================================
-	 * Header Styles & Scripts
-	===========================================*/
-
-	add_action( 'wp_enqueue_scripts', 'trestle_header_actions' );
-
-	/*===========================================
-	 * Widget Areas
-	===========================================*/
-	
-	add_action( 'widgets_init', 'trestle_register_widget_areas' );
-
-	/*===========================================
-	 * Auto & Mobile Navigation
-	===========================================*/	
-	
-	// Implement auto-nav and mobile nav button
-	add_action( 'init', 'trestle_nav_modifications' );
-
-
-	/*===========================================
-	 * Posts & Pages
-	===========================================*/
-
-	// Setup revisions number
-	add_filter( 'wp_revisions_to_keep', 'trestle_update_revisions_number', 10, 2 );
-
-	// Manually control where Post Info & Meta display
-	add_action( 'the_post', 'trestle_post_info_meta', 0 );
-
-	// Remove default featured image fallback of 'first-attached'
-	add_filter( 'genesis_get_image_default_args', 'trestle_featured_image_fallback' );
-
-
-	/*===========================================
-	 * General Actions & Filters
-	===========================================*/
-
-	// Add body classes
-	add_filter( 'body_class', 'trestle_body_classes' );
-
-	// Do custom Read More text
-	add_filter( 'excerpt_more', 'trestle_read_more_link' );
-	add_filter( 'get_the_content_more_link', 'trestle_read_more_link' );
-	add_filter( 'the_content_more_link', 'trestle_read_more_link' );
-}

includes/admin/admin.php

@@ -1,12 +1,13 @@
 <?php
 /**
- * Trestle admin functions
+ * Trestle admin functions.
  *
  * @since 1.0.0
  *
  * @package Trestle
  */
 
+add_action( 'admin_enqueue_scripts', 'trestle_admin_actions' );
 /**
  * Loads admin scripts and styles.
  *
@@ -14,15 +15,16 @@
  */
 function trestle_admin_actions() {
 	// Add admin jQuery
-	wp_enqueue_script( 'trestle-admin-jquery', get_stylesheet_directory_uri() . '/lib/admin/admin.js', array( 'jquery' ), '1.0.0', true );
+	wp_enqueue_script( 'trestle-admin-jquery', get_stylesheet_directory_uri() . '/includes/admin/admin.js', array( 'jquery' ), '1.0.0', true );
 
 	// Add admin jQuery
-	wp_enqueue_style( 'trestle-admin', get_stylesheet_directory_uri() . '/lib/admin/admin.css' );
+	wp_enqueue_style( 'trestle-admin', get_stylesheet_directory_uri() . '/includes/admin/admin.css' );
 
 	// Add admin CSS
-    add_editor_style( get_stylesheet_directory_uri() . '/lib/admin/editor-style.css' );
+    add_editor_style( get_stylesheet_directory_uri() . '/includes/admin/editor-style.css' );
 }
 
+add_filter( 'genesis_theme_settings_defaults', 'trestle_custom_defaults' );
 /**
  * Sets up Trestle default settings.
  *
@@ -34,14 +36,20 @@ function trestle_admin_actions() {
 function trestle_custom_defaults( $defaults ) {
  	// Trestle default key/value pairs
  	$trestle_defaults = array(
-		'trestle_layout' => 'solid',
+		'trestle_layout'                => 'solid',
-		'trestle_auto_nav' => 0,
+		'trestle_logo_url'              => '',
-		'trestle_include_home_link' => 0,
+		'trestle_logo_url_mobile'       => '',
-		'trestle_home_link_text' => __( 'Home', 'trestle' ),
+		'trestle_favicon_url'           => '',
-		'trestle_nav_button_text' => '[icon name="icon-list-ul"]  ' . __( 'Navigation', 'trestle' ),
+		'trestle_nav_primary_location'  => 'full',
-		'trestle_read_more_text' => __( 'Read&nbsp;More&nbsp;&raquo;', 'trestle' ),
+		'trestle_auto_nav'              => 0,
-		'trestle_revisions_number' => 3,
+		'trestle_auto_nav_depth'        => 0,
-		'trestle_equal_height_cols' => 1,
+		'trestle_include_home_link'     => 0,
+		'trestle_home_link_text'        => __( 'Home', 'trestle' ),
+		'trestle_nav_button_text'       => '[icon name="icon-list-ul"]  ' . __( 'Navigation', 'trestle' ),
+		'trestle_read_more_text'        => __( 'Read&nbsp;More&nbsp;&raquo;', 'trestle' ),
+		'trestle_revisions_number'      => 3,
+		'trestle_footer_widgets_number' => 3,
+		'trestle_equal_height_cols'     => 1,
 		'trestle_equal_cols_breakpoint' => 768,
 	);
 
@@ -63,6 +71,7 @@ function trestle_custom_defaults( $defaults ) {
 	return $defaults;
 }
 
+add_action( 'genesis_settings_sanitizer_init', 'trestle_register_social_sanitization_filters' );
 /**
  * Adds sanitization for various Trestle admin settings.
  *
@@ -91,6 +100,7 @@ function trestle_register_social_sanitization_filters() {
 		'absint', 
 		GENESIS_SETTINGS_FIELD,
 		array(
+			'trestle_auto_nav_depth',
 			'trestle_revisions_number',
 			'trestle_footer_widgets_number',
 			'trestle_equal_cols_breakpoint',
@@ -103,6 +113,7 @@ function trestle_register_social_sanitization_filters() {
 		GENESIS_SETTINGS_FIELD,
 		array(
 			'trestle_layout',
+			'trestle_nav_primary_location'
 		)
 	);
 
@@ -111,6 +122,9 @@ function trestle_register_social_sanitization_filters() {
 		'safe_html', 
 		GENESIS_SETTINGS_FIELD,
 		array(
+			'trestle_logo_url',
+			'trestle_logo_url_mobile',
+			'trestle_favicon_url',
 			'trestle_home_link_text',
 			'trestle_nav_button_text',
 			'trestle_custom_nav_extras_text',
@@ -118,7 +132,8 @@ function trestle_register_social_sanitization_filters() {
 		)
 	);
 }
- 
+
+add_action( 'genesis_theme_settings_metaboxes', 'trestle_register_settings_box' );
 /**
  * Registers Trestle admin settings box.
  *
@@ -153,28 +168,60 @@ function trestle_settings_box() {
 		<img src="<?php echo $img_path; ?>icon-bubble.gif" width="200" height="160" <?php echo 'bubble' == genesis_get_option( 'trestle_layout' ) ? 'class="checked"' : '' ?> />
 		<input type="radio" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_layout]" value="bubble" <?php checked( esc_attr( genesis_get_option( 'trestle_layout' ) ), 'bubble' ); ?> />
 	</p>
+
+	<h4><?php _e( 'Logos & Favicon', 'trestle' ) ?></h4>
+	<p>
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url]"><?php _e( 'Logo URL', 'trestle' ); ?></label><br />
+		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url]" value="<?php echo esc_attr( genesis_get_option( 'trestle_logo_url' ) ); ?>" />
+	</p>
+	<p>
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url_mobile]"><?php _e( 'Mobile Logo URL', 'trestle' ); ?></label><br />
+		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url_mobile]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url_mobile]" value="<?php echo esc_attr( genesis_get_option( 'trestle_logo_url_mobile' ) ); ?>" />
+	</p>
+	<p>
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_favicon_url]"><?php _e( 'Favicon URL', 'trestle' ); ?></label><br />
+		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_favicon_url]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_favicon_url]" value="<?php echo esc_attr( genesis_get_option( 'trestle_favicon_url' ) ); ?>" />
+		<span class="description"><?php _e( 'Defaults to <i>/wp-content/themes/trestle/images/favicon.ico</i> if not specified.', 'trestle' ); ?></span>
+	</p>
 	
 	<h4><?php _e( 'Primary Navigation', 'trestle' ) ?></h4>
 	<p>
-		<input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_auto_nav' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]"><?php _e( 'Automatically generate nav menu (replaces custom/manual menu with auto-generated menu)', 'trestle' ); ?></label><br />
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_primary_location]"><?php _e( 'Menu style:', 'trestle' ); ?> </label><br/>
+		<select name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_primary_location]" />
+			<option value="full" <?php selected( esc_attr( genesis_get_option( 'trestle_nav_primary_location' ) ), 'full' ); ?> ><?php _e( 'Full width', 'trestle' ); ?></option>
+			<option value="header" <?php selected( esc_attr( genesis_get_option( 'trestle_nav_primary_location' ) ), 'header' ); ?> ><?php _e( 'Header right', 'trestle' ); ?></option>
+		</select>
+	</p>
+	<p>
+		<input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_auto_nav' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]"><?php _e( 'Auto-generate primary navigation menu with published pages, to a depth of:', 'trestle' ); ?> </label>
+		<select name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav_depth]" />
+			<option value="0" <?php selected( esc_attr( genesis_get_option( 'trestle_auto_nav_depth' ) ), '0' ); ?> ><?php _e( 'Unlimited', 'trestle' ); ?></option>
+			<?php
+				for( $i=1; $i<=10; $i++ ) {
+					echo '<option value="' . $i . '" ' . selected( esc_attr( genesis_get_option( 'trestle_auto_nav_depth' ) ), $i, false ) . '>' . $i . '</option>' . "\n";
+				}
+			?>
+		</select><br />
 		<input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_include_home_link]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_include_home_link]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_include_home_link' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_include_home_link]"><?php _e( 'Include home link', 'trestle' ); ?></label>
 	</p>
 	
 	<p>
-		<?php _e( 'Home link text (shortcodes can be included):', 'trestle' ); ?></label><br />
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_home_link_text]"><?php _e( 'Home link text (shortcodes can be included):', 'trestle' ); ?></label><br />
-		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_home_link_text]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_home_link_text]" value="<?php echo esc_attr( genesis_get_option( 'trestle_home_link_text' ) ); ?>" /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_home_link_text]">
+		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_home_link_text]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_home_link_text]" value="<?php echo esc_attr( genesis_get_option( 'trestle_home_link_text' ) ); ?>" />
 	</p>
 	
 	<p>
-		<?php _e( 'Text for mobile navigation button (shortcodes can be included):', 'trestle' ); ?></label><br />
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_button_text]"><?php _e( 'Text for mobile navigation button (shortcodes can be included):', 'trestle' ); ?></label><br />
-		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_button_text]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_button_text]" value="<?php echo esc_attr( genesis_get_option( 'trestle_nav_button_text' ) ); ?>" /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_button_text]">
+		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_button_text]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_button_text]" value="<?php echo esc_attr( genesis_get_option( 'trestle_nav_button_text' ) ); ?>" /> 
 	</p>
 	
 	<h4><?php _e( 'Primary Navigation Extras', 'trestle' ) ?></h4>
-	<p><input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_custom_nav_extras' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras]"><?php _e( 'Display custom navigation extras content (overrides standard Genesis navigation extras)', 'trestle' ); ?></label></p>
 	<p>
-		<?php _e( 'Custom navigation extras text:', 'trestle' ); ?><br />
+		<input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_custom_nav_extras' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras]"><?php _e( 'Display custom navigation extras content (overrides standard Genesis navigation extras)', 'trestle' ); ?></label>
-		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras_text]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras_text]" value="<?php echo esc_attr( genesis_get_option( 'trestle_custom_nav_extras_text' ) ); ?>" /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras_text]">
+	</p>
+	<p>
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras_text]"><?php _e( 'Custom navigation extras text:', 'trestle' ); ?></label><br />
+		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras_text]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_custom_nav_extras_text]" value="<?php echo esc_attr( genesis_get_option( 'trestle_custom_nav_extras_text' ) ); ?>" /> 
 	</p>
 	
 	<h4><?php _e( 'Blog/Posts', 'trestle' ) ?></h4>
@@ -194,13 +241,21 @@ function trestle_settings_box() {
 	</p>
 	
 	<h4><?php _e( 'Post Info & Meta', 'trestle' ) ?></h4>
-	<p><input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_manual_post_info_meta]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_manual_post_info_meta]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_manual_post_info_meta' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_manual_post_info_meta]"><?php _e( 'Manually select where to show Post Info & Meta', 'trestle' ); ?></label></p>
+	<p>
+		<input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_manual_post_info_meta]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_manual_post_info_meta]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_manual_post_info_meta' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_manual_post_info_meta]"><?php _e( 'Manually select where to show Post Info & Meta', 'trestle' ); ?></label>
+	</p>
 	<div class="trestle-post-info-meta">
 		<div class="one-half first">
 			<b><?php _e( 'Show Post Info on:', 'trestle' ) ?></b>
 				<?php
 				$post_types = get_post_types();
 				foreach ( $post_types as $post_type ) {
+					// Don't show this option for pages, since genesis_post_info/meta won't work for pages
+					if ( 'page' == $post_type ) {
+						continue;
+					}
+
+					// Otherwise generate post info settings
 					$post_type_object = get_post_type_object( $post_type );
 					$name = $post_type_object->labels->name;
 					$slug = $post_type_object->name;
@@ -221,6 +276,12 @@ function trestle_settings_box() {
 				<?php
 				$post_types = get_post_types();
 				foreach ( $post_types as $post_type ) {
+					// Don't show this option for pages, since genesis_post_info/meta won't work for pages
+					if ( 'page' == $post_type ) {
+						continue;
+					}
+
+					// Otherwise generate post meta settings
 					$post_type_object = get_post_type_object( $post_type );
 					$name = $post_type_object->labels->name;
 					$slug = $post_type_object->name;
@@ -255,7 +316,7 @@ function trestle_settings_box() {
 		<input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_height_cols]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_height_cols]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_equal_height_cols' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_height_cols]"><?php _e( 'Automatically equalize height of Genesis Extender homepage columns', 'trestle' ); ?></label>
 	</p>
 	<p class="trestle-equal-columns-breakpoint">
-		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_cols_breakpoint]"><?php _e( 'Implement at', 'trestle' ); ?></label> <input type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_cols_breakpoint]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_cols_breakpoint]" value="<?php echo esc_attr( genesis_get_option( 'trestle_equal_cols_breakpoint' ) ); ?>" size="4"/>px&nbsp;<?php _e( 'and wider (should match main CSS breakpoint)', 'trestle' ); ?>
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_cols_breakpoint]"><?php _e( 'Implement at', 'trestle' ); ?><input type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_cols_breakpoint]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_equal_cols_breakpoint]" value="<?php echo esc_attr( genesis_get_option( 'trestle_equal_cols_breakpoint' ) ); ?>" size="4"/>px&nbsp;<?php _e( 'and wider (should match main CSS breakpoint)', 'trestle' ); ?></label> 
 	</p>
 
 	<h4><?php _e( 'Link Icons', 'trestle' ) ?></h4>
@@ -268,6 +329,7 @@ function trestle_settings_box() {
 	<?php
 }
 
+add_action( 'tgmpa_register', 'trestle_register_required_plugins' );
 /**
  * Loads required & recommended plugins.
  *
@@ -276,7 +338,7 @@ function trestle_settings_box() {
  *
  * @since 1.0.0
  *
- * @see tgmpa() in /lib/classes/class-tgm-plugin-activation.php
+ * @see tgmpa() in /includes/classes/class-tgm-plugin-activation.php
  */
 function trestle_register_required_plugins() {
 	$plugins = array(
@@ -319,8 +381,8 @@ function trestle_register_required_plugins() {
 		),
 
 		array(
-			'name' 		=> 'FancyBox for WordPress',
+			'name' 		=> 'Easy Fancybox',
-			'slug' 		=> 'fancybox-for-wordpress',
+			'slug' 		=> 'easy-fancybox',
 			'required'  => false,
 		),
 

includes/admin/editor-style.css

@@ -11,7 +11,9 @@
 /* Overrides
 --------------------------------------------- */
 body {
+	padding: 8px 16px;
 	background-color: #FFF;
+	background-image: none;
 }
 
 .content {

includes/functions/theme-functions.php

@@ -10,57 +10,184 @@
  */
 
 /*===========================================
- * Header Styles & Scripts
+ * Header
 ===========================================*/
 
+add_action( 'wp_enqueue_scripts', 'trestle_header_actions' );
 /**
  * Loads theme scripts and styles.
  *
  * @since  1.0.0
  */
 function trestle_header_actions() {
+	
 	// 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() . '/lib/js/theme-jquery.js', array( 'jquery' ), '1.0.0', true );
+	wp_enqueue_script( 'theme-jquery', get_stylesheet_directory_uri() . '/includes/js/theme-jquery.js', array( 'jquery' ), CHILD_THEME_VERSION, true );
+
+	// 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_file = 'wp-content/uploads/trestle/custom.css';
+	$custom_css_file = '/trestle/custom.css';
-	if ( is_readable( ABSPATH . $custom_css_file ) )
+	if ( is_readable( $upload_path . $custom_css_file ) )
-		wp_enqueue_style( 'trestle-custom-css', '/' . $custom_css_file );
+		wp_enqueue_style( 'trestle-custom-css', $upload_url . $custom_css_file );
 	
 	// Custom jQuery (if it exists)
-	$custom_js_file = 'wp-content/uploads/trestle/custom.js';
+	$custom_js_file = '/trestle/custom.js';
-	if ( is_readable( ABSPATH . $custom_js_file ) )
+	if ( is_readable( $upload_path . $custom_js_file ) )
-		wp_enqueue_script( 'trestle-custom-jquery', '/' . $custom_js_file, array( 'jquery' ), '1.0.0', true );
+		wp_enqueue_script( 'trestle-custom-jquery', $upload_url . $custom_js_file, array( 'jquery' ), CHILD_THEME_VERSION, true );
 
 	// Pass PHP variables to theme jQuery
 	$php_vars = array (
 		'trestle_equal_cols_breakpoint' => genesis_get_option( 'trestle_equal_cols_breakpoint' ),
 	);
-	wp_localize_script( 'theme-jquery', 'php_vars', $php_vars );
+	wp_localize_script( 'theme-jquery', 'trestle_vars', $php_vars );
+
+}
+
+add_filter( 'genesis_pre_load_favicon', 'trestle_do_custom_favicon' );
+/**
+ * Output custom favicon if specified in the theme options.
+ *
+ * @since   1.0.0
+ *
+ * @param   string  $favicon_url  Default favicon URL.
+ *
+ * @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;
+}
+
+/*===========================================
+ * Body Classes
+===========================================*/
+
+add_filter( 'body_class', 'trestle_body_classes' );
+/**
+ * Adds custom classes to the <body> element for styling purposes.
+ *
+ * @since 1.0.0
+ *
+ * @param array $classes Body classes.
+ * @return array 		 Updated body classes.
+ */
+function trestle_body_classes( $classes ) {
+	
+	// Add 'no-jquery' class to be removed by jQuery if enabled
+	$classes[] = 'no-jquery';
+
+	// Add 'bubble' class
+	if ( 'bubble' == genesis_get_option( 'trestle_layout' ) )
+		$classes[] = 'bubble';
+
+	// Add link icon classes
+	if ( genesis_get_option( 'trestle_external_link_icons' ) )
+		$classes[] = 'external-link-icons';
+	if ( genesis_get_option( 'trestle_email_link_icons' ) )
+		$classes[] = 'email-link-icons';
+	if ( genesis_get_option( 'trestle_pdf_link_icons' ) )
+		$classes[] = 'pdf-link-icons';
+	if ( genesis_get_option( 'trestle_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 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 class for equal height Genesis Extender columns
+	if ( 1 == genesis_get_option( 'trestle_equal_height_cols' ) )
+		$classes[] = 'equal-height-genesis-extender-cols';
+
+	// Add logo class
+	if ( genesis_get_option( 'trestle_logo_url' ) || genesis_get_option( 'trestle_logo_url_mobile' ) )
+		$classes[] = 'has-logo';
+	
+	return $classes;
+
 }
 
 
 /*===========================================
- * Widget Areas
+ * Header
 ===========================================*/
 
+add_filter( 'genesis_seo_title', 'trestle_do_logos', 10, 3 );
 /**
- * Register custom widget areas
+ * Output logos.
  *
  * @since 1.0.0
  */
-function trestle_register_widget_areas() {
+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_html = '';
 
+	// Regular logo
+	if ( $logo_url ) {
+
+		// Default logo class
+		$classes = array('logo-full');
+
+		// If no mobile logo is specified, make regular logo act as mobile logo too
+		if( ! $logo_url_mobile )
+			$classes[] = 'show';
+
+		$logo_html .= sprintf( '<img class="logo %s" alt="%s" src="%s" />',
+			implode(' ', $classes),
+			esc_attr( get_bloginfo( 'name' ) ),
+			$logo_url 
+		);
+	}
+
+	// Mobile logo
+	if ( $logo_url_mobile ) {
+
+		// Default mobile logo class
+		$classes = array('logo-mobile');
+
+		// If no regular logo is specified, make mobile logo act as regular logo too
+		if( ! $logo_url )
+			$classes[] = 'show';
+
+		$logo_html .= sprintf( '<img class="logo %s" alt="%s" src="%s" />',
+			implode(' ', $classes),
+			esc_attr( get_bloginfo( 'name' ) ),
+			$logo_url_mobile 
+		);	
+	}
+
+	if ( $logo_html ) {
+		$inside .= sprintf( '<a href="%s" title="%s">%s</a>',
+			trailingslashit( home_url() ),
+			esc_attr( get_bloginfo( 'name' ) ),
+			$logo_html
+		);
+	}
+
+	//* 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)
+	return $title;
 }
 
 
 /*===========================================
- * Auto & Mobile Navigation
+ * Navigation
 ===========================================*/
 
+add_action( 'init', 'trestle_nav_modifications' );
 /**
  * Performs modifications to the primary navigation menu
  *
@@ -72,12 +199,15 @@ function trestle_register_widget_areas() {
  * @see trestle_nav_placeholder()
  */
 function trestle_nav_modifications() {
-	// Add mobile nav button
+	global $trestle_nav_title;
-	add_action( 'genesis_after_header', 'trestle_add_mobile_nav', 0 );
+
+	// 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' ) )
+	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' ) ) {
@@ -92,15 +222,19 @@ function trestle_nav_modifications() {
 	trestle_nav_placeholder();
 }
 
+add_action( 'init', 'trestle_nav_primary_location' );
 /**
- * Adds button to open primary mobile navigation menu.
+ * Move primary navigation into the header if need be.
  *
- * @since 1.0.0
+ * @since  1.2.0
  */
-function trestle_add_mobile_nav() {
+function trestle_nav_primary_location() {
-	// Only add the button if there is a primary menu
+
-	if ( 1 == genesis_get_option( 'trestle_auto_nav' ) || has_nav_menu( 'primary' ) )
+	if ( 'header' == genesis_get_option( 'trestle_nav_primary_location' ) ) {
-		echo '<a id="menu-button" class="button" href="javascript:void(0)">' . do_shortcode( genesis_get_option( 'trestle_nav_button_text' ) ) . '</a>';
+		remove_action( 'genesis_after_header', 'genesis_do_nav' );
+		add_action( 'genesis_header', 'genesis_do_nav', 12 );
+	}
+
 }
 
 /**
@@ -115,6 +249,7 @@ function trestle_add_mobile_nav() {
 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'
@@ -166,15 +301,15 @@ function trestle_custom_nav_extras( $nav_items, stdClass $menu_args ) {
  * @since 1.0.0
  */
 function trestle_nav_placeholder() {
-	// Set title for Trestle placeholder navigation menu
+	global $trestle_nav_title;
-	$trestle_nav_title = __( 'Trestle Auto Nav Placeholder', 'trestle' );
 
 	// 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 ) && ! has_nav_menu( 'primary' ) ) {
+	if ( 1 == genesis_get_option( 'trestle_auto_nav' ) && ! wp_get_nav_menu_object( $trestle_nav_title ) ) {
-		// Create placholder menu
 		wp_create_nav_menu( $trestle_nav_title );
+	}
 
-		// Assign placeholder menu to 'primary'
+	// 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 );
@@ -192,6 +327,7 @@ function trestle_nav_placeholder() {
  * Posts & Pages
 ===========================================*/
 
+add_filter( 'wp_revisions_to_keep', 'trestle_update_revisions_number', 10, 2 );
 /**
  * Sets the number of post revisions. 
  *
@@ -209,6 +345,7 @@ function trestle_update_revisions_number( $num ) {
 	return $num;
 }
 
+add_action( 'the_post', 'trestle_post_info_meta', 5 );
 /**
  * Manually controls display of post info/meta for all post types.
  *
@@ -218,20 +355,12 @@ function trestle_update_revisions_number( $num ) {
  * @global object $post The current $post object.
  */
 function trestle_post_info_meta() {
-	if( in_the_loop() && genesis_get_option( 'trestle_manual_post_info_meta' ) ) {
+	if ( ! is_admin() && in_the_loop() && genesis_get_option( 'trestle_manual_post_info_meta' ) ) {
 
 		global $post;
 
 		// Get post type
-		$orig_post_type = '';
-		
 		$post_type = get_post_type( $post->ID );
-
-		// Override "page" post type to allow for Post Info & Meta (reset back to page below)
-		if ( 'page' == $post_type ) {
-			$orig_post_type = 'page';
-			set_post_type( $post->ID, 'post' );
-		}		
 				
 		// Remove all Post Info & Meta
 		remove_action( 'genesis_entry_header', 'genesis_post_info', 12 );
@@ -243,11 +372,11 @@ function trestle_post_info_meta() {
 			$single_meta_option = 'trestle_post_meta_' . $post_type . '_single';
 		
 			// Post Info
-			if( genesis_get_option( $single_info_option ) )
+			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 ) )
+			if ( genesis_get_option( $single_meta_option ) )
 				add_action( 'genesis_entry_footer', 'genesis_post_meta' );
 		}
 
@@ -257,20 +386,17 @@ function trestle_post_info_meta() {
 			$archive_meta_option = 'trestle_post_meta_' . $post_type . '_archive';
 			
 			// Post Info
-			if( genesis_get_option( $archive_info_option ) )
+			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 ) )
+			if ( genesis_get_option( $archive_meta_option ) )
 				add_action( 'genesis_entry_footer', 'genesis_post_meta' );
 		}
-	
-		// Reset post type back to page if need be
-		if ( ! empty( $orig_post_type ) && 'page' == $orig_post_type )
-			add_action( 'genesis_entry_footer', 'trestle_set_page_post_type' );
 	}
 }
 
+add_filter( 'genesis_get_image_default_args', 'trestle_featured_image_fallback' );
 /**
  * Unset Genesis default featured image fallback of 'first-attached'
  *
@@ -293,55 +419,9 @@ function trestle_featured_image_fallback( $args ) {
  * General Actions & Filters
 ===========================================*/
 
-/**
+add_filter( 'excerpt_more', 'trestle_read_more_link' );
- * Adds custom classes to the <body> element for styling purposes.
+add_filter( 'get_the_content_more_link', 'trestle_read_more_link' );
- *
+add_filter( 'the_content_more_link', 'trestle_read_more_link' );
- * @since 1.0.0
- *
- * @param array $classes Body classes.
- * @return array 		 Updated body classes.
- */
-function trestle_body_classes( $classes ) {
-	// Add 'no-jquery' class to be removed by jQuery if enabled
-	$classes[] = 'no-jquery';
-
-	// Add 'bubble' class
-	if ( 'bubble' == genesis_get_option( 'trestle_layout' ) )
-		$classes[] = 'bubble';
-
-	// Add link icon classes
-	if ( genesis_get_option( 'trestle_external_link_icons' ) )
-		$classes[] = 'external-link-icons';
-	if ( genesis_get_option( 'trestle_email_link_icons' ) )
-		$classes[] = 'email-link-icons';
-	if ( genesis_get_option( 'trestle_pdf_link_icons' ) )
-		$classes[] = 'pdf-link-icons';
-	if ( genesis_get_option( 'trestle_doc_link_icons' ) )
-		$classes[] = 'doc-link-icons';
-
-	// 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 class for equal height Genesis Extender columns
-	if ( 1 == genesis_get_option( 'trestle_equal_height_cols' ) )
-		$classes[] = 'equal-height-genesis-extender-cols';
-	
-	return $classes;
-}
-
-/**
- * Resets post type back to page once post info / meta functionality is done.
- *
- * @since 1.0.0
- *
- * @global object $post The current $post object.
- */
-function trestle_set_page_post_type() {
-	global $post;
-	set_post_type( $post->ID, 'page' );
-}
-
 /**
  * Displays custom Trestle "read more" text in place of WordPress default.
  *
@@ -354,8 +434,9 @@ 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' ) );
 
-	if ( $custom_text )	
+	if ( $custom_text )	{
 		return '&hellip;&nbsp;<a class="more-link" title="' . $custom_text . '" href="' . get_permalink() . '">' . $custom_text . '</a>';
-	else
+	} else {
 		return $default_text;
-}
+	}
+}

includes/js/theme-jquery.js

@@ -0,0 +1,194 @@
+/**
+ * Trestle theme jQuery
+ *
+ * @since 1.0.0
+ *
+ * @package Trestle
+ */
+
+// Executes when the document is ready
+jQuery(document).ready(function( $ ) {
+
+	// Get PHP vars passed via wp_localize_script()
+	trestleEqualColsBreakpoint = trestle_vars.trestle_equal_cols_breakpoint;
+	trestleEqualHeightCols = trestle_vars.trestle_equal_height_cols;
+
+	// Remove .no-jquery body class
+	$('body').removeClass('no-jquery');
+	
+	// External Links
+	var h = window.location.host.toLowerCase();
+	$('[href^="http"]').not('[href*="' + h + '"]').addClass('external-link').attr("target", "_blank");
+
+	// Add classes to different types of links
+	$('a[href^="mailto:"]').addClass('email-link');
+	$('a[href*=".pdf"]').attr({"target":"_blank"}).addClass('pdf-link');
+	$('a[href*=".doc"]').attr({"target":"_blank"}).addClass('doc-link');
+	$('a').has('img').addClass('image-link');
+
+	// Add classes to parts of lists
+	$('li:last-child').addClass('last');
+	$('li:first-child').addClass('first');
+	$('ul, ol').parent('li').addClass('parent');
+
+	// Mobile header toggle buttons
+	$('.site-header .title-area').after('<div class="toggle-buttons" />');
+	$('.site-header .widget-area, .nav-primary').each(function(i) {
+		var target = $(this);
+
+		var buttonClass = 'toggle-button';
+
+        // Add classes of target element
+        var targetClass = target.attr('class').split(/\s+/);
+        $.each(targetClass, function(index,value) {
+        	buttonClass += ' targets-' + value;
+        });
+        
+        if ( $(this).is( 'nav' ) ) {
+        	buttonClass += ' nav-toggle';
+        }
+
+        // Add toggle buttons to header
+        $('.toggle-buttons').prepend('<a id="toggle-button-' + i + '" class="' + buttonClass + '" href="#">Toggle</a>');
+
+        // Add target class to nav and widget areas
+        target.addClass('toggle-target-' + i );
+    });
+	
+    // Toggle widget areas and primary nav
+    $('.site-header .toggle-button').click( function( event ) {
+    	
+        // Prevent default behavior
+        event.preventDefault();
+
+        // Get toggle button that was clicked
+    	var button = $(this);
+
+        // Remove focus
+        button.blur();
+
+    	var target = $( '.toggle-target-' + button.attr('id').match(/\d+/) );
+
+        // Toggle buttons
+        button.toggleClass('open');
+        $('.site-header .toggle-button').not(button).removeClass('open');
+
+        // Toggle targets
+        target.toggleClass('open');
+        $('[class*="toggle-target"]').not(target).removeClass('open');
+
+    });
+
+    // Mobile navigation icons
+    var closedIcon = '+';
+    var openIcon = '-';
+
+    $('.nav-primary').find('.genesis-nav-menu .parent:not(.current-menu-item, .current_page_item, .current_page_parent, .current_page_ancestor) > a').after('<a class="sub-icon" href="#">' + closedIcon + '</a>');
+    $('.nav-primary').find('.genesis-nav-menu .parent.current-menu-item > a, .genesis-nav-menu .parent.current_page_item > a, .genesis-nav-menu .parent.current_page_parent > a, .genesis-nav-menu .parent.current_page_ancestor > a').after('<a class="sub-icon" href="#">' + openIcon + '</a>');
+    
+    // Mobile navigation expand/contract functionality
+    $('.sub-icon').click(function(event) {
+    	
+        // Prevent default behavior
+        event.preventDefault();
+    	
+        // Get icon clicked
+        var icon = $(this);
+
+        // Remove focus
+        icon.blur();
+
+    	icon.next('ul').slideToggle().toggleClass('open');
+    	if ( icon.text().indexOf( closedIcon ) !== -1 )
+    		icon.text(openIcon);
+    	else if ( icon.text().indexOf( openIcon ) !== -1 )
+    		icon.text(closedIcon);
+    });
+    
+    $('.widget-area-toggle').click(function(event) {
+    	
+        // Prevent default behavior
+        event.preventDefault();
+
+        // Get button clicked
+    	var button = $(this);
+
+        // Remove focus
+        button.blur();
+
+    	button.toggleClass('open');
+    	button.next('.widget-area').slideToggle();
+    });
+
+	// Equal height homepage cols
+	$('.equal-height-genesis-extender-cols .ez-home-container-area').each(function() {
+		$(this).children('.widget-area').equalHeights(null,null,trestleEqualColsBreakpoint);
+	});
+
+	
+}); /* end of as page load scripts */
+
+
+// Executes when complete page is fully loaded, including all frames, objects, and images
+jQuery(window).load(function( $ ) {
+
+});
+
+
+/**
+ * Equal Heights Plugin
+ * 
+ * Equalize the heights of elements. Great for columns or any elements
+ * that need to be the same size (floats, etc).
+ *
+ * Based on Rob Glazebrook's (cssnewbie.com) script
+ *
+ * Additions
+ *  - ability to include a break point (the minimum viewport width at which the script does anything)
+ *  - binds the script to run on load, orientation change (for mobile), and when resizing the window
+ *
+ * Usage: jQuery(object).equalHeights([minHeight], [maxHeight], [breakPoint]);
+ * 
+ * Example 1: jQuery(".cols").equalHeights(); Sets all columns to the same height.
+ * Example 2: jQuery(".cols").equalHeights(400); Sets all cols to at least 400px tall.
+ * Example 3: jQuery(".cols").equalHeights(100,300); Cols are at least 100 but no more
+ * than 300 pixels tall. Elements with too much content will gain a scrollbar.
+ * Example 4: jQuery(".cols").equalHeights(null, null,768); Only resize columns above 768px viewport
+ * 
+ */
+ (function( $ ) {
+ 	$.fn.equalHeights = function(minHeight, maxHeight, breakPoint) {
+ 		var items = this;
+ 		breakPoint = breakPoint || 0;
+
+         // Bind functionality to appropriate events
+         $(window).on('load orientationchange resize equalheights', function() {
+         	tallest = (minHeight) ? minHeight : 0;
+         	items.each(function() {
+         		$(this).height('auto');
+         		if($(this).outerHeight() > tallest) {
+         			tallest = $(this).outerHeight();
+         		}
+         	});
+
+             // Get viewport width (taking scrollbars into account)
+             var e = window;
+             a = 'inner';
+             if (!('innerWidth' in window )) {
+             	a = 'client';
+             	e = document.documentElement || document.body;
+             }
+             width = e[ a+'Width' ];
+
+             // Equalize column heights if above the specified breakpoint
+             if ( width >= breakPoint ) {
+             	if((maxHeight) && tallest > maxHeight) tallest = maxHeight;
+             	console.log(tallest);
+             	return items.each(function() {
+             		$(this).height(tallest);
+             	});
+             }
+         });
+     }
+
+ })(jQuery);

includes/shortcodes/shortcodes.php

@@ -0,0 +1,142 @@
+<?php 
+/**
+ * Trestle shortcodes
+ *
+ * @since 1.0.0
+ *
+ * @package Trestle
+ */
+
+/*===========================================
+ * Shortcodes
+===========================================*/
+
+add_filter('the_content', 'trestle_shortcode_empty_paragraph_fix');
+/**
+ * Fix for empty <p> tags around shortcodes
+ *
+ * @since  1.0.0
+ *
+ * @param   string  $content  HTML content.
+ *
+ * @return  string            Updated content.
+ */
+function trestle_shortcode_empty_paragraph_fix( $content )
+{   
+    $array = array (
+        '<p>[' => '[', 
+        ']</p>' => ']', 
+        ']<br />' => ']'
+        );
+
+    $content = strtr($content, $array);
+
+    return $content;
+}
+
+add_shortcode( 'col', 'trestle_column' );
+/**
+ * Columns
+ * 
+ * Example:
+ * [col class="one-half first no-list-margin"] Contents [/col]
+ *
+ * Classes:
+ *     - width (one-half, one-third, etc - uses native Genesis column classes in style.css)
+ *     - first (used to specify the first column in a row)
+ *     - no-list-margin (will cause contained list elements to collapse as one on mobile sizes)
+ *
+ * @param   array  $atts  Shortcode attributes.
+ *
+ * @return  string        Shortcode output.
+ */
+function trestle_column( $atts, $content = null ) {
+    extract( shortcode_atts( array(
+        'class' => '',
+        ), $atts ) );
+    return '<div class="col ' . $class . '">' . do_shortcode( $content ) . '</div>';
+}
+
+
+
+add_shortcode( 'button', 'trestle_button' );
+/**
+ * Button
+ * 
+ * Example: [button href="url" title="title" target="target" class="class"]Text[/button]
+ *
+ * @param   array  $atts  Shortcode attributes.
+ *
+ * @return  string        Shortcode output.
+ */
+function trestle_button( $atts, $content = null ) {
+    extract( shortcode_atts( array(
+        'href' => '#',
+        'target' => '',
+        'title' => '',
+        'class' => '',
+        ), $atts ) );
+    return '<a class="button ' . $class . '" href="' . $href . '" title="' . $title . '" target="' . $target . '">' . do_shortcode( $content ) . '</a>';
+}
+
+
+add_shortcode( 'date', 'trestle_date' );
+/**
+ * Date
+ *
+ * Example: [date format="M d, Y"]
+ *
+ * @param   array  $atts  Shortcode attributes.
+ *
+ * @return  string        Shortcode output.
+ */
+function trestle_date( $atts ) {
+    extract( shortcode_atts( array(
+        'format' => 'M d, Y',
+    ), $format ) );
+
+    if ( ! $format ) {
+        $format = 'M d, Y'; 
+    }
+
+    return date( $format );
+}
+
+add_shortcode( 'blockquote', 'igg_blockquote_shortcode' );
+/**
+ * Blockquote
+ * 
+ * Example: [blockquote citation=""]Content[/blockquote]
+ *
+ * @since   1.2.0
+ *
+ * @param   array  $atts  Shortcode attributes.
+ *
+ * @return  string        Shortcode output.
+ */
+function igg_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; ?>
+
+   </blockquote>
+   
+   <?php
+   
+   $output = ob_get_clean();
+
+   return $output;
+}

includes/widget-areas/widget-areas.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Trestle widget area registration and functionality
+ *  
+ * @since  1.0.0
+ * 
+ * @package Trestle
+ */
+
+//add_action( 'widgets_init', 'trestle_register_widget_areas' );
+/**
+ * Register custom widget areas
+ *
+ * @since 1.0.0
+ */
+function trestle_register_widget_areas() {
+	genesis_register_widget_area( array(
+		'id'            => 'sample-widget-area',
+		'name'          => __( 'Sample Widget Area', 'trestle' ),
+		'description'   => __( 'This is the sample widget area', 'trestle' ),
+	) );
+}
+
+//add_action( 'genesis_header', 'trestle_output_sample_widget_area' );
+/**
+ * Output sample widget area.
+ *
+ * @since  1.2.0
+ */
+function trestle_output_sample_widget_area() {
+	genesis_widget_area( 'sample-widget-area', array(
+		'before' => '<aside class="sample-widget-area widget-area">',
+		'after' => '</aside>',
+	) );
+}

languages/trestle.pot

@@ -15,334 +15,334 @@ msgstr ""
 "X-Poedit-KeywordsList: __;_e;_x;_n\n"
 "X-Poedit-SearchPath-0: ..\n"
 
-#: ../lib/admin/admin-functions.php:38
+#: ../includes/admin/admin-functions.php:38
 msgid "Navigation"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:39
+#: ../includes/admin/admin-functions.php:39
 msgid "Read More »"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:121
+#: ../includes/admin/admin-functions.php:121
 msgid "Trestle Settings <small>by</small>"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:135
+#: ../includes/admin/admin-functions.php:135
 msgid "Layout"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:143
+#: ../includes/admin/admin-functions.php:143
 msgid "Primary Navigation"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:145
+#: ../includes/admin/admin-functions.php:145
 msgid ""
 "Automatically generate nav menu (replaces custom/manual menu with auto-"
 "generated menu)"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:146
+#: ../includes/admin/admin-functions.php:146
 msgid "Include home link"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:149
+#: ../includes/admin/admin-functions.php:149
 msgid "Text for mobile navigation button (shortcodes can be included):"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:153
+#: ../includes/admin/admin-functions.php:153
 msgid "Primary Navigation Extras"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:154
+#: ../includes/admin/admin-functions.php:154
 msgid ""
 "Display custom navigation extras content (overrides standard Genesis "
 "navigation extras)"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:156
+#: ../includes/admin/admin-functions.php:156
 msgid "Custom navigation extras text:"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:160
+#: ../includes/admin/admin-functions.php:160
 msgid "Blog/Posts"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:162
+#: ../includes/admin/admin-functions.php:162
 msgid "Custom read more link text"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:165
+#: ../includes/admin/admin-functions.php:165
 msgid "Number of post revisions"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:176
+#: ../includes/admin/admin-functions.php:176
 msgid "Post Info & Meta"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:177
+#: ../includes/admin/admin-functions.php:177
 msgid "Manually select where to show Post Info & Meta"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:180
+#: ../includes/admin/admin-functions.php:180
 msgid "Show Post Info on:"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:190 ../lib/admin/admin-functions.php:210
+#: ../includes/admin/admin-functions.php:190 ../includes/admin/admin-functions.php:210
 #, php-format
 msgid "%s (single)"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:193 ../lib/admin/admin-functions.php:213
+#: ../includes/admin/admin-functions.php:193 ../includes/admin/admin-functions.php:213
 #, php-format
 msgid "%s (archive)"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:200
+#: ../includes/admin/admin-functions.php:200
 msgid "Show Post Meta on:"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:221
+#: ../includes/admin/admin-functions.php:221
 msgid "Footer Widgets"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:223
+#: ../includes/admin/admin-functions.php:223
 msgid "Number"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:233
+#: ../includes/admin/admin-functions.php:233
 msgid "Link Icons"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:235
+#: ../includes/admin/admin-functions.php:235
 msgid "Add icons to external links"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:236
+#: ../includes/admin/admin-functions.php:236
 msgid "Add icons to email links"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:237
+#: ../includes/admin/admin-functions.php:237
 msgid "Add icons to .pdf links"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:238
+#: ../includes/admin/admin-functions.php:238
 msgid "Add icons to .doc links"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:398
+#: ../includes/admin/admin-functions.php:398
-#: ../lib/classes/class-tgm-plugin-activation.php:155
+#: ../includes/classes/class-tgm-plugin-activation.php:155
 msgid "Install Required Plugins"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:399
+#: ../includes/admin/admin-functions.php:399
-#: ../lib/classes/class-tgm-plugin-activation.php:156
+#: ../includes/classes/class-tgm-plugin-activation.php:156
 msgid "Install Plugins"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:400
+#: ../includes/admin/admin-functions.php:400
-#: ../lib/classes/class-tgm-plugin-activation.php:157
+#: ../includes/classes/class-tgm-plugin-activation.php:157
 #, php-format
 msgid "Installing Plugin: %s"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:401
+#: ../includes/admin/admin-functions.php:401
 msgid "Something went wrong with the plugin API."
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:412
+#: ../includes/admin/admin-functions.php:412
-#: ../lib/classes/class-tgm-plugin-activation.php:169
+#: ../includes/classes/class-tgm-plugin-activation.php:169
 msgid "Return to Required Plugins Installer"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:413
+#: ../includes/admin/admin-functions.php:413
-#: ../lib/classes/class-tgm-plugin-activation.php:171
+#: ../includes/classes/class-tgm-plugin-activation.php:171
-#: ../lib/classes/class-tgm-plugin-activation.php:1840
+#: ../includes/classes/class-tgm-plugin-activation.php:1840
 msgid "Plugin activated successfully."
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:414
+#: ../includes/admin/admin-functions.php:414
 #, php-format
 msgid "All plugins installed and activated successfully. %s"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:158
+#: ../includes/classes/class-tgm-plugin-activation.php:158
 msgid "Something went wrong."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:170
+#: ../includes/classes/class-tgm-plugin-activation.php:170
 msgid "Return to the dashboard"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:172
+#: ../includes/classes/class-tgm-plugin-activation.php:172
-#: ../lib/classes/class-tgm-plugin-activation.php:1538
+#: ../includes/classes/class-tgm-plugin-activation.php:1538
 msgid "The following plugin was activated successfully:"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:173
+#: ../includes/classes/class-tgm-plugin-activation.php:173
 #, php-format
 msgid "All plugins installed and activated successfully. %1$s"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:174
+#: ../includes/classes/class-tgm-plugin-activation.php:174
 msgid "Dismiss this notice"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1085
+#: ../includes/classes/class-tgm-plugin-activation.php:1085
 msgid "External Link"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1090
+#: ../includes/classes/class-tgm-plugin-activation.php:1090
 msgid "Private Repository"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1093
+#: ../includes/classes/class-tgm-plugin-activation.php:1093
 msgid "Pre-Packaged"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1097
+#: ../includes/classes/class-tgm-plugin-activation.php:1097
 msgid "WordPress Repository"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1100
+#: ../includes/classes/class-tgm-plugin-activation.php:1100
 msgid "Required"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1100
+#: ../includes/classes/class-tgm-plugin-activation.php:1100
 msgid "Recommended"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1103
+#: ../includes/classes/class-tgm-plugin-activation.php:1103
 msgid "Not Installed"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1105
+#: ../includes/classes/class-tgm-plugin-activation.php:1105
 msgid "Installed But Not Activated"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1275
+#: ../includes/classes/class-tgm-plugin-activation.php:1275
 #, php-format
 msgid ""
 "No plugins to install or activate. <a href=\"%1$s\" title=\"Return to the "
 "Dashboard\">Return to the Dashboard</a>"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1291
+#: ../includes/classes/class-tgm-plugin-activation.php:1291
 msgid "Plugin"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1292
+#: ../includes/classes/class-tgm-plugin-activation.php:1292
 msgid "Source"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1293
+#: ../includes/classes/class-tgm-plugin-activation.php:1293
 msgid "Type"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1294
+#: ../includes/classes/class-tgm-plugin-activation.php:1294
 msgid "Status"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1312
+#: ../includes/classes/class-tgm-plugin-activation.php:1312
 msgid "Install"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1313
+#: ../includes/classes/class-tgm-plugin-activation.php:1313
 msgid "Activate"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1823
+#: ../includes/classes/class-tgm-plugin-activation.php:1823
 msgid "Install package not available."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1824
+#: ../includes/classes/class-tgm-plugin-activation.php:1824
 #, php-format
 msgid "Downloading install package from <span class=\"code\">%s</span>&#8230;"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1825
+#: ../includes/classes/class-tgm-plugin-activation.php:1825
 msgid "Unpacking the package&#8230;"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1826
+#: ../includes/classes/class-tgm-plugin-activation.php:1826
 msgid "Installing the plugin&#8230;"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1827
+#: ../includes/classes/class-tgm-plugin-activation.php:1827
 msgid "Plugin install failed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1828
+#: ../includes/classes/class-tgm-plugin-activation.php:1828
 msgid "Plugin installed successfully."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1839
+#: ../includes/classes/class-tgm-plugin-activation.php:1839
 msgid "Plugin activation failed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1949
+#: ../includes/classes/class-tgm-plugin-activation.php:1949
 msgid ""
 "The installation and activation process is starting. This process may take a "
 "while on some hosts, so please be patient."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1950
+#: ../includes/classes/class-tgm-plugin-activation.php:1950
 #, php-format
 msgid "%1$s installed and activated successfully."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1950
+#: ../includes/classes/class-tgm-plugin-activation.php:1950
-#: ../lib/classes/class-tgm-plugin-activation.php:1959
+#: ../includes/classes/class-tgm-plugin-activation.php:1959
 msgid "Show Details"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1950
+#: ../includes/classes/class-tgm-plugin-activation.php:1950
-#: ../lib/classes/class-tgm-plugin-activation.php:1959
+#: ../includes/classes/class-tgm-plugin-activation.php:1959
 msgid "Hide Details"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1951
+#: ../includes/classes/class-tgm-plugin-activation.php:1951
 msgid "All installations and activations have been completed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1952
+#: ../includes/classes/class-tgm-plugin-activation.php:1952
 #, php-format
 msgid "Installing and Activating Plugin %1$s (%2$d/%3$d)"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1956
+#: ../includes/classes/class-tgm-plugin-activation.php:1956
 msgid ""
 "The installation process is starting. This process may take a while on some "
 "hosts, so please be patient."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1957
+#: ../includes/classes/class-tgm-plugin-activation.php:1957
 #, php-format
 msgid "An error occurred while installing %1$s: <strong>%2$s</strong>."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1958
+#: ../includes/classes/class-tgm-plugin-activation.php:1958
 #, php-format
 msgid "The installation of %1$s failed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1959
+#: ../includes/classes/class-tgm-plugin-activation.php:1959
 #, php-format
 msgid "%1$s installed successfully."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1960
+#: ../includes/classes/class-tgm-plugin-activation.php:1960
 msgid "All installations have been completed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1961
+#: ../includes/classes/class-tgm-plugin-activation.php:1961
 #, php-format
 msgid "Installing Plugin %1$s (%2$d/%3$d)"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:2052
+#: ../includes/classes/class-tgm-plugin-activation.php:2052
 msgid "Return to the Dashboard"
 msgstr ""
 
-#: ../lib/functions/theme-functions.php:136
+#: ../includes/functions/theme-functions.php:136
 msgid "Trestle Auto Nav Placeholder"
 msgstr ""

lib/admin/admin.php

@@ -1,26 +0,0 @@
-<?php
-/**
- * Trestle admin functionality
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-// Require admin functions
-require_once dirname( __FILE__ ) . '/admin-functions.php';
-
-// Trestle admin scripts and styles
-add_action( 'admin_enqueue_scripts', 'trestle_admin_actions' );
-
-// Trestle default settings
-add_filter( 'genesis_theme_settings_defaults', 'trestle_custom_defaults' );
-
-// Sanitize settings
-add_action( 'genesis_settings_sanitizer_init', 'trestle_register_social_sanitization_filters' );
- 
-// Register Trestle settings metabox
-add_action( 'genesis_theme_settings_metaboxes', 'trestle_register_settings_box' );
-
-// Required & recommended plugins
-add_action( 'tgmpa_register', 'trestle_register_required_plugins' );

lib/js/theme-jquery.js

@@ -1,129 +0,0 @@
-/**
- * Trestle theme jQuery
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-// Executes when the document is ready
-jQuery(document).ready(function() {
-
-	// Get PHP vars passed via wp_localize_script()
-	trestleEqualColsBreakpoint = php_vars.trestle_equal_cols_breakpoint;
-	trestleEqualHeightCols = php_vars.trestle_equal_height_cols
-
-	// Remove .no-jquery body class
-	jQuery('body').removeClass('no-jquery');
-	
-	// External Links
-	var h = window.location.host.toLowerCase();
-	jQuery('[href^="http"]').not('[href*="' + h + '"]').addClass('external-link').attr("target", "_blank");
-
-	// Add classes to different types of links
-	jQuery('a[href^="mailto:"]').addClass('email-link');
-	jQuery('a[href*=".pdf"]').attr({"target":"_blank"}).addClass('pdf-link');
-	jQuery('a[href*=".doc"]').attr({"target":"_blank"}).addClass('doc-link');
-	jQuery('a').has('img').addClass('image-link');
-
-	// Add classes to parts of lists
-	jQuery('li:last-child').addClass('last');
-	jQuery('li:first-child').addClass('first');
-	jQuery('ul, ol').parent('li').addClass('parent');
-
-	// Mobile navigation button
-	jQuery('#menu-button').click(function() {
-		var button = jQuery(this);
-		button.toggleClass('open');
-        jQuery('.nav-primary').slideToggle();
-    });
-
-    // Mobile navigation icons
-    var closedIcon = '+';
-    var openIcon = '-';
-
-    jQuery('.nav-primary').find('.genesis-nav-menu .parent:not(.current-menu-item, .current_page_item, .current_page_parent, .current_page_ancestor) > a').after('<a class="sub-icon" href="javascript:void()">' + closedIcon + '</a>');
-    jQuery('.nav-primary').find('.genesis-nav-menu .parent.current-menu-item > a, .genesis-nav-menu .parent.current_page_item > a, .genesis-nav-menu .parent.current_page_parent > a, .genesis-nav-menu .parent.current_page_ancestor > a').after('<a class="sub-icon" href="javscript: void()">' + openIcon + '</a>');
-    
-    // Mobile navigation expand/contract functionality
-    jQuery('.sub-icon').click(function() {
-		var icon = jQuery(this);
-		icon.next('ul').slideToggle().toggleClass('open');
-		if ( icon.text().indexOf( closedIcon ) !== -1 )
-			icon.text(openIcon);
-		else if ( icon.text().indexOf( openIcon ) !== -1 )
-			icon.text(closedIcon);
-    });
-
-	// Equal height homepage cols
-    jQuery('.equal-height-genesis-extender-cols .ez-home-container-area').each(function() {
-    	jQuery(this).children('.widget-area').equalHeights(null,null,trestleEqualColsBreakpoint);
-    });
-
-    
-}); /* end of as page load scripts */
-
-
-// Executes when complete page is fully loaded, including all frames, objects, and images
-jQuery(window).load(function() {
-
-});
-
-
-/**
- * Equal Heights Plugin
- * 
- * Equalize the heights of elements. Great for columns or any elements
- * that need to be the same size (floats, etc).
- *
- * Based on Rob Glazebrook's (cssnewbie.com) script
- *
- * Additions
- *  - ability to include a break point (the minimum viewport width at which the script does anything)
- *  - binds the script to run on load, orientation change (for mobile), and when resizing the window
- *
- * Usage: jQuery(object).equalHeights([minHeight], [maxHeight], [breakPoint]);
- * 
- * Example 1: jQuery(".cols").equalHeights(); Sets all columns to the same height.
- * Example 2: jQuery(".cols").equalHeights(400); Sets all cols to at least 400px tall.
- * Example 3: jQuery(".cols").equalHeights(100,300); Cols are at least 100 but no more
- * than 300 pixels tall. Elements with too much content will gain a scrollbar.
- * Example 4: jQuery(".cols").equalHeights(null, null,768); Only resize columns above 768px viewport
- * 
- */
-(function(jQuery) {
-     jQuery.fn.equalHeights = function(minHeight, maxHeight, breakPoint) {
-         var items = this;
-         breakPoint = breakPoint || 0;
- 
-         // Bind functionality to appropriate events
-         jQuery(window).bind('load orientationchange resize', function() {
-             tallest = (minHeight) ? minHeight : 0;
-             items.each(function() {
-                 jQuery(this).height('auto');
-                 if(jQuery(this).height() > tallest) {
-                     tallest = jQuery(this).height();
-                 }
-             });
- 
-             // Get viewport width (taking scrollbars into account)
-             var e = window;
-             a = 'inner';
-             if (!('innerWidth' in window )) {
-                 a = 'client';
-                 e = document.documentElement || document.body;
-             }
-             width = e[ a+'Width' ];
- 
-             // Equalize column heights if above the specified breakpoint
-             if ( width >= breakPoint ) {
-                 if((maxHeight) && tallest > maxHeight) tallest = maxHeight;
-                 console.log(tallest);
-                 return items.each(function() {
-                     jQuery(this).height(tallest);
-                 });
-             }
-         });
-     }
- 
- })(jQuery);

lib/shortcodes/shortcodes.php

@@ -1,55 +0,0 @@
-<?php 
-/**
- * Trestle shortcodes
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-/*===========================================
- * Shortcodes
-===========================================*/
-
-// Fix for empty <p> tags around shortcodes
-function trestle_shortcode_empty_paragraph_fix($content)
-{   
-    $array = array (
-        '<p>[' => '[', 
-        ']</p>' => ']', 
-        ']<br />' => ']'
-    );
-
-    $content = strtr($content, $array);
-
-    return $content;
-}
-add_filter('the_content', 'trestle_shortcode_empty_paragraph_fix');
-
-/**
- * Columns - [col class="one-half first no-list-margin"] Contents [/col]
- *
- * Classes:
- *     - width (one-half, one-third, etc - uses native Genesis column classes in style.css)
- *     - first (used to specify the first column in a row)
- *     - no-list-margin (will cause contained list elements to collapse as one on mobile sizes)
- */
-function trestle_column( $atts, $content = null ) {
-    extract( shortcode_atts( array(
-        'class' => '',
-    ), $atts ) );
-    return '<div class="col ' . $class . '">' . do_shortcode( $content ) . '</div>';
-}
-add_shortcode( 'col', 'trestle_column' );
-
-/**
- * Buttons - [button href="url" class="class"]Text[/button]
- */
-function trestle_button( $atts, $content = null ) {
-    extract( shortcode_atts( array(
-        'href' => '#',
-        'class' => '',
-    ), $atts ) );
-    return '<a class="button ' . $class . '" href="' . $href . '">' . do_shortcode( $content ) . '</a>';
-}
-add_shortcode( 'button', 'trestle_button' );

page_archive_all_pages.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Genesis Framework.
+ *
+ * WARNING: This file is part of the core Genesis Framework. DO NOT edit this file under any circumstances.
+ * Please do all modifications in the form of a child theme.
+ *
+ * @package Genesis\Templates
+ * @author  StudioPress
+ * @license GPL-2.0+
+ * @link    http://my.studiopress.com/themes/genesis/
+ */
+
+//* Template Name: Archive - All Pages
+
+//* Remove standard post content output
+remove_action( 'genesis_post_content', 'genesis_do_post_content' );
+remove_action( 'genesis_entry_content', 'genesis_do_post_content' );
+
+add_action( 'genesis_entry_content', 'genesis_page_archive_content' );
+add_action( 'genesis_post_content', 'genesis_page_archive_content' );
+/**
+ * This function outputs sitemap-esque columns displaying all pages,
+ * categories, authors, monthly archives, and recent posts.
+ *
+ * @since 1.6
+ */
+function genesis_page_archive_content() { 
+
+	// Pause Exclude Pages plugin functionality.
+	pause_exclude_pages();
+	
+	?>
+	
+	<h4><?php _e( 'Pages:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_list_pages( 'title_li=' ); ?>
+	</ul>
+
+	<h4><?php _e( 'Categories:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_list_categories( 'sort_column=name&title_li=' ); ?>
+	</ul>
+
+	<h4><?php _e( 'Authors:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_list_authors( 'exclude_admin=0&optioncount=1' ); ?>
+	</ul>
+
+	<h4><?php _e( 'Monthly:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_get_archives( 'type=monthly' ); ?>
+	</ul>
+
+	<h4><?php _e( 'Recent Posts:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_get_archives( 'type=postbypost&limit=100' ); ?>
+	</ul>
+
+	<?php
+
+	// Resume Exclude Pages plugin functionality.
+	resume_exclude_pages();
+
+}
+
+genesis();