- fixed select2 styles;

- fixed icon selector inside the extensions;
This commit is contained in:
Mykyta Synelnikov
2023-11-14 13:09:00 +02:00
parent f0a16ea2fb
commit ddeb941d0c
15 changed files with 234 additions and 332 deletions
-10
View File
@@ -3,13 +3,3 @@
float: right; } float: right; }
.um-form-fields-section label input { .um-form-fields-section label input {
float: right; } float: right; }
.select2-container .select2-choice > .select2-chosen {
text-align: right !important;
margin-right: 10px !important;
margin-left: 26px !important; }
.select2-container .select2-choice .select2-arrow {
border: none !important;
right: auto !important;
left: 0 !important; }
+1 -1
View File
@@ -1 +1 @@
.um-form-fields-section{padding:0 0 0 10px;float:right}.um-form-fields-section label input{float:right}.select2-container .select2-choice>.select2-chosen{text-align:right!important;margin-right:10px!important;margin-left:26px!important}.select2-container .select2-choice .select2-arrow{border:none!important;right:auto!important;left:0!important} .um-form-fields-section{padding:0 0 0 10px;float:right}.um-form-fields-section label input{float:right}
+10 -10
View File
@@ -5,13 +5,13 @@
input input
float: right float: right
.select2-container //.select2-container
.select2-choice // .select2-choice
& > .select2-chosen // & > .select2-chosen
text-align: right !important // text-align: right !important
margin-right: 10px !important // margin-right: 10px !important
margin-left: 26px !important // margin-left: 26px !important
.select2-arrow // .select2-arrow
border: none !important // border: none !important
right: auto !important // right: auto !important
left: 0 !important // left: 0 !important
+19 -106
View File
@@ -42,14 +42,6 @@
overflow: auto; overflow: auto;
border: 1px solid #a1a1a1; } border: 1px solid #a1a1a1; }
.um-form-table .um-forms-line td .select2 {
margin: 1px 0 0 0; }
.um-form-table .um-forms-line td .select2 .select2-selection__rendered {
line-height: 26px; }
.um-form-table .um-forms-line td .select2 .select2-selection__clear {
top: -1px;
margin-right: 0; }
.um-form-table .um-forms-line[data-field_type="same_page_update"] { .um-form-table .um-forms-line[data-field_type="same_page_update"] {
vertical-align: baseline; } vertical-align: baseline; }
.um-form-table .um-forms-line[data-field_type="same_page_update"] th, .um-form-table .um-forms-line[data-field_type="same_page_update"] th,
@@ -355,103 +347,24 @@ input[type="number"].um-forms-field {
padding: 2px 4px !important; padding: 2px 4px !important;
border-width: 1px !important; } border-width: 1px !important; }
body.um-admin .select2.select2-container .select2-selection { span.um-admin-icon-value {
display: block !important; margin: 0 10px;
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: #fff none !important;
border: 1px solid #ddd !important; }
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.select2-container .select2-selection .select2-selection__arrow b[role="presentation"] {
display: none; }
body.um-admin .select2.select2-container .select2-selection .select2-selection__arrow b[role="presentation"]: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-search--inline {
line-height: 37px !important; }
body.um-admin .select2.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.select2-results__option.select2-results__option--highlighted {
background: none !important;
background: #f4f4f4 !important;
color: #666 !important; }
body.um-admin .select2-container--default .select2-selection--single .select2-selection__rendered {
line-height: 25px; }
body.um-admin .select2-container--default .select2-selection--multiple {
height: auto !important; }
body.um-admin .select2-container--default .select2-selection--multiple .select2-selection__clear {
cursor: pointer;
float: right;
margin-top: 0;
margin-right: 5px;
font-size: 25px; }
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-selection--multiple .select2-selection__rendered {
box-sizing: border-box;
list-style: none;
margin: 0;
padding: 0;
width: 100%;
line-height: 20px;
font-size: 13px; } font-size: 13px; }
span.um-admin-icon-value i {
font-size: 28px;
color: #0085ba;
position: relative;
top: 5px; }
body.um-admin .select2-drop-active { span.um-admin-icon-clear {
z-index: 99999 !important; } display: none;
cursor: pointer;
position: relative;
color: #ccc; }
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; }
+1 -1
View File
File diff suppressed because one or more lines are too long
+133 -107
View File
@@ -46,13 +46,19 @@
height: 150px height: 150px
overflow: auto overflow: auto
border: 1px solid #a1a1a1 border: 1px solid #a1a1a1
.select2 //.select2
margin: 1px 0 0 0 // margin: 1px 0 0 0
.select2-selection__rendered // .select2-selection__rendered
line-height: 26px // line-height: 28px
.select2-selection__clear // padding: 0
top: -1px // color: #2c3338
margin-right: 0 // .select2-selection__clear
// margin-right: 0
// right: 5px
// font-size: 24px
// color: #2c3338 !important
// font-weight: 300 !important
// top: -2px
&[data-field_type="same_page_update"] &[data-field_type="same_page_update"]
vertical-align: baseline vertical-align: baseline
@@ -365,104 +371,124 @@ input[type="number"]
padding: 2px 4px !important padding: 2px 4px !important
border-width: 1px !important border-width: 1px !important
body.#{$prefix}admin //body.#{$prefix}admin
.select2 // .select2
&.select2-container // &.select2-container
.select2-selection // .select2-selection
display: block !important // width: 100%
height: 28px !important // display: block !important
padding: 0 0 0 12px !important // min-height: 30px !important
overflow: hidden !important // padding: 0 0 0 8px !important
position: relative !important // margin: 0 1px !important
white-space: nowrap !important // overflow: hidden !important
line-height: 25px !important // position: relative !important
color: #666 !important // white-space: nowrap !important
font-size: 13px !important // color: #2c3338 !important
text-align: left !important // font-size: 14px !important
text-decoration: none !important // line-height: 2 !important
-moz-border-radius: 2px !important // text-align: left !important
-webkit-border-radius: 2px !important // text-decoration: none !important
border-radius: 2px !important // +border-radius(3px,3px,3px,3px)
background-clip: padding-box !important // background-clip: padding-box !important
-webkit-touch-callout: none // -webkit-touch-callout: none
-webkit-user-select: none // -webkit-user-select: none
-moz-user-select: none // -moz-user-select: none
-ms-user-select: none // -ms-user-select: none
user-select: none // user-select: none
background: #fff none !important // background: #fff none !important
border: 1px solid #ddd !important // border: 1px solid #8c8f94 !important
.select2-selection__arrow // .select2-selection__arrow
display: inline-block !important // display: inline-block !important
width: 34px !important // width: 34px !important
height: 100% !important // height: 100% !important
position: absolute !important // position: absolute !important
right: 0 !important // right: 0 !important
top: 0 !important // top: 0 !important
-moz-border-radius: 0 2px 2px 0 !important // -moz-border-radius: 0 2px 2px 0 !important
-webkit-border-radius: 0 2px 2px 0 !important // -webkit-border-radius: 0 2px 2px 0 !important
border-radius: 0 2px 2px 0 !important // border-radius: 0 2px 2px 0 !important
background-clip: padding-box !important // background-clip: padding-box !important
text-align: center !important // text-align: center !important
background: transparent !important // background: transparent !important
border-left: 0 !important // border-left: 0 !important
b[role="presentation"] // b[role="presentation"]
display: none // display: none
&:before // &:before
content: "\f3d0" !important // content: "\f3d0" !important
font-size: 27px !important // font-size: 27px !important
font-family: "Ionicons" !important // font-family: "Ionicons" !important
width: 100% !important // width: 100% !important
display: block // display: block
height: 100% // height: 100%
line-height: 28px // line-height: 28px
color: #aaaaaa // color: #aaaaaa
.select2-search--inline // .select2-search--inline
line-height: 37px !important // line-height: 37px !important
&.select2-container--open // &.select2-container--open
.select2-dropdown // .select2-dropdown
border: 1px solid #ddd !important // border: 1px solid #ddd !important
.select2-results // .select2-results
li // li
list-style: none // list-style: none
display: list-item // display: list-item
background-image: none // background-image: none
font-size: 13px // font-size: 13px
margin: 5px !important // margin: 5px !important
padding: 3px 0 !important // padding: 3px 0 !important
color: #666 !important // color: #666 !important
&.select2-results__option // &.select2-results__option
&.select2-results__option--highlighted // &.select2-results__option--highlighted
background: none !important // background: none !important
background: #f4f4f4 !important // background: #f4f4f4 !important
color: #666 !important // color: #666 !important
.select2-container--default // .select2-container--default
.select2-selection--single // .select2-selection--multiple
.select2-selection__rendered // height: auto !important
line-height: 25px // .select2-selection__clear
.select2-selection--multiple // cursor: pointer
height: auto !important // float: right
.select2-selection__clear // margin-top: 0
cursor: pointer // margin-right: 5px
float: right // font-size: 25px
margin-top: 0 // .select2-results__option[aria-selected="true"]
margin-right: 5px // background: transparent !important
font-size: 25px // .select2-selection__clear
.select2-results__option[aria-selected="true"] // right: 5px
background: transparent !important // font-size: 24px
.select2-selection__clear // color: #555 !important
right: 10px // font-weight: 300 !important
font-size: 25px // top: -2px
color: #aaaaaa !important // .select2-selection--multiple
font-weight: 300 !important // .select2-selection__rendered
.select2-selection--multiple // box-sizing: border-box
.select2-selection__rendered // list-style: none
box-sizing: border-box // margin: 0
list-style: none // padding: 0
margin: 0 // width: 100%
padding: 0 // line-height: 20px
width: 100% // font-size: 13px
line-height: 20px //
font-size: 13px // .select2-drop-active
// z-index: 99999 !important
.select2-drop-active span.um-admin-icon-value
z-index: 99999 !important margin: 0 10px
font-size: 13px
i
font-size: 28px
color: #0085ba
position: relative
top: 5px
span.um-admin-icon-clear
display: none
cursor: pointer
position: relative
color: #ccc
&.show
display: inline-block
&:hover
color: #777
i
font-size: 20px
vertical-align: middle
-22
View File
@@ -138,25 +138,3 @@ p._icon_search {
text-align: center; text-align: center;
padding: 15px 20px; padding: 15px 20px;
display: inline-block; } display: inline-block; }
span.um-admin-icon-value {
margin: 0 10px;
font-size: 13px; }
span.um-admin-icon-value i {
font-size: 28px;
color: #0085ba;
position: relative;
top: 5px; }
span.um-admin-icon-clear {
display: none;
cursor: pointer;
position: relative;
color: #ccc; }
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; }
+1 -1
View File
@@ -1 +1 @@
.um-admin-overlay{background:rgba(0,0,0,.7);width:100%;height:100%;position:fixed;top:0;left:0;z-index:10000}.um-admin-modal{border-radius:3px;background:#fff;position:fixed;top:50%!important;left:50%!important;display:none;z-index:10001;box-sizing:border-box;width:730px;margin-left:-365px}.um-admin-modal.normal{width:730px;margin-left:-365px}.um-admin-modal.smaller{width:500px;margin-left:-250px}.um-admin-modal.small{width:400px;margin-left:-200px}.um-admin-modal input[type=submit].button-primary{padding:0 12px!important;vertical-align:middle!important;line-height:24px!important}.um-admin-modal .um-admin-modal-body{padding:10px 20px 10px 20px;max-height:500px;overflow:auto}.um-admin-modal .um-admin-modal-body.um-admin-metabox label{margin:0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .um-admin-editor-h{margin-top:12px}.um-admin-modal .um-admin-modal-body.um-admin-metabox .um-admin-editor-h label{margin:0 0 4px 0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .wp-editor-wrap{margin:0 0 4px 0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .wp-editor-wrap textarea{border:0!important}.um-admin-modal a.button-primary{padding:0 12px!important;vertical-align:middle!important}.um-admin-modal a.button{padding:0 12px!important;vertical-align:middle!important}.um-admin-modal a.button i:before{display:block;top:0}.um-admin-modal h3{font-size:14px;line-height:14px;font-weight:400;color:#fff}.um-admin-modal h4{margin:0 0 10px 0!important}.um-admin-modal label{font-size:13px;color:#aaa}.um-admin-modal p{font-size:13px;color:#aaa}.um-admin-modal.loading .um-admin-modal-body{height:200px;background:url(../../img/ajax-loader.gif) no-repeat center}.um-admin-modal-close{position:absolute;color:#fff!important;right:16px;top:14px;font-size:22px;text-decoration:none;opacity:.4}.um-admin-modal-close:hover{opacity:1}.um-admin-modal-head{padding:4px 20px;background:#0085ba;position:relative;border-radius:3px 3px 0 0}.um-admin-modal-foot{padding:20px 0!important;border-top:1px solid #ddd;text-align:center;background:#eee;border-radius:0 0 3px 3px}.um-admin-modal-foot a,.um-admin-modal-foot input{margin:0 10px!important;font-size:14px!important}#UM_fonticons div.um-admin-metabox{padding-bottom:22px!important}p._icon_search{position:relative;width:85%!important;margin:0 auto!important;padding:12px 0 0 0!important}p._icon_search:before{position:absolute;right:6px;top:12px;font-size:20px;content:"\f4a4";font-family:Ionicons;color:#999}p._icon_search:before input[type=text]{padding-right:40px!important}.um-admin-icons{padding:0 0 15px 12px;float:left}.um-admin-icons span{cursor:pointer;float:left;margin:5px;color:#777;border:4px solid #eee;border-radius:3px}.um-admin-icons span.highlighted,.um-admin-icons span:hover{color:#0085ba;border-color:#0085ba}.um-admin-icons i{vertical-align:middle!important;font-size:24px;width:24px;text-align:center;padding:15px 20px;display:inline-block}span.um-admin-icon-value{margin:0 10px;font-size:13px}span.um-admin-icon-value i{font-size:28px;color:#0085ba;position:relative;top:5px}span.um-admin-icon-clear{display:none;cursor:pointer;position:relative;color:#ccc}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-overlay{background:rgba(0,0,0,.7);width:100%;height:100%;position:fixed;top:0;left:0;z-index:10000}.um-admin-modal{border-radius:3px;background:#fff;position:fixed;top:50%!important;left:50%!important;display:none;z-index:10001;box-sizing:border-box;width:730px;margin-left:-365px}.um-admin-modal.normal{width:730px;margin-left:-365px}.um-admin-modal.smaller{width:500px;margin-left:-250px}.um-admin-modal.small{width:400px;margin-left:-200px}.um-admin-modal input[type=submit].button-primary{padding:0 12px!important;vertical-align:middle!important;line-height:24px!important}.um-admin-modal .um-admin-modal-body{padding:10px 20px 10px 20px;max-height:500px;overflow:auto}.um-admin-modal .um-admin-modal-body.um-admin-metabox label{margin:0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .um-admin-editor-h{margin-top:12px}.um-admin-modal .um-admin-modal-body.um-admin-metabox .um-admin-editor-h label{margin:0 0 4px 0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .wp-editor-wrap{margin:0 0 4px 0!important}.um-admin-modal .um-admin-modal-body.um-admin-metabox .wp-editor-wrap textarea{border:0!important}.um-admin-modal a.button-primary{padding:0 12px!important;vertical-align:middle!important}.um-admin-modal a.button{padding:0 12px!important;vertical-align:middle!important}.um-admin-modal a.button i:before{display:block;top:0}.um-admin-modal h3{font-size:14px;line-height:14px;font-weight:400;color:#fff}.um-admin-modal h4{margin:0 0 10px 0!important}.um-admin-modal label{font-size:13px;color:#aaa}.um-admin-modal p{font-size:13px;color:#aaa}.um-admin-modal.loading .um-admin-modal-body{height:200px;background:url(../../img/ajax-loader.gif) no-repeat center}.um-admin-modal-close{position:absolute;color:#fff!important;right:16px;top:14px;font-size:22px;text-decoration:none;opacity:.4}.um-admin-modal-close:hover{opacity:1}.um-admin-modal-head{padding:4px 20px;background:#0085ba;position:relative;border-radius:3px 3px 0 0}.um-admin-modal-foot{padding:20px 0!important;border-top:1px solid #ddd;text-align:center;background:#eee;border-radius:0 0 3px 3px}.um-admin-modal-foot a,.um-admin-modal-foot input{margin:0 10px!important;font-size:14px!important}#UM_fonticons div.um-admin-metabox{padding-bottom:22px!important}p._icon_search{position:relative;width:85%!important;margin:0 auto!important;padding:12px 0 0 0!important}p._icon_search:before{position:absolute;right:6px;top:12px;font-size:20px;content:"\f4a4";font-family:Ionicons;color:#999}p._icon_search:before input[type=text]{padding-right:40px!important}.um-admin-icons{padding:0 0 15px 12px;float:left}.um-admin-icons span{cursor:pointer;float:left;margin:5px;color:#777;border:4px solid #eee;border-radius:3px}.um-admin-icons span.highlighted,.um-admin-icons span:hover{color:#0085ba;border-color:#0085ba}.um-admin-icons i{vertical-align:middle!important;font-size:24px;width:24px;text-align:center;padding:15px 20px;display:inline-block}
-22
View File
@@ -145,25 +145,3 @@ p._icon_search
text-align: center text-align: center
padding: 15px 20px padding: 15px 20px
display: inline-block display: inline-block
span.um-admin-icon-value
margin: 0 10px
font-size: 13px
i
font-size: 28px
color: #0085ba
position: relative
top: 5px
span.um-admin-icon-clear
display: none
cursor: pointer
position: relative
color: #ccc
&.show
display: inline-block
&:hover
color: #777
i
font-size: 20px
vertical-align: middle
-10
View File
@@ -955,16 +955,6 @@ jQuery( document ).ready( function() {
}); });
/**
choose font icon
**/
jQuery(document.body).on('click', '.um-admin-icons span', function(){
var icon = jQuery(this).attr('data-code');
jQuery(this).parent().find('span').removeClass('highlighted');
jQuery(this).addClass('highlighted');
jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-code", icon);
});
if ( !jQuery('.um-admin-drag').length ) { if ( !jQuery('.um-admin-drag').length ) {
return false; return false;
} }
+1 -1
View File
File diff suppressed because one or more lines are too long
+31 -10
View File
@@ -128,6 +128,13 @@ jQuery(document).ready(function() {
let modal_id = jQuery(this).attr('data-modal'); let modal_id = jQuery(this).attr('data-modal');
if ( 'UM_fonticons' === modal_id ) {
let iconField = jQuery(this).data('icon_field');
if ( '' !== iconField ) {
jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-icon_field", iconField );
}
}
if ( jQuery(this).attr('data-back') ) { if ( jQuery(this).attr('data-back') ) {
jQuery('#UM_fonticons').find('a.um-admin-modal-back').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') );
var current_icon = jQuery( '#' + jQuery(this).attr('data-back') ).find('input#_icon').val(); var current_icon = jQuery( '#' + jQuery(this).attr('data-back') ).find('input#_icon').val();
@@ -148,20 +155,24 @@ jQuery(document).ready(function() {
submit font icon submit font icon
**/ **/
jQuery(document.body).on('click', '#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)', function(){ jQuery(document.body).on('click', '#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)', function(){
var v_id = ''; let baseWrapper = '';
var icon_selected = jQuery(this).attr('data-code'); let iconSelected = jQuery(this).attr('data-code');
if ( '' !== icon_selected ) { let inModal = false;
if ( '' !== iconSelected ) {
if ( jQuery(this).attr('data-modal') ) { if ( jQuery(this).attr('data-modal') ) {
v_id = '#' + jQuery(this).attr('data-modal'); inModal = true;
baseWrapper = '#' + jQuery(this).attr('data-modal');
jQuery( baseWrapper ).find('input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon').val( iconSelected );
jQuery( baseWrapper ).find('span.um-admin-icon-value').html('<i class="' + iconSelected + '"></i>');
jQuery( baseWrapper ).find('.um-admin-icon-clear').addClass('show');
} else { } else {
v_id = '.postbox'; baseWrapper = '#' + jQuery(this).data('icon_field');
jQuery(baseWrapper).val( iconSelected ).parent().find('span.um-admin-icon-value').html('<i class="' + iconSelected + '"></i>');
jQuery( baseWrapper ).parent().find('.um-admin-icon-clear').addClass('show');
} }
jQuery( v_id ).find('input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon').val( icon_selected );
jQuery( v_id ).find('span.um-admin-icon-value').html('<i class="'+icon_selected+'"></i>');
jQuery( v_id ).find('.um-admin-icon-clear').show();
} }
jQuery(this).attr('data-code', ''); jQuery(this).attr('data-code', '');
if ( v_id == '.postbox' ) { if ( ! inModal ) {
UM.common.tipsy.hide(); UM.common.tipsy.hide();
UM.admin.modal.remove(); UM.admin.modal.remove();
} }
@@ -179,7 +190,7 @@ jQuery(document).ready(function() {
element = jQuery(this).parents('td'); element = jQuery(this).parents('td');
element.find('input[type="hidden"]').val(''); element.find('input[type="hidden"]').val('');
element.find('.um-admin-icon-value').html( wp.i18n.__( 'No Icon', 'ultimate-member' ) ); element.find('.um-admin-icon-value').html( wp.i18n.__( 'No Icon', 'ultimate-member' ) );
jQuery(this).hide(); jQuery(this).removeClass('show');
}); });
/** /**
@@ -194,4 +205,14 @@ jQuery(document).ready(function() {
} }
UM.admin.modal.resize(); UM.admin.modal.resize();
}); });
/**
choose font icon
**/
jQuery(document.body).on('click', '.um-admin-icons span', function(){
var icon = jQuery(this).attr('data-code');
jQuery(this).parent().find('span').removeClass('highlighted');
jQuery(this).addClass('highlighted');
jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-code", icon);
});
}); });
+1 -1
View File
File diff suppressed because one or more lines are too long
+14 -12
View File
@@ -534,29 +534,31 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
* *
* @return bool|string * @return bool|string
*/ */
function render_icon( $field_data ) { public function render_icon( $field_data ) {
if ( empty( $field_data['id'] ) ) { if ( empty( $field_data['id'] ) ) {
return false; return false;
} }
$id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id']; // Required modal scripts for proper functioning
UM()->admin()->enqueue()->load_modal();
$id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
$id_attr = ' id="' . esc_attr( $id ) . '" '; $id_attr = ' id="' . esc_attr( $id ) . '" ';
$name = $field_data['id']; $name = $field_data['id'];
$name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name; $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
$name_attr = ' name="' . $name . '" '; $name_attr = ' name="' . esc_attr( $name ) . '" ';
$value = $this->get_field_value( $field_data ); $value = $this->get_field_value( $field_data );
$value_attr = ' value="' . $value . '" '; $value_attr = ' value="' . esc_attr( $value ) . '" ';
$html = '<span class="um_admin_fonticon_wrapper"><a href="javascript:void(0);" 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> $html = '<span class="um_admin_fonticon_wrapper"><a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="" data-icon_field="' . esc_attr( $id ) . '">' . esc_html__( 'Choose Icon', 'ultimate-member' ) . '</a>
<span class="um-admin-icon-value">'; <span class="um-admin-icon-value">';
if ( ! empty( $value ) ) { if ( ! empty( $value ) ) {
$html .= '<i class="' . $value . '"></i>'; $html .= '<i class="' . esc_attr( $value ) . '"></i>';
} else { } else {
$html .= __( 'No Icon', 'ultimate-member' ); $html .= esc_html__( 'No Icon', 'ultimate-member' );
} }
$html .= '</span><input type="hidden" ' . $name_attr . ' ' . $id_attr . ' ' . $value_attr . ' />'; $html .= '</span><input type="hidden" ' . $name_attr . ' ' . $id_attr . ' ' . $value_attr . ' />';
@@ -569,12 +571,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
$html .= '</span></span>'; $html .= '</span></span>';
// Required include the fonticons modal *.php file.
UM()->metabox()->init_icon = true; UM()->metabox()->init_icon = true;
return $html; return $html;
} }
/** /**
* @param $field_data * @param $field_data
* *
+22 -18
View File
@@ -1546,18 +1546,21 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
if ( 'row' === $this->set_field_type ) { if ( 'row' === $this->set_field_type ) {
$back = 'UM_edit_row'; $back = 'UM_edit_row';
?> ?>
<p class="_heading_text"><label for="_icon"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label> <p class="_heading_text">
<a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="<?php echo esc_attr( $back ); ?>"><?php esc_html_e( 'Choose Icon', 'ultimate-member' ); ?></a> <label for="_icon"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label>
<span class="um_admin_fonticon_wrapper">
<a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="<?php echo esc_attr( $back ); ?>"><?php esc_html_e( 'Choose Icon', 'ultimate-member' ); ?></a>
<span class="um-admin-icon-value"><?php if ( ! empty( $this->edit_mode_value ) ) { ?><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i><?php } else { ?><?php esc_html_e( 'No Icon', 'ultimate-member' ); ?><?php } ?></span> <span class="um-admin-icon-value"><?php if ( ! empty( $this->edit_mode_value ) ) { ?><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i><?php } else { ?><?php esc_html_e( 'No Icon', 'ultimate-member' ); ?><?php } ?></span>
<input type="hidden" name="_icon" id="_icon" value="<?php echo ! empty( $this->edit_mode_value ) ? esc_attr( $this->edit_mode_value ) : ''; ?>" /> <input type="hidden" name="_icon" id="_icon" value="<?php echo ! empty( $this->edit_mode_value ) ? esc_attr( $this->edit_mode_value ) : ''; ?>" />
<?php if ( ! empty( $this->edit_mode_value ) ) { ?> <?php if ( ! empty( $this->edit_mode_value ) ) { ?>
<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span> <span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
<?php } else { ?> <?php } else { ?>
<span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span> <span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span>
<?php } ?> <?php } ?>
</span>
</p> </p>
<?php <?php
} else { } else {
@@ -1570,18 +1573,19 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
<div class="um-admin-tri"> <div class="um-admin-tri">
<p> <p>
<label for="_icon"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label> <label for="_icon"><?php esc_html_e( 'Icon', 'ultimate-member' ); ?> <?php UM()->tooltip( __( 'Select an icon to appear in the field. Leave blank if you do not want an icon to show in the field.', 'ultimate-member' ) ); ?></label>
<span class="um_admin_fonticon_wrapper">
<a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="<?php echo esc_attr( $back ); ?>"><?php esc_html_e( 'Choose Icon', 'ultimate-member' ); ?></a>
<a href="javascript:void(0);" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="<?php echo esc_attr( $back ); ?>"><?php esc_html_e( 'Choose Icon', 'ultimate-member' ); ?></a> <span class="um-admin-icon-value"><?php if ( ! empty( $this->edit_mode_value ) ) { ?><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i><?php } else { ?><?php esc_html_e( 'No Icon', 'ultimate-member' ) ?><?php } ?></span>
<span class="um-admin-icon-value"><?php if ( ! empty( $this->edit_mode_value ) ) { ?><i class="<?php echo esc_attr( $this->edit_mode_value ); ?>"></i><?php } else { ?><?php esc_html_e( 'No Icon', 'ultimate-member' ) ?><?php } ?></span> <input type="hidden" name="_icon" id="_icon" value="<?php echo ! empty( $this->edit_mode_value ) ? esc_attr( $this->edit_mode_value ) : ''; ?>" />
<input type="hidden" name="_icon" id="_icon" value="<?php echo ! empty( $this->edit_mode_value ) ? esc_attr( $this->edit_mode_value ) : ''; ?>" /> <?php if ( ! empty( $this->edit_mode_value ) ) { ?>
<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span>
<?php if ( ! empty( $this->edit_mode_value ) ) { ?> <?php } else { ?>
<span class="um-admin-icon-clear show"><i class="um-icon-android-cancel"></i></span> <span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span>
<?php } else { ?> <?php } ?>
<span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span> </span>
<?php } ?>
</p> </p>
</div> </div>
<?php <?php