Bring embedded sources up to date

Author: Ghost1227

framework.php

@@ -16,8 +16,8 @@
  *
  * @package ReduxFramework
  * @author Daniel J Griffiths (Ghost1227)
- * @author Dovy Paukstys
- * @version 3.0.0
+ * @author Dovy Paukstys (dovy)
+ * @version 3.0.1
  */
 
 // Exit if accessed directly
@@ -26,7 +26,7 @@
 // Don't duplicate me!
 if( !class_exists( 'ReduxFramework' ) ) {
 
-define('REDUX_VERSION', '3.0.0');
+define('REDUX_VERSION', '3.0.1');
 
  // Windows-proof constants: replace backward by forward slashes
  // Thanks to: https://github.com/peterbouwmeester
@@ -116,9 +116,9 @@ public function __construct( $sections = array(), $args = array(), $extra_tabs =
  $defaults['dev_mode'] = false;
  $defaults['system_info'] = false;
  $defaults['admin_stylesheet'] = 'standard';
- $defaults['footer_credit'] = __( '<span id="footer-thankyou">Options panel created using <a href="' . $this->framework_url . '" target="_blank">Redux Framework</a> v' . $this->framework_version . '</span>', 'redux-framework' );
+ $defaults['footer_credit'] = '<span id="footer-thankyou">' . __( 'Options panel created using', 'redux-framework') . '<a href="' . $this->framework_url . '" target="_blank">' . __('Redux Framework', 'redux-framework') . '</a> v' . $this->framework_version . '</span>';
  $defaults['help_tabs'] = array();
- $defaults['help_sidebar'] = __( '', 'redux-framework' );
+ $defaults['help_sidebar'] = ''; // __( '', 'redux-framework' );
  $defaults['database']	= ''; // possible: options, theme_mods, theme_mods_expanded, transient
  $defaults['customizer']	= true; // setting to true forces get_theme_mod_expanded
 $defaults['global_variable']	= '';
@@ -618,6 +618,9 @@ function _options_page() {
  if ( !isset( $section['title'] ) )
  continue;
 
+ if ( isset( $section['submenu'] ) && $section['submenu'] == false )
+ continue;
+
  add_submenu_page(
  $this->args['page_slug'],
  $section['title'],
@@ -1055,11 +1058,7 @@ public function _register_setting() {
  if( isset( $field['title'] ) && isset( $field['type'] ) && $field['type'] !== "info" ) {
  $default_mark = ( !empty($field['default']) && isset($this->options[$field['id']]) && $this->options[$field['id']] == $field['default'] && !empty( $this->args['default_mark'] ) && isset( $field['default'] ) ) ? $this->args['default_mark'] : '';
  if (!empty($field['title'])) {
-if ( $field['type'] == 'text' ) {
- $th = '<label for="'. $field['id'] .'-'. $field['type'] .'">'. $field['title'] . $default_mark .'</label>';
-} else {
-$th = $field['title'] . $default_mark;
-}
+ $th = $field['title'] . $default_mark;
  }
  if( isset( $field['subtitle'] ) ) {
 $th .= '<span class="description">' . $field['subtitle'] . '</span>';
@@ -1438,15 +1437,15 @@ public function _options_page_html() {
  // Warning bar
  if( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] == 'true' && $saved == '1' ) {
  if( isset( $this->options['REDUX_imported'] ) && $this->options['REDUX_imported'] === 1 ) {
- echo '<div id="redux-imported">' . apply_filters( 'redux-imported-text-' . $this->args['opt_name'], '' . __( '<strong>Settings Imported!</strong>', 'redux-framework' ) ) . '</div>';
+ echo '<div id="redux-imported">' . apply_filters( 'redux-imported-text-' . $this->args['opt_name'], '<strong>' . __( 'Settings Imported!', 'redux-framework' ) ) . '</strong></div>';
  } else {
- echo '<div id="redux-save">' . apply_filters( 'redux-saved-text-' . $this->args['opt_name'], __( '<strong>Settings Saved!</strong>', 'redux-framework' ) ) . '</div>';
+ echo '<div id="redux-save">' . apply_filters( 'redux-saved-text-' . $this->args['opt_name'], '<strong>'.__( 'Settings Saved!', 'redux-framework' ) ) . '</strong></div>';
  }
  }
 
- echo '<div id="redux-save-warn">' . apply_filters( 'redux-changed-text-' . $this->args['opt_name'], __( '<strong>Settings have changed, you should save them!</strong>', 'redux-framework' ) ) . '</div>';
- echo '<div id="redux-field-errors">' . __( '<strong><span></span> error(s) were found!</strong>', 'redux-framework' ) . '</div>';
- echo '<div id="redux-field-warnings">' . __( '<strong><span></span> warning(s) were found!</strong>', 'redux-framework' ) . '</div>';
+ echo '<div id="redux-save-warn">' . apply_filters( 'redux-changed-text-' . $this->args['opt_name'], '<strong>'.__( 'Settings have changed, you should save them!', 'redux-framework' ) ) . '</strong></div>';
+ echo '<div id="redux-field-errors"><strong><span></span> ' . __( 'error(s) were found!', 'redux-framework' ) . '</strong></div>';
+ echo '<div id="redux-field-warnings"><strong><span></span> ' . __( 'warning(s) were found!', 'redux-framework' ) . '</strong></div>';
 
  echo '</div>';