mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-06-05 15:09:37 +09:00
- recover 2.0.34
This commit is contained in:
nikitasinelnikov
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -295,52 +295,4 @@ span.um-admin-icon-clear{
|
||||
}
|
||||
span.um-admin-icon-clear.show {display: inline-block}
|
||||
span.um-admin-icon-clear:hover {color: #777}
|
||||
span.um-admin-icon-clear i {font-size: 20px;vertical-align: middle;}
|
||||
|
||||
.um-admin-new-condition-compare-and {
|
||||
margin-top: 10px !important;
|
||||
margin-bottom: 10px !important;
|
||||
text-align: center;
|
||||
}
|
||||
.um-admin-new-condition-compare-or {
|
||||
display: block !important;
|
||||
width: 150px;
|
||||
margin-top: 20px !important;
|
||||
text-align: center;
|
||||
}
|
||||
hr.or-devider {
|
||||
border-width: 3px;
|
||||
position: relative;
|
||||
overflow: visible;
|
||||
margin: 10px 0;
|
||||
}
|
||||
hr.or-devider:after {
|
||||
content: 'OR';
|
||||
display: block;
|
||||
position: absolute;
|
||||
background: #fff;
|
||||
left: 50%;
|
||||
margin: -11px 0 0 -13px;
|
||||
top: 50%;
|
||||
text-align: center;
|
||||
color: #000;
|
||||
width: 26px;
|
||||
}
|
||||
.um-admin-cur-condition {
|
||||
position: relative;
|
||||
}
|
||||
.um-admin-cur-condition:after {
|
||||
clear: both;
|
||||
content: '';
|
||||
display: block;
|
||||
}
|
||||
.um-admin-cur-condition + .um-admin-cur-condition:before {
|
||||
content: 'AND';
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: -25px;
|
||||
right: -7px;
|
||||
}
|
||||
.um-admin-cur-condition p:last-of-type('p') {
|
||||
float: right;
|
||||
}
|
||||
span.um-admin-icon-clear i {font-size: 20px;vertical-align: middle;}
|
||||
@@ -1,35 +1,30 @@
|
||||
function um_admin_live_update_scripts(count) {
|
||||
function um_admin_live_update_scripts() {
|
||||
|
||||
var metakey = jQuery('.um-admin-modal #UM_edit_field #_metakey').val();
|
||||
|
||||
if( count === 0 ){
|
||||
jQuery('.um_add_field .um-admin-btn-toggle').hide();
|
||||
} else if( metakey && count === 1 ){
|
||||
jQuery('.um_add_field .um-admin-btn-toggle').hide();
|
||||
} else {
|
||||
jQuery('.um_add_field .um-admin-btn-toggle').show();
|
||||
}
|
||||
|
||||
jQuery('.um-adm-conditional').each(function(){jQuery(this).trigger('change');});
|
||||
if ( jQuery('.um-admin-colorpicker').length ) {
|
||||
jQuery('.um-admin-colorpicker').wpColorPicker();
|
||||
}
|
||||
/*jQuery('.um-admin-modal-body:visible select').select2({
|
||||
allowClear: false,
|
||||
minimumResultsForSearch: 10
|
||||
});*/
|
||||
|
||||
jQuery('.um-adm-conditional').each(function(){jQuery(this).trigger('change');});
|
||||
if ( jQuery('.um-admin-colorpicker').length ) {
|
||||
jQuery('.um-admin-colorpicker').wpColorPicker();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function um_admin_new_modal( id, ajax, size ){
|
||||
|
||||
|
||||
var modal = jQuery('body').find('.um-admin-overlay');
|
||||
|
||||
|
||||
jQuery('.tipsy').hide();
|
||||
|
||||
|
||||
um_admin_remove_modal();
|
||||
|
||||
|
||||
jQuery('body').addClass('um-admin-modal-open').append('<div class="um-admin-overlay" /><div class="um-admin-modal" />');
|
||||
jQuery('#' + id).prependTo('.um-admin-modal');
|
||||
jQuery('#' + id).show();
|
||||
jQuery('.um-admin-modal').show();
|
||||
|
||||
|
||||
jQuery('.um-admin-modal-head').append('<a href="#" data-action="UM_remove_modal" class="um-admin-modal-close"><i class="um-faicon-times"></i></a>');
|
||||
|
||||
if ( ajax == true ) {
|
||||
@@ -39,23 +34,23 @@ function um_admin_new_modal( id, ajax, size ){
|
||||
} else {
|
||||
um_admin_modal_responsive();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
|
||||
var count = jQuery('.um-admin-builder .um-admin-drag-fld').length;
|
||||
|
||||
in_row = '';
|
||||
in_sub_row = '';
|
||||
in_column = '';
|
||||
in_group = '';
|
||||
|
||||
|
||||
if ( jQuery('.um-col-demon-settings').data('in_column') ) {
|
||||
in_row = jQuery('.um-col-demon-settings').data('in_row');
|
||||
in_sub_row = jQuery('.um-col-demon-settings').data('in_sub_row');
|
||||
in_column = jQuery('.um-col-demon-settings').data('in_column');
|
||||
in_group = jQuery('.um-col-demon-settings').data('in_group');
|
||||
}
|
||||
|
||||
|
||||
jQuery.ajax({
|
||||
url: wp.ajax.settings.url,
|
||||
type: 'POST',
|
||||
@@ -78,10 +73,10 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
|
||||
success: function(data){
|
||||
|
||||
jQuery('.um-admin-modal').find('.um-admin-modal-body').html( data );
|
||||
|
||||
|
||||
um_responsive();
|
||||
|
||||
um_admin_live_update_scripts(count);
|
||||
|
||||
um_admin_live_update_scripts();
|
||||
|
||||
jQuery( "#_custom_dropdown_options_source" ).trigger('blur');
|
||||
|
||||
@@ -92,11 +87,11 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
|
||||
tinyMCE.execCommand('mceRemoveEditor', true, 'um_editor_edit');
|
||||
jQuery('.um-admin-editor:visible').html( jQuery('.um-hidden-editor-edit').contents() );
|
||||
tinyMCE.execCommand('mceAddEditor', true, 'um_editor_edit');
|
||||
|
||||
|
||||
jQuery('.switch-html').trigger('click');
|
||||
jQuery('.switch-html').trigger('click');
|
||||
jQuery('.switch-tmce').trigger('click');
|
||||
|
||||
|
||||
jQuery('#um_editor_edit_ifr').height(200);
|
||||
|
||||
var editor = tinyMCE.get('um_editor_edit');
|
||||
@@ -108,19 +103,19 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
|
||||
tinyMCE.execCommand('mceRemoveEditor', true, 'um_editor_new');
|
||||
jQuery('.um-admin-editor:visible').html( jQuery('.um-hidden-editor-new').contents() );
|
||||
tinyMCE.execCommand('mceAddEditor', true, 'um_editor_new');
|
||||
|
||||
|
||||
jQuery('.switch-html').trigger('click');
|
||||
jQuery('.switch-html').trigger('click');
|
||||
jQuery('.switch-tmce').trigger('click');
|
||||
|
||||
|
||||
jQuery('#um_editor_new_ifr').height(200);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
um_init_tooltips();
|
||||
|
||||
|
||||
},
|
||||
error: function(data){
|
||||
|
||||
@@ -137,23 +132,23 @@ function um_admin_modal_responsive() {
|
||||
function um_admin_remove_modal(){
|
||||
|
||||
if ( jQuery('.um-admin-editor:visible').length > 0 ) {
|
||||
|
||||
|
||||
if ( jQuery('.um-admin-modal:visible').find('form').parent().attr('id') == 'UM_edit_field' ) {
|
||||
|
||||
|
||||
tinyMCE.execCommand('mceRemoveEditor', true, 'um_editor_edit');
|
||||
jQuery('.um-hidden-editor-edit').html( jQuery('.um-admin-editor:visible').contents() );
|
||||
tinyMCE.execCommand('mceAddEditor', true, 'um_editor_edit');
|
||||
|
||||
|
||||
} else {
|
||||
|
||||
|
||||
tinyMCE.execCommand('mceRemoveEditor', true, 'um_editor_new');
|
||||
jQuery('.um-hidden-editor-new').html( jQuery('.um-admin-editor:visible').contents() );
|
||||
tinyMCE.execCommand('mceAddEditor', true, 'um_editor_new');
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
jQuery('body').removeClass('um-admin-modal-open');
|
||||
jQuery('.um-admin-modal div[id^="UM_"]').hide().appendTo('body');
|
||||
jQuery('.um-admin-modal,.um-admin-overlay').remove();
|
||||
@@ -181,7 +176,7 @@ function um_admin_modal_add_attr( id, value ) {
|
||||
**/
|
||||
|
||||
jQuery(document).ready(function() {
|
||||
|
||||
|
||||
/**
|
||||
disable link
|
||||
**/
|
||||
@@ -189,22 +184,11 @@ jQuery(document).ready(function() {
|
||||
e.preventDefault();
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
toggle area
|
||||
**/
|
||||
jQuery(document).on('click', '.um-admin-btn-toggle a', function(e){
|
||||
|
||||
jQuery('.condition-wrap .um-admin-cur-condition').each(function () {
|
||||
var cond_operator = jQuery(this).find('[id^="_conditional_operator"]').val();
|
||||
var cond_value = jQuery(this).find('[id^="_conditional_value"]');
|
||||
if( cond_operator === 'empty' || cond_operator === 'not empty' ){
|
||||
cond_value.attr('disabled','disabled');
|
||||
} else {
|
||||
cond_value.removeAttr('disabled');
|
||||
}
|
||||
});
|
||||
|
||||
var content = jQuery(this).parent().find('.um-admin-btn-content');
|
||||
var link = jQuery(this);
|
||||
if ( content.is(':hidden') ) {
|
||||
@@ -219,128 +203,73 @@ jQuery(document).ready(function() {
|
||||
um_admin_modal_responsive();
|
||||
});
|
||||
|
||||
/**
|
||||
check if empty/not empty
|
||||
**/
|
||||
jQuery(document).on('change', 'select[id^="_conditional_operator"]', function(){
|
||||
var cond_operator = jQuery(this).val();
|
||||
var cond_value = jQuery(this).closest('.um-admin-cur-condition').find('[id^="_conditional_value"]');
|
||||
if( cond_operator === 'empty' || cond_operator === 'not empty' ){
|
||||
cond_value.attr('disabled','disabled');
|
||||
} else {
|
||||
cond_value.removeAttr('disabled');
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
clone a condition
|
||||
**/
|
||||
jQuery(document).on('click', '.um-admin-new-condition', function() {
|
||||
|
||||
if ( jQuery(this).hasClass('disabled') )
|
||||
return false;
|
||||
if ( jQuery(this).hasClass('disabled') )
|
||||
return false;
|
||||
|
||||
var content = jQuery(this).parents('.um-admin-btn-content'),
|
||||
length = content.find('.um-admin-cur-condition').length;
|
||||
var content = jQuery(this).parents('.um-admin-btn-content'),
|
||||
length = content.find('.um-admin-cur-condition').length;
|
||||
|
||||
if ( length < 5 ) {
|
||||
if ( length < 5 ) {
|
||||
//content.find('select').select2('destroy');
|
||||
|
||||
if( jQuery('#UM_add_field .um-admin-btn-content .um-admin-cur-condition-template').length>0 ){
|
||||
var template = jQuery('#UM_add_field .um-admin-btn-content').find('.um-admin-cur-condition-template').clone();
|
||||
} else {
|
||||
var template = jQuery('#UM_edit_field .um-admin-btn-content').find('.um-admin-cur-condition-template').clone();
|
||||
}
|
||||
var template = jQuery('.um-admin-btn-content').find('.um-admin-cur-condition-template').clone();
|
||||
template.find('input[type=text]').val('');
|
||||
template.find('select').val('');
|
||||
|
||||
template.find('input[type=text]').val('');
|
||||
template.find('select').val('');
|
||||
template.appendTo( content );
|
||||
jQuery(template).removeClass("um-admin-cur-condition-template");
|
||||
jQuery(template).addClass("um-admin-cur-condition");
|
||||
|
||||
if ( jQuery(this).hasClass('um-admin-new-condition-compare-and') ){
|
||||
|
||||
template.find('#_conditional_compare').val('and');
|
||||
var group = jQuery(this).prev('.um-admin-cur-condition').find('[id^="_conditional_group"]').val();
|
||||
|
||||
template.find('#_conditional_group').val(group);
|
||||
var templatehtml = template.html();
|
||||
template.insertBefore( jQuery(this) );
|
||||
|
||||
} else {
|
||||
|
||||
template.find('#_conditional_compare').val('or');
|
||||
var group = jQuery('.condition-wrap .um-admin-cur-condition').last().find('[id^="_conditional_group"]').val();
|
||||
template.find('#_conditional_group').val(parseInt(group)+1);
|
||||
var button = jQuery('.um-admin-new-condition-compare-and:first').clone();
|
||||
jQuery('<hr class="or-devider" />').insertBefore( jQuery(this) );
|
||||
template.insertBefore( jQuery(this) );
|
||||
button.addClass('for-remove-on-reset').insertBefore( jQuery(this) );
|
||||
|
||||
}
|
||||
|
||||
jQuery(template).removeClass("um-admin-cur-condition-template");
|
||||
jQuery(template).addClass("um-admin-cur-condition");
|
||||
|
||||
um_admin_live_update_scripts();
|
||||
um_admin_modal_responsive();
|
||||
} else {
|
||||
jQuery(this).addClass('disabled');
|
||||
alert( 'You already have 5 rules' );
|
||||
}
|
||||
//need fields refactor
|
||||
um_admin_live_update_scripts();
|
||||
um_admin_modal_responsive();
|
||||
} else {
|
||||
jQuery(this).addClass('disabled');
|
||||
alert( 'You already have 5 rules' );
|
||||
}
|
||||
//need fields refactor
|
||||
var conditions = jQuery('.um-admin-cur-condition');
|
||||
|
||||
jQuery(conditions).each( function ( i ) {
|
||||
// var value = jQuery( this )
|
||||
|
||||
id = i === 0 ? '' : i;
|
||||
jQuery( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
|
||||
jQuery( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
|
||||
jQuery( this ).find('[id^="_conditional_field"]').attr('name', '_conditional_field' + id);
|
||||
jQuery( this ).find('[id^="_conditional_field"]').attr('id', '_conditional_field' + id);
|
||||
jQuery( this ).find('[id^="_conditional_operator"]').attr('name', '_conditional_operator' + id);
|
||||
jQuery( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_compare"]').attr('name', '_conditional_compare' + id);
|
||||
jQuery( this ).find('[id^="_conditional_compare"]').attr('id', '_conditional_compare' + id);
|
||||
jQuery( this ).find('[id^="_conditional_group"]').attr('name', '_conditional_group' + id);
|
||||
jQuery( this ).find('[id^="_conditional_group"]').attr('id', '_conditional_group' + id);
|
||||
jQuery(conditions).each( function ( i ) {
|
||||
id = i === 0 ? '' : i;
|
||||
jQuery( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
|
||||
jQuery( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
|
||||
jQuery( this ).find('[id^="_conditional_field"]').attr('name', '_conditional_field' + id);
|
||||
jQuery( this ).find('[id^="_conditional_field"]').attr('id', '_conditional_field' + id);
|
||||
jQuery( this ).find('[id^="_conditional_operator"]').attr('name', '_conditional_operator' + id);
|
||||
jQuery( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
|
||||
} );
|
||||
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
reset conditions
|
||||
**/
|
||||
jQuery(document).on('click', '.um-admin-reset-conditions a', function(){
|
||||
var content = jQuery(this).parents('.um-admin-btn-content');
|
||||
content.find('.um-admin-cur-condition').slice(1).remove();
|
||||
content.find('input[type=text]').val('');
|
||||
content.find('select').val('');
|
||||
jQuery('.um-admin-new-condition').removeClass('disabled');
|
||||
jQuery('.condition-wrap hr').remove();
|
||||
jQuery('.condition-wrap .for-remove-on-reset').remove();
|
||||
|
||||
um_admin_live_update_scripts();
|
||||
um_admin_modal_responsive();
|
||||
var content = jQuery(this).parents('.um-admin-btn-content');
|
||||
content.find('.um-admin-cur-condition').slice(1).remove();
|
||||
content.find('input[type=text]').val('');
|
||||
content.find('select').val('');
|
||||
jQuery('.um-admin-new-condition').removeClass('disabled');
|
||||
um_admin_live_update_scripts();
|
||||
um_admin_modal_responsive();
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
remove a condition
|
||||
**/
|
||||
jQuery(document).on('click', '.um-admin-remove-condition', function(){
|
||||
var condition = jQuery(this).parents('.um-admin-cur-condition');
|
||||
jQuery('.um-admin-new-condition').removeClass('disabled');
|
||||
jQuery('.tipsy').remove();
|
||||
var compare = condition.find('input[type=hidden]').val();
|
||||
if( compare == 'or' ){
|
||||
condition.next().find('input[type=hidden]').val(compare);
|
||||
}
|
||||
|
||||
if( condition.prev().is('hr') && condition.next().is('.um-admin-new-condition-compare-and') ){
|
||||
condition.next().remove();
|
||||
condition.prev().remove();
|
||||
}
|
||||
condition.remove();
|
||||
|
||||
var condition = jQuery(this).parents('.um-admin-cur-condition');
|
||||
jQuery('.um-admin-new-condition').removeClass('disabled');
|
||||
jQuery('.tipsy').remove();
|
||||
condition.remove();
|
||||
//need fields refactor
|
||||
var conditions = jQuery('.um-admin-cur-condition');
|
||||
jQuery(conditions).each( function ( i ) {
|
||||
@@ -353,52 +282,48 @@ jQuery(document).ready(function() {
|
||||
jQuery( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_compare"]').attr('name', '_conditional_compare' + id);
|
||||
jQuery( this ).find('[id^="_conditional_compare"]').attr('id', '_conditional_compare' + id);
|
||||
jQuery( this ).find('[id^="_conditional_group"]').attr('name', '_conditional_group' + id);
|
||||
jQuery( this ).find('[id^="_conditional_group"]').attr('id', '_conditional_group' + id);
|
||||
} );
|
||||
um_admin_live_update_scripts();
|
||||
um_admin_modal_responsive();
|
||||
um_admin_live_update_scripts();
|
||||
um_admin_modal_responsive();
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
remove modal via action
|
||||
**/
|
||||
jQuery(document).on('click', '.um-admin-overlay, a[data-action="UM_remove_modal"]', function(){
|
||||
um_admin_remove_modal();
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
fire new modal
|
||||
**/
|
||||
jQuery(document).on('click', 'a[data-modal^="UM_"], span[data-modal^="UM_"]', function(e){
|
||||
|
||||
|
||||
e.preventDefault();
|
||||
|
||||
var modal_id = jQuery(this).attr('data-modal');
|
||||
|
||||
if ( jQuery(this).attr('data-back') ) {
|
||||
|
||||
|
||||
jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-modal", jQuery(this).attr('data-back') );
|
||||
var current_icon = jQuery( '#' + jQuery(this).attr('data-back') ).find('input#_icon').val();
|
||||
if ( current_icon == '' ) {
|
||||
jQuery('#UM_fonticons').find('.um-admin-icons span').removeClass('highlighted');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
if ( jQuery(this).data('dynamic-content') ) {
|
||||
um_admin_new_modal( modal_id, true, jQuery(this).data('modal-size') );
|
||||
um_admin_modal_ajaxcall( jQuery(this).data('dynamic-content'), jQuery(this).data('arg1'), jQuery(this).data('arg2'), jQuery(this).data('arg3') );
|
||||
} else {
|
||||
um_admin_new_modal( modal_id );
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
choose font icon
|
||||
**/
|
||||
@@ -408,7 +333,7 @@ jQuery(document).ready(function() {
|
||||
jQuery(this).addClass('highlighted');
|
||||
jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-code", icon);
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
submit font icon
|
||||
**/
|
||||
@@ -430,7 +355,7 @@ jQuery(document).ready(function() {
|
||||
um_admin_remove_modal();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
restore font icon
|
||||
**/
|
||||
@@ -445,7 +370,7 @@ jQuery(document).ready(function() {
|
||||
element.find('.um-admin-icon-value').html('No Icon');
|
||||
jQuery(this).hide();
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
search font icons
|
||||
**/
|
||||
@@ -459,14 +384,14 @@ jQuery(document).ready(function() {
|
||||
um_admin_modal_responsive();
|
||||
});
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Retrieve options from a callback function
|
||||
*/
|
||||
jQuery(document).on('blur',"#_custom_dropdown_options_source", function(){
|
||||
var me = jQuery(this);
|
||||
var _options = jQuery('textarea[id=_options]');
|
||||
|
||||
|
||||
if( me.val() != '' ){
|
||||
var um_option_callback = me.val();
|
||||
jQuery.ajax({
|
||||
@@ -478,17 +403,17 @@ jQuery(document).ready(function() {
|
||||
nonce: um_admin_scripts.nonce
|
||||
},
|
||||
complete: function(){
|
||||
|
||||
|
||||
},
|
||||
success: function( response ){
|
||||
var arr_opts = [];
|
||||
|
||||
|
||||
for (var key in response.data ){
|
||||
arr_opts.push( response.data[ key ] );
|
||||
}
|
||||
|
||||
_options.val( arr_opts.join('\n') );
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -168,27 +168,27 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
|
||||
unset( $array['conditions'] );
|
||||
if ( isset($array['conditional_field']) && !empty( $array['conditional_action'] ) && !empty( $array['conditional_operator'] ) ) {
|
||||
$array['conditional_value'] = isset( $array['conditional_value'] ) ? $array['conditional_value'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action'], $array['conditional_field'], $array['conditional_operator'], $array['conditional_value'], $array['conditional_compare'], $array['conditional_group'] );
|
||||
$array['conditions'][] = array( $array['conditional_action'], $array['conditional_field'], $array['conditional_operator'], $array['conditional_value'] );
|
||||
}
|
||||
|
||||
if ( isset($array['conditional_field1']) && !empty( $array['conditional_action1'] ) && !empty( $array['conditional_operator1'] ) ) {
|
||||
$array['conditional_value1'] = isset( $array['conditional_value1'] ) ? $array['conditional_value1'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action1'], $array['conditional_field1'], $array['conditional_operator1'], $array['conditional_value1'], $array['conditional_compare1'], $array['conditional_group1'] );
|
||||
$array['conditions'][] = array( $array['conditional_action1'], $array['conditional_field1'], $array['conditional_operator1'], $array['conditional_value1'] );
|
||||
}
|
||||
|
||||
if ( isset($array['conditional_field2']) && !empty( $array['conditional_action2'] ) && !empty( $array['conditional_operator2'] ) ) {
|
||||
$array['conditional_value2'] = isset( $array['conditional_value2'] ) ? $array['conditional_value2'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action2'], $array['conditional_field2'], $array['conditional_operator2'], $array['conditional_value2'], $array['conditional_compare2'], $array['conditional_group2'] );
|
||||
$array['conditions'][] = array( $array['conditional_action2'], $array['conditional_field2'], $array['conditional_operator2'], $array['conditional_value2'] );
|
||||
}
|
||||
|
||||
if ( isset($array['conditional_field3']) && !empty( $array['conditional_action3'] ) && !empty( $array['conditional_operator3'] ) ) {
|
||||
$array['conditional_value3'] = isset( $array['conditional_value3'] ) ? $array['conditional_value3'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action3'], $array['conditional_field3'], $array['conditional_operator3'], $array['conditional_value3'], $array['conditional_compare3'], $array['conditional_group3'] );
|
||||
$array['conditions'][] = array( $array['conditional_action3'], $array['conditional_field3'], $array['conditional_operator3'], $array['conditional_value3'] );
|
||||
}
|
||||
|
||||
if ( isset($array['conditional_field4']) && !empty( $array['conditional_action4'] ) && !empty( $array['conditional_operator4'] ) ) {
|
||||
$array['conditional_value4'] = isset( $array['conditional_value4'] ) ? $array['conditional_value4'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action4'], $array['conditional_field4'], $array['conditional_operator4'], $array['conditional_value4'], $array['conditional_compare4'], $array['conditional_group4'] );
|
||||
$array['conditions'][] = array( $array['conditional_action4'], $array['conditional_field4'], $array['conditional_operator4'], $array['conditional_value4'] );
|
||||
}
|
||||
|
||||
return $array;
|
||||
@@ -236,65 +236,52 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
|
||||
<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_compare', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_group', $form_id ); ?>
|
||||
|
||||
<p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
|
||||
|
||||
<div class="um-admin-clear"></div>
|
||||
</div>
|
||||
<?php /*<p><a href="#" class="um-admin-new-condition button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule', 'ultimate-member' ); ?></a></p>*/ ?>
|
||||
<p><a href="#" class="um-admin-new-condition button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule', 'ultimate-member' ); ?></a></p>
|
||||
<p class="um-admin-reset-conditions"><a href="#" class="button"><?php _e( 'Reset all rules', 'ultimate-member' ); ?></a></p>
|
||||
<div class="um-admin-clear"></div>
|
||||
<div class="condition-wrap">
|
||||
<?php if ( isset( $edit_array['conditions'] ) && count( $edit_array['conditions'] ) != 0 ) {
|
||||
|
||||
foreach ( $edit_array['conditions'] as $k => $arr ) {
|
||||
<?php if ( isset( $edit_array['conditions'] ) && count( $edit_array['conditions'] ) != 0 ) {
|
||||
|
||||
if ( $k == 0 ) $k = ''; ?>
|
||||
<?php if( $arr[4] == 'or' ){ ?>
|
||||
<a href="#" class="for-remove-on-reset um-admin-new-condition um-admin-new-condition-compare-and button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule', 'ultimate-member' ); ?></a>
|
||||
foreach ( $edit_array['conditions'] as $k => $arr ) {
|
||||
|
||||
<hr class="or-devider" />
|
||||
<?php } ?>
|
||||
<div class="um-admin-cur-condition">
|
||||
if ( $k == 0 ) $k = ''; ?>
|
||||
|
||||
<?php $metabox->field_input( '_conditional_action' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_field' . $k , $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_operator' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_value' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_compare' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_group' . $k, $form_id ); ?>
|
||||
<div class="um-admin-cur-condition">
|
||||
|
||||
<p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
|
||||
|
||||
<div class="um-admin-clear"></div>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
|
||||
} else { ?>
|
||||
|
||||
<div class="um-admin-cur-condition">
|
||||
|
||||
<?php $metabox->field_input( '_conditional_action', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_compare', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_group', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_action' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_field' . $k , $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_operator' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_value' . $k, $form_id ); ?>
|
||||
|
||||
<p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
|
||||
|
||||
<div class="um-admin-clear"></div>
|
||||
</div>
|
||||
<div class="um-admin-clear"></div>
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
<a href="#" class="um-admin-new-condition um-admin-new-condition-compare-and button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule', 'ultimate-member' ); ?></a>
|
||||
<a href="#" class="um-admin-new-condition um-admin-new-condition-compare-or button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule group', 'ultimate-member' ); ?></a>
|
||||
<?php
|
||||
}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
} else { ?>
|
||||
|
||||
<div class="um-admin-cur-condition">
|
||||
|
||||
<?php $metabox->field_input( '_conditional_action', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
|
||||
|
||||
<p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
|
||||
|
||||
<div class="um-admin-clear"></div>
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
|
||||
@@ -31,10 +31,17 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set Form Data
|
||||
*
|
||||
* @param $data
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
function set_data( $data ) {
|
||||
$this->form_data = $data;
|
||||
return $this;
|
||||
}
|
||||
$this->form_data = $data;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
@@ -46,8 +53,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
*/
|
||||
function render_form( $echo = true ) {
|
||||
|
||||
if ( empty( $this->form_data['fields'] ) )
|
||||
if ( empty( $this->form_data['fields'] ) ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$class = 'form-table um-form-table ' . ( ! empty( $this->form_data['class'] ) ? $this->form_data['class'] : '' );
|
||||
$class_attr = ' class="' . $class . '" ';
|
||||
@@ -56,7 +64,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
|
||||
foreach ( $this->form_data['fields'] as $field_data ) {
|
||||
if ( isset( $field_data['type'] ) && 'hidden' == $field_data['type'] ) {
|
||||
echo $this->render_form_row( $field_data );
|
||||
echo $this->render_form_row( $field_data );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -183,7 +191,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
if ( strpos( $this->form_data['class'], 'um-top-label' ) !== false ) {
|
||||
|
||||
$html .= '<tr class="um-forms-line" ' . $conditional . $prefix_attr . $type_attr . '>
|
||||
<td>' . $this->render_field_label( $data );
|
||||
<td>' . $this->render_field_label( $data );
|
||||
|
||||
if ( method_exists( $this, 'render_' . $data['type'] ) ) {
|
||||
|
||||
@@ -205,7 +213,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
if ( ! empty( $data['without_label'] ) ) {
|
||||
|
||||
$html .= '<tr class="um-forms-line" ' . $conditional . $prefix_attr . $type_attr . '>
|
||||
<td colspan="2">';
|
||||
<td colspan="2">';
|
||||
|
||||
if ( method_exists( $this, 'render_' . $data['type'] ) ) {
|
||||
|
||||
@@ -225,8 +233,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
} else {
|
||||
|
||||
$html .= '<tr class="um-forms-line" ' . $conditional . $prefix_attr . $type_attr . '>
|
||||
<th>' . $this->render_field_label( $data ) . '</th>
|
||||
<td>';
|
||||
<th>' . $this->render_field_label( $data ) . '</th>
|
||||
<td>';
|
||||
|
||||
if ( method_exists( $this, 'render_' . $data['type'] ) ) {
|
||||
|
||||
@@ -303,7 +311,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
|
||||
$label = $data['label'];
|
||||
if ( isset( $data['required'] ) && $data['required'] )
|
||||
$label = $label . '<span class="um-req" title="'.__('Required','ultimate-member').'">*</span>';
|
||||
$label = $label . '<span class="um-req" title="'.__('Required','ultimate-member').'">*</span>';
|
||||
|
||||
$tooltip = ! empty( $data['tooltip'] ) ? UM()->tooltip( $data['tooltip'], false, false ) : '';
|
||||
|
||||
@@ -318,8 +326,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
*/
|
||||
function render_hidden( $field_data ) {
|
||||
|
||||
if ( empty( $field_data['id'] ) )
|
||||
if ( empty( $field_data['id'] ) ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
|
||||
$id_attr = ' id="' . $id . '" ';
|
||||
@@ -455,7 +464,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
$value_attr = ' value="' . $value . '" ';
|
||||
|
||||
$html = '<a href="#" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="">' . __( 'Choose Icon', 'ultimate-member' ) . '</a>
|
||||
<span class="um-admin-icon-value">';
|
||||
<span class="um-admin-icon-value">';
|
||||
|
||||
if ( ! empty( $value ) ) {
|
||||
$html .= '<i class="' . $value . '"></i>';
|
||||
@@ -690,7 +699,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
$value = $this->get_field_value( $field_data );
|
||||
|
||||
$html = "<input type=\"hidden\" $id_attr_hidden $name_attr value=\"0\" />
|
||||
<input type=\"checkbox\" $id_attr $class_attr $name_attr $data_attr " . checked( $value, true, false ) . " value=\"1\" />";
|
||||
<input type=\"checkbox\" $id_attr $class_attr $name_attr $data_attr " . checked( $value, true, false ) . " value=\"1\" />";
|
||||
|
||||
|
||||
return $html;
|
||||
@@ -810,8 +819,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
}
|
||||
|
||||
$html .= "<li class=\"um-multi-selects-option-line\"><span class=\"um-field-wrapper\">
|
||||
<select $id_attr $name_attr $class_attr $data_attr>$options</select></span>
|
||||
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-select-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span></li>";
|
||||
<select $id_attr $name_attr $class_attr $data_attr>$options</select></span>
|
||||
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-select-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span></li>";
|
||||
}
|
||||
} elseif ( ! empty( $field_data['show_default_number'] ) && is_numeric( $field_data['show_default_number'] ) && $field_data['show_default_number'] > 0 ) {
|
||||
$i = 0;
|
||||
@@ -824,8 +833,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
}
|
||||
|
||||
$html .= "<li class=\"um-multi-selects-option-line\"><span class=\"um-field-wrapper\">
|
||||
<select $id_attr $name_attr $class_attr $data_attr>$options</select></span>
|
||||
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-select-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span></li>";
|
||||
<select $id_attr $name_attr $class_attr $data_attr>$options</select></span>
|
||||
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-select-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span></li>";
|
||||
|
||||
$i++;
|
||||
}
|
||||
@@ -873,11 +882,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
$name_attr = ' name="' . $name . '[' . $k . ']" ';
|
||||
|
||||
$html .= "<label $for_attr>
|
||||
<input type=\"checkbox\" " . checked( in_array( $k, $values ), true, false ) . "$id_attr $name_attr value=\"1\" $class_attr>
|
||||
<span>$title</span>
|
||||
</label>";
|
||||
<input type=\"checkbox\" " . checked( in_array( $k, $values ), true, false ) . "$id_attr $name_attr value=\"1\" $class_attr>
|
||||
<span>$title</span>
|
||||
</label>";
|
||||
}
|
||||
|
||||
|
||||
$html .= '</span>';
|
||||
$i++;
|
||||
}
|
||||
@@ -929,8 +938,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
$id_attr = ' id="' . $id . '-' . $k . '" ';
|
||||
|
||||
$html .= "<li class=\"um-multi-text-option-line {$size}\"><span class=\"um-field-wrapper\">
|
||||
<input type=\"text\" $id_attr $name_attr $class_attr $data_attr value=\"$value\" /></span>
|
||||
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-text-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span></li>";
|
||||
<input type=\"text\" $id_attr $name_attr $class_attr $data_attr value=\"$value\" /></span>
|
||||
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-text-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span></li>";
|
||||
}
|
||||
} elseif ( ! empty( $field_data['show_default_number'] ) && is_numeric( $field_data['show_default_number'] ) && $field_data['show_default_number'] > 0 ) {
|
||||
$i = 0;
|
||||
@@ -938,8 +947,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
$id_attr = ' id="' . $id . '-' . $i . '" ';
|
||||
|
||||
$html .= "<li class=\"um-multi-text-option-line {$size}\"><span class=\"um-field-wrapper\">
|
||||
<input type=\"text\" $id_attr $name_attr $class_attr $data_attr value=\"\" /></span>
|
||||
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-text-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span></li>";
|
||||
<input type=\"text\" $id_attr $name_attr $class_attr $data_attr value=\"\" /></span>
|
||||
<span class=\"um-field-control\"><a href=\"javascript:void(0);\" class=\"um-text-delete\">" . __( 'Remove', 'ultimate-member' ) . "</a></span></li>";
|
||||
|
||||
$i++;
|
||||
}
|
||||
@@ -993,11 +1002,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
$image_url = ! empty( $value['url'] ) ? $value['url'] : '';
|
||||
|
||||
$html = "<div class=\"um-media-upload\">" .
|
||||
"<input type=\"hidden\" class=\"um-media-upload-data-id\" name=\"{$name}[id]\" id=\"{$id}_id\" value=\"$image_id\">" .
|
||||
"<input type=\"hidden\" class=\"um-media-upload-data-width\" name=\"{$name}[width]\" id=\"{$id}_width\" value=\"$image_width\">" .
|
||||
"<input type=\"hidden\" class=\"um-media-upload-data-height\" name=\"{$name}[height]\" id=\"{$id}_height\" value=\"$image_height\">" .
|
||||
"<input type=\"hidden\" class=\"um-media-upload-data-thumbnail\" name=\"{$name}[thumbnail]\" id=\"{$id}_thumbnail\" value=\"$image_thumbnail\">" .
|
||||
"<input type=\"hidden\" $class_attr name=\"{$name}[url]\" id=\"{$id}_url\" value=\"$image_url\" $data_attr>";
|
||||
"<input type=\"hidden\" class=\"um-media-upload-data-id\" name=\"{$name}[id]\" id=\"{$id}_id\" value=\"$image_id\">" .
|
||||
"<input type=\"hidden\" class=\"um-media-upload-data-width\" name=\"{$name}[width]\" id=\"{$id}_width\" value=\"$image_width\">" .
|
||||
"<input type=\"hidden\" class=\"um-media-upload-data-height\" name=\"{$name}[height]\" id=\"{$id}_height\" value=\"$image_height\">" .
|
||||
"<input type=\"hidden\" class=\"um-media-upload-data-thumbnail\" name=\"{$name}[thumbnail]\" id=\"{$id}_thumbnail\" value=\"$image_thumbnail\">" .
|
||||
"<input type=\"hidden\" $class_attr name=\"{$name}[url]\" id=\"{$id}_url\" value=\"$image_url\" $data_attr>";
|
||||
|
||||
if ( ! isset( $field_data['preview'] ) || $field_data['preview'] !== false ) {
|
||||
$html .= '<img src="' . $image_url . '" alt="" class="icon_preview"><div style="clear:both;"></div>';
|
||||
@@ -1008,7 +1017,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
}
|
||||
|
||||
$html .= '<input type="button" class="um-set-image button button-primary" value="' . __( 'Select', 'ultimate-member' ) . '" data-upload_frame="' . $upload_frame_title . '" />
|
||||
<input type="button" class="um-clear-image button" value="' . __( 'Clear', 'ultimate-member' ) . '" /></div>';
|
||||
<input type="button" class="um-clear-image button" value="' . __( 'Clear', 'ultimate-member' ) . '" /></div>';
|
||||
|
||||
return $html;
|
||||
}
|
||||
|
||||
@@ -1344,30 +1344,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
|
||||
<p>
|
||||
<input type="text" name="<?php echo $attribute; ?>" id="<?php echo $attribute; ?>" value="<?php echo isset( $this->edit_mode_value ) ? $this->edit_mode_value : ''; ?>" placeholder="<?php _e( 'Value', 'ultimate-member' ); ?>" style="width: 150px!important;position: relative;top: -1px;" />
|
||||
</p>
|
||||
<?php
|
||||
break;
|
||||
|
||||
case '_conditional_compare':
|
||||
case '_conditional_compare1':
|
||||
case '_conditional_compare2':
|
||||
case '_conditional_compare3':
|
||||
case '_conditional_compare4':
|
||||
?>
|
||||
<p>
|
||||
<input type="hidden" name="<?php echo $attribute; ?>" id="<?php echo $attribute; ?>" value="<?php echo isset( $this->edit_mode_value ) ? $this->edit_mode_value : ''; ?>">
|
||||
</p>
|
||||
<?php
|
||||
break;
|
||||
|
||||
case '_conditional_group':
|
||||
case '_conditional_group1':
|
||||
case '_conditional_group2':
|
||||
case '_conditional_group3':
|
||||
case '_conditional_group4':
|
||||
?>
|
||||
<p>
|
||||
<input type="hidden" name="<?php echo $attribute; ?>" id="<?php echo $attribute; ?>" value="<?php echo isset( $this->edit_mode_value ) ? $this->edit_mode_value : '0'; ?>">
|
||||
</p>
|
||||
<?php
|
||||
break;
|
||||
|
||||
|
||||
@@ -202,16 +202,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
unset( $condition_fields[ $key ][ $deleted_field ] );
|
||||
unset( $condition_fields[ $key ][ 'conditional_operator' . $deleted_field_id ] );
|
||||
unset( $condition_fields[ $key ][ 'conditional_value' . $deleted_field_id ] );
|
||||
unset( $condition_fields[ $key ][ 'conditional_compare' . $deleted_field_id ] );
|
||||
unset( $condition_fields[ $key ][ 'conditional_group' . $deleted_field_id ] );
|
||||
unset( $condition_fields[ $key ]['conditions'][ $arr_id ] );
|
||||
|
||||
unset( $fields[ $key ][ 'conditional_action' . $deleted_field_id ] );
|
||||
unset( $fields[ $key ][ $deleted_field ] );
|
||||
unset( $fields[ $key ][ 'conditional_operator' . $deleted_field_id ] );
|
||||
unset( $fields[ $key ][ 'conditional_value' . $deleted_field_id ] );
|
||||
unset( $fields[ $key ][ 'conditional_compare' . $deleted_field_id ] );
|
||||
unset( $fields[ $key ][ 'conditional_group' . $deleted_field_id ] );
|
||||
unset( $fields[ $key ]['conditions'][ $arr_id ] );
|
||||
}
|
||||
}
|
||||
@@ -263,40 +259,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
}
|
||||
}
|
||||
|
||||
$keys = array_keys($fields);
|
||||
$last_key = end($keys);
|
||||
unset($fields[$last_key]['conditions']);
|
||||
unset($fields[$last_key]['conditional_action']);
|
||||
unset($fields[$last_key]['conditional_action1']);
|
||||
unset($fields[$last_key]['conditional_action2']);
|
||||
unset($fields[$last_key]['conditional_action3']);
|
||||
unset($fields[$last_key]['conditional_action4']);
|
||||
unset($fields[$last_key]['conditional_field']);
|
||||
unset($fields[$last_key]['conditional_field1']);
|
||||
unset($fields[$last_key]['conditional_field2']);
|
||||
unset($fields[$last_key]['conditional_field3']);
|
||||
unset($fields[$last_key]['conditional_field4']);
|
||||
unset($fields[$last_key]['conditional_operator']);
|
||||
unset($fields[$last_key]['conditional_operator1']);
|
||||
unset($fields[$last_key]['conditional_operator2']);
|
||||
unset($fields[$last_key]['conditional_operator3']);
|
||||
unset($fields[$last_key]['conditional_operator4']);
|
||||
unset($fields[$last_key]['conditional_value']);
|
||||
unset($fields[$last_key]['conditional_value1']);
|
||||
unset($fields[$last_key]['conditional_value2']);
|
||||
unset($fields[$last_key]['conditional_value3']);
|
||||
unset($fields[$last_key]['conditional_value4']);
|
||||
unset($fields[$last_key]['conditional_group']);
|
||||
unset($fields[$last_key]['conditional_group1']);
|
||||
unset($fields[$last_key]['conditional_group2']);
|
||||
unset($fields[$last_key]['conditional_group3']);
|
||||
unset($fields[$last_key]['conditional_group4']);
|
||||
unset($fields[$last_key]['conditional_compare']);
|
||||
unset($fields[$last_key]['conditional_compare1']);
|
||||
unset($fields[$last_key]['conditional_compare2']);
|
||||
unset($fields[$last_key]['conditional_compare3']);
|
||||
unset($fields[$last_key]['conditional_compare4']);
|
||||
|
||||
// add field to form
|
||||
UM()->query()->update_attr( 'custom_fields', $form_id, $fields );
|
||||
|
||||
@@ -1283,8 +1245,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
if (isset( $array['conditions'] ) && is_array( $array['conditions'] ) && !$this->viewing) {
|
||||
$array['conditional'] = '';
|
||||
|
||||
$cond_data = json_encode($array['conditions']);
|
||||
$array['conditional'] .= " data-conds='".$cond_data."'";
|
||||
foreach ($array['conditions'] as $cond_id => $cond) {
|
||||
$array['conditional'] .= ' data-cond-' . $cond_id . '-action="' . $cond[0] . '" data-cond-' . $cond_id . '-field="' . $cond[1] . '" data-cond-' . $cond_id . '-operator="' . $cond[2] . '" data-cond-' . $cond_id . '-value="' . $cond[3] . '"';
|
||||
}
|
||||
|
||||
$array['classes'] .= ' um-is-conditional';
|
||||
|
||||
|
||||
+700
-706
File diff suppressed because it is too large
Load Diff
@@ -1,28 +1,38 @@
|
||||
<?php foreach( UM()->shortcodes()->loop as $comment ) { ?>
|
||||
<?php $post_type = get_post_type( $comment->comment_post_ID );
|
||||
if( $post_type == 'um_groups_discussion' ){
|
||||
$comment_id = $comment->comment_post_ID;
|
||||
$group_id = get_post_meta( $comment_id, '_group_id', true);
|
||||
$comment_title = get_the_title($group_id);
|
||||
$link = site_url().'/groups/'.$comment_title.'/?tab=discussion'.'#commentid-'.$comment_id;
|
||||
} else {
|
||||
$comment_title = get_the_title($comment->comment_post_ID);
|
||||
$link = get_permalink($comment->comment_post_ID);
|
||||
}
|
||||
?>
|
||||
<div class="um-item">
|
||||
<div class="um-item-link"><i class="um-icon-chatboxes"></i><a href="<?php echo get_comment_link( $comment->comment_ID ); ?>"><?php echo get_comment_excerpt( $comment->comment_ID ); ?></a></div>
|
||||
<div class="um-item-meta">
|
||||
<span><?php printf(__('On <a href="%1$s">%2$s</a>','ultimate-member'), $link, $comment_title ); ?></span>
|
||||
</div>
|
||||
<?php if ( ! defined( 'ABSPATH' ) ) exit;
|
||||
|
||||
foreach ( UM()->shortcodes()->loop as $comment ) {
|
||||
|
||||
$post_type = get_post_type( $comment->comment_post_ID );
|
||||
if ( $post_type == 'um_groups_discussion' ) {
|
||||
$comment_id = $comment->comment_post_ID;
|
||||
$group_id = get_post_meta( $comment_id, '_group_id', true );
|
||||
$comment_title = get_the_title( $group_id );
|
||||
$link = site_url() . '/groups/' . $comment_title . '/?tab=discussion#commentid-' . $comment_id;
|
||||
} else {
|
||||
$comment_title = get_the_title( $comment->comment_post_ID );
|
||||
$link = get_permalink( $comment->comment_post_ID );
|
||||
} ?>
|
||||
|
||||
<div class="um-item">
|
||||
<div class="um-item-link">
|
||||
<i class="um-icon-chatboxes"></i>
|
||||
<a href="<?php echo get_comment_link( $comment->comment_ID ); ?>">
|
||||
<?php echo get_comment_excerpt( $comment->comment_ID ); ?>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
<?php if ( isset( UM()->shortcodes()->modified_args) && count(UM()->shortcodes()->loop) >= 10 ) { ?>
|
||||
|
||||
<div class="um-load-items">
|
||||
<a href="#" class="um-ajax-paginate um-button" data-hook="um_load_comments" data-args="<?php echo UM()->shortcodes()->modified_args; ?>"><?php _e('load more comments','ultimate-member'); ?></a>
|
||||
<div class="um-item-meta">
|
||||
<span><?php printf( __( 'On <a href="%1$s">%2$s</a>','ultimate-member' ), $link, $comment_title ); ?></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
<?php }
|
||||
|
||||
if ( isset( UM()->shortcodes()->modified_args ) && count(UM()->shortcodes()->loop ) >= 10 ) { ?>
|
||||
|
||||
<div class="um-load-items">
|
||||
<a href="#" class="um-ajax-paginate um-button" data-hook="um_load_comments" data-args="<?php echo UM()->shortcodes()->modified_args; ?>">
|
||||
<?php _e('load more comments','ultimate-member'); ?>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<?php }
|
||||
Reference in New Issue
Block a user