Revert "Update for new term meta handling."

This reverts commit 93a304aa06.

.gitattributes

@@ -0,0 +1,14 @@
+# Default behavior
+* text=auto
+
+# Text files
+*.php text
+*.css text
+*.js text
+*.md text
+
+# Binary files
+*.png binary
+*.jpg binary
+*.gif binary
+*.ico binary

.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+Thumbs.db
+.svn
+node_modules/

.svnignore

@@ -0,0 +1,5 @@
+.git
+.gitignore
+.gitattributes
+.svnignore
+node_modules

Gruntfile.js

@@ -0,0 +1,97 @@
+'use strict';
+
+module.exports = function(grunt) {
+
+	// Load tasks
+	require('load-grunt-tasks')(grunt);
+
+	grunt.initConfig({
+		pkg: grunt.file.readJSON('package.json'),
+
+
+		// Dependencies
+
+		// PHP
+
+		// Lint .php files for syntax errors
+		phplint: {
+			all: [ '*.php',	'lib/**/*.php' ]
+		},
+
+
+		// I18n
+
+		// Add text domain as last argument of i18n functions
+		addtextdomain: {
+			php: {
+				options: {
+					updateDomains: true
+				},
+				src: [
+					'*.php',
+					'lib/**/*.php'
+				]
+			}
+		},
+
+		// Check text domain is last argument of i18n functions
+		checktextdomain: {
+			options: {
+				text_domain: '<%= pkg.name %>',
+				keywords: [
+					'__:1,2d',
+					'_e:1,2d',
+					'_x:1,2c,3d',
+					'_ex:1,2c,3d',
+					'_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_html__:1,2d',
+					'esc_attr_e:1,2d',
+					'esc_html_e:1,2d',
+					'esc_attr_x:1,2c,3d',
+					'esc_html_x:1,2c,3d'
+				]
+			},
+			files: {
+				expand: true,
+				src: [
+					'*.php',
+					'includes/**/*.php'
+				]
+			}
+		},
+
+
+		// Build language .pot file
+		makepot: {
+			plugin: {
+				options: {
+					domainPath: '/languages',
+					processPot: function( pot ) {
+						pot.headers['report-msgid-bugs-to']   = 'StudioPress <translations@studiopress.com>';
+						pot.headers['last-translator']        = 'StudioPress <translations@studiopress.com>';
+						pot.headers['language-team']          = 'English <translations@studiopress.com>';
+						pot.headers['plural-forms']           = 'nplurals=2; plural=n != 1;';
+						pot.headers['x-generator']            = 'grunt-wp-i18n';
+						pot.headers['x-poedit-basepath']      = '.';
+						pot.headers['x-poedit-language']      = 'English';
+						pot.headers['x-poedit-country']       = 'UNITED STATES';
+						pot.headers['x-poedit-sourcecharset'] = 'utf-8';
+						pot.headers['x-poedit-keywordslist']  = '__;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;esc_html_x:1,2c;';
+						pot.headers['x-poedit-bookmarks']     = '';
+						pot.headers['x-poedit-searchpath-0']  = '.';
+						pot.headers['x-textdomain-support']   = 'yes';
+						return pot;
+					},
+					type: 'wp-plugin'
+				}
+			}
+		},
+
+
+	});
+
+};

includes/admin.php

@@ -29,19 +29,19 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 		$menu_ops = array(
 			'submenu' => array(
 				'parent_slug' => 'genesis',
-				'page_title'  => __( 'Genesis - Simple Sidebars', 'ss' ),
-				'menu_title'  => __( 'Simple Sidebars', 'ss' )
+				'page_title'  => __( 'Genesis - Simple Sidebars', 'genesis-simple-sidebars' ),
+				'menu_title'  => __( 'Simple Sidebars', 'genesis-simple-sidebars' )
 			)
 		);
 
-		/** 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, $settings_field );
 
-		/** Simpe Sidebar actions (create, edit, or delete) */
+		//* Simpe Sidebar actions (create, edit, or delete)
 		add_action( 'admin_init', array( $this, 'actions' ) );
 
 	}
@@ -104,8 +104,8 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 					<?php if ( $is_editable ) : ?>
 					<br />
 					<div class="row-actions">
-						<span class="edit"><a href="<?php echo admin_url('admin.php?page=simple-sidebars&amp;action=edit&amp;id=' . esc_html( $id ) ); ?>"><?php _e('Edit', 'ss'); ?></a> | </span>
-						<span class="delete"><a class="delete-tag" href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=simple-sidebars&amp;action=delete&amp;id=' . esc_html( $id ) ), 'simple-sidebars-action_delete-sidebar' ); ?>"><?php _e('Delete', 'ss'); ?></a></span>
+						<span class="edit"><a href="<?php echo admin_url('admin.php?page=simple-sidebars&amp;action=edit&amp;id=' . esc_html( $id ) ); ?>"><?php _e('Edit', 'genesis-simple-sidebars'); ?></a> | </span>
+						<span class="delete"><a class="delete-tag" href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=simple-sidebars&amp;action=delete&amp;id=' . esc_html( $id ) ), 'simple-sidebars-action_delete-sidebar' ); ?>"><?php _e('Delete', 'genesis-simple-sidebars'); ?></a></span>
 					</div>
 					<?php endif; ?>
 
