From d77a0a744035413e22969ff2258b20eb46341484 Mon Sep 17 00:00:00 2001 From: Braad Date: Thu, 30 Apr 2015 12:24:30 -0700 Subject: [PATCH] First pass at switching to trestle-settings and some inline documentation cleanup --- functions.php | 36 ++++--- includes/admin/admin.php | 36 ++++--- includes/admin/customizer.js | 36 +++---- includes/admin/customizer.php | 124 +++++++++++------------ includes/functions/theme-functions.php | 134 ++++++++----------------- includes/shortcodes/shortcodes.php | 16 +-- includes/widget-areas/widget-areas.php | 8 +- 7 files changed, 173 insertions(+), 217 deletions(-) diff --git a/functions.php b/functions.php index b8512c1..af3743a 100644 --- a/functions.php +++ b/functions.php @@ -1,7 +1,7 @@ 'solid', - 'trestle_logo_url' => '', - 'trestle_logo_url_mobile' => '', - 'trestle_favicon_url' => '', - 'trestle_nav_primary_location' => 'full', - 'trestle_read_more_text' => __( 'Read More »', 'trestle' ), - 'trestle_revisions_number' => 3, - 'trestle_footer_widgets_number' => 3, + // Trestle default key/value pairs + $trestle_defaults = array( + 'layout' => 'solid', + 'logo_url' => '', + 'logo_url_mobile' => '', + 'favicon_url' => '', + 'nav_primary_location' => 'full', + 'custom_nav_extras_text' => '', + '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( GENESIS_SETTINGS_FIELD ); + $options = get_option( TRESTLE_SETTINGS_FIELD ); foreach ( $trestle_defaults as $k => $v ) { - // Add defaults to Genesis default settings array + // Add defaults to trestle_settings array $defaults[$k] = $v; // Update actual options if they don't yet exist @@ -56,7 +60,7 @@ function trestle_custom_defaults( $defaults ) { } // Update options with defaults - update_option( GENESIS_SETTINGS_FIELD, $options ); + update_option( TRESTLE_SETTINGS_FIELD, $options ); return $defaults; } diff --git a/includes/admin/customizer.js b/includes/admin/customizer.js index 7a44eb4..22d28e0 100644 --- a/includes/admin/customizer.js +++ b/includes/admin/customizer.js @@ -6,8 +6,8 @@ ( function( $ ) { - // Layout - wp.customize( 'genesis-settings[trestle_layout]', function( value ) { + // Layout. + wp.customize( 'trestle-settings[layout]', function( value ) { value.bind( function( value ) { var $body = $( 'body' ); @@ -24,8 +24,8 @@ }); }); - // Custom logo - wp.customize( 'genesis-settings[trestle_logo_url]', function( value ) { + // Custom logo. + wp.customize( 'trestle-settings[logo_url]', function( value ) { value.bind( function( url ) { var $body = $( 'body' ); @@ -42,8 +42,8 @@ }); }); - // Favicon - wp.customize( 'genesis-settings[trestle_favicon_url]', function( value ) { + // Favicon. + wp.customize( 'trestle-settings[favicon_url]', function( value ) { value.bind( function( url ) { var $faviconElem = $( 'link[rel="Shortcut Icon"]' ); @@ -52,8 +52,8 @@ }); }); - // Primary Nav Location - wp.customize( 'genesis-settings[trestle_nav_primary_location]', function( value ) { + // Primary Nav Location. + wp.customize( 'trestle-settings[nav_primary_location]', function( value ) { value.bind( function( value ) { var $body = $( 'body' ); @@ -75,8 +75,8 @@ }); }); - // Custom Read More Link Text - wp.customize( 'genesis-settings[trestle_read_more_text]', function( value ) { + // Custom Read More Link Text. + wp.customize( 'trestle-settings[read_more_text]', function( value ) { value.bind( function( value ) { $( 'a.more-link' ).html( value ); @@ -84,8 +84,8 @@ }); }); - // External Links - wp.customize( 'genesis-settings[trestle_external_link_icons]', function( value ) { + // External Links. + wp.customize( 'trestle-settings[external_link_icons]', function( value ) { value.bind( function( value ) { var $body = $( 'body' ); @@ -99,8 +99,8 @@ }); }); - // Email Links - wp.customize( 'genesis-settings[trestle_email_link_icons]', function( value ) { + // Email Links. + wp.customize( 'trestle-settings[email_link_icons]', function( value ) { value.bind( function( value ) { var $body = $( 'body' ); @@ -114,8 +114,8 @@ }); }); - // PDF Links - wp.customize( 'genesis-settings[trestle_pdf_link_icons]', function( value ) { + // PDF Links. + wp.customize( 'trestle-settings[pdf_link_icons]', function( value ) { value.bind( function( value ) { var $body = $( 'body' ); @@ -129,8 +129,8 @@ }); }); - // Doc Links - wp.customize( 'genesis-settings[trestle_doc_link_icons]', function( value ) { + // Doc Links. + wp.customize( 'trestle-settings[doc_link_icons]', function( value ) { value.bind( function( value ) { var $body = $( 'body' ); diff --git a/includes/admin/customizer.php b/includes/admin/customizer.php index 93df40a..e2ee241 100644 --- a/includes/admin/customizer.php +++ b/includes/admin/customizer.php @@ -1,6 +1,6 @@ add_section( 'trestle_settings_section', array( @@ -47,11 +47,11 @@ function trestle_customizer_controls( $wp_customize ) { ) ); - // Layout + // Layout. $wp_customize->add_setting( - 'genesis-settings[trestle_layout]', + 'trestle-settings[layout]', array( - 'default' => '', + 'default' => genesis_get_option( 'layout', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -61,7 +61,7 @@ function trestle_customizer_controls( $wp_customize ) { 'trestle_layout_control', array( 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_layout]', + 'settings' => 'trestle-settings[layout]', 'label' => __( 'Layout', 'trestle' ), 'type' => 'radio', 'choices' => array( @@ -71,11 +71,11 @@ function trestle_customizer_controls( $wp_customize ) { ) ); - // Upload a logo + // Upload a logo. $wp_customize->add_setting( - 'genesis-settings[trestle_logo_url]', + 'trestle-settings[logo_url]', array( - 'default' => genesis_get_option( 'trestle_logo_url' ), + 'default' => genesis_get_option( 'logo_url', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -88,16 +88,16 @@ function trestle_customizer_controls( $wp_customize ) { array( 'label' => __( 'Upload a logo', 'trestle' ), 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_logo_url]', + 'settings' => 'trestle-settings[logo_url]', ) ) ); - // Upload a mobile logo + // Upload a mobile logo. $wp_customize->add_setting( - 'genesis-settings[trestle_logo_url_mobile]', + 'trestle-settings[logo_url_mobile]', array( - 'default' => genesis_get_option( 'trestle_logo_url_mobile' ), + 'default' => genesis_get_option( 'logo_url_mobile', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -110,16 +110,16 @@ function trestle_customizer_controls( $wp_customize ) { array( 'label' => __( 'Upload a mobile logo', 'trestle' ), 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_logo_url_mobile]', + 'settings' => 'trestle-settings[logo_url_mobile]', ) ) ); - // Upload a mobile logo + // Upload a mobile logo. $wp_customize->add_setting( - 'genesis-settings[trestle_favicon_url]', + 'trestle-settings[favicon_url]', array( - 'default' => genesis_get_option( 'trestle_favicon_url' ), + 'default' => genesis_get_option( 'favicon_url', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -132,16 +132,16 @@ function trestle_customizer_controls( $wp_customize ) { array( 'label' => __( 'Upload a favicon', 'trestle' ), 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_favicon_url]', + 'settings' => 'trestle-settings[favicon_url]', ) ) ); - // Primary nav style + // Primary nav style. $wp_customize->add_setting( - 'genesis-settings[trestle_nav_primary_location]', + 'trestle-settings[nav_primary_location]', array( - 'default' => genesis_get_option( 'trestle_nav_primary_location' ), + 'default' => genesis_get_option( 'nav_primary_location', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -151,7 +151,7 @@ function trestle_customizer_controls( $wp_customize ) { 'trestle_nav_primary_location_control', array( 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_nav_primary_location]', + 'settings' => 'trestle-settings[nav_primary_location]', 'label' => __( 'Menu style', 'trestle' ), 'type' => 'select', 'choices' => array( @@ -161,11 +161,11 @@ function trestle_customizer_controls( $wp_customize ) { ) ); - // Primary nav extras + // Primary nav extras. $wp_customize->add_setting( - 'genesis-settings[trestle_custom_nav_extras_text]', + 'trestle-settings[custom_nav_extras_text]', array( - 'default' => genesis_get_option( 'trestle_custom_nav_extras_text' ), + 'default' => genesis_get_option( 'custom_nav_extras_text', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -175,17 +175,17 @@ function trestle_customizer_controls( $wp_customize ) { 'trestle_custom_nav_extras_text_control', array( 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_custom_nav_extras_text]', + 'settings' => 'trestle-settings[custom_nav_extras_text]', 'label' => __( 'Add search to mobile navigation', 'trestle' ), 'type' => 'checkbox', ) ); - // Blog post custom read more link text + // Blog post custom read more link text. $wp_customize->add_setting( - 'genesis-settings[trestle_read_more_text]', + 'trestle-settings[read_more_text]', array( - 'default' => genesis_get_option( 'trestle_read_more_text' ), + 'default' => genesis_get_option( 'read_more_text', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -196,16 +196,16 @@ function trestle_customizer_controls( $wp_customize ) { 'trestle_read_more_text_control', array( 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_read_more_text]', + 'settings' => 'trestle-settings[read_more_text]', 'label' => __( 'Custom read more link text', 'trestle' ), ) ); - // Post revisions number + // Post revisions number. $wp_customize->add_setting( - 'genesis-settings[trestle_revisions_number]', + 'trestle-settings[revisions_number]', array( - 'default' => genesis_get_option( 'trestle_revisions_number' ), + 'default' => genesis_get_option( 'revisions_number', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -215,7 +215,7 @@ function trestle_customizer_controls( $wp_customize ) { 'trestle_revisions_number_control', array( 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_revisions_number]', + 'settings' => 'trestle-settings[revisions_number]', 'label' => __( 'Number of post revisions', 'trestle' ), 'type' => 'select', 'choices' => array( @@ -235,11 +235,11 @@ function trestle_customizer_controls( $wp_customize ) { ) ); - // Footer Widget Areas + // Footer Widget Areas. $wp_customize->add_setting( - 'genesis-settings[trestle_footer_widgets_number]', + 'trestle-settings[footer_widgets_number]', array( - 'default' => genesis_get_option( 'trestle_footer_widgets_number' ), + 'default' => genesis_get_option( 'footer_widgets_number', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -249,7 +249,7 @@ function trestle_customizer_controls( $wp_customize ) { 'trestle_footer_widgets_number_control', array( 'section' => 'trestle_settings_section', - 'settings' => 'genesis-settings[trestle_footer_widgets_number]', + 'settings' => 'trestle-settings[footer_widgets_number]', 'label' => __( 'Number of footer widgets', 'trestle' ), 'type' => 'select', 'choices' => array( @@ -264,11 +264,11 @@ function trestle_customizer_controls( $wp_customize ) { ) ); - // Add a label for the link icons + // Add a label for the link icons. $wp_customize->add_setting( - 'genesis-settings[trestle_link_icons_title]', + 'trestle-settings[link_icons_title]', array( - 'default' => '', + 'default' => genesis_get_option( 'link_icons_title', 'trestle-settings' ), 'type' => 'option', 'capability' => 'edit_theme_options', ) @@ -277,17 +277,17 @@ function trestle_customizer_controls( $wp_customize ) { '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' ), + 'default' => genesis_get_option( 'external_link_icons', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -297,17 +297,17 @@ function trestle_customizer_controls( $wp_customize ) { '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' ), + 'default' => genesis_get_option( 'email_link_icons', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -317,17 +317,17 @@ function trestle_customizer_controls( $wp_customize ) { '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' ), + 'default' => genesis_get_option( 'pdf_link_icons', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -337,17 +337,17 @@ function trestle_customizer_controls( $wp_customize ) { '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' ), + 'default' => genesis_get_option( 'doc_link_icons', 'trestle-settings' ), 'type' => 'option', 'transport' => 'postMessage', 'capability' => 'edit_theme_options', @@ -357,7 +357,7 @@ function trestle_customizer_controls( $wp_customize ) { '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', ) diff --git a/includes/functions/theme-functions.php b/includes/functions/theme-functions.php index 0946233..b549e9e 100644 --- a/includes/functions/theme-functions.php +++ b/includes/functions/theme-functions.php @@ -21,7 +21,7 @@ add_action( 'init', 'trestle_load_bfa' ); */ function trestle_load_bfa() { - // Set the library initialization args + // Set the library initialization args. $args = array( 'version' => 'latest', 'minified' => true, @@ -49,23 +49,23 @@ 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 + // Theme jQuery. wp_enqueue_script( 'theme-jquery', get_stylesheet_directory_uri() . '/includes/js/theme-jquery.js', array( 'jquery' ), CHILD_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 ); @@ -83,7 +83,7 @@ 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; + return genesis_get_option( 'favicon_url', 'trestle-settings' ) ? genesis_get_option( 'favicon_url', 'trestle-settings' ) : $favicon_url; } /*=========================================== @@ -101,33 +101,33 @@ 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' == genesis_get_option( 'layout', 'trestle-settings' ) ) $classes[] = 'bubble'; - // Add link icon classes - if ( genesis_get_option( 'trestle_external_link_icons' ) ) + // Add link icon classes. + if ( genesis_get_option( 'external_link_icons', 'trestle-settings' ) ) $classes[] = 'external-link-icons'; - if ( genesis_get_option( 'trestle_email_link_icons' ) ) + if ( genesis_get_option( 'email_link_icons', 'trestle-settings' ) ) $classes[] = 'email-link-icons'; - if ( genesis_get_option( 'trestle_pdf_link_icons' ) ) + if ( genesis_get_option( 'pdf_link_icons', 'trestle-settings' ) ) $classes[] = 'pdf-link-icons'; - if ( genesis_get_option( 'trestle_doc_link_icons' ) ) + if ( genesis_get_option( 'doc_link_icons', 'trestle-settings' ) ) $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. + if ( genesis_get_option( 'nav_primary_location', 'trestle-settings' ) ) + $classes[] = 'nav-primary-location-' . esc_attr( genesis_get_option( 'nav_primary_location', 'trestle-settings' ) ); - // 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. + if ( genesis_get_option( 'footer_widgets_number', 'trestle-settings' ) ) + $classes[] = 'footer-widgets-number-' . esc_attr( genesis_get_option( 'footer_widgets_number', 'trestle-settings' ) ); - // Add logo class - if ( genesis_get_option( 'trestle_logo_url' ) || genesis_get_option( 'trestle_logo_url_mobile' ) ) + // Add logo class. + if ( genesis_get_option( 'logo_url', 'trestle-settings' ) || genesis_get_option( 'logo_url_mobile', 'trestle-settings' ) ) $classes[] = 'has-logo'; return $classes; @@ -147,17 +147,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 = genesis_get_option( 'logo_url', 'trestle-settings' ); + $logo_url_mobile = genesis_get_option( 'logo_url_mobile', 'trestle-settings' ); $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 +168,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,11 +193,11 @@ 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', $wrap, $inside, $wrap ); $title .= genesis_html5() ? "{$inside}" : ''; - // Echo (filtered) + // Echo (filtered). return $title; } @@ -214,7 +214,7 @@ add_action( 'init', 'trestle_nav_primary_location' ); */ function trestle_nav_primary_location() { - if ( 'header' == genesis_get_option( 'trestle_nav_primary_location' ) ) { + if ( 'header' == genesis_get_option( 'nav_primary_location', 'trestle-settings' ) ) { remove_action( 'genesis_after_header', 'genesis_do_nav' ); add_action( 'genesis_header', 'genesis_do_nav', 12 ); } @@ -233,7 +233,7 @@ add_filter( 'wp_nav_menu_items', 'trestle_custom_nav_extras', 10, 2 ); */ function trestle_custom_nav_extras( $nav_items, stdClass $menu_args ) { - if ( 'primary' == $menu_args->theme_location && genesis_get_option( 'trestle_custom_nav_extras_text' ) ) { + if ( 'primary' == $menu_args->theme_location && genesis_get_option( 'custom_nav_extras_text', 'trestle-settings' ) ) { return $nav_items . '
  • ' . get_search_form( false ) . '
    • '; } @@ -256,7 +256,7 @@ 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( genesis_get_option( 'revisions_number', 'trestle-settings' ) ); if ( isset( $trestle_revisions_number ) ) return $trestle_revisions_number; @@ -264,61 +264,9 @@ 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. - * - * @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) @@ -326,8 +274,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 ) { @@ -354,8 +302,8 @@ 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( genesis_get_option( 'read_more_text', 'trestle-settings' ) ); if ( $custom_text ) { return '… ' . $custom_text . ''; diff --git a/includes/shortcodes/shortcodes.php b/includes/shortcodes/shortcodes.php index d37c835..082a225 100644 --- a/includes/shortcodes/shortcodes.php +++ b/includes/shortcodes/shortcodes.php @@ -1,6 +1,6 @@ tags around shortcodes + * Fix for empty

    tags around shortcodes. * * @since 1.0.0 * @@ -28,14 +28,14 @@ function trestle_shortcode_empty_paragraph_fix( $content ) { ']
    ' => ']' ); - $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] @@ -58,7 +58,7 @@ function trestle_column( $atts, $content = null ) { add_shortcode( 'button', 'trestle_button' ); /** - * Button + * Button. * * Example: [button href="url" title="title" target="target" class="class"]Text[/button] * @@ -78,7 +78,7 @@ function trestle_button( $atts, $content = null ) { add_shortcode( 'date', 'trestle_date' ); /** - * Date + * Date. * * Example: [date format="M d, Y"] * @@ -100,7 +100,7 @@ function trestle_date( $atts ) { add_shortcode( 'blockquote', 'trestle_blockquote_shortcode' ); /** - * Blockquote + * Blockquote. * * Example: [blockquote citation=""]Content[/blockquote] * diff --git a/includes/widget-areas/widget-areas.php b/includes/widget-areas/widget-areas.php index e8602a4..0e96d19 100644 --- a/includes/widget-areas/widget-areas.php +++ b/includes/widget-areas/widget-areas.php @@ -1,16 +1,16 @@