Merge pull request #3 from JoryHogeveen/dev

v0.2.0.1

Author: JoryHogeveen

includes/off-canvas-sidebars-menu-meta-box.class.php

@@ -46,7 +46,8 @@ function add_meta_box() {
 	}
 
 	function meta_box() {
-		global $_nav_menu_placeholder, $nav_menu_selected_id, $off_canvas_sidebars;
+		global $_nav_menu_placeholder, $nav_menu_selected_id;
+		$off_canvas_sidebars = Off_Canvas_Sidebars();
 		$_nav_menu_placeholder = 0 > $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1;
 		?>
 		<div class="off-canvas-control-meta-box posttypediv" id="off-canvas-control-meta-box">
@@ -142,7 +143,7 @@ public function admin_enqueue_scripts() {
 	 * @param 	int 	$menu_item_db_id
 	 */
 	public function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0 ) {
-		global $off_canvas_sidebars;
+		$off_canvas_sidebars = Off_Canvas_Sidebars();
 		if (empty($_POST['menu-item-url'][$menu_item_db_id]) || $_POST['menu-item-url'][$menu_item_db_id] != '#off_canvas_control')
 			return;
 

includes/off-canvas-sidebars-settings.class.php

@@ -62,15 +62,15 @@ function enqueue_styles_scripts( $hook ) {
 	}
 
 	function register_settings() {
-		$this->plugin_tabs[ $this->settings_tab ] = esc_attr__( 'Off-Canvas Sidebars Settings', 'off-canvas-sidebars' );
+		$this->plugin_tabs[ $this->settings_tab ] = esc_attr__( 'Settings', 'off-canvas-sidebars' );
 		$this->plugin_tabs[ $this->sidebars_tab ] = esc_attr__( 'Sidebars', 'off-canvas-sidebars' );
 
 		register_setting( $this->settings_tab, $this->general_key, array( $this, 'validate_input' ) );
 		register_setting( $this->sidebars_tab, $this->general_key, array( $this, 'validate_input' ) );
 
 		add_settings_section( 
 			'section_general', 
-			esc_attr__( 'Off-Canvas Sidebars Settings', 'off-canvas-sidebars' ), 
+			esc_attr__( 'Global Settings', 'off-canvas-sidebars' ), 
 			array( $this, 'register_general_settings' ), 
 			$this->settings_tab 
 		);
@@ -642,6 +642,7 @@ function plugin_options_page() {
 		$tab = isset( $_GET['tab'] ) ? $_GET['tab'] : $this->settings_tab;
 		?>
 	<div class="wrap">
+		<h1><?php _e( 'Off-Canvas Sidebars', 'off-canvas-sidebars' ) ?></h1>
 		<?php $this->plugin_options_tabs(); ?>
 		<div class="<?php echo $this->plugin_key ?> container">
 

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=YGPLM
 Tags: genesis, off-canvas, sidebars, slidebars, jQuery, app, mobile, tablet, responsive
 Requires at least: 3.8
 Tested up to: 4.6
-Stable tag: 0.2
+Stable tag: 0.2.0.1
 
 Add off-canvas sidebars using the Slidebars jQuery plugin.
 
@@ -91,6 +91,11 @@ The final output of your theme should be similar to this:
 
 == Changelog ==
 
+= 0.2.0.1 =
+
+*	Fix: Global variable bug
+*	UI: Improve settings page
+
 = 0.2 =
 
 *	Update Slidebars plugin to v2.0.2: [click here for info](https://www.adchsm.com/slidebars/features/ "Slidebars Features")

widgets/off-canvas-sidebars-widget.php

@@ -95,7 +95,7 @@ public function widget( $args, $instance ) {
 	 * @param array $instance The widget options
 	 */
 	public function form( $instance ) {
-		global $off_canvas_sidebars;
+		$off_canvas_sidebars = Off_Canvas_Sidebars();
 		$this->load_plugin_data();
 		$instance = $this->merge_settings( $instance );
 		//print_r($this);