@@ -123,7 +123,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 	 * Action handler.
 	 *
 	 * Depending on what action was intended by the user, this method calls the appropriate action method.
-	 * 
+	 *
 	 * @since 1.0.0
 	 *
 	 */
@@ -170,17 +170,17 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 		$pattern = '<div id="message" class="updated"><p><strong>%s</strong></p></div>';
 
 		if ( isset( $_REQUEST['created'] ) && 'true' === $_REQUEST['created'] ) {
-			printf( $pattern, __( 'New sidebar successfully created!', 'ss' ) );
+			printf( $pattern, __( 'New sidebar successfully created!', 'genesis-simple-sidebars' ) );
 			return;
 		}
 
 		if ( isset( $_REQUEST['edited'] ) && 'true' === $_REQUEST['edited'] ) {
-			printf( $pattern, __( 'Sidebar successfully edited!', 'ss' ) );
+			printf( $pattern, __( 'Sidebar successfully edited!', 'genesis-simple-sidebars' ) );
 			return;
 		}
 
 		if ( isset( $_REQUEST['deleted'] ) && 'true' === $_REQUEST['deleted'] ) {
-			printf( $pattern, __( 'Sidebar successfully deleted.', 'ss' ) );
+			printf( $pattern, __( 'Sidebar successfully deleted.', 'genesis-simple-sidebars' ) );
 			return;
 		}
 
@@ -201,10 +201,10 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 			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
+		//* 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'] );
 
@@ -242,10 +242,10 @@ 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
+		//* 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'] );
 
@@ -283,7 +283,7 @@ 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 );
@@ -316,19 +316,19 @@ 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', 'ss' );
+				return __( 'Oops! Please choose a valid Name and ID for this sidebar', 'genesis-simple-sidebars' );
 				break;
 			case 2:
-				return __( 'Oops! That sidebar ID already exists', 'ss' );
+				return __( 'Oops! That sidebar ID already exists', 'genesis-simple-sidebars' );
 				break;
 			case 3:
-				return __( 'Oops! You are trying to edit a sidebar that does not exist, or is not editable', 'ss' );
+				return __( 'Oops! You are trying to edit a sidebar that does not exist, or is not editable', 'genesis-simple-sidebars' );
 				break;
 			case 4:
-				return __( 'Oops! You are trying to delete a sidebar that does not exist, or cannot be deleted', 'ss' );
+				return __( 'Oops! You are trying to delete a sidebar that does not exist, or cannot be deleted', 'genesis-simple-sidebars' );
 				break;
 			default:
-				return __( 'Oops! Something went wrong. Try again.', 'ss' );
+				return __( 'Oops! Something went wrong. Try again.', 'genesis-simple-sidebars' );
 
 		}
 
@@ -344,6 +344,8 @@ add_action( 'genesis_admin_menu', 'simplesidebars_settings_menu' );
  */
 function simplesidebars_settings_menu() {
 
-	new Genesis_Simple_Sidebars_Admin;
+	global $_genesis_simple_sidebars_admin;
+	
+	$_genesis_simple_sidebars_admin = new Genesis_Simple_Sidebars_Admin;
 
-}
+}

includes/inpost.php

@@ -1,15 +1,15 @@
 <?php
+add_action('admin_menu', 'ss_add_inpost_metabox');
 /**
  * This bit of code registers the meta box on posts/pages,
  * so that users can choose what sidebar to use.
  */
