Bring embedded sources up to date

Author: Ghost1227

assets/js/admin.js

@@ -133,13 +133,13 @@
  case '>': 
  case 'greater': 
  case 'is_larger':
- if(value1 > value2) 
+ if(parseFloat(value1) > parseFloat(value2)) 
  show = true;
  break;
  case '<':
  case 'less': 
  case 'is_smaller':
- if(value1 <  value2) 
+ if(parseFloat(value1) < parseFloat(value2)) 
  show = true;
  break;
  case 'contains':
@@ -158,8 +158,6 @@
  if(value1 != "" && value1 != value2) 
  show = true;
  break;
-
-
  }
  }
 
@@ -379,16 +377,35 @@ jQuery(document).ready(function($) {
 opacity: 0.7
 });
 }
+
+$('#toplevel_page_'+redux_opts.slug+' .wp-submenu a').click(function(e) {
+//if ( $(this).hasClass('wp-menu-open') ) {
+e.preventDefault();
+var url = $(this).attr('href').split('&tab=');
+$('#'+url[1]+'_section_group_li_a').click();
+console.log(url[1]);
+return false;
+//}
+});
+
 /**
 Current tab checks, based on cookies
 **/
 jQuery('.redux-group-tab-link-a').click(function() {
 relid = jQuery(this).data('rel'); // The group ID of interest
 // Set the proper page cookie
-$.cookie('redux_current_tab', relid, {
-expires: 7,
-path: '/'
+
+$('#toplevel_page_'+redux_opts.slug+' .wp-submenu a.current').removeClass('current');
+$('#toplevel_page_'+redux_opts.slug+' .wp-submenu li.current').removeClass('current');
+
+$('#toplevel_page_'+redux_opts.slug+' .wp-submenu a').each(function() {
+var url = $(this).attr('href').split('&tab=');
+if (url[1] == relid) {
+$(this).addClass('current');
+$(this).parent().addClass('current');
+}
 });
+
 // Remove the old active tab
 var oldid = jQuery('.redux-group-tab-link-li.active .redux-group-tab-link-a').data('rel');
 jQuery('#' + oldid + '_section_group_li').removeClass('active');

assets/js/admin.min.js

@@ -26,7 +26,7 @@
 // Don't duplicate me!
 if( !class_exists( 'ReduxFramework' ) ) {
 
-define('REDUX_VERSION', '3.0.3');
+define('REDUX_VERSION', '3.0.4');
 
  // Windows-proof constants: replace backward by forward slashes
  // Thanks to: https://github.com/peterbouwmeester
@@ -115,8 +115,7 @@ public function __construct( $sections = array(), $args = array(), $extra_tabs =
  $defaults['show_import_export'] = true;
  $defaults['dev_mode'] = false;
  $defaults['system_info'] = false;
- $defaults['admin_stylesheet'] = 'standard';
- $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['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['database']	= ''; // possible: options, theme_mods, theme_mods_expanded, transient
@@ -153,6 +152,9 @@ public function __construct( $sections = array(), $args = array(), $extra_tabs =
 
 $this->extra_tabs = $extra_tabs;
 
+ // Options page
+ add_action( 'admin_menu', array( &$this, '_internationalization' ) );
+
  // Set option with defaults
  add_action( 'init', array( &$this, '_set_default_options' ) );
 
@@ -173,6 +175,10 @@ public function __construct( $sections = array(), $args = array(), $extra_tabs =
 
  }
 
+ public function _internationalization() {
+ load_plugin_textdomain('redux-framework', false, basename( dirname( __FILE__ ) ) . '/languages' );
+ }
+
  public function get_instance() {
  return $this->instance;
  }
@@ -736,9 +742,9 @@ public function _enqueue_output() {
  public function _enqueue() {
  global $wp_styles;
 
- wp_enqueue_script('jquery');
- wp_enqueue_script('jquery-ui-core');
- 
+  wp_enqueue_script('jquery');
+  wp_enqueue_script('jquery-ui-core');
+  add_thickbox();
 
  wp_register_style(
  'redux-css',
@@ -785,11 +791,7 @@ public function _enqueue() {
 
  wp_enqueue_style( 'redux-lte-ie8' );
 
- if( $this->args['admin_stylesheet'] == 'standard' ) {
- wp_enqueue_style( 'redux-css' );
- } elseif( $this->args['admin_stylesheet'] == 'custom' ) {
- wp_enqueue_style( 'redux-custom-css' );
- }
+ wp_enqueue_style( 'redux-css' );
 
  wp_enqueue_style( 'redux-elusive-icon' );
  wp_enqueue_style( 'redux-elusive-icon-ie7' );
@@ -1059,11 +1061,15 @@ public function _register_setting() {
  if( isset( $field['title'] ) && isset( $field['type'] ) && $field['type'] !== "info" && $field['type'] !== "group" ) {
  $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'])) {
- $th = $field['title'] . $default_mark;
+ $th = $field['title'] . $default_mark."";
  }
+ 
  if( isset( $field['subtitle'] ) ) {
 $th .= '<span class="description">' . $field['subtitle'] . '</span>';
  }
+
+ 
+ 
  } 
 if (!isset($field['id'])) {
 print_r($field);
@@ -1128,6 +1134,11 @@ public function _register_setting() {
 }
 $this->sections[$k]['fields'][$fieldk] = $field;
 
+ if( isset( $this->args['display_source'] ) ) {
+ $th .= '<div id="'.$field['id'].'-settings" style="display:none;"><pre>'.var_export($this->sections[$k]['fields'][$fieldk], true).'</pre></div>';
+ $th .= '<br /><a href="#TB_inline?width=600&height=800&inlineId='.$field['id'].'-settings" class="thickbox"><small>View Source</small></a>';
+ } 
+
  add_settings_field( $fieldk . '_field', $th, array( &$this, '_field_input' ), $this->args['opt_name'] . $k . '_section_group', $this->args['opt_name'] . $k . '_section', $field ); // checkbox
  }
  }
@@ -1427,7 +1438,7 @@ public function _options_page_html() {
  echo '<div id="info_bar">';
  echo '<a href="javascript:void(0);" id="expand_options">' . __( 'Expand', 'redux-framework' ) . '</a>';
  echo '<div class="redux-action_bar">';
- submit_button( '', 'primary', 'redux_save', false );
+ submit_button( __( 'Save Changes', 'redux-framework'), 'primary', 'redux_save', false );
  echo '&nbsp;';
  submit_button( __( 'Reset to Defaults', 'redux-framework' ), 'secondary', $this->args['opt_name'] . '[defaults]', false );
  echo '</div>';
@@ -1684,7 +1695,7 @@ public function _options_page_html() {
  }
 
  echo '<div class="redux-action_bar">';
- submit_button( '', 'primary', 'redux_save', false );
+ submit_button( __( 'Save Changes', 'redux-framework'), 'primary', 'redux_save', false );
  echo '&nbsp;';
  submit_button( __( 'Reset to Defaults', 'redux-framework'), 'secondary', $this->args['opt_name'] . '[defaults]', false );
  echo '</div>';

framework.php

@@ -61,6 +61,7 @@ public function __construct( $field = array(), $value ='', $parent ) {
  * @return	void
  */
 public function render() {
+print_r($this->value);
 
 echo '<input data-id="'.$this->field['id'].'" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . ']" id="' . $this->field['id'] . '-color" class="redux-color redux-color-init ' . $this->field['class'] . '" type="text" value="' . $this->value . '" data-default-color="' . $this->field['default'] . '" />';
 
@@ -69,7 +70,7 @@ public function render() {
 if ( $this->value == "transparent" ) {
 $tChecked = ' checked="checked"';
 }
-echo '<label for="' . $this->field['id'] . '-transparency" class="color-transparency-check"><input type="checkbox" class="checkbox color-transparency ' . $this->field['class'] . '" id="' . $this->field['id'] . '-transparency" data-id="'.$this->field['id'] . '-color" value="1"'.$tChecked.'> Transparent</label>';
+echo '<label for="' . $this->field['id'] . '-transparency" class="color-transparency-check"><input type="checkbox" class="checkbox color-transparency ' . $this->field['class'] . '" id="' . $this->field['id'] . '-transparency" data-id="'.$this->field['id'] . '-color" value="1"'.$tChecked.'> '.__('Transparent', 'redux-framework').'</label>';
 }
 
 }

inc/fields/color/field_color.php

@@ -78,7 +78,7 @@ public function render() {
 if ( $this->value['from'] == "transparent" ) {
 $tChecked = ' checked="checked"';
 }
- echo '<label for="' . $this->field['id'] . '-from-transparency" class="color-transparency-check"><input type="checkbox" class="checkbox color-transparency ' . $this->field['class'] . '" id="' . $this->field['id'] . '-from-transparency" data-id="' . $this->field['id'] . '-from" value="1"'.$tChecked.'> Transparent</label>';
+ echo '<label for="' . $this->field['id'] . '-from-transparency" class="color-transparency-check"><input type="checkbox" class="checkbox color-transparency ' . $this->field['class'] . '" id="' . $this->field['id'] . '-from-transparency" data-id="' . $this->field['id'] . '-from" value="1"'.$tChecked.'> '.__('Transparent', 'redux-framework').'</label>';
  }
 
  echo '&nbsp;&nbsp;&nbsp;&nbsp;<strong>' . __( 'To ', 'redux-framework' ) . '</strong>&nbsp;<input data-id="'.$this->field['id'].'" id="' . $this->field['id'] . '-to" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][to]" value="' . $this->value['to'] . '" class="redux-color redux-color-init ' . $this->field['class'] . '" type="text" data-default-color="' . $this->field['default']['to'] . '" />';
@@ -88,7 +88,7 @@ public function render() {
 if ( $this->value['from'] == "transparent" ) {
 $tChecked = ' checked="checked"';
 }
-echo '<label for="' . $this->field['id'] . '-to-transparency" class="color-transparency-check"><input type="checkbox" class="checkbox color-transparency" id="' . $this->field['id'] . '-to-transparency" data-id="' . $this->field['id'] . '-to" value="1"'.$tChecked.'> Transparent</label>';
+echo '<label for="' . $this->field['id'] . '-to-transparency" class="color-transparency-check"><input type="checkbox" class="checkbox color-transparency" id="' . $this->field['id'] . '-to-transparency" data-id="' . $this->field['id'] . '-to" value="1"'.$tChecked.'> '.__('Transparent', 'redux-framework').'</label>';
 }
 
  }

inc/fields/color_gradient/field_color_gradient.php

@@ -73,8 +73,8 @@ public function render() {
  }
  endif;
  echo '</div>';
- echo '<a href="#" onclick="return false;" id="edit-gallery" class="gallery-attachments button button-primary">' . __('Add/Edit Gallery', 'so-panels') . '</a> ';
- echo '<a href="#" onclick="return false;" id="clear-gallery" class="gallery-attachments button">' . __('Clear Gallery', 'so-panels') . '</a>'; echo '<input type="hidden" class="gallery_values ' . $this->field['class'] . '" value="' . esc_attr($this->value) . '" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . ']" />';
+ echo '<a href="#" onclick="return false;" id="edit-gallery" class="gallery-attachments button button-primary">' . __('Add/Edit Gallery', 'redux-framework') . '</a> ';
+ echo '<a href="#" onclick="return false;" id="clear-gallery" class="gallery-attachments button">' . __('Clear Gallery', 'redux-framework') . '</a>'; echo '<input type="hidden" class="gallery_values ' . $this->field['class'] . '" value="' . esc_attr($this->value) . '" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . ']" />';
 
 
  }

inc/fields/gallery/field_gallery.php

@@ -58,21 +58,7 @@
  $(newSlide).find('h3').text('').append('<span class="redux-groups-header">New Group</span><span class="ui-accordion-header-icon ui-icon ui-icon-plus"></span>');
  $(this).prev().append(newSlide);
 
- //we need to add slideCount1 data-id in fieldset , to make it work with fold
- $(newSlide).find('fieldset').each(function(){
- var fieldset = $(this),
- data_id = fieldset.data('id'),
- tr = fieldset.parents('tr:eq(0)');
- if (typeof data_id !== 'undefined' && data_id !== false){
- //fieldset.attr("data-id", data_id.replace(/\d+/, slideCount1) );
- //tr.attr('data-check-id' , data_id.replace(/\d+/, slideCount1) );
- //console.log(tr.attr('data-check-field'));
- //alert("eee");
- //tr.attr('data-check-field' , tr.attr('data-check-field')+'-'+slideCount1 );
- } 
- //console.log($(this).attr("data-id"));
- //$(this).attr("data-id", $(this).data('id').replace(/\d+/, slideCount1) );
- });
+
  $(newSlide).find('input[type="text"], input[type="hidden"], textarea , select').each(function(){
  var attr_name = $(this).attr('name');
  var attr_id = $(this).attr('id');
@@ -88,13 +74,8 @@
  //we clean select2 first
  $(newSlide).find('.select2-container').remove();
  $(newSlide).find('select').removeClass('select2-offscreen');
-
- //we rebind the select2
- //$(newSlide).find('.redux-select-item').addClass('xxxxxxxxxxxxxxxx');
- 
- //$.redux.select();
  }
- //$(this).attr("name", $(this).attr("name").replace(/\d+/, slideCount1) ).attr("id", $(this).attr("id").replace(/\d+/, slideCount1) );
+
  $(this).val('');
  if ($(this).hasClass('slide-sort')){
  $(this).val(slideCount1);

inc/fields/group/field_group.js

@@ -108,7 +108,7 @@ public function render() {
  $hide = '';
  } 
 
- echo '<input class="' . $hide . 'upload ' . $this->field['class'] . '" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][url]" id="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][url]" value="' . $this->value['url'] . '" readonly="readonly" />';
+ echo '<input placeholder="'.__('None media selected', 'redux-framework').'" type="text" class="' . $hide . 'upload ' . $this->field['class'] . '" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][url]" id="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][url]" value="' . $this->value['url'] . '" readonly="readonly" />';
  echo '<input type="hidden" class="upload-id ' . $this->field['class'] . '" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][id]" id="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][id]" value="' . $this->value['id'] . '" />';
  echo '<input type="hidden" class="upload-height" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][height]" id="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][height]" value="' . $this->value['height'] . '" />';
  echo '<input type="hidden" class="upload-width" name="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][width]" id="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][width]" value="' . $this->value['width'] . '" />';

inc/fields/media/field_media.php

@@ -0,0 +1,39 @@
+<?php
+class ReduxFramework_raw {
+
+ /**
+ * Field Constructor.
+ *
+ * Required - must call the parent constructor, then assign field and value to vars, and obviously call the render field function
+ *
+ * @since ReduxFramework 3.0.4
+ */
+ function __construct($field = array(), $value ='', $parent) {
+ $this->field = $field;
+$this->value = $value;
+$this->args = $parent->args;
+ }
+
+ /**
+ * Field Render Function.
+ *
+ * Takes the vars and outputs the HTML for the field in the settings
+ *
+ * @since ReduxFramework 1.0.0
+ */
+ function render() {
+ 
+ echo '</td></tr></table><table class="form-table no-border redux-group-table" style="margin-top: 0;"><tbody><tr><td>';
+ echo '<fieldset id="'.$this->parent->args['opt_name'].'-'.$this->field['id'].'" class="redux-field redux-container-'.$this->field['type'].' '.$this->field['class'].'" data-id="'.$this->field['id'].'">';
+
+ if ( !empty( $this->field['include'] ) && file_exists( $this->field['include'] ) ) {
+ include( $this->field['include'] );
+ }
+
+ do_action('redux-field-raw-'.$this->parent->args['opt_name'].'-'.$this->field['id']);
+
+ echo '</fieldset>';
+ echo '</td></tr></table><table class="form-table no-border" style="margin-top: 0;"><tbody><tr><th></th><td>'; 
+
+ }
+}