diff --git a/includes/functions/theme-functions.php b/includes/functions/theme-functions.php
index eb49a3b..33a3789 100644
--- a/includes/functions/theme-functions.php
+++ b/includes/functions/theme-functions.php
@@ -14,13 +14,13 @@
===========================================*/
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(
'version' => 'latest',
@@ -202,150 +202,6 @@ 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' );
-/**
- * Move primary navigation into the header if need be.
- *
- * @since 1.2.0
- */
-function trestle_nav_primary_location() {
-
- if ( 'header' == genesis_get_option( 'trestle_nav_primary_location' ) ) {
- remove_action( 'genesis_after_header', 'genesis_do_nav' );
- add_action( 'genesis_header', 'genesis_do_nav', 12 );
- }
-
-}
-
-/**
- * Auto-generates list of pages for use in the primary navigation menu.
- *
- * @since 1.0.0
- *
- * @param string $nav_items
list of navigation menu items.
- * @param stdClass $menu_args Arguments for the menu.
- * @return string 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
- $nav_items = preg_replace( '/]*>\s*
/', '', $nav_items );
-
- // Remove closing
- $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 - list of menu items.
- * @param stdClass $menu_args Arguments for the menu.
- * @return string
- list of menu items with custom navigation extras
- 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 . '
- ' . do_shortcode( genesis_get_option( 'trestle_custom_nav_extras_text' ) ) . '
';
- }
-
- 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
===========================================*/