-add_action('admin_menu', 'ss_add_inpost_metabox');
 function ss_add_inpost_metabox() {
 
-	foreach ( (array)get_post_types( array( 'public' => true ) ) as $type ) {
+	foreach ( (array) get_post_types( array( 'public' => true ) ) as $type ) {
 
 		if ( post_type_supports( $type, 'genesis-simple-sidebars' ) || $type == 'post' || $type == 'page' ) {
-			add_meta_box('ss_inpost_metabox', __('Sidebar Selection', 'ss'), 'ss_inpost_metabox', $type, 'side', 'low');
+			add_meta_box( 'ss_inpost_metabox', __( 'Sidebar Selection', 'genesis-simple-sidebars' ), 'ss_inpost_metabox', $type, 'side', 'low' );
 		}
 
 	}
@@ -19,79 +19,84 @@ function ss_add_inpost_metabox() {
 function ss_inpost_metabox() {
 
 	$_sidebars = stripslashes_deep( get_option( SS_SETTINGS_FIELD ) );
+	global $wp_registered_sidebars;
 
 ?>
 
-	<input type="hidden" name="ss_inpost_nonce" value="<?php echo wp_create_nonce(plugin_basename(__FILE__)); ?>" />
+	<input type="hidden" name="ss_inpost_nonce" value="<?php echo wp_create_nonce( plugin_basename( __FILE__ ) ); ?>" />
+
+<?php
+	if( isset( $wp_registered_sidebars['sidebar'] ) ) {
+?>
 
 	<p>
-		<label class="howto" for="_ss_sidebar"><span><?php _e('Primary Sidebar', 'ss'); ?><span></label>
+		<label class="howto" for="_ss_sidebar"><span><?php echo esc_attr( $wp_registered_sidebars['sidebar']['name'] ); ?><span></label>
 		<select name="_ss_sidebar" id="_ss_sidebar" style="width: 99%">
-			<option value=""><?php _e('Default', 'ss'); ?></option>
+			<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
 			<?php
-			foreach ( (array)$_sidebars as $id => $info ) {
-				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field('_ss_sidebar'), false), esc_html( $info['name'] ) );
+			foreach ( (array) $_sidebars as $id => $info ) {
+				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field( '_ss_sidebar' ), false), esc_html( $info['name'] ) );
 			}
 			?>
 		</select>
 	</p>
 <?php
-	// don't show the option if there are no 3 column layouts registered
-	if ( ! ss_has_3_column_layouts() )
-		return;
+	}
+	if( isset( $wp_registered_sidebars['sidebar-alt'] ) ) {
 ?>
 	<p>
-		<label class="howto" for="_ss_sidebar_alt"><span><?php _e('Secondary Sidebar', 'ss'); ?><span></label>
+		<label class="howto" for="_ss_sidebar_alt"><span><?php echo esc_attr( $wp_registered_sidebars['sidebar-alt']['name'] ); ?><span></label>
 		<select name="_ss_sidebar_alt" id="_ss_sidebar_alt" style="width: 99%">
-			<option value=""><?php _e('Default', 'ss'); ?></option>
+			<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
 			<?php
-			foreach ( (array)$_sidebars as $id => $info ) {
-				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field('_ss_sidebar_alt'), false), esc_html( $info['name'] ) );
+			foreach ( (array) $_sidebars as $id => $info ) {
+				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field( '_ss_sidebar_alt' ), false ), esc_html( $info['name'] ) );
 			}
 			?>
 		</select>
 	</p>
 
 <?php
+	}
 }
 
+add_action( 'save_post', 'ss_inpost_metabox_save', 1, 2 );
 /**
  * This bit of code saves the sidebars chosen as post meta.
  */
-add_action('save_post', 'ss_inpost_metabox_save', 1, 2);
 function ss_inpost_metabox_save( $post_id, $post ) {
 
-	//	verify the nonce
+	//* verify the nonce
 	if ( !isset($_POST['ss_inpost_nonce']) || !wp_verify_nonce( $_POST['ss_inpost_nonce'], plugin_basename(__FILE__) ) )
 		return $post->ID;
 
-	//	don't try to save the data under autosave, ajax, or future post.
+	//* 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 ) )
+	//* 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' => $_POST['_ss_sidebar'],
-		'_ss_sidebar_alt' => $_POST['_ss_sidebar_alt']
+		'_ss_sidebar'     => $_POST['_ss_sidebar'],
+		'_ss_sidebar_alt' => $_POST['_ss_sidebar_alt'],
 	);
 
-	//	store the custom fields
+	//* store the custom fields
 	foreach ( $_sidebars as $key => $value ) {
 
-		if ( $post->post_type == 'revision' ) return; // don't try to store data during revision save
+		//* don't try to store data during revision save
+		if ( 'revision' === $post->post_type )
+			return;
 
 		if ( $value ) {
-			//	save/update
 			update_post_meta($post->ID, $key, $value);
 		} else {
-			//	delete if blank
 			delete_post_meta($post->ID, $key);
 		}
 
 	}
 
-}
+}

includes/term.php

