Merge branch 'develop'

addresses #9

Gruntfile.js

@@ -27,11 +27,15 @@ module.exports = function(grunt) {
 				options: {
 					updateDomains: true
 				},
+				target: {
+					files: {
 						src: [
 							'*.php',
 							'lib/**/*.php'
 						]
 					}
+				}
+			}
 		},
 
 		// Check text domain is last argument of i18n functions
@@ -75,7 +79,7 @@ module.exports = function(grunt) {
 						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-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';

includes/inpost.php

@@ -6,6 +6,12 @@ add_action('admin_menu', 'ss_add_inpost_metabox');
  */
 function ss_add_inpost_metabox() {
 
+	global $wp_registered_sidebars;
+
+	if( ! array_key_exists( 'sidebar', $wp_registered_sidebars ) && ! array_key_exists( 'sidebar-alt', $wp_registered_sidebars ) ){
+		return;
+	}
+	
 	foreach ( (array) get_post_types( array( 'public' => true ) ) as $type ) {
 
 		if ( post_type_supports( $type, 'genesis-simple-sidebars' ) || $type == 'post' || $type == 'page' ) {

includes/views/edit.php

@@ -22,7 +22,7 @@ screen_icon( 'themes' ); ?>
 	<tr class="form-field">
 		<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" readonly />
+		<input type="text" value="<?php echo esc_html( $_REQUEST['id'] ); ?>" size="40" disabled="disabled" />
 		<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)', 'genesis-simple-sidebars' ); ?></p></td>
 	</tr>

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 <translations@studiopress.com>\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 <translations@studiopress.com>\n"
 "Language-Team: English <translations@studiopress.com>\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"

package.json

@@ -7,21 +7,21 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "grunt": "*",
+    "grunt": "^0.4.5",
-    "grunt-autoprefixer": "*",
+    "grunt-autoprefixer": "^0.8.1",
-    "grunt-checktextdomain": "*",
+    "grunt-checktextdomain": "^0.1.1",
-    "grunt-contrib-cssmin": "*",
+    "grunt-contrib-cssmin": "^0.10.0",
-    "grunt-contrib-imagemin": "*",
+    "grunt-contrib-imagemin": "^0.7.1",
-    "grunt-contrib-jshint": "*",
+    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-uglify": "*",
+    "grunt-contrib-uglify": "^0.5.0",
-    "grunt-contrib-watch": "*",
+    "grunt-contrib-watch": "^0.6.1",
-    "grunt-csscomb": "*",
+    "grunt-csscomb": "~2.0.1",
-    "grunt-jsbeautifier": "*",
+    "grunt-jsbeautifier": "^0.2.7",
-    "grunt-jsvalidate": "*",
+    "grunt-jsvalidate": "^0.2.2",
-    "grunt-phplint": "*",
+    "grunt-phplint": "0.0.5",
-    "grunt-styledocco": "*",
+    "grunt-styledocco": "^0.1.4",
-    "grunt-wp-i18n": "*",
+    "grunt-wp-i18n": "^0.4.7",
-    "load-grunt-tasks": "*"
+    "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.3",
+    "version": "2.0.2",
     "license": "GPL-2.0+",
     "licenseuri": "http://www.gnu.org/licenses/gpl-2.0.html",
     "textdomain": "genesis-simple-sidebars"

plugin.php

@@ -7,7 +7,7 @@ Author: Nathan Rice
 Author URI: http://www.nathanrice.net/
 
 Text Domain: genesis-simple-sidebars
-Domain Path: /languages
+Domain Path: /languages/
 
 Version: 2.0.2
 

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: 4.4.2
+Requires at least: 3.6
-Tested up to: 4.4.2
+Tested up to: 4.3.1
-Stable tag: 2.0.3
+Stable tag: 2.0.2
 
 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,10 +37,6 @@ Not in the way you're probably thinking. The markup surrounding the widget area
 
 == Changelog ==
 
-= 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.