From febb5ede11f23fa1f27f7040d6c8e533f08bb2cf Mon Sep 17 00:00:00 2001 From: Nathan Rice Date: Wed, 1 Mar 2017 19:51:34 -0500 Subject: [PATCH] Rewrite based on new plugin boilerplate. --- Gruntfile.js | 24 +- README.md | 1 - genesis-simple-sidebars.php | 187 +++++++++++++++ ...> class-genesis-simple-sidebars-admin.php} | 110 +++++---- .../class-genesis-simple-sidebars-core.php | 223 ++++++++++++++++++ .../class-genesis-simple-sidebars-entry.php | 63 +++++ .../class-genesis-simple-sidebars-term.php | 31 +++ includes/deprecated.php | 161 +++++++++++++ includes/inpost.php | 102 -------- includes/term.php | 69 ------ includes/views/{edit.php => admin-edit.php} | 17 +- includes/views/{main.php => admin-main.php} | 5 +- includes/views/entry-metabox-content.php | 46 ++++ includes/views/term-edit-sidebar-form.php | 51 ++++ languages/genesis-simple-sidebars.pot | 10 +- package.json | 32 +-- plugin.php | 217 +---------------- readme.txt | 47 ++-- 18 files changed, 895 insertions(+), 501 deletions(-) delete mode 100644 README.md create mode 100644 genesis-simple-sidebars.php rename includes/{admin.php => class-genesis-simple-sidebars-admin.php} (78%) create mode 100644 includes/class-genesis-simple-sidebars-core.php create mode 100644 includes/class-genesis-simple-sidebars-entry.php create mode 100644 includes/class-genesis-simple-sidebars-term.php create mode 100644 includes/deprecated.php delete mode 100644 includes/inpost.php delete mode 100644 includes/term.php rename includes/views/{edit.php => admin-edit.php} (79%) rename includes/views/{main.php => admin-main.php} (94%) create mode 100644 includes/views/entry-metabox-content.php create mode 100644 includes/views/term-edit-sidebar-form.php diff --git a/Gruntfile.js b/Gruntfile.js index 230ed93..e965fb1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -20,17 +20,21 @@ module.exports = function(grunt) { // I18n - + // Add text domain as last argument of i18n functions addtextdomain: { php: { options: { updateDomains: true }, - src: [ - '*.php', - 'lib/**/*.php' - ] + target: { + files: { + src: [ + '*.php', + 'lib/**/*.php' + ] + } + } } }, @@ -43,15 +47,15 @@ module.exports = function(grunt) { '_e:1,2d', '_x:1,2c,3d', '_ex:1,2c,3d', - '_n:1,2,4d', + '_n:1,2,4d', '_nx:1,2,4c,5d', '_n_noop:1,2,3d', '_nx_noop:1,2,3c,4d', - 'esc_attr__:1,2d', + 'esc_attr__:1,2d', 'esc_html__:1,2d', - 'esc_attr_e:1,2d', + 'esc_attr_e:1,2d', 'esc_html_e:1,2d', - 'esc_attr_x:1,2c,3d', + 'esc_attr_x:1,2c,3d', 'esc_html_x:1,2c,3d' ] }, @@ -75,7 +79,7 @@ module.exports = function(grunt) { pot.headers['last-translator'] = 'StudioPress '; pot.headers['language-team'] = 'English '; pot.headers['plural-forms'] = 'nplurals=2; plural=n != 1;'; - pot.headers['x-generator'] = 'grunt-wp-i18n'; + pot.headers['x-generator'] = 'grunt-wp-i18n 0.4.4'; pot.headers['x-poedit-basepath'] = '.'; pot.headers['x-poedit-language'] = 'English'; pot.headers['x-poedit-country'] = 'UNITED STATES'; diff --git a/README.md b/README.md deleted file mode 100644 index 8b13789..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/genesis-simple-sidebars.php b/genesis-simple-sidebars.php new file mode 100644 index 0000000..622bc3d --- /dev/null +++ b/genesis-simple-sidebars.php @@ -0,0 +1,187 @@ +plugin_dir_url = plugin_dir_url( __FILE__ ); + $this->plugin_dir_path = plugin_dir_path( __FILE__ ); + + // For backward compatibility + define( 'SS_PLUGIN_DIR', $this->plugin_dir_path ); + + } + + /** + * Initialize. + * + * @since 2.1.0 + */ + public function init() { + + register_activation_hook( __FILE__, array( $this, 'activation' ) ); + + $this->load_plugin_textdomain(); + $this->includes(); + $this->instantiate(); + + } + + /** + * Plugin activation hook. Runs when plugin is activated. + * + * @since 2.1.0 + */ + public function activation() { + + if ( ! defined( 'PARENT_THEME_VERSION' ) || ! version_compare( PARENT_THEME_VERSION, $this->min_genesis_version, '>=' ) ) { + + deactivate_plugins( plugin_basename( __FILE__ ) ); + wp_die( sprintf( __( 'Sorry, you cannot run Genesis Simple Sidebars without WordPress %s and Genesis %s, or greater.', 'genesis-simple-sidebars' ), $this->min_wp_version, 'http://my.studiopress.com/?download_id=91046d629e74d525b3f2978e404e7ffa', $this->min_genesis_version ) ); + + } + + } + + /** + * Load the plugin textdomain, for translation. + * + * @since 2.1.0 + */ + public function load_plugin_textdomain() { + load_plugin_textdomain( $this->plugin_textdomain, false, $this->plugin_dir_path . 'languages/' ); + } + + /** + * All general includes. + * + * @since 2.1.0 + */ + public function includes() { + + //require_once( $this->plugin_dir_path . 'includes/functions.php' ); + //require_once( $this->plugin_dir_path . 'includes/deprecated.php' ); + + } + + /** + * Include the class file, instantiate the classes, create objects. + * + * @since 2.1.0 + */ + public function instantiate() { + + add_action( 'genesis_setup', array( $this, 'genesis_dependencies' ) ); + + } + + /** + * Load and instantiate any Genesis dependencies. + * + * @since 2.1.0 + */ + public function genesis_dependencies() { + + require_once( $this->plugin_dir_path . 'includes/class-genesis-simple-sidebars-core.php' ); + $this->core = new Genesis_Simple_Sidebars_Core; + $this->core->init(); + + // Anything beyond this point should only be loaded if in the admin. + if ( ! is_admin() ) { + return; + } + + require_once( $this->plugin_dir_path . 'includes/class-genesis-simple-sidebars-entry.php' ); + $this->entry = new Genesis_Simple_Sidebars_Entry; + $this->entry->init(); + + require_once( $this->plugin_dir_path . 'includes/class-genesis-simple-sidebars-term.php' ); + $this->term = new Genesis_Simple_Sidebars_Term; + $this->term->init(); + + require_once( $this->plugin_dir_path . 'includes/class-genesis-simple-sidebars-admin.php' ); + $this->admin = new Genesis_Simple_Sidebars_Admin; + $this->admin->admin_menu(); + + // For backward compatibility + global $_genesis_simple_sidebars; + $_genesis_simple_sidebars = $this->admin; + + } + +} + +/** + * Helper function to retrieve the static object without using globals. + * + * @since 2.1.0 + */ +function Genesis_Simple_Sidebars() { + + static $object; + + if ( null == $object ) { + $object = new Genesis_Simple_Sidebars; + } + + return $object; +} +/** + * Initialize the object on `plugins_loaded`. + */ +add_action( 'plugins_loaded', array( Genesis_Simple_Sidebars(), 'init' ) ); diff --git a/includes/admin.php b/includes/class-genesis-simple-sidebars-admin.php similarity index 78% rename from includes/admin.php rename to includes/class-genesis-simple-sidebars-admin.php index f045e32..fb9c1f8 100644 --- a/includes/admin.php +++ b/includes/class-genesis-simple-sidebars-admin.php @@ -13,6 +13,25 @@ */ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { + /** + * Settings field. + * + * @since 2.1.0 + */ + public $settings_field; + + /** + * Constructor. + */ + public function __construct() { + + $this->settings_field = Genesis_Simple_Sidebars()->settings_field; + + // For backward compatibility + define( 'SS_SETTINGS_FIELD', $this->settings_field ); + + } + /** * Create an admin menu item and settings page. * @@ -22,7 +41,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { * * @see Genesis_Admin_Import_Export::actions() Handle creating, editing, and deleting sidebars. */ - public function __construct() { + public function admin_menu() { $page_id = 'simple-sidebars'; @@ -34,14 +53,12 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { ) ); - //* Empty, as we'll be building the page manually + // Empty, as we'll be building the page manually $page_ops = array(); - $settings_field = SS_SETTINGS_FIELD; + $this->create( $page_id, $menu_ops, $page_ops, $this->settings_field ); - $this->create( $page_id, $menu_ops, $page_ops, $settings_field ); - - //* Simpe Sidebar actions (create, edit, or delete) + // Simpe Sidebar actions (create, edit, or delete) add_action( 'admin_init', array( $this, 'actions' ) ); } @@ -56,14 +73,14 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { */ public function admin() { - $_sidebars = get_option( $this->settings_field ); - echo '
'; - if ( isset( $_REQUEST['action'] ) && 'edit' == $_REQUEST['action'] ) - require_once( SS_PLUGIN_DIR . '/includes/views/edit.php' ); - else - require_once( SS_PLUGIN_DIR . '/includes/views/main.php' ); + if ( isset( $_REQUEST['action'] ) && 'edit' == $_REQUEST['action'] ) { + require_once( Genesis_Simple_Sidebars()->plugin_dir_path . '/includes/views/admin-edit.php' ); + } + else { + require_once( Genesis_Simple_Sidebars()->plugin_dir_path . '/includes/views/admin-main.php' ); + } echo '
'; @@ -129,8 +146,9 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { */ public function actions() { - if ( ! genesis_is_menu_page( 'simple-sidebars' ) ) + if ( ! genesis_is_menu_page( 'simple-sidebars' ) ) { return; + } /** * This section handles the data if a new sidebar is created @@ -164,8 +182,9 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { */ public function notices() { - if ( ! genesis_is_menu_page( 'simple-sidebars' ) ) + if ( ! genesis_is_menu_page( 'simple-sidebars' ) ) { return; + } $pattern = '

%s

'; @@ -196,34 +215,39 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { */ protected function create_sidebar( $args = array() ) { - if ( empty( $args['name'] ) || empty( $args['id'] ) ) { + if ( empty( $args['name'] ) ) { wp_die( $this->error( 1 ) ); exit; } - //* nonce verification + // nonce verification check_admin_referer( 'simple-sidebars-action_create-sidebar' ); - //* WP changes a numeric sidebar id to sidebar-id which makes it inaccessible to the user - if ( is_numeric( $args['id'] ) ) - $args['id'] = sanitize_title_with_dashes( $args['name'] ); + // Change empty or numeric IDs to the name, lowercased and separated by dashes. + if ( empty( $args['id'] ) || is_numeric( $args['id'] ) ) { + $args['id'] = $args['name']; + } + + // Strip all but alphanumeric, sanitize with dashes. + $id = preg_replace( "/[^a-zA-Z0-9 -]+/", "", sanitize_title_with_dashes( $args['id'] ) ); + + $db = (array) get_option( $this->settings_field ); - $db = (array) get_option( SS_SETTINGS_FIELD ); $new = array( - sanitize_title_with_dashes( $args['id'] ) => array( - 'name' => esc_html( $args['name'] ), + $id => array( + 'name' => esc_html( $args['name'] ), 'description' => esc_html( $args['description'] ) - ) + ), ); - if ( array_key_exists( $args['id'], $db ) ) { + if ( array_key_exists( $id, $db ) ) { wp_die( $this->error( 2 ) ); exit; } $_sidebars = wp_parse_args( $new, $db ); - update_option( SS_SETTINGS_FIELD, $_sidebars ); + update_option( $this->settings_field, $_sidebars ); wp_redirect( admin_url( 'admin.php?page=simple-sidebars&created=true' ) ); exit; @@ -242,17 +266,13 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { exit; } - //* nonce verification + // nonce verification check_admin_referer( 'simple-sidebars-action_edit-sidebar' ); - //* WP changes a numeric sidebar id to sidebar-id which makes it inaccessible to the user - if ( is_numeric( $args['id'] ) ) - $args['id'] = sanitize_title_with_dashes( $args['name'] ); - - $db = (array) get_option( SS_SETTINGS_FIELD ); + $db = (array) get_option( $this->settings_field ); $new = array( - sanitize_title_with_dashes( $args['id'] ) => array( - 'name' => esc_html( $args['name'] ), + $args['id'] => array( + 'name' => esc_html( $args['name'] ), 'description' => esc_html( $args['description'] ) ) ); @@ -264,7 +284,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { $_sidebars = wp_parse_args( $new, $db ); - update_option( SS_SETTINGS_FIELD, $_sidebars ); + update_option( $this->settings_field, $_sidebars ); wp_redirect( admin_url( 'admin.php?page=simple-sidebars&edited=true' ) ); exit; @@ -283,10 +303,10 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { exit; } - //* nonce verification + // nonce verification check_admin_referer( 'simple-sidebars-action_delete-sidebar' ); - $_sidebars = (array) get_option( SS_SETTINGS_FIELD ); + $_sidebars = (array) get_option( $this->settings_field ); if ( ! isset( $_sidebars[$id] ) ) { wp_die( $this->error( 4 ) ); @@ -295,7 +315,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { unset( $_sidebars[$id] ); - update_option( SS_SETTINGS_FIELD, $_sidebars ); + update_option( $this->settings_field, $_sidebars ); wp_redirect( admin_url( 'admin.php?page=simple-sidebars&deleted=true' ) ); exit; @@ -316,7 +336,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { switch( (int) $error ) { case 1: - return __( 'Oops! Please choose a valid Name and ID for this sidebar', 'genesis-simple-sidebars' ); + return __( 'Oops! Please choose a valid Name for this sidebar', 'genesis-simple-sidebars' ); break; case 2: return __( 'Oops! That sidebar ID already exists', 'genesis-simple-sidebars' ); @@ -335,17 +355,3 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { } } - -add_action( 'genesis_admin_menu', 'simplesidebars_settings_menu' ); -/** - * Instantiate the class to create the menu. - * - * @since 1.0.0 - */ -function simplesidebars_settings_menu() { - - global $_genesis_simple_sidebars_admin; - - $_genesis_simple_sidebars_admin = new Genesis_Simple_Sidebars_Admin; - -} diff --git a/includes/class-genesis-simple-sidebars-core.php b/includes/class-genesis-simple-sidebars-core.php new file mode 100644 index 0000000..1fb525c --- /dev/null +++ b/includes/class-genesis-simple-sidebars-core.php @@ -0,0 +1,223 @@ +core->get_sidebars(); + + if ( ! $sidebars ) { + return; + } + + // Cycle through created sidebars, register them as widget areas + foreach ( (array) $sidebars as $id => $info ) { + + if ( ! isset( $info['name'] ) || ! isset( $info['description'] ) ) { + continue; + } + + genesis_register_sidebar( array( + 'name' => esc_html( $info['name'] ), + 'id' => $id, + 'description' => esc_html( $info['description'] ), + 'editable' => 1, + ) ); + + } + + } + + /** + * Remove default sidebars and inject custom sidebars. + * + * @since 2.1.0 + */ + public function swap_sidebars() { + + // Header + if ( is_registered_sidebar( 'header-right' ) ) { + global $wp_registered_sidebars; + $wp_registered_sidebars['ss-header-right-temp'] = $wp_registered_sidebars['header-right']; + unset( $wp_registered_sidebars['header-right'] ); + add_action( 'genesis_header_right', array( $this, 'do_header_right' ) ); + } + + // Sidebars + remove_action( 'genesis_sidebar', 'genesis_do_sidebar' ); + remove_action( 'genesis_sidebar_alt', 'genesis_do_sidebar_alt' ); + add_action( 'genesis_sidebar', array( $this, 'do_primary_sidebar' ) ); + add_action( 'genesis_sidebar_alt', array( $this, 'do_secondary_sidebar' ) ); + + } + + /** + * Output custom header widget area, if one is set. Otherwise output default. + * + * @since 2.1.0 + */ + public function do_header_right() { + + global $wp_registered_sidebars; + + if ( ! $this->do_sidebar( '_ss_header' ) ) { + $wp_registered_sidebars['header-right'] = $wp_registered_sidebars['ss-header-right-temp']; + } + + unset( $wp_registered_sidebars['ss-header-right-temp'] ); + + } + + /** + * Output custom primary sidebar, if one is set. Otherwise output default. + * + * @since 2.1.0 + */ + public function do_primary_sidebar() { + + if ( ! $this->do_sidebar( '_ss_sidebar' ) ) { + genesis_do_sidebar(); + } + + } + + /** + * Output custom secondary sidebar, if one is set. Otherwise output default. + * + * @since 2.1.0 + */ + public function do_secondary_sidebar() { + + if ( ! $this->do_sidebar( '_ss_sidebar_alt' ) ) { + genesis_do_sidebar_alt(); + } + + } + + /** + * Show widgets in a particular sidebar. + * + * @param string $key sidebar id you wish to output. + * + * @since 2.1.0 + */ + public function do_sidebar( $key ) { + + if ( is_singular() && $key = genesis_get_custom_field( $key ) ) { + + if ( dynamic_sidebar( $key ) ) { + return true; + } + + } + + if ( is_tax() || is_category() || is_tag() ) { + + if ( $key = get_term_meta( get_queried_object()->term_id, $key, true ) ) { + dynamic_sidebar( $key ); + return true; + } + + } + + return false; + + } + + /** + * Get all custom registered sidebars. + * + * @since 2.1.0 + */ + public function get_sidebars( $cache = true ) { + + if ( ! $cache ) { + return stripslashes_deep( get_option( Genesis_Simple_Sidebars()->settings_field ) ); + } + + if ( is_null( $this->sidebars ) ) { + $this->sidebars = stripslashes_deep( get_option( Genesis_Simple_Sidebars()->settings_field ) ); + } + + return $this->sidebars; + + } + + /** + * Return taxonomy ids. + * + * Helper function to return the array keys from a taxonomy query. + * + * @since 2.1.0 + */ + public function get_public_taxonomies() { + + if ( is_null( $this->public_taxonomies ) ) { + $this->public_taxonomies = get_taxonomies( array( + 'show_ui' => true, + 'public' => true, + ) ); + } + + $this->public_taxonomies = apply_filters( 'genesis_simple_sidebars_taxonomies', array_keys( $this->public_taxonomies ) ); + + return $this->public_taxonomies; + + } + + /** + * Determines if this site has disabled 3 column layouts or not. + * + * @since 2.1.0 + */ + public function has_3_column_layout() { + + $layouts = genesis_get_layouts(); + + $three_column_layouts = array( + 'content-sidebar-sidebar', + 'sidebar-content-sidebar', + 'sidebar-sidebar-content', + ); + + foreach ( $three_column_layouts as $layout ) { + if ( array_key_exists( $layout, $layouts ) ) { + return true; + } + } + + return false; + + } + +} diff --git a/includes/class-genesis-simple-sidebars-entry.php b/includes/class-genesis-simple-sidebars-entry.php new file mode 100644 index 0000000..5c05e3c --- /dev/null +++ b/includes/class-genesis-simple-sidebars-entry.php @@ -0,0 +1,63 @@ + true ) ) as $type ) { + + if ( post_type_supports( $type, 'genesis-simple-sidebars' ) || $type == 'post' || $type == 'page' ) { + add_meta_box( 'ss_inpost_metabox', __( 'Sidebar Selection', 'genesis-simple-sidebars' ), array( $this, 'metabox_content' ), $type, 'side', 'low' ); + } + + } + + } + + /** + * Include the metabox content. + * + * @since 2.1.0 + */ + public function metabox_content() { + + require_once( Genesis_Simple_Sidebars()->plugin_dir_path . 'includes/views/entry-metabox-content.php' ); + + print_r( get_post_meta( get_the_ID() ) ); + + } + + /** + * Save the metabox fields when the entry is saved. + * + * @since 2.1.0 + */ + public function metabox_save( $post_id, $post ) { + + if ( ! isset( $_POST['genesis_simple_sidebars'] ) ) { + return; + } + + $data = wp_parse_args( $_POST['genesis_simple_sidebars'], array( + '_ss_header' => '', + '_ss_sidebar' => '', + '_ss_sidebar_alt' => '', + ) ); + + genesis_save_custom_fields( $data, 'genesis-simple-sidebars-save-entry', 'genesis-simple-sidebars-save-entry-nonce', $post ); + + } + +} diff --git a/includes/class-genesis-simple-sidebars-term.php b/includes/class-genesis-simple-sidebars-term.php new file mode 100644 index 0000000..af9f64b --- /dev/null +++ b/includes/class-genesis-simple-sidebars-term.php @@ -0,0 +1,31 @@ +core->get_public_taxonomies(); + + if ( ! empty( $taxonomies ) && is_admin() && is_array( $taxonomies ) ) { + + foreach ( $taxonomies as $tax ) { + add_action( "{$tax}_edit_form", array( $this, 'term_sidebar_form' ), 9, 2 ); + } + + } + + } + + public function term_sidebar_form( $tag, $taxonomy ) { + + require_once( Genesis_Simple_Sidebars()->plugin_dir_path . 'includes/views/term-edit-sidebar-form.php' ); + + } + +} diff --git a/includes/deprecated.php b/includes/deprecated.php new file mode 100644 index 0000000..ab4cbf4 --- /dev/null +++ b/includes/deprecated.php @@ -0,0 +1,161 @@ + true ) ) as $type ) { - - if ( post_type_supports( $type, 'genesis-simple-sidebars' ) || $type == 'post' || $type == 'page' ) { - add_meta_box( 'ss_inpost_metabox', __( 'Sidebar Selection', 'genesis-simple-sidebars' ), 'ss_inpost_metabox', $type, 'side', 'low' ); - } - - } - -} - -function ss_inpost_metabox() { - - $_sidebars = stripslashes_deep( get_option( SS_SETTINGS_FIELD ) ); - global $wp_registered_sidebars; - -?> - - - - - -

- - -

- -

- - -

- -ID; - - //* don't try to save the data under autosave, ajax, or future post. - if ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) return; - if ( defined('DOING_AJAX') && DOING_AJAX ) return; - if ( defined('DOING_CRON') && DOING_CRON ) return; - - //* is the user allowed to edit the post or page? - if ( ( 'page' == $_POST['post_type'] && ! current_user_can( 'edit_page', $post->ID ) ) || ! current_user_can( 'edit_post', $post->ID ) ) - return $post->ID; - - $_sidebars = array( - '_ss_sidebar' => isset( $_POST['_ss_sidebar'] ) ? $_POST['_ss_sidebar'] : '', - '_ss_sidebar_alt' => isset( $_POST['_ss_sidebar_alt'] ) ? $_POST['_ss_sidebar_alt'] : '', - ); - - //* store the custom fields - foreach ( $_sidebars as $key => $value ) { - - //* don't try to store data during revision save - if ( 'revision' === $post->post_type ) - return; - - if ( $value ) { - update_post_meta($post->ID, $key, $value); - } else { - delete_post_meta($post->ID, $key); - } - - } - -} diff --git a/includes/term.php b/includes/term.php deleted file mode 100644 index 562f50a..0000000 --- a/includes/term.php +++ /dev/null @@ -1,69 +0,0 @@ -meta = wp_parse_args( $tag->meta, array( '_ss_sidebar' => '', '_ss_sidebar_alt' => '' ) ); - - //* Pull custom sidebars - $_sidebars = stripslashes_deep( get_option( SS_SETTINGS_FIELD ) ); - -?> - -

- - - - - - - - - - - - -
- -
- -
- -core->get_sidebars(); + +if ( array_key_exists( $_REQUEST['id'], (array) $sidebars ) ) { + $sidebar = stripslashes_deep( $sidebars[ $_REQUEST['id'] ] ); } else { wp_die( __( 'Nice try, partner. But that sidebar doesn\'t exist. Click back and try again.', 'genesis-simple-sidebars' ) ); } - -screen_icon( 'themes' ); ?> -

+?> +

@@ -15,21 +16,21 @@ screen_icon( 'themes' ); ?> - +

- +

- + diff --git a/includes/views/main.php b/includes/views/admin-main.php similarity index 94% rename from includes/views/main.php rename to includes/views/admin-main.php index eedd871..2542455 100644 --- a/includes/views/main.php +++ b/includes/views/admin-main.php @@ -1,5 +1,4 @@ - -

+

@@ -67,4 +66,4 @@
- \ No newline at end of file + diff --git a/includes/views/entry-metabox-content.php b/includes/views/entry-metabox-content.php new file mode 100644 index 0000000..f728049 --- /dev/null +++ b/includes/views/entry-metabox-content.php @@ -0,0 +1,46 @@ +core->get_sidebars(); +global $wp_registered_sidebars; +wp_nonce_field( 'genesis-simple-sidebars-save-entry', 'genesis-simple-sidebars-save-entry-nonce' ); + +if ( is_registered_sidebar( 'header-right' ) ) : ?> +

+ + +

+ +

+ + +

+ +

+ + +

+core->get_sidebars(); ?> + +

+ + + + + + + + + + + + + + +core->has_3_column_layout() ) : ?> + + + + + +
+ +
+ +
+ +
diff --git a/languages/genesis-simple-sidebars.pot b/languages/genesis-simple-sidebars.pot index 16e7420..1c55ce6 100644 --- a/languages/genesis-simple-sidebars.pot +++ b/languages/genesis-simple-sidebars.pot @@ -1,17 +1,17 @@ -# Copyright (C) 2016 Nathan Rice +# Copyright (C) 2015 Nathan Rice # This file is distributed under the GNU General Public License v2.0 (or later). msgid "" msgstr "" -"Project-Id-Version: Genesis Simple Sidebars 2.0.3\n" +"Project-Id-Version: Genesis Simple Sidebars 2.0.2\n" "Report-Msgid-Bugs-To: StudioPress \n" -"POT-Creation-Date: 2016-02-24 19:51:21+00:00\n" +"POT-Creation-Date: 2015-09-29 20:53:32+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n" "Last-Translator: StudioPress \n" "Language-Team: English \n" -"X-Generator: grunt-wp-i18n\n" +"X-Generator: grunt-wp-i18n 0.4.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Basepath: .\n" "X-Poedit-Language: English\n" diff --git a/package.json b/package.json index 88cc5cc..2b7a6f7 100644 --- a/package.json +++ b/package.json @@ -7,21 +7,21 @@ }, "dependencies": {}, "devDependencies": { - "grunt": "*", - "grunt-autoprefixer": "*", - "grunt-checktextdomain": "*", - "grunt-contrib-cssmin": "*", - "grunt-contrib-imagemin": "*", - "grunt-contrib-jshint": "*", - "grunt-contrib-uglify": "*", - "grunt-contrib-watch": "*", - "grunt-csscomb": "*", - "grunt-jsbeautifier": "*", - "grunt-jsvalidate": "*", - "grunt-phplint": "*", - "grunt-styledocco": "*", - "grunt-wp-i18n": "*", - "load-grunt-tasks": "*" + "grunt": "^0.4.5", + "grunt-autoprefixer": "^0.8.1", + "grunt-checktextdomain": "^0.1.1", + "grunt-contrib-cssmin": "^0.10.0", + "grunt-contrib-imagemin": "^0.7.1", + "grunt-contrib-jshint": "^0.10.0", + "grunt-contrib-uglify": "^0.5.0", + "grunt-contrib-watch": "^0.6.1", + "grunt-csscomb": "~2.0.1", + "grunt-jsbeautifier": "^0.2.7", + "grunt-jsvalidate": "^0.2.2", + "grunt-phplint": "0.0.5", + "grunt-styledocco": "^0.1.4", + "grunt-wp-i18n": "^0.4.7", + "load-grunt-tasks": "^0.6.0" }, "plugin": { "name": "Genesis Simple Sidebars", @@ -29,7 +29,7 @@ "description": "Genesis Simple Sidebars allows you to easily create and use new sidebar widget areas.", "author": "StudioPress", "authoruri": "http://www.studiopress.com/", - "version": "2.0.4", + "version": "2.0.2", "license": "GPL-2.0+", "licenseuri": "http://www.gnu.org/licenses/gpl-2.0.html", "textdomain": "genesis-simple-sidebars" diff --git a/plugin.php b/plugin.php index 401ae36..75613e0 100644 --- a/plugin.php +++ b/plugin.php @@ -2,224 +2,19 @@ /* Plugin Name: Genesis Simple Sidebars Plugin URI: http://www.studiopress.com/plugins/simple-sidebars + Description: Genesis Simple Sidebars allows you to easily create and use new sidebar widget areas. + Author: Nathan Rice Author URI: http://www.nathanrice.net/ -Text Domain: genesis-simple-sidebars -Domain Path: /languages +Version: 2.1.0 -Version: 2.0.4 +Text Domain: genesis-simple-sidebars +Domain Path: /languages/ License: GNU General Public License v2.0 (or later) License URI: http://www.opensource.org/licenses/gpl-license.php */ -/** Define our constants */ -define( 'SS_SETTINGS_FIELD', 'ss-settings' ); -define( 'SS_PLUGIN_DIR', dirname( __FILE__ ) ); - -register_activation_hook( __FILE__, 'ss_activation_check' ); -/** - * Activation hook callback. - * - * This functions runs when the plugin is activated. It checks to make sure the user is running - * a minimum Genesis version, so there are no conflicts or fatal errors. - * - * @since 0.9.0 - */ -function ss_activation_check() { - - if ( ! defined( 'PARENT_THEME_VERSION' ) || ! version_compare( PARENT_THEME_VERSION, '2.3.0', '>=' ) ) - ss_deactivate( '2.3.0', '4.4.2' ); - -} - -/** - * Deactivate Simple Sidebars. - * - * This function deactivates Simple Sidebars. - * - * @since 1.0.0 - */ -function ss_deactivate( $genesis_version = '2.3.0', $wp_version = '4.4.2' ) { - - deactivate_plugins( plugin_basename( __FILE__ ) ); - wp_die( sprintf( __( 'Sorry, you cannot run Simple Sidebars without WordPress %s and Genesis %s, or greater.', 'genesis-simple-sidebars' ), $wp_version, 'http://my.studiopress.com/?download_id=91046d629e74d525b3f2978e404e7ffa', $genesis_version ) ); - -} - -add_action( 'genesis_init', 'ss_genesis_init', 12 ); -/** - * Plugin initialization. - * - * Initialize the plugin, set the constants, hook callbacks to actions, and include the plugin library. - * - * @since 0.9.0 - */ -function ss_genesis_init() { - - //* Deactivate if not running Genesis 1.8.0 or greater - if ( ! class_exists( 'Genesis_Admin_Boxes' ) ) - add_action( 'admin_init', 'ss_deactivate', 10, 0 ); - - //* Load translations - load_plugin_textdomain( 'genesis-simple-sidebars', false, 'genesis-simple-sidebars/languages' ); - - //* required hooks - add_action( 'get_header', 'ss_sidebars_init' ); - add_action( 'widgets_init', 'ss_register_sidebars' ); - - //* The rest is admin stuff, so load only if we're in the admin area - if ( ! is_admin() ) - return; - - //* Include admin files - require_once( SS_PLUGIN_DIR . '/includes/admin.php' ); - require_once( SS_PLUGIN_DIR . '/includes/inpost.php' ); - require_once( SS_PLUGIN_DIR . '/includes/term.php' ); - - //* let the child theme hook the genesis_simple_sidebars_taxonomies filter before hooking term edit - add_action( 'init', 'ss_term_edit_init' ); - -} -/** - * Register widget areas. - * - * This function registers the created sidebars as widget areas - * - * @since 0.9.0 - */ -function ss_register_sidebars() { - - $_sidebars = stripslashes_deep( get_option( SS_SETTINGS_FIELD ) ); - - //* If no sidebars have been created, do nothing - if ( ! $_sidebars ) - return; - - //* Cycle through created sidebars, register them as widget areas - foreach ( (array) $_sidebars as $id => $info ) { - - if ( ! isset( $info['name'] ) || ! isset( $info['description'] ) ) { - continue; - } - - genesis_register_sidebar( array( - 'name' => esc_html( $info['name'] ), - 'id' => $id, - 'description' => esc_html( $info['description'] ), - 'editable' => 1, - ) ); - - } - -} - -/** - * Use custom sidebars. - * - * Remove the default sidebars, run some conditional logic, - * use alternate sidebars if necessary, else fallback on default sidebars. - * - * @since 0.9.0 - */ -function ss_sidebars_init() { - - remove_action( 'genesis_sidebar', 'genesis_do_sidebar' ); - remove_action( 'genesis_sidebar_alt', 'genesis_do_sidebar_alt' ); - add_action( 'genesis_sidebar', 'ss_do_sidebar' ); - add_action( 'genesis_sidebar_alt', 'ss_do_sidebar_alt' ); - -} - -/** - * Display primary sidebar. - * - * Display custom sidebar if one exists, else display default primary sidebar. - * - * @since 0.9.0 - */ -function ss_do_sidebar() { - - if ( ! ss_do_one_sidebar( '_ss_sidebar' ) ) - genesis_do_sidebar(); - -} - -/** - * Display secondary sidebar. - * - * Display custom sidebar if one exists, else display default secondary sidebar. - * - * @since 0.9.0 - */ -function ss_do_sidebar_alt() { - - if ( ! ss_do_one_sidebar( '_ss_sidebar_alt' ) ) - genesis_do_sidebar_alt(); - -} - -/** - * Sidebar widget area output. - * - * Helper function to show widgets in a particular sidebar. - * - * @param string $sidebar_key sidebar id you wish to output. - * - * @since 0.9.0 - * - */ -function ss_do_one_sidebar( $sidebar_key = '_ss_sidebar' ) { - - if ( is_singular() && $sidebar_key = genesis_get_custom_field( $sidebar_key ) ) { - if ( dynamic_sidebar( $sidebar_key ) ) { - return true; - } - } - - if ( is_tax() || is_category() || is_tag() ) { - - if ( $sidebar_key = get_term_meta( get_queried_object()->term_id, $sidebar_key, true ) ) { - dynamic_sidebar( $sidebar_key ); - return true; - } - - } - - return false; - -} - -/** - * Return taxonomy ids. - * - * Helper function to return the array keys from a taxonomy query. - * - * @since 0.9.0 - */ -function ss_get_taxonomies() { - - $taxonomies = get_taxonomies( array( 'show_ui' => true, 'public' => true ) ); - return apply_filters( 'genesis_simple_sidebars_taxonomies', array_keys( $taxonomies ) ); - -} - -/** - * Does this Genesis install have the 3 column layouts deactivated? - * - * This function checks to see if the Genesis install still has active 3 column layouts. Since - * child themes and plugins can deregister layouts, we need to know if they have deregistered the 3 column layouts. - * - * @since 0.9.2 - */ -function ss_has_3_column_layouts() { - - $_layouts = (array) genesis_get_layouts(); - $_layouts = array_keys( $_layouts ); - $_3_column = array_intersect( $_layouts, array( 'content-sidebar-sidebar', 'sidebar-content-sidebar', 'sidebar-sidebar-content' ) ); - - return ! empty( $_3_column ); - -} +require_once( plugin_dir_path( __FILE__ ) . 'genesis-simple-sidebars.php' ); diff --git a/readme.txt b/readme.txt index 274d64d..606fa31 100644 --- a/readme.txt +++ b/readme.txt @@ -1,10 +1,10 @@ === Plugin Name === -Contributors: nathanrice, wpmuguru, studiopress +Contributors: nathanrice, wpmuguru Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5553118 Tags: hooks, genesis, genesiswp, studiopress Requires at least: 3.6 Tested up to: 4.5 -Stable tag: 2.0.4 +Stable tag: 2.1.0 This plugin allows you to create multiple, dynamic widget areas, and assign those widget areas to sidebar locations within the Genesis Framework on a per post, per page, or per tag/category archive basis. @@ -37,49 +37,48 @@ Not in the way you're probably thinking. The markup surrounding the widget area == Changelog == -= 2.0.4 = -* Update for WordPress 4.4+ and Genesis 2.3.0+ -* DO NOT upgrade to 2.0.4 unless you are running WordPress 4.4+ AND Genesis 2.3.0+ += 2.1.0 = +* Rewrite based on new plugin boilerplate. = 2.0.3 = -* Fix warnings and notices +* Fix warnings and notices. = 2.0.2 = * Change text domain, update POT file. = 2.0.1 = -* Genesis 2.0.1 compatibility with term meta keys -* Use actual sidebar name, instead of hard coded names -* Fix incorrect textdomain +* Genesis 2.0.1 compatibility with term meta keys. +* Use actual sidebar name, instead of hard coded names. +* Fix incorrect textdomain. = 2.0.0 = -* Compatibility with Genesis 2.0 -* Standards +* Compatibility with Genesis 2.0.0. +* Standards. = 1.0.0 = -* Reorganize theme files +* Reorganize theme files. * Standards = 0.9.2.1 = -* Restore default tag/category support -* Default custom taxonomy support to on for public taxonomies -* Remove secondary selection when no 3 column layouts are enabled +* Restore default tag/category support. +* Default custom taxonomy support to on for public taxonomies. +* Remove secondary selection when no 3 column layouts are enabled. = 0.9.2 = -* Added support for custom taxonomies -* Added translation support -* bug fix to prevent invalid sidebar creation +* Added support for custom taxonomies. +* Added translation support. +* bug fix to prevent invalid sidebar creation. = 0.9.1 = -* Added support for custom post types +* Added support for custom post types. = 0.9 = -* Fixed "is not array" errors reported by users -* Added nonce verification for security purposes -* Added error and success messages -* Bump to pre-release 0.9 branch +* Fixed "is not array" errors reported by users. +* Added nonce verification for security purposes. +* Added error and success messages. +* Bump to pre-release 0.9 branch. = 0.1 = -* Initial Alpha Release +* Initial Alpha Release.