@@ -19,24 +19,24 @@ function ss_term_edit_init() {
 
 function ss_term_sidebar($tag, $taxonomy) {
 
-	// Merge Defaults to prevent notices
+	//* Merge Defaults to prevent notices
 	$tag->meta = wp_parse_args( $tag->meta, array( '_ss_sidebar' => '', '_ss_sidebar_alt' => '' ) );
 
-	// Pull custom sidebars
+	//* Pull custom sidebars
 	$_sidebars = stripslashes_deep( get_option( SS_SETTINGS_FIELD ) );
 
 ?>
 
-	<h3><?php _e('Sidebar Options', 'ss'); ?></h3>
+	<h3><?php _e( 'Sidebar Options', 'genesis-simple-sidebars' ); ?></h3>
 	<table class="form-table">
 
 	<tr class="form-field">
-		<th scope="row" valign="top"><label for="meta[_ss_sidebar]"><?php _e('Primary Sidebar', 'ss'); ?></label></th>
+		<th scope="row" valign="top"><label for="genesis-meta[_ss_sidebar]"><?php _e( 'Primary Sidebar', 'genesis-simple-sidebars' ); ?></label></th>
 		<td>
-			<select name="meta[_ss_sidebar]" id="meta[_ss_sidebar]" style="padding-right: 10px;">
-				<option value=""><?php _e('Default', 'ss'); ?></option>
+			<select name="genesis-meta[_ss_sidebar]" id="genesis-meta[_ss_sidebar]" style="padding-right: 10px;">
+				<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
 				<?php
-				foreach ( (array)$_sidebars as $id => $info ) {
+				foreach ( (array) $_sidebars as $id => $info ) {
 					printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, $tag->meta['_ss_sidebar'] , false), esc_html( $info['name'] ) );
 				}
 				?>
@@ -44,16 +44,16 @@ function ss_term_sidebar($tag, $taxonomy) {
 		</td>
 	</tr>
 <?php
-	// don't show the option if there are no 3 column layouts registered
+	//* don't show the option if there are no 3 column layouts registered
 	if ( ss_has_3_column_layouts() ) {
 ?>
 	<tr class="form-field">
-		<th scope="row" valign="top"><label for="meta[_ss_sidebar_alt]"><?php _e('Secondary Sidebar', 'ss'); ?></label></th>
+		<th scope="row" valign="top"><label for="genesis-meta[_ss_sidebar_alt]"><?php _e( 'Secondary Sidebar', 'genesis-simple-sidebars' ); ?></label></th>
 		<td>
-			<select name="meta[_ss_sidebar_alt]" id="meta[_ss_sidebar_alt]" style="padding-right: 10px;">
-				<option value=""><?php _e('Default', 'ss'); ?></option>
+			<select name="genesis-meta[_ss_sidebar_alt]" id="genesis-meta[_ss_sidebar_alt]" style="padding-right: 10px;">
+				<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
 				<?php
-				foreach ( (array)$_sidebars as $id => $info ) {
+				foreach ( (array) $_sidebars as $id => $info ) {
 					printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, $tag->meta['_ss_sidebar_alt'] , false), esc_html( $info['name'] ) );
 				}
 				?>
@@ -66,4 +66,4 @@ function ss_term_sidebar($tag, $taxonomy) {
 	</table>
 
 <?php
-}
+}

includes/views/edit.php

@@ -2,38 +2,38 @@
 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.', 'ss' ) );
+	wp_die( __( 'Nice try, partner. But that sidebar doesn\'t exist. Click back and try again.', 'genesis-simple-sidebars' ) );
 }
 
-screen_icon('themes'); ?>
-<h2><?php _e('Edit Sidebar', 'ss'); ?></h2>
+screen_icon( 'themes' ); ?>
+<h2><?php _e( 'Edit Sidebar', 'genesis-simple-sidebars' ); ?></h2>
 
 <form method="post" action="<?php echo admin_url( 'admin.php?page=simple-sidebars&amp;action=edit' ); ?>">
-<?php wp_nonce_field('simple-sidebars-action_edit-sidebar'); ?>
+<?php wp_nonce_field( 'simple-sidebars-action_edit-sidebar' ); ?>
 
 <table class="form-table">
 
 	<tr class="form-field">
-		<th scope="row" valign="top"><label for="edit_sidebar[name]"><?php _e('Name', 'ss'); ?></label></th>
+		<th scope="row" valign="top"><label for="edit_sidebar[name]"><?php _e( 'Name', 'genesis-simple-sidebars' ); ?></label></th>
 		<td><input name="edit_sidebar[name]" id="edit_sidebar[name]" type="text" value="<?php echo esc_html( $_sidebar['name'] ); ?>" size="40" />
-		<p class="description"><?php _e('A recognizable name for your new sidebar widget area', 'ss'); ?></p></td>
+		<p class="description"><?php _e( 'A recognizable name for your new sidebar widget area', 'genesis-simple-sidebars' ); ?></p></td>
 	</tr>
 
 	<tr class="form-field">
-		<th scope="row" valign="top"><label for="edit_sidebar[id]"><?php _e('ID', 'ss'); ?></label></th>
+		<th scope="row" valign="top"><label for="edit_sidebar[id]"><?php _e( 'ID', 'genesis-simple-sidebars' ); ?></label></th>
 		<td>
-		<input type="text" value="<?php echo esc_html( $_REQUEST['id'] ); ?>" size="40" disabled="disabled" />
+		<input type="text" value="<?php echo esc_html( $_REQUEST['id'] ); ?>" size="40" readonly />
 		<input name="edit_sidebar[id]" id="edit_sidebar[id]" type="hidden" value="<?php echo esc_html( $_REQUEST['id'] ); ?>" size="40" />
-		<p class="description"><?php _e('The unique ID is used to register the sidebar widget area (cannot be changed)', 'ss'); ?></p></td>
+		<p class="description"><?php _e( 'The unique ID is used to register the sidebar widget area (cannot be changed)', 'genesis-simple-sidebars' ); ?></p></td>
 	</tr>
 
 	<tr class="form-field">
-		<th scope="row" valign="top"><label for="edit_sidebar[description]"><?php _e('Description', 'ss'); ?></label></th>
+		<th scope="row" valign="top"><label for="edit_sidebar[description]"><?php _e( 'Description', 'genesis-simple-sidebars' ); ?></label></th>
 		<td><textarea name="edit_sidebar[description]" id="edit_sidebar[description]" rows="3" cols="50" style="width: 97%;"><?php echo esc_html( $_sidebar['description'] ); ?></textarea></td>
 	</tr>
 
 </table>
 
