From ca4396e4698ad72c69bd38717a918d95f77eca5c Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Tue, 7 Nov 2023 12:29:38 +0200 Subject: [PATCH] - wp-admin assets refactoring (in process); --- .../css/admin/builder-rtl.css | 27 - assets/css/admin/builder-rtl.min.css | 1 + assets/css/admin/forms-rtl.css | 26 + assets/css/admin/forms-rtl.min.css | 1 + assets/js/admin/builder.js | 15 + assets/js/admin/builder.min.js | 2 +- assets/js/admin/modal.js | 174 +++--- assets/js/admin/modal.min.js | 2 +- includes/admin/assets/css/um-admin-forms.css | 548 ------------------ includes/admin/class-enqueue.php | 29 +- 10 files changed, 138 insertions(+), 687 deletions(-) rename includes/admin/assets/css/um-admin-rtl.css => assets/css/admin/builder-rtl.css (52%) create mode 100644 assets/css/admin/builder-rtl.min.css create mode 100644 assets/css/admin/forms-rtl.css create mode 100644 assets/css/admin/forms-rtl.min.css delete mode 100644 includes/admin/assets/css/um-admin-forms.css diff --git a/includes/admin/assets/css/um-admin-rtl.css b/assets/css/admin/builder-rtl.css similarity index 52% rename from includes/admin/assets/css/um-admin-rtl.css rename to assets/css/admin/builder-rtl.css index 4e2298bf..2b106528 100644 --- a/includes/admin/assets/css/um-admin-rtl.css +++ b/assets/css/admin/builder-rtl.css @@ -38,30 +38,3 @@ float: right; margin: 0 20px 0 0; } - -.select2-container .select2-choice > .select2-chosen { - text-align: right !important; -} - -.select2-container .select2-choice .select2-arrow { - border: none !important; - right: auto !important; - left: 0 !important; -} - -.select2-container .select2-choice > .select2-chosen { - margin-right: 10px !important; - margin-left: 26px !important; -} - -.um-form-fields-section { - padding: 0 0 0 10px; -} - -.um-form-fields-section { - float: right; -} - -.um-form-fields-section label input { - float: right; -} diff --git a/assets/css/admin/builder-rtl.min.css b/assets/css/admin/builder-rtl.min.css new file mode 100644 index 00000000..2ba34da4 --- /dev/null +++ b/assets/css/admin/builder-rtl.min.css @@ -0,0 +1 @@ +.um-admin-drag-ctrls-demo.um-admin-drag-ctrls{left:12px;right:auto}.um-admin-drag-row-icons{left:0;right:auto}.um-admin-drag-ctrls.columns{right:0!important;left:auto}.um-admin-drag-ctrls.columns a{float:right}.um-admin-drag-rowsub-icons{right:auto;left:0}.um-admin-drag-row-icons a{float:right}.um-admin-drag-fld-icons a{float:right}.um-admin-drag-fld-icons{float:left}.um-admin-drag-fld-title,.um-admin-drag-fld-type{float:right;margin:0 20px 0 0} \ No newline at end of file diff --git a/assets/css/admin/forms-rtl.css b/assets/css/admin/forms-rtl.css new file mode 100644 index 00000000..9fdb2978 --- /dev/null +++ b/assets/css/admin/forms-rtl.css @@ -0,0 +1,26 @@ +.um-form-fields-section { + padding: 0 0 0 10px; +} + +.um-form-fields-section { + float: right; +} + +.um-form-fields-section label input { + float: right; +} + +.select2-container .select2-choice > .select2-chosen { + text-align: right !important; +} + +.select2-container .select2-choice .select2-arrow { + border: none !important; + right: auto !important; + left: 0 !important; +} + +.select2-container .select2-choice > .select2-chosen { + margin-right: 10px !important; + margin-left: 26px !important; +} diff --git a/assets/css/admin/forms-rtl.min.css b/assets/css/admin/forms-rtl.min.css new file mode 100644 index 00000000..086900a8 --- /dev/null +++ b/assets/css/admin/forms-rtl.min.css @@ -0,0 +1 @@ +.um-form-fields-section{padding:0 0 0 10px}.um-form-fields-section{float:right}.um-form-fields-section label input{float:right}.select2-container .select2-choice>.select2-chosen{text-align:right!important}.select2-container .select2-choice .select2-arrow{border:none!important;right:auto!important;left:0!important}.select2-container .select2-choice>.select2-chosen{margin-right:10px!important;margin-left:26px!important} \ No newline at end of file diff --git a/assets/js/admin/builder.js b/assets/js/admin/builder.js index c6b76165..ce631133 100644 --- a/assets/js/admin/builder.js +++ b/assets/js/admin/builder.js @@ -100,6 +100,21 @@ wp.hooks.addAction( 'um_admin_modal_success_result', 'um_admin_builder', functio UM.common.datetimePicker.init(); }); +wp.hooks.addAction( 'um_admin_modal_resize', 'um_admin_builder', function() { + if ( jQuery('#UM_preview_form .um-s1').length ) { + jQuery("#UM_preview_form .um-s1").select2({ + allowClear: true + }); + } + + if ( jQuery('#UM_preview_form .um-s2').length ) { + jQuery("#UM_preview_form .um-s2").select2({ + allowClear: false, + minimumResultsForSearch: 10 + }); + } +}); + wp.hooks.addAction( 'um_admin_modal_remove', 'um_admin_builder', function() { if ( jQuery('.um-admin-editor:visible').length > 0 ) { tinyMCE.triggerSave(); diff --git a/assets/js/admin/builder.min.js b/assets/js/admin/builder.min.js index 6a6857fd..ec18e9ca 100644 --- a/assets/js/admin/builder.min.js +++ b/assets/js/admin/builder.min.js @@ -1 +1 @@ -function UM_Drag_and_Drop(){jQuery(".um-admin-drag-col,.um-admin-drag-group").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",placeholder:"um-fld-placeholder",forcePlaceholderSize:!0,update:function(i,e){jQuery("#publish").attr("disabled","disabled"),e.item.hasClass("um-field-type-group")&&0')})}function UM_update_subrows(){jQuery('a[data-remove_element="um-admin-drag-rowsub"]').remove(),jQuery(".um-admin-drag-row").each(function(){c=0,jQuery(this).find(".um-admin-drag-rowsub").each(function(){c++,row=jQuery(this),1!=c&&row.find(".um-admin-drag-rowsub-icons").append('')})})}function UM_Change_Field_Col(){jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){cols=jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length,(col=jQuery(this).parents(".um-admin-drag-col")).hasClass("cols-last")?(1==cols&&(saved_col=1),3==cols?saved_col=3:2==cols&&(saved_col=2)):saved_col=col.hasClass("cols-middle")&&3==cols?2:1,jQuery(this).data("column",saved_col)})}function UM_Change_Field_Grp(){jQuery(".um-admin-drag-col .um-admin-drag-fld:not(.um-field-type-group)").each(function(){0==jQuery(this).parents(".um-admin-drag-group").length?jQuery(this).data("group",""):jQuery(this).data("group",jQuery(this).parents(".um-admin-drag-fld.um-field-type-group").data("key"))})}function UM_Rows_Refresh(){jQuery(".um_update_order_fields").empty();var e,d=0;jQuery(".um-admin-drag-row").each(function(){d++,row=jQuery(this),col_num="",row.find(".um-admin-drag-rowsub").each(function(){(subrow=jQuery(this)).find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),subrow.find(".um-admin-drag-col").addClass("cols-"+subrow.find(".um-admin-drag-col").length),subrow.find(".um-admin-drag-col:last").addClass("cols-last"),3==subrow.find(".um-admin-drag-col").length&&subrow.find(".um-admin-drag-col:eq(1)").addClass("cols-middle"),col_num=col_num?col_num+":"+subrow.find(".um-admin-drag-col").length:subrow.find(".um-admin-drag-col").length}),jQuery(".um_update_order_fields").append(''),sub_rows_count=row.find(".um-admin-drag-rowsub").length;var i=jQuery(this).attr("data-original");jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(this).attr("data-original","_um_row_"+d)}),e=0,jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){var i;jQuery(this).hasClass("group")||(""!=(i=jQuery(this).data("group"))?(0==jQuery(".um-admin-drag-fld.um-field-type-group."+i).find(".um-admin-drag-group").find(jQuery(this)).length&&jQuery(this).appendTo(jQuery(".um-admin-drag-fld.um-field-type-group."+i).find(".um-admin-drag-group")),jQuery(".um_update_order_fields").append('')):jQuery(".um_update_order_fields").append('')),e++,row="_um_row_"+(row=jQuery(this).parents(".um-admin-drag-row").index()+1),3==(saved_col=jQuery(this).data("column"))&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(2)")),2==saved_col&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(1)")),sub_row=jQuery(this).parents(".um-admin-drag-rowsub").index(),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append('')}),UM_Drag_and_Drop(),UM_Add_Icon(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:jQuery(".um_update_order").serialize(),success:function(){jQuery("#publish").prop("disabled",!1)}})}function UM_Add_Icon(){var i='';jQuery(".um-admin-drag-col").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(i)}),jQuery(".um-admin-drag-group").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(i)})}function um_builder_delete_field_ajax(e){var i,d;0").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith('
'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),d=void 0===tinyMCEPreInit.mceInit[e]?tinyMCEPreInit.mceInit[e]=tinyMCE.extend({},tinyMCEPreInit.mceInit[e]):tinyMCEPreInit.mceInit[e],"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),"object"==typeof window.switchEditors&&window.switchEditors.go(e),tinyMCE.init(d),tinyMCE.get(e).setContent(i),a):(UM.admin.builder.tinyMCE.editor=jQuery("
").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith('
'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),jQuery("#"+e))).html(i),jQuery("body").on("click",".wp-switch-editor",function(){var i=jQuery(this);i.hasClass("wp-switch-editor")&&"object"==typeof window.switchEditors&&(i=i.hasClass("switch-tmce")?"tmce":"html",window.switchEditors.go(e,i))})}}},wp.hooks.addAction("um_admin_modal_success_result","um_admin_builder",function(i,e){UM.admin.builder.fieldConditions.refresh(),jQuery("#_custom_dropdown_options_source").trigger("blur"),0'+jQuery(".um-col-demon-row").html()+"
"),i.find(".um-admin-drag-row:last").find(".um-admin-drag-row-icons").find("a.um-admin-drag-row-edit").attr("data-arg3","_um_row_"+i.find(".um-admin-drag-row").length),i.find(".um-admin-drag-row:last").attr("data-original","_um_row_"+i.find(".um-admin-drag-row").length),UM_update_rows(),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'*[data-row_action="add_subrow"]',function(){jQuery(this).parents(".um-admin-drag-row").find(".um-admin-drag-rowsubs").append('
'+jQuery(".um-col-demon-subrow").html()+"
"),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'a[data-remove_element^="um-"]',function(){let i=jQuery(this),e=jQuery(this).data("remove_element"),d=jQuery(this).parents("."+e).children(".um-admin-row-loading");var a=jQuery(this).parents(".um-admin-drag-row").index(),n=jQuery(this).parents(".um-admin-drag-rowsub").index();let r={row:a,subrow:n},o=!1;jQuery.each(UM.admin.builder.deleteProcess,function(i){if(r.row===UM.admin.builder.deleteProcess[i].row&&r.subrow===UM.admin.builder.deleteProcess[i].subrow)return!(o=!0)}),o||(d.show(),UM.admin.builder.deleteProcess.push({row:a,subrow:n}),UM.admin.builder.fieldsToDelete=jQuery(this).parents("."+e).find(".um-admin-drag-fld").toArray(),0');e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col").length),e.find(".um-admin-drag-col:last").addClass("cols-last"),3==e.find(".um-admin-drag-col").length&&e.find(".um-admin-drag-col:eq(1)").addClass("cols-middle")}else n<0&&(2==(n+=3)&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col.cols-last").remove()),1==n&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-middle").html()),e.find(".um-admin-drag-col.cols-last").remove(),e.find(".um-admin-drag-col.cols-middle").remove()),e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col:visible").length),e.find(".um-admin-drag-col:last").addClass("cols-last"));1==allow_update_via_col_click&&(UM_Change_Field_Col(),UM_Rows_Refresh())}),allow_update_via_col_click=!1,jQuery(".um-admin-drag-ctrls.columns a.active").each(function(){jQuery(this).trigger("click")}).promise().done(function(){allow_update_via_col_click=!0}),UM_Rows_Refresh()}); \ No newline at end of file +function UM_Drag_and_Drop(){jQuery(".um-admin-drag-col,.um-admin-drag-group").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",placeholder:"um-fld-placeholder",forcePlaceholderSize:!0,update:function(i,e){jQuery("#publish").attr("disabled","disabled"),e.item.hasClass("um-field-type-group")&&0')})}function UM_update_subrows(){jQuery('a[data-remove_element="um-admin-drag-rowsub"]').remove(),jQuery(".um-admin-drag-row").each(function(){c=0,jQuery(this).find(".um-admin-drag-rowsub").each(function(){c++,row=jQuery(this),1!=c&&row.find(".um-admin-drag-rowsub-icons").append('')})})}function UM_Change_Field_Col(){jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){cols=jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length,(col=jQuery(this).parents(".um-admin-drag-col")).hasClass("cols-last")?(1==cols&&(saved_col=1),3==cols?saved_col=3:2==cols&&(saved_col=2)):saved_col=col.hasClass("cols-middle")&&3==cols?2:1,jQuery(this).data("column",saved_col)})}function UM_Change_Field_Grp(){jQuery(".um-admin-drag-col .um-admin-drag-fld:not(.um-field-type-group)").each(function(){0==jQuery(this).parents(".um-admin-drag-group").length?jQuery(this).data("group",""):jQuery(this).data("group",jQuery(this).parents(".um-admin-drag-fld.um-field-type-group").data("key"))})}function UM_Rows_Refresh(){jQuery(".um_update_order_fields").empty();var e,d=0;jQuery(".um-admin-drag-row").each(function(){d++,row=jQuery(this),col_num="",row.find(".um-admin-drag-rowsub").each(function(){(subrow=jQuery(this)).find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),subrow.find(".um-admin-drag-col").addClass("cols-"+subrow.find(".um-admin-drag-col").length),subrow.find(".um-admin-drag-col:last").addClass("cols-last"),3==subrow.find(".um-admin-drag-col").length&&subrow.find(".um-admin-drag-col:eq(1)").addClass("cols-middle"),col_num=col_num?col_num+":"+subrow.find(".um-admin-drag-col").length:subrow.find(".um-admin-drag-col").length}),jQuery(".um_update_order_fields").append(''),sub_rows_count=row.find(".um-admin-drag-rowsub").length;var i=jQuery(this).attr("data-original");jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(this).attr("data-original","_um_row_"+d)}),e=0,jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){var i;jQuery(this).hasClass("group")||(""!=(i=jQuery(this).data("group"))?(0==jQuery(".um-admin-drag-fld.um-field-type-group."+i).find(".um-admin-drag-group").find(jQuery(this)).length&&jQuery(this).appendTo(jQuery(".um-admin-drag-fld.um-field-type-group."+i).find(".um-admin-drag-group")),jQuery(".um_update_order_fields").append('')):jQuery(".um_update_order_fields").append('')),e++,row="_um_row_"+(row=jQuery(this).parents(".um-admin-drag-row").index()+1),3==(saved_col=jQuery(this).data("column"))&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(2)")),2==saved_col&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(1)")),sub_row=jQuery(this).parents(".um-admin-drag-rowsub").index(),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append('')}),UM_Drag_and_Drop(),UM_Add_Icon(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:jQuery(".um_update_order").serialize(),success:function(){jQuery("#publish").prop("disabled",!1)}})}function UM_Add_Icon(){var i='';jQuery(".um-admin-drag-col").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(i)}),jQuery(".um-admin-drag-group").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(i)})}function um_builder_delete_field_ajax(e){var i,d;0").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith('
'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),d=void 0===tinyMCEPreInit.mceInit[e]?tinyMCEPreInit.mceInit[e]=tinyMCE.extend({},tinyMCEPreInit.mceInit[e]):tinyMCEPreInit.mceInit[e],"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),"object"==typeof window.switchEditors&&window.switchEditors.go(e),tinyMCE.init(d),tinyMCE.get(e).setContent(i),a):(UM.admin.builder.tinyMCE.editor=jQuery("
").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith('
'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),jQuery("#"+e))).html(i),jQuery("body").on("click",".wp-switch-editor",function(){var i=jQuery(this);i.hasClass("wp-switch-editor")&&"object"==typeof window.switchEditors&&(i=i.hasClass("switch-tmce")?"tmce":"html",window.switchEditors.go(e,i))})}}},wp.hooks.addAction("um_admin_modal_success_result","um_admin_builder",function(i,e){UM.admin.builder.fieldConditions.refresh(),jQuery("#_custom_dropdown_options_source").trigger("blur"),0'+jQuery(".um-col-demon-row").html()+"
"),i.find(".um-admin-drag-row:last").find(".um-admin-drag-row-icons").find("a.um-admin-drag-row-edit").attr("data-arg3","_um_row_"+i.find(".um-admin-drag-row").length),i.find(".um-admin-drag-row:last").attr("data-original","_um_row_"+i.find(".um-admin-drag-row").length),UM_update_rows(),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'*[data-row_action="add_subrow"]',function(){jQuery(this).parents(".um-admin-drag-row").find(".um-admin-drag-rowsubs").append('
'+jQuery(".um-col-demon-subrow").html()+"
"),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'a[data-remove_element^="um-"]',function(){let i=jQuery(this),e=jQuery(this).data("remove_element"),d=jQuery(this).parents("."+e).children(".um-admin-row-loading");var a=jQuery(this).parents(".um-admin-drag-row").index(),n=jQuery(this).parents(".um-admin-drag-rowsub").index();let r={row:a,subrow:n},o=!1;jQuery.each(UM.admin.builder.deleteProcess,function(i){if(r.row===UM.admin.builder.deleteProcess[i].row&&r.subrow===UM.admin.builder.deleteProcess[i].subrow)return!(o=!0)}),o||(d.show(),UM.admin.builder.deleteProcess.push({row:a,subrow:n}),UM.admin.builder.fieldsToDelete=jQuery(this).parents("."+e).find(".um-admin-drag-fld").toArray(),0');e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col").length),e.find(".um-admin-drag-col:last").addClass("cols-last"),3==e.find(".um-admin-drag-col").length&&e.find(".um-admin-drag-col:eq(1)").addClass("cols-middle")}else n<0&&(2==(n+=3)&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col.cols-last").remove()),1==n&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-middle").html()),e.find(".um-admin-drag-col.cols-last").remove(),e.find(".um-admin-drag-col.cols-middle").remove()),e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col:visible").length),e.find(".um-admin-drag-col:last").addClass("cols-last"));1==allow_update_via_col_click&&(UM_Change_Field_Col(),UM_Rows_Refresh())}),allow_update_via_col_click=!1,jQuery(".um-admin-drag-ctrls.columns a.active").each(function(){jQuery(this).trigger("click")}).promise().done(function(){allow_update_via_col_click=!0}),UM_Rows_Refresh()}); \ No newline at end of file diff --git a/assets/js/admin/modal.js b/assets/js/admin/modal.js index 346dfcea..29553857 100644 --- a/assets/js/admin/modal.js +++ b/assets/js/admin/modal.js @@ -7,6 +7,9 @@ if ( typeof (window.UM.admin) !== 'object' ) { } UM.admin.modal = { + getVisible: function() { + return jQuery('.um-admin-modal:visible'); + }, preload: function () { jQuery('.um-admin-modal:visible').addClass('loading'); jQuery('.um-admin-modal-body:visible').empty(); @@ -25,6 +28,7 @@ UM.admin.modal = { UM.admin.tooltip.close(); UM.common.tipsy.hide(); + 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(); @@ -33,102 +37,81 @@ UM.admin.modal = { var required_margin = jQuery('.um-admin-modal:visible').innerHeight() / 2 + 'px'; jQuery('.um-admin-modal:visible').css({'margin-top': '-' + required_margin }); - if ( jQuery('#UM_preview_form .um-s1').length ) { - jQuery("#UM_preview_form .um-s1").select2({ - allowClear: true - }); - } + wp.hooks.doAction( 'um_admin_modal_resize' ); + }, + show: function( id, ajax, size ) { + UM.common.tipsy.hide(); - if ( jQuery('#UM_preview_form .um-s2').length ) { - jQuery("#UM_preview_form .um-s2").select2({ - allowClear: false, - minimumResultsForSearch: 10 - }); - } - } -} + UM.admin.modal.remove(); -function um_admin_new_modal( id, ajax, size ) { - var modal = jQuery('body').find('.um-admin-overlay'); + jQuery('body').addClass('um-admin-modal-open').append('
'); + jQuery('#' + id).prependTo('.um-admin-modal'); + jQuery('#' + id).show(); + jQuery('.um-admin-modal').show(); - UM.common.tipsy.hide(); + jQuery('.um-admin-modal-head').append(''); - UM.admin.modal.remove(); - - jQuery('body').addClass('um-admin-modal-open').append('
'); - jQuery('#' + id).prependTo('.um-admin-modal'); - jQuery('#' + id).show(); - jQuery('.um-admin-modal').show(); - - jQuery('.um-admin-modal-head').append(''); - - if ( ajax == true ) { - UM.admin.modal.setSize( size ); - UM.admin.modal.preload(); - UM.admin.modal.resize(); - } else { - UM.admin.modal.resize(); - } -} - -function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) { - let in_row = ''; - let in_sub_row = ''; - let in_column = ''; - let in_group = ''; - - let $hiddenModalData = jQuery('.um-col-demon-settings'); - - if ( $hiddenModalData.data('in_column') ) { - in_row = $hiddenModalData.data('in_row'); - in_sub_row = $hiddenModalData.data('in_sub_row'); - in_column = $hiddenModalData.data('in_column'); - in_group = $hiddenModalData.data('in_group'); - } - - let form_mode = jQuery('input[type="hidden"][id="form__um_mode"]').val(); - - jQuery.ajax({ - url: wp.ajax.settings.url, - type: 'POST', - data: { - action:'um_dynamic_modal_content', - act_id: act_id, - arg1 : arg1, - arg2 : arg2, - arg3: arg3, - in_row: in_row, - in_sub_row: in_sub_row, - in_column: in_column, - in_group: in_group, - nonce: um_admin_scripts.nonce, - form_mode: form_mode - }, - complete: function(){ - UM.admin.modal.loaded(); + if ( ajax == true ) { + UM.admin.modal.setSize( size ); + UM.admin.modal.preload(); + UM.admin.modal.resize(); + } else { UM.admin.modal.resize(); - }, - success: function(data) { - let $adminModal = jQuery('.um-admin-modal'); - $adminModal.find('.um-admin-modal-body').html( data ); - - wp.hooks.doAction( 'um_admin_modal_success_result', $adminModal, act_id ); - - UM.admin.tooltip.init(); - }, - error: function(data) { - } - }); - return false; -} + }, + contentRequest: function( act_id, arg1, arg2, arg3 ) { + let in_row = ''; + let in_sub_row = ''; + let in_column = ''; + let in_group = ''; -/** - Custom modal scripting starts -**/ + let $hiddenModalData = jQuery('.um-col-demon-settings'); + + if ( $hiddenModalData.data('in_column') ) { + in_row = $hiddenModalData.data('in_row'); + in_sub_row = $hiddenModalData.data('in_sub_row'); + in_column = $hiddenModalData.data('in_column'); + in_group = $hiddenModalData.data('in_group'); + } + + let form_mode = jQuery('input[type="hidden"][id="form__um_mode"]').val(); + + jQuery.ajax({ + url: wp.ajax.settings.url, + type: 'POST', + data: { + action:'um_dynamic_modal_content', + act_id: act_id, + arg1 : arg1, + arg2 : arg2, + arg3: arg3, + in_row: in_row, + in_sub_row: in_sub_row, + in_column: in_column, + in_group: in_group, + nonce: um_admin_scripts.nonce, + form_mode: form_mode + }, + complete: function(){ + UM.admin.modal.loaded(); + UM.admin.modal.resize(); + }, + success: function(data) { + let $adminModal = jQuery('.um-admin-modal'); + $adminModal.find('.um-admin-modal-body').html( data ); + + wp.hooks.doAction( 'um_admin_modal_success_result', $adminModal, act_id ); + + UM.admin.tooltip.init(); + }, + error: function(data) { + + } + }); + } +} jQuery(document).ready(function() { - /** remove modal via action **/ @@ -143,27 +126,22 @@ jQuery(document).ready(function() { jQuery(document.body).on('click', 'a[data-modal^="UM_"], span[data-modal^="UM_"]', function(e){ e.preventDefault(); - var modal_id = jQuery(this).attr('data-modal'); + let 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 == '' ) { + 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') ); + UM.admin.modal.show( modal_id, true, jQuery(this).data('modal-size') ); + UM.admin.modal.contentRequest( jQuery(this).data('dynamic-content'), jQuery(this).data('arg1'), jQuery(this).data('arg2'), jQuery(this).data('arg3') ); } else { - um_admin_new_modal( modal_id ); + UM.admin.modal.show( modal_id ); } - - return false; - }); /** @@ -172,7 +150,7 @@ jQuery(document).ready(function() { jQuery(document.body).on('click', '#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)', function(){ var v_id = ''; var icon_selected = jQuery(this).attr('data-code'); - if ( icon_selected != '' ) { + if ( '' !== icon_selected ) { if ( jQuery(this).attr('data-modal') ) { v_id = '#' + jQuery(this).attr('data-modal'); } else { diff --git a/assets/js/admin/modal.min.js b/assets/js/admin/modal.min.js index 10b9c6c7..cea0b602 100644 --- a/assets/js/admin/modal.min.js +++ b/assets/js/admin/modal.min.js @@ -1 +1 @@ -function um_admin_new_modal(a,i,n){jQuery("body").find(".um-admin-overlay");UM.common.tipsy.hide(),UM.admin.modal.remove(),jQuery("body").addClass("um-admin-modal-open").append('
'),jQuery("#"+a).prependTo(".um-admin-modal"),jQuery("#"+a).show(),jQuery(".um-admin-modal").show(),jQuery(".um-admin-modal-head").append(''),1==i&&(UM.admin.modal.setSize(n),UM.admin.modal.preload()),UM.admin.modal.resize()}function um_admin_modal_ajaxcall(n,a,i,d){let o="",e="",m="",t="";var u=jQuery(".um-col-demon-settings"),u=(u.data("in_column")&&(o=u.data("in_row"),e=u.data("in_sub_row"),m=u.data("in_column"),t=u.data("in_group")),jQuery('input[type="hidden"][id="form__um_mode"]').val());return jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:n,arg1:a,arg2:i,arg3:d,in_row:o,in_sub_row:e,in_column:m,in_group:t,nonce:um_admin_scripts.nonce,form_mode:u},complete:function(){UM.admin.modal.loaded(),UM.admin.modal.resize()},success:function(a){var i=jQuery(".um-admin-modal");i.find(".um-admin-modal-body").html(a),wp.hooks.doAction("um_admin_modal_success_result",i,n),UM.admin.tooltip.init()},error:function(a){}}),!1}"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin.modal={preload:function(){jQuery(".um-admin-modal:visible").addClass("loading"),jQuery(".um-admin-modal-body:visible").empty()},loaded:function(){jQuery(".um-admin-modal:visible").removeClass("loading")},setSize:function(a){jQuery(".um-admin-modal:visible").addClass(a)},setAttr:function(a,i){jQuery(".um-admin-modal:visible").data(a,i)},remove:function(){wp.hooks.doAction("um_admin_modal_remove"),UM.admin.tooltip.close(),UM.common.tipsy.hide(),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()},resize:function(){var a=jQuery(".um-admin-modal:visible").innerHeight()/2+"px";jQuery(".um-admin-modal:visible").css({"margin-top":"-"+a}),jQuery("#UM_preview_form .um-s1").length&&jQuery("#UM_preview_form .um-s1").select2({allowClear:!0}),jQuery("#UM_preview_form .um-s2").length&&jQuery("#UM_preview_form .um-s2").select2({allowClear:!1,minimumResultsForSearch:10})}},jQuery(document).ready(function(){jQuery(document.body).on("click",'.um-admin-overlay, a[data-action="UM_remove_modal"]',function(){UM.common.tipsy.hide(),UM.admin.modal.remove()}),jQuery(document.body).on("click",'a[data-modal^="UM_"], span[data-modal^="UM_"]',function(a){a.preventDefault();a=jQuery(this).attr("data-modal");return jQuery(this).attr("data-back")&&(jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-modal",jQuery(this).attr("data-back")),""==jQuery("#"+jQuery(this).attr("data-back")).find("input#_icon").val())&&jQuery("#UM_fonticons").find(".um-admin-icons span").removeClass("highlighted"),jQuery(this).data("dynamic-content")?(um_admin_new_modal(a,!0,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"))):um_admin_new_modal(a),!1}),jQuery(document.body).on("click","#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)",function(){var a="",i=jQuery(this).attr("data-code");""!=i&&(a=jQuery(this).attr("data-modal")?"#"+jQuery(this).attr("data-modal"):".postbox",jQuery(a).find("input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon").val(i),jQuery(a).find("span.um-admin-icon-value").html(''),jQuery(a).find(".um-admin-icon-clear").show()),jQuery(this).attr("data-code",""),".postbox"==a&&(UM.common.tipsy.hide(),UM.admin.modal.remove())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var a=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),a.find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),(a=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),jQuery(this).hide()}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),UM.admin.modal.resize()})}); \ No newline at end of file +"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin.modal={getVisible:function(){return jQuery(".um-admin-modal:visible")},preload:function(){jQuery(".um-admin-modal:visible").addClass("loading"),jQuery(".um-admin-modal-body:visible").empty()},loaded:function(){jQuery(".um-admin-modal:visible").removeClass("loading")},setSize:function(a){jQuery(".um-admin-modal:visible").addClass(a)},setAttr:function(a,i){jQuery(".um-admin-modal:visible").data(a,i)},remove:function(){wp.hooks.doAction("um_admin_modal_remove"),UM.admin.tooltip.close(),UM.common.tipsy.hide(),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()},resize:function(){var a=jQuery(".um-admin-modal:visible").innerHeight()/2+"px";jQuery(".um-admin-modal:visible").css({"margin-top":"-"+a}),wp.hooks.doAction("um_admin_modal_resize")},show:function(a,i,n){UM.common.tipsy.hide(),UM.admin.modal.remove(),jQuery("body").addClass("um-admin-modal-open").append('
'),jQuery("#"+a).prependTo(".um-admin-modal"),jQuery("#"+a).show(),jQuery(".um-admin-modal").show(),jQuery(".um-admin-modal-head").append(''),1==i&&(UM.admin.modal.setSize(n),UM.admin.modal.preload()),UM.admin.modal.resize()},contentRequest:function(n,a,i,o){let d="",e="",m="",t="";var u=jQuery(".um-col-demon-settings"),u=(u.data("in_column")&&(d=u.data("in_row"),e=u.data("in_sub_row"),m=u.data("in_column"),t=u.data("in_group")),jQuery('input[type="hidden"][id="form__um_mode"]').val());jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:n,arg1:a,arg2:i,arg3:o,in_row:d,in_sub_row:e,in_column:m,in_group:t,nonce:um_admin_scripts.nonce,form_mode:u},complete:function(){UM.admin.modal.loaded(),UM.admin.modal.resize()},success:function(a){var i=jQuery(".um-admin-modal");i.find(".um-admin-modal-body").html(a),wp.hooks.doAction("um_admin_modal_success_result",i,n),UM.admin.tooltip.init()},error:function(a){}})}},jQuery(document).ready(function(){jQuery(document.body).on("click",'.um-admin-overlay, a[data-action="UM_remove_modal"]',function(){UM.common.tipsy.hide(),UM.admin.modal.remove()}),jQuery(document.body).on("click",'a[data-modal^="UM_"], span[data-modal^="UM_"]',function(a){a.preventDefault();a=jQuery(this).attr("data-modal");jQuery(this).attr("data-back")&&(jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-modal",jQuery(this).attr("data-back")),""===jQuery("#"+jQuery(this).attr("data-back")).find("input#_icon").val())&&jQuery("#UM_fonticons").find(".um-admin-icons span").removeClass("highlighted"),jQuery(this).data("dynamic-content")?(UM.admin.modal.show(a,!0,jQuery(this).data("modal-size")),UM.admin.modal.contentRequest(jQuery(this).data("dynamic-content"),jQuery(this).data("arg1"),jQuery(this).data("arg2"),jQuery(this).data("arg3"))):UM.admin.modal.show(a)}),jQuery(document.body).on("click","#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)",function(){var a="",i=jQuery(this).attr("data-code");""!==i&&(a=jQuery(this).attr("data-modal")?"#"+jQuery(this).attr("data-modal"):".postbox",jQuery(a).find("input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon").val(i),jQuery(a).find("span.um-admin-icon-value").html(''),jQuery(a).find(".um-admin-icon-clear").show()),jQuery(this).attr("data-code",""),".postbox"==a&&(UM.common.tipsy.hide(),UM.admin.modal.remove())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var a=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),a.find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),(a=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),jQuery(this).hide()}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),UM.admin.modal.resize()})}); \ No newline at end of file diff --git a/includes/admin/assets/css/um-admin-forms.css b/includes/admin/assets/css/um-admin-forms.css deleted file mode 100644 index 6ed1bcb7..00000000 --- a/includes/admin/assets/css/um-admin-forms.css +++ /dev/null @@ -1,548 +0,0 @@ -.um-form-table.um-third-column .um-forms-line th { - width: 33%; -} - -.um-form-table.um-half-column .um-forms-line th { - width: 50%; -} - -.um-form-table.um-two-thirds-column .um-forms-line th { - width: 83%; -} - -.um-form-table.um-top-label .um-forms-line td { - padding: 0 0 15px 0; -} - -.um-form-table.um-top-label .um-forms-line td label { - margin: 0 0 5px 0; - display: inline-block; -} - -.um-form-table.um-top-label .um-forms-line[data-field_type="icon"] td label { - width: 100%; - display: block; - margin: 0 0 5px 0; -} - -.um_admin_fonticon_wrapper { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: flex-start; - align-items: center; -} - -.um-admin-icon-value { - line-height: 1; -} - -.um_admin_fonticon_wrapper .um-admin-icon-value i { - top: 0; -} - -input[type=text].um-forms-field.um-long-field, -select.um-forms-field.um-long-field, -textarea.um-forms-field.um-long-field { - width:100% !important; -} - -input[type=text].um-forms-field.um-medium-field, -select.um-forms-field.um-medium-field, -textarea.um-forms-field.um-medium-field { - width:50% !important; -} - -input[type=text].um-forms-field.um-small-field, -select.um-forms-field.um-small-field, -textarea.um-forms-field.um-small-field { - width:25% !important; -} - - - -.um-multi-text-list, -.um-multi-selects-list, -.um-md-default-filters-list { - float: left; - width:100%; - margin: 0 0 10px 0; -} - -.um-hidden-multi-text, -.um-hidden-multi-selects, -.um-hidden-md-default-filters { - display: none !important; -} - -.um-multi-text-option-line, -.um-multi-selects-option-line, -.um-md-default-filters-option-line { - float:left; - width:100%; - margin: 0; - padding: 0; - clear:both; -} - -.um-md-default-filters-option-line { - border-bottom: 1px solid #eee; - padding: 0 0 5px 0; - margin: 5px 0 0 0; -} - -.um-md-default-filters-option-line .um.um-field-wrapper2 { - margin: 5px 0 0 0; -} - -.um-multi-selects-option-line.um-admin-drag-fld { - background: none; - border: none; - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; - flex-wrap: nowrap; -} - -.um-multi-selects-option-line.um-admin-drag-fld .um-field-icon { - float: left; - width: 20px; - text-align: left; - line-height: 30px; -} - -.um-multi-selects-option-line .um-field-wrapper { - float:left; - width: calc( 100% - 60px ); - line-height: 30px; - box-sizing: border-box; -} - -.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields { - margin: 5px 0 0 0; -} - -.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label { - float:left; - width: 100%; - line-height: 30px; - box-sizing: border-box; - margin: 0 !important; - padding: 0 !important; - font-weight: bold; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: space-between; - align-items: baseline; -} - -.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type="text"] { - width: auto; - display: inline; - font-weight: normal; - max-width: 70%; - flex: 0.9; -} - -.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{ - width: auto; - display: inline; - font-weight: normal; - max-width: 70%; - flex: 0.9; -} - -.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper { - width: calc( 100% - 90px ); -} - -.um-multi-text-option-line .um-field-wrapper { - float:left; - width: calc( 100% - 90px ); - line-height: 30px; - box-sizing: border-box; -} - -.um-md-default-filters-option-line .um-field-wrapper { - float:left; - width: calc( 100% - 60px ); - line-height: 30px; - box-sizing: border-box; -} - -.um-md-default-filters-option-line .um-field-wrapper2 { - float:left; - width: calc( 100% - 60px ); - line-height: 30px; - box-sizing: border-box; -} - -.um-md-default-filters-option-line .um-field-wrapper2 .ui-slider-range.ui-widget-header { - background: #44b0ec; - border: 1px solid #44b0ec !important; - margin-top: -1px; -} - -.um-md-default-filters-option-line .um-field-wrapper2 select { - width: 100%; - float: left; -} - -.um-md-default-filters-option-line .um-field-wrapper2 input { - width: 100%; - float: left; -} - -.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter, -.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter { - width: calc( 50% - 7px ) !important; - float: left; -} - -.um-md-default-filters-option-line .um-field-wrapper2 .um-slider { - margin: 5px 9px 0 9px; - width: calc( 100% - 18px ); - box-sizing: border-box; - display: block; -} - -.um-md-default-filters-option-line .um-field-wrapper2 input.um-timepicker-filter:first-child, -.um-md-default-filters-option-line .um-field-wrapper2 input.um-datepicker-filter:first-child { - margin-right: 11px; -} - -.um-multi-text-option-line .um-field-wrapper input, -.um-multi-selects-option-line .um-field-wrapper select { - float:left; - width: 100%; - margin:0; -} - - -.um-multi-text-option-line .um-field-control, -.um-multi-selects-option-line .um-field-control, -.um-md-default-filters-option-line .um-field-control { - float:left; - width: 60px; - line-height: 30px; - padding: 0 10px; - box-sizing: border-box; -} - -.um-form-table .description { - font-style: italic; -} - -.um-form-field .description { - clear: both; -} - - -.um-form-fields-section { - float:left; - clear: none; - margin:0; - padding: 0 10px 0 0; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -.um-form-fields-section label { - float:left; - width:100%; - margin:0; - padding:0; -} - -.um-form-fields-section label input { - float:left; - margin-top:0; -} - -.um-form-fields-section label span { - float:left; - width:calc( 100% - 20px ); -} - -.um-multi-text-option-line, -.um-multi-selects-option-line { - margin: 0 0 5px 0; -} - -@media screen and (max-width: 782px) { - .um-form-fields-section { - width:100% !important; - } - .um-admin-metabox .um-form-fields-section label { - line-height: 22px !important; - margin: 0 0 12px 0 !important; - } - .um-form-fields-section label span { - width:calc( 100% - 30px ); - } - - .um-multi-text-option-line, - .um-multi-selects-option-line { - margin: 0 0 6px 0; - } - - .um-forms-line label { - float:left; - width:100%; - } - - - .um-form-table.um-third-column .um-forms-line th, - .um-form-table.um-half-column .um-forms-line th, - .um-form-table.um-two-thirds-column .um-forms-line th { - float:left; - width: 100%; - } - - .um-form-table.um-third-column .um-forms-line td, - .um-form-table.um-half-column .um-forms-line td, - .um-form-table.um-two-thirds-column .um-forms-line td { - float:left; - width: 100%; - } - - .um-form-table.um-third-column .um-forms-line th label, - .um-form-table.um-half-column .um-forms-line th label, - .um-form-table.um-two-thirds-column .um-forms-line th label { - float:left; - width: 100%; - } -} - - -/*Multi text filed */ -.um-forms-line .um-text-delete { - color: #a00; - float:left; -} - -.um-forms-line .um-text-delete:hover { - color: red; -} - -.um-forms-line .um-multi-text-add-option { - margin-bottom: 14px; -} - - -/* Media uploader */ -.um-forms-line .icon_preview { - display: none; - max-width: 200px; - max-height: 200px; - padding: 5px; - cursor: pointer; - border: 1px solid #e3e3e3; - background: #f7f7f7; - border-radius: 3px; - height: auto; - width: auto !important; -} - - -.um-forms-line[data-conditional] { - display: none; -} - - - -/* Same page update field */ -.um-forms-line td .um-same-page-update-wrapper { - display: none; - margin: 7px 0 0 0; -} - -.um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update { - margin: 7px 0 0 0; -} - -.um-forms-line td .um-same-page-update-wrapper .upgrade_log { - margin: 7px 0 0 0; - width:100%; - height:150px; - overflow: auto; - border: 1px solid #a1a1a1; -} - -.um-forms-line[data-field_type="same_page_update"] { - vertical-align: baseline; -} - -.um-forms-line[data-field_type="same_page_update"] th, -.um-forms-line[data-field_type="same_page_update"] td { - vertical-align: baseline; -} - -.um-sortable-items-field .um-sortable-item { - cursor: move !important; - padding: 5px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - border: 1px solid #7e8993; - border-radius: 4px; - -moz-border-radius: 4px; - background: #f1f1f1; - height: 42px; - line-height: 28px; - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; - flex-wrap: nowrap; -} - -.um-sortable-items-field .um-sortable-item.um-hidden-item { - display: none; -} - -.um-sortable-items-field .um-sortable-item .um-field-icon { - font-size: 18px; - width: 20px; - text-align: left; - margin: 0 10px 0 0; -} - -.um-form-table span.um-req { - margin: 0 0 0 4px; - color: #a00; -} - -.wp-picker-container input.wp-color-picker[type="text"] { - width: 68px !important; - float: left !important; - padding: 2px 4px !important; - border-width: 1px !important; -} - -/* Select2 4.0*/ -body.um-admin .select2.select2-container .select2-selection{ - display: block !important; - height: 28px !important; - padding: 0 0 0 12px !important; - overflow: hidden !important; - position: relative !important; - white-space: nowrap !important; - line-height: 25px !important; - color: #666 !important; - font-size: 13px !important; - text-align: left !important; - text-decoration: none !important; - -moz-border-radius: 2px !important; - -webkit-border-radius: 2px !important; - border-radius: 2px !important; - background-clip: padding-box !important; - -webkit-touch-callout: none; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - background: none !important; - background-color: #fff !important; - border: 1px solid #ddd !important; -} -body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow b[role=presentation]{ - display:none; -} -body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow:before{ - content: "\f3d0" !important; - font-size: 27px !important; - font-family: "Ionicons" !important; - width: 100% !important; - display: block; - height: 100%; - line-height: 28px; - color: #aaaaaa; -} -body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow { - display: inline-block !important; - width: 34px !important; - height: 100% !important; - position: absolute !important; - right: 0 !important; - top: 0 !important; - -moz-border-radius: 0 2px 2px 0 !important; - -webkit-border-radius: 0 2px 2px 0 !important; - border-radius: 0 2px 2px 0 !important; - background-clip: padding-box !important; - text-align: center !important; - background: transparent !important; - border-left: 0 !important; -} -body.um-admin .select2-container.select2-container--open .select2-dropdown{ - border: 1px solid #ddd !important; -} -body.um-admin .select2-results li{ - list-style: none; - display: list-item; - background-image: none; - font-size: 13px; - margin: 5px !important; - padding: 3px 0 !important; - color: #666 !important; -} -body.um-admin .select2-results li { - padding: 3px 7px 4px !important; - cursor: pointer; - min-height: 1em !important; -} - -body.um-admin .select2-container--default .select2-selection--single .select2-selection__rendered { - line-height: 25px; -} -body.um-admin .select2-results li.select2-results__option.select2-results__option--highlighted{ - background: none !important; - background: #f4f4f4 !important; - color: #666 !important; -} -body.um-admin .select2-container--default .select2-results__option[aria-selected=true] { - background: transparent !important; -} -body.um-admin .select2-selection__clear { - right: 10px; - font-size: 25px; - color: #aaaaaa !important; - font-weight: 300 !important; -} - -body.um-admin .select2-container--default .select2-selection--multiple .select2-selection__rendered { - box-sizing: border-box; - list-style: none; - margin: 0; - padding: 0px; - width: 100%; - line-height: 20px; - font-size: 13px; -} - -body.um-admin .select2.select2-container .select2-selection.select2-selection--multiple { - height: auto !important; -} - -body.um-admin .select2-container--default .select2-selection--multiple .select2-selection__clear { - cursor: pointer; - float: right; - margin-top: 0px; - margin-right: 5px; - font-size: 25px; -} - -body.um-admin .select2-container--default .select2-results__option[aria-selected=true] { - background-color: #ddd !important; -} - -body.um-admin .select2-container .select2-search--inline { - line-height: 37px !important; -} - -body.um-admin .select2-drop-active { - z-index: 99999 !important; -} diff --git a/includes/admin/class-enqueue.php b/includes/admin/class-enqueue.php index 435e3b94..7ac5b1fd 100644 --- a/includes/admin/class-enqueue.php +++ b/includes/admin/class-enqueue.php @@ -322,12 +322,12 @@ final class Enqueue extends \um\common\Enqueue { wp_register_script( 'um_modal', $this->front_js_baseurl . 'um-modal' . $suffix . '.js', array( 'um_responsive' ), UM_VERSION, true ); wp_register_style( 'um_responsive', $this->front_css_baseurl . 'um-responsive.css', array(), UM_VERSION ); - wp_register_style( 'um_modal', $this->front_css_baseurl . 'um-modal.css', array(), ultimatemember_version ); + wp_register_style( 'um_modal', $this->front_css_baseurl . 'um-modal.css', array(), UM_VERSION ); wp_register_style( 'um_styles', $this->front_css_baseurl . 'um-styles.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2' ), UM_VERSION ); - wp_register_style( 'um_members', $this->front_css_baseurl . 'um-members.css', array(), ultimatemember_version ); - wp_register_style( 'um_profile', $this->front_css_baseurl . 'um-profile.css', array(), ultimatemember_version ); - wp_register_style( 'um_account', $this->front_css_baseurl . 'um-account.css', array(), ultimatemember_version ); - wp_register_style( 'um_misc', $this->front_css_baseurl . 'um-misc.css', array(), ultimatemember_version ); + wp_register_style( 'um_members', $this->front_css_baseurl . 'um-members.css', array(), UM_VERSION ); + wp_register_style( 'um_profile', $this->front_css_baseurl . 'um-profile.css', array(), UM_VERSION ); + wp_register_style( 'um_account', $this->front_css_baseurl . 'um-account.css', array(), UM_VERSION ); + wp_register_style( 'um_misc', $this->front_css_baseurl . 'um-misc.css', array(), UM_VERSION ); wp_register_style( 'um_default_css', $this->front_css_baseurl . 'um-old-default.css', array( 'um_crop', 'um_tipsy', 'um_raty', 'um_responsive', 'um_modal', 'um_styles', 'um_members', 'um_profile', 'um_account', 'um_misc', 'um_datetime_date', 'um_datetime_time', 'select2' ), UM_VERSION ); // Scripts for frontend preview. @@ -365,6 +365,11 @@ final class Enqueue extends \um\common\Enqueue { wp_enqueue_script( 'um_admin_forms' ); wp_register_style( 'um_admin_forms', $css_url . 'admin/forms' . $suffix . '.css', array( 'wp-color-picker', 'um_ui', 'select2' ), UM_VERSION ); + // RTL styles. + if ( is_rtl() ) { + wp_style_add_data( 'um_admin_forms', 'rtl', true ); + wp_style_add_data( 'um_admin_forms', 'suffix', $suffix ); + } wp_enqueue_style( 'um_admin_forms' ); } @@ -393,10 +398,15 @@ final class Enqueue extends \um\common\Enqueue { $js_url = self::get_url( 'js' ); $css_url = self::get_url( 'css' ); - wp_register_script( 'um_admin_builder', $js_url . 'admin/builder' . $suffix . '.js', array( 'um_admin_modal', 'jquery-ui-draggable', 'jquery-ui-sortable', 'editor', 'wp-tinymce' ), UM_VERSION, true ); + wp_register_script( 'um_admin_builder', $js_url . 'admin/builder' . $suffix . '.js', array( 'um_admin_modal', 'jquery-ui-draggable', 'jquery-ui-sortable', 'editor', 'wp-tinymce', self::$select2_handle ), UM_VERSION, true ); wp_enqueue_script( 'um_admin_builder' ); - wp_register_style( 'um_admin_builder', $css_url . 'admin/builder' . $suffix . '.css', array( 'um_admin_modal' ), UM_VERSION ); + wp_register_style( 'um_admin_builder', $css_url . 'admin/builder' . $suffix . '.css', array( 'um_admin_modal', 'select2' ), UM_VERSION ); + // RTL styles. + if ( is_rtl() ) { + wp_style_add_data( 'um_admin_builder', 'rtl', true ); + wp_style_add_data( 'um_admin_builder', 'suffix', $suffix ); + } wp_enqueue_style( 'um_admin_builder' ); } @@ -528,11 +538,6 @@ final class Enqueue extends \um\common\Enqueue { } $this->load_forms(); - - if ( is_rtl() ) { - wp_register_style( 'um_admin_rtl', $this->css_url . 'um-admin-rtl.css', array(), ultimatemember_version ); - wp_enqueue_style( 'um_admin_rtl' ); - } } if ( 'users.php' === $hook ) {