diff --git a/functions.php b/functions.php
index e143591..b8512c1 100644
--- a/functions.php
+++ b/functions.php
@@ -2,9 +2,9 @@
/**
* Theme functionality
- *
+ *
* @since 1.0.0
- *
+ *
* @package Trestle
*/
@@ -18,6 +18,9 @@ require_once dirname( __FILE__ ) . '/includes/functions/theme-functions.php';
// Admin functionality
require_once dirname( __FILE__ ) . '/includes/admin/admin.php';
+// Customizer controls
+require_once dirname( __FILE__ ) . '/includes/admin/customizer.php';
+
// Shortcodes
require_once dirname( __FILE__ ) . '/includes/shortcodes/shortcodes.php';
@@ -60,5 +63,4 @@ function trestle_theme_setup() {
// 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 );
-
}
diff --git a/includes/admin/admin.css b/includes/admin/admin.css
deleted file mode 100644
index 8a9bf26..0000000
--- a/includes/admin/admin.css
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Trestle admin styles
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-.trestle-layout img {
- margin-right: 10px;
- border: 4px solid transparent;
- cursor: pointer;
-}
-
-.trestle-layout img:hover {
- border-color: #EEE;
-}
-
-.trestle-layout img.checked {
- border-color: #CCC;
-}
-
-/* Columns
---------------------------------------------- */
-.five-sixths,
-.four-sixths,
-.one-fourth,
-.one-half,
-.one-sixth,
-.one-third,
-.three-fourths,
-.three-sixths,
-.two-fourths,
-.two-sixths,
-.two-thirds,
-.footer-widgets .widget-area {
- float: left;
- margin: 0;
- width: 100%;
-}
-
-
-/* Media Queries
---------------------------------------------- */
-@media (min-width: 768px) {
-
- /* Columns
- --------------------------------------------- */
-
- .five-sixths,
- .four-sixths,
- .one-fourth,
- .one-half,
- .one-sixth,
- .one-third,
- .three-fourths,
- .three-sixths,
- .two-fourths,
- .two-sixths,
- .two-thirds,
- .footer-widgets .widget-area {
- margin-left: 2.564102564102564%;
- }
-
- .one-half,
- .three-sixths,
- .two-fourths,
- .footer-widgets-number-2 .footer-widgets .widget-area {
- width: 48.717948717948715%;
- }
-
- .one-third,
- .two-sixths,
- .sidebar-primary,
- .title-area,
- .footer-widgets-number-3 .footer-widgets .widget-area {
- width: 31.623931623931625%;
- }
-
- .four-sixths,
- .two-thirds,
- .content {
- width: 65.81196581196582%;
- }
-
- .one-fourth,
- .footer-widgets-number-4 .footer-widgets .widget-area {
- width: 23.076923076923077%;
- }
-
- .three-fourths {
- width: 74.35897435897436%;
- }
-
- .one-fifth,
- .footer-widgets-number-5 .footer-widgets .widget-area {
- width: 17.948717949%;
- }
-
- .one-sixth,
- .footer-widgets-number-6 .footer-widgets .widget-area {
- width: 14.52991452991453%;
- }
-
- .five-sixths {
- width: 82.90598290598291%;
- }
-
- .first,
- .footer-widgets .footer-widgets-1 {
- clear: both;
- margin-left: 0;
- }
-
- /* Lists inside columns (to remove bottom margin as needed at mobile sizes */
- .no-list-margin ul,
- .no-list-margin ol {
- margin-bottom: 26px;
- margin-bottom: 2.6rem;
- }
-
-}
\ No newline at end of file
diff --git a/includes/admin/admin.js b/includes/admin/admin.js
deleted file mode 100644
index c580186..0000000
--- a/includes/admin/admin.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * jQuery that runs in the WordPress admin
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-// Executes when the document is ready
-jQuery(document).ready(function() {
-
- // Hide Trestle layout radio buttons
- jQuery('.trestle-layout img').next('input[type="radio"]').hide();
-
- // Add radio button functionality to layout icons
- jQuery('.trestle-layout img').click(function() {
- jQuery(this).next('input[type="radio"]').attr('checked', true);
- jQuery('.trestle-layout img').removeClass('checked');
- jQuery(this).addClass('checked');
- });
-
- // Add drop-down functionality for Post Info & Meta options
- if( ! jQuery('#genesis-settings\\[trestle_manual_post_info_meta\\]').is(':checked') ) {
- jQuery('.trestle-post-info-meta').hide();
- }
-
- jQuery('#genesis-settings\\[trestle_manual_post_info_meta\\]').change(function() {
- jQuery('.trestle-post-info-meta').slideToggle();
- });
-
- // Add drop-down functionality for equal height breakpoint
- if( ! jQuery('#genesis-settings\\[trestle_equal_height_cols\\]').is(':checked') ) {
- jQuery('.trestle-equal-columns-breakpoint').hide();
- }
-
- jQuery('#genesis-settings\\[trestle_equal_height_cols\\]').change(function() {
- jQuery('.trestle-equal-columns-breakpoint').slideToggle();
- });
-
-}); /* end of as page load scripts */
diff --git a/includes/admin/admin.php b/includes/admin/admin.php
index 3628874..4fd5bc4 100644
--- a/includes/admin/admin.php
+++ b/includes/admin/admin.php
@@ -14,26 +14,22 @@ add_action( 'admin_enqueue_scripts', 'trestle_admin_actions' );
* @since 1.0.0
*/
function trestle_admin_actions() {
- // Add admin jQuery
- 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() . '/includes/admin/admin.css' );
-
- // Add admin CSS
- add_editor_style( get_stylesheet_directory_uri() . '/includes/admin/editor-style.css' );
+ // Include the main stylesheet in the editor
+ add_editor_style( get_stylesheet_uri() );
}
add_filter( 'genesis_theme_settings_defaults', 'trestle_custom_defaults' );
/**
* Sets up Trestle default settings.
*
- * @since 1.0.0
+ * @since 1.0.0
*
- * @param array $defaults Genesis default settings.
- * @return array Genesis settings updated to include Trestle defaults.
+ * @param array $defaults Genesis default settings.
+ * @return array Genesis settings updated to include Trestle defaults.
*/
function trestle_custom_defaults( $defaults ) {
+
// Trestle default key/value pairs
$trestle_defaults = array(
'trestle_layout' => 'solid',
@@ -41,303 +37,35 @@ function trestle_custom_defaults( $defaults ) {
'trestle_logo_url_mobile' => '',
'trestle_favicon_url' => '',
'trestle_nav_primary_location' => 'full',
- 'trestle_auto_nav' => 0,
- 'trestle_auto_nav_depth' => 0,
- '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 More »', 'trestle' ),
'trestle_revisions_number' => 3,
'trestle_footer_widgets_number' => 3,
- 'trestle_equal_height_cols' => 1,
- 'trestle_equal_cols_breakpoint' => 768,
- 'trestle_external_link_icons' => 1,
- 'trestle_email_link_icons' => 1,
- 'trestle_pdf_link_icons' => 1,
- 'trestle_doc_link_icons' => 1,
);
// Populate Trestle settings with default values if they don't yet exist
$options = get_option( GENESIS_SETTINGS_FIELD );
foreach ( $trestle_defaults as $k => $v ) {
+
// Add defaults to Genesis default settings array
$defaults[$k] = $v;
// Update actual options if they don't yet exist
- if ( $options && ! array_key_exists( $k, $options ) )
+ if ( $options && ! array_key_exists( $k, $options ) )
$options[$k] = $v;
}
// Update options with defaults
update_option( GENESIS_SETTINGS_FIELD, $options );
-
+
return $defaults;
}
-add_action( 'genesis_settings_sanitizer_init', 'trestle_register_social_sanitization_filters' );
-/**
- * Adds sanitization for various Trestle admin settings.
- *
- * @since 1.0.0
- */
-function trestle_register_social_sanitization_filters() {
- // 1 or 0
- genesis_add_option_filter(
- 'one_zero',
- GENESIS_SETTINGS_FIELD,
- array(
- 'trestle_auto_nav',
- 'trestle_include_home_link',
- 'trestle_custom_nav_extras',
- 'trestle_manual_post_info_meta',
- 'trestle_equal_height_cols',
- 'trestle_external_link_icons',
- 'trestle_email_link_icons',
- 'trestle_pdf_link_icons',
- 'trestle_doc_link_icons',
- )
- );
-
- // Integer
- genesis_add_option_filter(
- 'absint',
- GENESIS_SETTINGS_FIELD,
- array(
- 'trestle_auto_nav_depth',
- 'trestle_revisions_number',
- 'trestle_footer_widgets_number',
- 'trestle_equal_cols_breakpoint',
- )
- );
-
- // No HTML
- genesis_add_option_filter(
- 'no_html',
- GENESIS_SETTINGS_FIELD,
- array(
- 'trestle_layout',
- 'trestle_nav_primary_location'
- )
- );
-
- // Safe HTML
- genesis_add_option_filter(
- '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',
- 'trestle_read_more_text'
- )
- );
-}
-
-add_action( 'genesis_theme_settings_metaboxes', 'trestle_register_settings_box' );
-/**
- * Registers Trestle admin settings box.
- *
- * @since 1.0.0
- *
- * @global array $_genesis_admin_settings Genesis admin settings.
- *
- * @param string $_genesis_theme_settings_pagehook Hook for main Genesis settings page in admin.
- */
-function trestle_register_settings_box( $_genesis_theme_settings_pagehook ) {
- global $_genesis_admin_settings;
-
- // Create Trestle settings metabox
- $settings_box_title = __( 'Trestle Settings by', 'trestle' ) . ' MIGHTYminnow';
- add_meta_box( 'trestle-settings', $settings_box_title, 'trestle_settings_box', $_genesis_theme_settings_pagehook, 'main', 'high' );
-}
-
-/**
- * Outputs contents of Trestle admin settings box on Genesis settings page.
- *
- * @since 1.0.0
- */
-function trestle_settings_box() {
- // Set path for image radio inputs
- $img_path = get_stylesheet_directory_uri() . '/images/admin/';
-
- ?>
-
-
- 
/>
- />
- 
/>
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /wp-content/themes/trestle/images/favicon.ico if not specified.', 'trestle' ); ?>
-
-
-
-
-
-
-
-
-
-
-
- />
-
-
- ' . $i . '' . "\n";
- }
- ?>
-
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- />
-
-
-
-
-
-
-
-
- :
-
-
-
-
-
- ' . $i . '' . "\n";
- }
- ?>
-
-
-
-
-
- />
-
-
-
-
-
-
-
- ' . $i . '' . "\n";
- }
- ?>
-
-
-
-
-
- />
-
-
-
-
-
-
-
- />
- />
- />
- />
-
- 'Better Font Awesome',
+ 'slug' => 'better-font-awesome',
+ 'required' => true,
+ ),
+
array(
'name' => 'Respond.js',
'slug' => 'respondjs',
@@ -379,8 +114,8 @@ function trestle_register_required_plugins() {
),
array(
- 'name' => 'Easy Fancybox',
- 'slug' => 'easy-fancybox',
+ 'name' => 'FancyBox for WordPress',
+ 'slug' => 'fancybox-for-wordpress',
'required' => false,
),
diff --git a/includes/admin/customizer.js b/includes/admin/customizer.js
new file mode 100644
index 0000000..7a44eb4
--- /dev/null
+++ b/includes/admin/customizer.js
@@ -0,0 +1,147 @@
+/**
+ * JavaScript for the Customizer Preview
+ *
+ * @since 1.0.0
+ */
+
+( function( $ ) {
+
+ // Layout
+ wp.customize( 'genesis-settings[trestle_layout]', function( value ) {
+ value.bind( function( value ) {
+
+ var $body = $( 'body' );
+
+ switch ( value ) {
+ case 'solid':
+ $body.removeClass( 'bubble' );
+ break;
+ case 'bubble':
+ $body.addClass( 'bubble' );
+ break;
+ }
+
+ });
+ });
+
+ // Custom logo
+ wp.customize( 'genesis-settings[trestle_logo_url]', function( value ) {
+ value.bind( function( url ) {
+
+ var $body = $( 'body' );
+
+ if ( 0 === $.trim( url ).length ) {
+ $body.removeClass( 'has-logo' );
+ $( '.site-title a.image-link' ).remove();
+ } else {
+ $body.addClass( 'has-logo' );
+ $( '.site-title a.image-link' ).remove();
+ $( '.site-title' ).append( '
' );
+ }
+
+ });
+ });
+
+ // Favicon
+ wp.customize( 'genesis-settings[trestle_favicon_url]', function( value ) {
+ value.bind( function( url ) {
+
+ var $faviconElem = $( 'link[rel="Shortcut Icon"]' );
+ $faviconElem.attr( 'href', url );
+
+ });
+ });
+
+ // Primary Nav Location
+ wp.customize( 'genesis-settings[trestle_nav_primary_location]', function( value ) {
+ value.bind( function( value ) {
+
+ var $body = $( 'body' );
+ var $nav = $( '.nav-primary' );
+
+ switch ( value ) {
+ case 'full':
+ $body.removeClass( 'nav-primary-location-header' )
+ .addClass( 'nav-primary-location-full' );
+ $nav.remove().insertAfter( '.site-header' );
+ break;
+ case 'header':
+ $body.removeClass( 'nav-primary-location-full' )
+ .addClass( 'nav-primary-location-header' );
+ $nav.remove().appendTo( '.site-header .wrap' );
+ break;
+ }
+
+ });
+ });
+
+ // Custom Read More Link Text
+ wp.customize( 'genesis-settings[trestle_read_more_text]', function( value ) {
+ value.bind( function( value ) {
+
+ $( 'a.more-link' ).html( value );
+
+ });
+ });
+
+ // External Links
+ wp.customize( 'genesis-settings[trestle_external_link_icons]', function( value ) {
+ value.bind( function( value ) {
+
+ var $body = $( 'body' );
+
+ if ( value ) {
+ $body.addClass( 'external-link-icons' );
+ } else {
+ $body.removeClass( 'external-link-icons' );
+ }
+
+ });
+ });
+
+ // Email Links
+ wp.customize( 'genesis-settings[trestle_email_link_icons]', function( value ) {
+ value.bind( function( value ) {
+
+ var $body = $( 'body' );
+
+ if ( value ) {
+ $body.addClass( 'email-link-icons' );
+ } else {
+ $body.removeClass( 'email-link-icons' );
+ }
+
+ });
+ });
+
+ // PDF Links
+ wp.customize( 'genesis-settings[trestle_pdf_link_icons]', function( value ) {
+ value.bind( function( value ) {
+
+ var $body = $( 'body' );
+
+ if ( value ) {
+ $body.addClass( 'pdf-link-icons' );
+ } else {
+ $body.removeClass( 'pdf-link-icons' );
+ }
+
+ });
+ });
+
+ // Doc Links
+ wp.customize( 'genesis-settings[trestle_doc_link_icons]', function( value ) {
+ value.bind( function( value ) {
+
+ var $body = $( 'body' );
+
+ if ( value ) {
+ $body.addClass( 'doc-link-icons' );
+ } else {
+ $body.removeClass( 'doc-link-icons' );
+ }
+
+ });
+ });
+
+})( jQuery );
diff --git a/includes/admin/customizer.php b/includes/admin/customizer.php
new file mode 100644
index 0000000..93df40a
--- /dev/null
+++ b/includes/admin/customizer.php
@@ -0,0 +1,366 @@
+add_section(
+ 'trestle_settings_section',
+ array(
+ 'title' => __( 'Trestle Settings', 'trestle' ),
+ 'priority' => 160,
+ )
+ );
+
+ // Layout
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_layout]',
+ array(
+ 'default' => '',
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_layout_control',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_layout]',
+ 'label' => __( 'Layout', 'trestle' ),
+ 'type' => 'radio',
+ 'choices' => array(
+ 'bubble' => __( 'Bubble', 'trestle' ),
+ 'solid' => __( 'Solid', 'trestle' ),
+ )
+ )
+ );
+
+ // Upload a logo
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_logo_url]',
+ array(
+ 'default' => genesis_get_option( 'trestle_logo_url' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ new WP_Customize_Image_Control(
+ $wp_customize,
+ 'trestle_logo_control',
+ array(
+ 'label' => __( 'Upload a logo', 'trestle' ),
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_logo_url]',
+ )
+ )
+ );
+
+ // Upload a mobile logo
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_logo_url_mobile]',
+ array(
+ 'default' => genesis_get_option( 'trestle_logo_url_mobile' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ new WP_Customize_Image_Control(
+ $wp_customize,
+ 'trestle_mobile_logo_control',
+ array(
+ 'label' => __( 'Upload a mobile logo', 'trestle' ),
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_logo_url_mobile]',
+ )
+ )
+ );
+
+ // Upload a mobile logo
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_favicon_url]',
+ array(
+ 'default' => genesis_get_option( 'trestle_favicon_url' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ new WP_Customize_Image_Control(
+ $wp_customize,
+ 'trestle_favicon_control',
+ array(
+ 'label' => __( 'Upload a favicon', 'trestle' ),
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_favicon_url]',
+ )
+ )
+ );
+
+ // Primary nav style
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_nav_primary_location]',
+ array(
+ 'default' => genesis_get_option( 'trestle_nav_primary_location' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_nav_primary_location_control',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_nav_primary_location]',
+ 'label' => __( 'Menu style', 'trestle' ),
+ 'type' => 'select',
+ 'choices' => array(
+ 'full' => __( 'Full Width', 'trestle' ),
+ 'header' => __( 'Header Right', 'trestle' ),
+ )
+ )
+ );
+
+ // Primary nav extras
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_custom_nav_extras_text]',
+ array(
+ 'default' => genesis_get_option( 'trestle_custom_nav_extras_text' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_custom_nav_extras_text_control',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_custom_nav_extras_text]',
+ 'label' => __( 'Add search to mobile navigation', 'trestle' ),
+ 'type' => 'checkbox',
+ )
+ );
+
+ // Blog post custom read more link text
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_read_more_text]',
+ array(
+ 'default' => genesis_get_option( 'trestle_read_more_text' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ 'sanitize_callback' => 'wp_kses_post',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_read_more_text_control',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_read_more_text]',
+ 'label' => __( 'Custom read more link text', 'trestle' ),
+ )
+ );
+
+ // Post revisions number
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_revisions_number]',
+ array(
+ 'default' => genesis_get_option( 'trestle_revisions_number' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_revisions_number_control',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_revisions_number]',
+ 'label' => __( 'Number of post revisions', 'trestle' ),
+ 'type' => 'select',
+ 'choices' => array(
+ '-1' => __( 'Unlimited', 'trestle' ),
+ '0' => '0',
+ '1' => '1',
+ '2' => '2',
+ '3' => '3',
+ '4' => '4',
+ '5' => '5',
+ '6' => '6',
+ '7' => '7',
+ '8' => '8',
+ '9' => '9',
+ '10' => '10',
+ )
+ )
+ );
+
+ // Footer Widget Areas
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_footer_widgets_number]',
+ array(
+ 'default' => genesis_get_option( 'trestle_footer_widgets_number' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_footer_widgets_number_control',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_footer_widgets_number]',
+ 'label' => __( 'Number of footer widgets', 'trestle' ),
+ 'type' => 'select',
+ 'choices' => array(
+ '0' => '0',
+ '1' => '1',
+ '2' => '2',
+ '3' => '3',
+ '4' => '4',
+ '5' => '5',
+ '6' => '6',
+ )
+ )
+ );
+
+ // Add a label for the link icons
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_link_icons_title]',
+ array(
+ 'default' => '',
+ 'type' => 'option',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_link_icons_title',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_link_icons_title]',
+ 'label' => __( 'Icon links', 'trestle' ),
+ 'type' => 'hidden',
+ )
+ );
+
+ // External Link Icons
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_external_link_icons]',
+ array(
+ 'default' => genesis_get_option( 'trestle_external_link_icons' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_external_link_icons',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_external_link_icons]',
+ 'label' => __( 'Add icons to external links', 'trestle' ),
+ 'type' => 'checkbox',
+ )
+ );
+
+ // E-mail Link Icons
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_email_link_icons]',
+ array(
+ 'default' => genesis_get_option( 'trestle_email_link_icons' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_email_link_icons',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_email_link_icons]',
+ 'label' => __( 'Add icons to email links', 'trestle' ),
+ 'type' => 'checkbox',
+ )
+ );
+
+ // PDF Link Icons
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_pdf_link_icons]',
+ array(
+ 'default' => genesis_get_option( 'trestle_pdf_link_icons' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_pdf_link_icons',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_pdf_link_icons]',
+ 'label' => __( 'Add icons to .pdf links', 'trestle' ),
+ 'type' => 'checkbox',
+ )
+ );
+
+ // Doc Link Icons
+ $wp_customize->add_setting(
+ 'genesis-settings[trestle_doc_link_icons]',
+ array(
+ 'default' => genesis_get_option( 'trestle_doc_link_icons' ),
+ 'type' => 'option',
+ 'transport' => 'postMessage',
+ 'capability' => 'edit_theme_options',
+ )
+ );
+ $wp_customize->add_control(
+ 'trestle_doc_link_icons',
+ array(
+ 'section' => 'trestle_settings_section',
+ 'settings' => 'genesis-settings[trestle_doc_link_icons]',
+ 'label' => __( 'Add icons to .doc links', 'trestle' ),
+ 'type' => 'checkbox',
+ )
+ );
+
+}
diff --git a/includes/admin/editor-style.css b/includes/admin/editor-style.css
deleted file mode 100644
index 4d17d21..0000000
--- a/includes/admin/editor-style.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Trestle editor styles
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-@import url( '../../style.css' );
-
-/* Overrides
---------------------------------------------- */
-body {
- padding: 8px 16px;
- background-color: #FFF;
- background-image: none;
-}
-
-.content {
- width: 100%;
- font-size: 1.6rem;
-}
-
-.content a {
- color: #f15123;
-}
-
-.content a:hover {
- color: #333;
-}
-
-.content ul,
-.content ol {
- margin: 0 0 26px 40px;
- margin: 0 0 2.6rem 4rem;
-}
\ No newline at end of file
diff --git a/includes/functions/theme-functions.php b/includes/functions/theme-functions.php
index cb0936f..0946233 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',
@@ -48,7 +48,7 @@ add_action( 'wp_enqueue_scripts', 'trestle_header_actions' );
* @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' );
@@ -64,18 +64,12 @@ function trestle_header_actions() {
$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_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 );
- // 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', 'trestle_vars', $php_vars );
-
}
add_filter( 'genesis_pre_load_favicon', 'trestle_do_custom_favicon' );
@@ -106,7 +100,7 @@ add_filter( 'body_class', 'trestle_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';
@@ -127,19 +121,15 @@ function trestle_body_classes( $classes ) {
// 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;
}
@@ -156,6 +146,7 @@ add_filter( 'genesis_seo_title', 'trestle_do_logos', 10, 3 );
* @since 1.0.0
*/
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 = '';
@@ -173,7 +164,7 @@ function trestle_do_logos( $title, $inside, $wrap ) {
$logo_html .= sprintf( '
',
implode(' ', $classes),
esc_attr( get_bloginfo( 'name' ) ),
- $logo_url
+ $logo_url
);
}
@@ -190,8 +181,8 @@ function trestle_do_logos( $title, $inside, $wrap ) {
$logo_html .= sprintf( '',
implode(' ', $classes),
esc_attr( get_bloginfo( 'name' ) ),
- $logo_url_mobile
- );
+ $logo_url_mobile
+ );
}
if ( $logo_html ) {
@@ -202,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;
}
@@ -215,41 +206,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.
@@ -265,91 +221,25 @@ function trestle_nav_primary_location() {
}
+add_filter( 'wp_nav_menu_items', 'trestle_custom_nav_extras', 10, 2 );
/**
- * Auto-generates list of pages for use in the primary navigation menu.
+ * Add custom nav extras.
*
* @since 1.0.0
*
- * @param string $nav_items 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