-<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update', 'ss'); ?>" /></p>
+<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e( 'Update', 'genesis-simple-sidebars' ); ?>" /></p>
 
-</form>
+</form>

includes/views/main.php

@@ -1,26 +1,26 @@
-<?php screen_icon('themes'); ?>
-<h2><?php _e('Genesis - Simple Sidebars', 'ss'); ?></h2>
+<?php screen_icon( 'themes' ); ?>
+<h2><?php _e( 'Genesis - Simple Sidebars', 'genesis-simple-sidebars' ); ?></h2>
 
 <div id="col-container">
 
 <div id="col-right">
 <div class="col-wrap">
 
-<h3><?php _e('Current Sidebars', 'ss'); ?></h3>
+<h3><?php _e( 'Current Sidebars', 'genesis-simple-sidebars' ); ?></h3>
 <table class="widefat tag fixed" cellspacing="0">
 	<thead>
 	<tr>
-	<th scope="col" id="name" class="manage-column column-name"><?php _e('Name', 'ss'); ?></th>
-	<th scope="col" class="manage-column column-slug"><?php _e('ID', 'ss'); ?></th>
-	<th scope="col" id="description" class="manage-column column-description"><?php _e('Description', 'ss'); ?></th>
+	<th scope="col" id="name" class="manage-column column-name"><?php _e( 'Name', 'genesis-simple-sidebars' ); ?></th>
+	<th scope="col" class="manage-column column-slug"><?php _e( 'ID', 'genesis-simple-sidebars' ); ?></th>
+	<th scope="col" id="description" class="manage-column column-description"><?php _e( 'Description', 'genesis-simple-sidebars' ); ?></th>
 	</tr>
 	</thead>
 
 	<tfoot>
 	<tr>
-	<th scope="col" class="manage-column column-name"><?php _e('Name', 'ss'); ?></th>
-	<th scope="col" class="manage-column column-slug"><?php _e('ID', 'ss'); ?></th>
-	<th scope="col" class="manage-column column-description"><?php _e('Description', 'ss'); ?></th>
+	<th scope="col" class="manage-column column-name"><?php _e( 'Name', 'genesis-simple-sidebars' ); ?></th>
+	<th scope="col" class="manage-column column-slug"><?php _e( 'ID', 'genesis-simple-sidebars' ); ?></th>
+	<th scope="col" class="manage-column column-description"><?php _e( 'Description', 'genesis-simple-sidebars' ); ?></th>
 	</tr>
 	</tfoot>
 
@@ -39,29 +39,29 @@
 
 
 <div class="form-wrap">
-<h3><?php _e('Add New Sidebar', 'ss'); ?></h3>
+<h3><?php _e( 'Add New Sidebar', 'genesis-simple-sidebars' ); ?></h3>
 
 <form method="post" action="<?php echo admin_url( 'admin.php?page=simple-sidebars&amp;action=create' ); ?>">
-<?php wp_nonce_field('simple-sidebars-action_create-sidebar'); ?>
+<?php wp_nonce_field( 'simple-sidebars-action_create-sidebar' ); ?>
 
 <div class="form-field form-required">
-	<label for="sidebar-name"><?php _e('Name', 'ss'); ?></label>
+	<label for="sidebar-name"><?php _e( 'Name', 'genesis-simple-sidebars' ); ?></label>
 	<input name="new_sidebar[name]" id="sidebar-name" type="text" value="" size="40" aria-required="true" />
-	<p><?php _e('A recognizable name for your new sidebar widget area', 'ss'); ?></p>
+	<p><?php _e( 'A recognizable name for your new sidebar widget area', 'genesis-simple-sidebars' ); ?></p>
 </div>
 
 <div class="form-field">
-	<label for="sidebar-id"><?php _e('ID', 'ss'); ?></label>
+	<label for="sidebar-id"><?php _e( 'ID', 'genesis-simple-sidebars' ); ?></label>
 	<input name="new_sidebar[id]" id="sidebar-id" type="text" value="" size="40" />
-	<p><?php _e('The unique ID is used to register the sidebar widget area', 'ss'); ?></p>
+	<p><?php _e( 'The unique ID is used to register the sidebar widget area', 'genesis-simple-sidebars' ); ?></p>
 </div>
 
 <div class="form-field">
-	<label for="sidebar-description"><?php _e('Description', 'ss'); ?></label>
+	<label for="sidebar-description"><?php _e( 'Description', 'genesis-simple-sidebars' ); ?></label>
 	<textarea name="new_sidebar[description]" id="sidebar-description" rows="5" cols="40"></textarea>
 </div>
 
-<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php _e('Add New Sidebar', 'ss'); ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php _e( 'Add New Sidebar', 'genesis-simple-sidebars' ); ?>" /></p>
 </form></div>
 
 </div>

languages/genesis-simple-sidebars.pot

@@ -0,0 +1,175 @@
+# Copyright (C) 2016 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"
+"Report-Msgid-Bugs-To: StudioPress <translations@studiopress.com>\n"
+"POT-Creation-Date: 2016-02-24 19:51:21+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"
+"Last-Translator: StudioPress <translations@studiopress.com>\n"
+"Language-Team: English <translations@studiopress.com>\n"
+"X-Generator: grunt-wp-i18n\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-Country: UNITED STATES\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-KeywordsList: "
+"__;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;_nx_noop:1,2,3c;esc_"
+"attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;esc_html_x:1,2c;\n"
+"X-Poedit-Bookmarks: \n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Textdomain-Support: yes\n"
+
+#: includes/admin.php:32 includes/views/main.php:2
+msgid "Genesis - Simple Sidebars"
+msgstr ""
+
+#: includes/admin.php:33
+msgid "Simple Sidebars"
+msgstr ""
+
+#: includes/admin.php:107
+msgid "Edit"
+msgstr ""
+
+#: includes/admin.php:108
+msgid "Delete"
+msgstr ""
+
+#: includes/admin.php:173
+msgid "New sidebar successfully created!"
+msgstr ""
+
+#: includes/admin.php:178
+msgid "Sidebar successfully edited!"
+msgstr ""
+
+#: includes/admin.php:183
+msgid "Sidebar successfully deleted."
+msgstr ""
+
+#: includes/admin.php:319
+msgid "Oops! Please choose a valid Name and ID for this sidebar"
+msgstr ""
+
+#: includes/admin.php:322
+msgid "Oops! That sidebar ID already exists"
+msgstr ""
+
+#: includes/admin.php:325
+msgid ""
+"Oops! You are trying to edit a sidebar that does not exist, or is not "
+"editable"
+msgstr ""
+
+#: includes/admin.php:328
+msgid ""
+"Oops! You are trying to delete a sidebar that does not exist, or cannot be "
+"deleted"
+msgstr ""
+
+#: includes/admin.php:331
+msgid "Oops! Something went wrong. Try again."
+msgstr ""
+
+#: includes/inpost.php:12
+msgid "Sidebar Selection"
+msgstr ""
+
+#: includes/inpost.php:35 includes/inpost.php:50 includes/term.php:37
+#: includes/term.php:54
+msgid "Default"
+msgstr ""
+
+#: includes/term.php:30
+msgid "Sidebar Options"
+msgstr ""
+
+#: includes/term.php:34
+msgid "Primary Sidebar"
+msgstr ""
+
+#: includes/term.php:51
+msgid "Secondary Sidebar"
+msgstr ""
+
+#: includes/views/edit.php:5
+msgid "Nice try, partner. But that sidebar doesn't exist. Click back and try again."
+msgstr ""
+
+#: includes/views/edit.php:9
+msgid "Edit Sidebar"
+msgstr ""
+
+#: includes/views/edit.php:17 includes/views/main.php:13
+#: includes/views/main.php:21 includes/views/main.php:48
+msgid "Name"
+msgstr ""
+
+#: includes/views/edit.php:19 includes/views/main.php:50
+msgid "A recognizable name for your new sidebar widget area"
+msgstr ""
+
+#: includes/views/edit.php:23 includes/views/main.php:14
+#: includes/views/main.php:22 includes/views/main.php:54
+msgid "ID"
+msgstr ""
+
+#: includes/views/edit.php:27
+msgid ""
+"The unique ID is used to register the sidebar widget area (cannot be "
+"changed)"
+msgstr ""
+
+#: includes/views/edit.php:31 includes/views/main.php:15
+#: includes/views/main.php:23 includes/views/main.php:60
+msgid "Description"
+msgstr ""
+
+#: includes/views/edit.php:37
+msgid "Update"
+msgstr ""
+
+#: includes/views/main.php:9
+msgid "Current Sidebars"
+msgstr ""
+
+#: includes/views/main.php:42 includes/views/main.php:64
+msgid "Add New Sidebar"
+msgstr ""
+
+#: includes/views/main.php:56
+msgid "The unique ID is used to register the sidebar widget area"
+msgstr ""
+
+#: plugin.php:48
+msgid ""
+"Sorry, you cannot run Simple Sidebars without WordPress %s and <a "
+"href=\"%s\">Genesis %s</a>, or greater."
+msgstr ""
+
+#. Plugin Name of the plugin/theme
+msgid "Genesis Simple Sidebars"
+msgstr ""
+
+#. Plugin URI of the plugin/theme
+msgid "http://www.studiopress.com/plugins/simple-sidebars"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid ""
+"Genesis Simple Sidebars allows you to easily create and use new sidebar "
+"widget areas."
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Nathan Rice"
+msgstr ""
+
+#. Author URI of the plugin/theme
+msgid "http://www.nathanrice.net/"
+msgstr ""

languages/ss.po

@@ -1,148 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-06 21:23-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: admin.php:17
-msgid "Simple Sidebars"
-msgstr ""
-
-#: admin.php:66
-msgid ""
-"Nice try, partner. But that sidebar doesn't exist. Click back and try again."
-msgstr ""
-
-#: admin.php:72
-msgid "Edit Sidebar"
-msgstr ""
-
-#: admin.php:79 admin.php:117 admin.php:125 admin.php:152
-msgid "Name"
-msgstr ""
-
-#: admin.php:81 admin.php:154
-msgid "A recognizable name for your new sidebar widget area"
-msgstr ""
-
-#: admin.php:85 admin.php:118 admin.php:126 admin.php:158
-msgid "ID"
-msgstr ""
-
-#: admin.php:89
-msgid ""
-"The unique ID is used to register the sidebar widget area (cannot be changed)"
-msgstr ""
-
-#: admin.php:93 admin.php:119 admin.php:127 admin.php:164
-msgid "Description"
-msgstr ""
-
-#: admin.php:99
-msgid "Update"
-msgstr ""
-
-#: admin.php:106
-msgid "Genesis - Simple Sidebars"
-msgstr ""
-
-#: admin.php:113
-msgid "Current Sidebars"
-msgstr ""
-
-#: admin.php:146 admin.php:168
-msgid "Add New Sidebar"
-msgstr ""
-
-#: admin.php:160
-msgid "The unique ID is used to register the sidebar widget area"
-msgstr ""
-
-#: functions.php:28
-msgid "Edit"
-msgstr ""
-
-#: functions.php:29
-msgid "Delete"
-msgstr ""
-
-#: functions.php:137
-msgid "Oops! Please choose a valid Name and ID for this sidebar"
-msgstr ""
-
-#: functions.php:140
-msgid "Oops! That sidebar ID already exists"
-msgstr ""
-
-#: functions.php:143
-msgid ""
-"Oops! You are trying to edit a sidebar that does not exist, or is not "
-"editable"
-msgstr ""
-
-#: functions.php:146
-msgid ""
-"Oops! You are trying to delete a sidebar that does not exist, or cannot be "
-"deleted"
-msgstr ""
-
-#: functions.php:149
-msgid "Oops! Something went wrong. Try again."
-msgstr ""
-
-#: functions.php:165
-msgid "New sidebar successfully created!"
-msgstr ""
-
-#: functions.php:170
-msgid "Sidebar successfully edited!"
-msgstr ""
-
-#: functions.php:175
-msgid "Sidebar successfully deleted."
-msgstr ""
-
-#: inpost.php:10
-msgid "Sidebar Selection"
-msgstr ""
-
-#: inpost.php:22 term.php:29
-msgid "Primary Sidebar"
-msgstr ""
-
-#: inpost.php:24 inpost.php:36 term.php:32 term.php:46
-msgid "Default"
-msgstr ""
-
-#: inpost.php:34 term.php:43
-msgid "Secondary Sidebar"
-msgstr ""
-
-#: plugin.php:21
-#, php-format
-msgid ""
-"Sorry, you can't activate unless you have installed <a href=\"%s\">Genesis</"
-"a>"
-msgstr ""
-
-#: plugin.php:26
-#, php-format
-msgid ""
-"Sorry, you cannot activate without <a href=\"%s\">Genesis %s</a> or greater"
-msgstr ""
-
-#: term.php:25
-msgid "Sidebar Options"
-msgstr ""

package.json

@@ -0,0 +1,37 @@
+{
+  "name": "genesis-simple-sidebars",
+  "description": "Development files for the Genesis Simple Sidebars plugin.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/copyblogger/genesis-simple-sidebars"
+  },
+  "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": "*"
+  },
+  "plugin": {
+    "name": "Genesis Simple Sidebars",
+    "uri": "https://github.com/copyblogger/genesis-simple-sidebars",
+    "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.3",
+    "license": "GPL-2.0+",
+    "licenseuri": "http://www.gnu.org/licenses/gpl-2.0.html",
+    "textdomain": "genesis-simple-sidebars"
+  }
+}

plugin.php

@@ -6,10 +6,10 @@ Description: Genesis Simple Sidebars allows you to easily create and use new sid
 Author: Nathan Rice
 Author URI: http://www.nathanrice.net/
 
-Text Domain: ss
-Domain Path: /languages/
+Text Domain: genesis-simple-sidebars
+Domain Path: /languages
 
-Version: 1.0.0
+Version: 2.0.2
 
 License: GNU General Public License v2.0 (or later)
 License URI: http://www.opensource.org/licenses/gpl-license.php
@@ -30,9 +30,8 @@ register_activation_hook( __FILE__, 'ss_activation_check' );
  */
 function ss_activation_check() {
 
-	if ( 'genesis' != basename( TEMPLATEPATH ) ) {
-		ss_deactivate( '1.8.0', '3.3' );
-	}
+	if ( ! defined( 'PARENT_THEME_VERSION' ) || ! version_compare( PARENT_THEME_VERSION, '2.0.0', '>=' ) )
+		ss_deactivate( '2.0.0', '3.6' );
 
 }
 
@@ -46,7 +45,7 @@ function ss_activation_check() {
 function ss_deactivate( $genesis_version = '1.8.0', $wp_version = '3.3' ) {
 
 	deactivate_plugins( plugin_basename( __FILE__ ) );
-	wp_die( sprintf( __( 'Sorry, you cannot run Simple Sidebars without WordPress %s and <a href="%s">Genesis %s</a>, or greater.', 'ss' ), $wp_version, 'http://www.studiopress.com/support/showthread.php?t=19576', $genesis_version ) );
+	wp_die( sprintf( __( 'Sorry, you cannot run Simple Sidebars without WordPress %s and <a href="%s">Genesis %s</a>, or greater.', 'genesis-simple-sidebars' ), $wp_version, 'http://my.studiopress.com/?download_id=91046d629e74d525b3f2978e404e7ffa', $genesis_version ) );
 
 }
 
@@ -60,27 +59,27 @@ add_action( 'genesis_init', 'ss_genesis_init', 12 );
  */
 function ss_genesis_init() {
 
-	/** Deactivate if not running Genesis 1.8.0 or greater */
+	//* 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( 'ss', false, 'genesis-simple-sidebars/languages' );
+	//* Load translations
+	load_plugin_textdomain( 'genesis-simple-sidebars', false, 'genesis-simple-sidebars/languages' );
 
-	/** required hooks */
+	//* 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 */
+	//* The rest is admin stuff, so load only if we're in the admin area
 	if ( ! is_admin() )
 		return;
 
-	/** Include admin files */
+	//* 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 */
+	//* let the child theme hook the genesis_simple_sidebars_taxonomies filter before hooking term edit
 	add_action( 'init', 'ss_term_edit_init' );
 
 }
@@ -95,23 +94,18 @@ function ss_register_sidebars() {
 
 	$_sidebars = stripslashes_deep( get_option( SS_SETTINGS_FIELD ) );
 
-	/** If no sidebars have been created, do nothing */
+	//* If no sidebars have been created, do nothing
 	if ( ! $_sidebars )
 		return;
 
-	/** Cycle through created sidebars, register them as widget areas */
+	//* Cycle through created sidebars, register them as widget areas
 	foreach ( (array) $_sidebars as $id => $info ) {
 
-		register_sidebar( array(
-			'name' => esc_html( $info['name'] ),
-			'id' => $id,
+		genesis_register_sidebar( array(
+			'name'        => esc_html( $info['name'] ),
+			'id'          => $id,
 			'description' => esc_html( $info['description'] ),
-			'editable' => 1,
-
-			'before_widget' => '<div id="%1$s" class="widget %2$s"><div class="widget-wrap">',
-			'after_widget'  => "</div></div>\n",
-			'before_title'  => '<h4 class="widgettitle">',
-			'after_title'   => "</h4>\n"
+			'editable'    => 1,
 		) );
 
 	}

readme.txt

@@ -1,16 +1,16 @@
 === Plugin Name ===
-Contributors: nathanrice, wpmuguru
+Contributors: nathanrice, wpmuguru, studiopress
 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.0
-Tested up to: 3.3
-Stable tag: 0.9.2.1
+Requires at least: 4.4.2
+Tested up to: 4.4.2
+Stable tag: 2.0.3
 
-This plugin allows you to create multiple, dynamic widget areas, and assign those widget areas to sidebar locations within the Genesis Theme Framework on a per post, per page, or per tag/category archive basis.
+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.
 
 == Description ==
 
-This plugin allows you to create multiple, dynamic widget areas, and assign those widget areas to sidebar locations within the Genesis Theme Framework on a per post, per page, or per tag/category archive basis.
+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.
 
 Creating widget areas programmatically, then using conditional logic to properly assign them to sidebar locations can be a complex task for a beginner. This plugin allows you to do all this from a simple administration menu, and assign widget areas to sidebar locations with simple drop-down menus within the post/page edit screens, or when editing a tag or category.
 
@@ -37,8 +37,38 @@ Not in the way you're probably thinking. The markup surrounding the widget area
 
 == Changelog ==
 
-= 0.1 =
-* Initial Alpha Release
+= 2.0.3 =
+* Update for WordPress 4.4+ and Genesis 2.2.7+
+* DO NOT upgrade to 2.0.3 unless you are running WordPress 4.4+ AND Genesis 2.2.7+
+
+= 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
+
+= 2.0.0 =
+* Compatibility with Genesis 2.0
+* Standards
+
+= 1.0.0 =
+* 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
+
+= 0.9.2 =
+* Added support for custom taxonomies
+* Added translation support
+* bug fix to prevent invalid sidebar creation
+
+= 0.9.1 =
+* Added support for custom post types
 
 = 0.9 =
 * Fixed "is not array" errors reported by users
@@ -46,16 +76,7 @@ Not in the way you're probably thinking. The markup surrounding the widget area
 * Added error and success messages
 * Bump to pre-release 0.9 branch
 
-= 0.9.1 =
-* Added support for custom post types
+= 0.1 =
+* Initial Alpha Release
 
-= 0.9.2 =
-* Added support for custom taxonomies
-* Added translation support
-* bug fix to prevent invalid sidebar creation
-
-= 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