diff --git a/assets/css/admin/forms.css b/assets/css/admin/forms.css index 8ffe133b..f56b0922 100644 --- a/assets/css/admin/forms.css +++ b/assets/css/admin/forms.css @@ -65,6 +65,13 @@ display: block; margin: 0 0 5px 0; } +.um-external-link-icon { + width: 1em; + height: 1em; + margin: 0; + vertical-align: middle; + fill: currentcolor; } + .um_admin_fonticon_wrapper { display: flex; flex-direction: row; diff --git a/assets/css/admin/forms.min.css b/assets/css/admin/forms.min.css index 4bde8a55..38a45e6c 100644 --- a/assets/css/admin/forms.min.css +++ b/assets/css/admin/forms.min.css @@ -1 +1 @@ -.um-form-table .um-forms-line[data-conditional]{display:none}.um-form-table .um-forms-line label .um-req{color:#a00;margin:0 0 0 3px;font-weight:400}.um-form-table .um-forms-line .um-text-delete{color:#a00;float:left}.um-form-table .um-forms-line .um-text-delete:hover{color:red}.um-form-table .um-forms-line .um-multi-text-add-option{margin-bottom:14px}.um-form-table .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-form-table .um-forms-line td .um-same-page-update-wrapper{display:none;margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update{margin:7px 0 0 0}.um-form-table .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-form-table .um-forms-line[data-field_type=same_page_update]{vertical-align:baseline}.um-form-table .um-forms-line[data-field_type=same_page_update] td,.um-form-table .um-forms-line[data-field_type=same_page_update] th{vertical-align:baseline}.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;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um_admin_fonticon_wrapper .um-admin-icon-value{line-height:1}.um_admin_fonticon_wrapper .um-admin-icon-value i{top:0}input[type=date].um-forms-field,input[type=number].um-forms-field,input[type=password].um-forms-field,input[type=text].um-forms-field,input[type=time].um-forms-field,input[type=url].um-forms-field,select.um-forms-field,textarea.um-forms-field{box-sizing:border-box}input[type=date].um-forms-field.um-long-field,input[type=number].um-forms-field.um-long-field,input[type=password].um-forms-field.um-long-field,input[type=text].um-forms-field.um-long-field,input[type=time].um-forms-field.um-long-field,input[type=url].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=date].um-forms-field.um-medium-field,input[type=number].um-forms-field.um-medium-field,input[type=password].um-forms-field.um-medium-field,input[type=text].um-forms-field.um-medium-field,input[type=time].um-forms-field.um-medium-field,input[type=url].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=date].um-forms-field.um-small-field,input[type=number].um-forms-field.um-small-field,input[type=password].um-forms-field.um-small-field,input[type=text].um-forms-field.um-small-field,input[type=time].um-forms-field.um-small-field,input[type=url].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:25%!important}input[type=number].um-forms-field{padding-right:0}.um-md-default-filters-list,.um-multi-selects-list,.um-multi-text-list{float:left;width:100%;margin:0 0 10px 0}.um-hidden-md-default-filters,.um-hidden-multi-selects,.um-hidden-multi-text{display:none!important}.um-md-default-filters-option-line{float:left;width:100%;clear:both;border-bottom:1px solid #eee;padding:0 0 5px 0;margin:5px 0 0 0}.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.um{margin:5px 0 0 0}.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-datepicker-filter,.um-md-default-filters-option-line .um-field-wrapper2>input.um-timepicker-filter{width:calc(50% - 7px)!important;float:left}.um-md-default-filters-option-line .um-field-wrapper2>input.um-datepicker-filter:first-child,.um-md-default-filters-option-line .um-field-wrapper2>input.um-timepicker-filter:first-child{margin-right:11px}.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-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-selects-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-selects-option-line.um-admin-drag-fld{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;background:0 0;border:none}.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper{width:calc(100% - 90px)}.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:700;display:flex;flex-direction:row;justify-content:space-beetween;align-items:baseline;flex-wrap:nowrap}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type=text],.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{width:auto;display:inline;font-weight:400;max-width:70%;flex:.9}.um-multi-selects-option-line .um-field-wrapper input,.um-multi-selects-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-selects-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-text-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-text-option-line .um-field-wrapper{float:left;width:calc(100% - 90px);line-height:30px;box-sizing:border-box}.um-multi-text-option-line .um-field-wrapper input,.um-multi-text-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-text-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.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)}@media screen and (max-width:782px){input[type=text].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:100%!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:50%!important}.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-admin-metabox .um-form-fields-section label span{width:calc(100% - 30px)}.um-multi-selects-option-line,.um-multi-text-option-line{margin:0 0 6px 0}.um-forms-line label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line th,.um-form-table.um-third-column .um-forms-line th,.um-form-table.um-two-thirds-column .um-forms-line th{float:left;width:100%;margin-bottom:5px}.um-form-table.um-half-column .um-forms-line th label,.um-form-table.um-third-column .um-forms-line th label,.um-form-table.um-two-thirds-column .um-forms-line th label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line td,.um-form-table.um-third-column .um-forms-line td,.um-form-table.um-two-thirds-column .um-forms-line td{float:left;width:100%}}.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:#fff;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{width:20px;text-align:left;margin:0 10px 0 0}.wp-picker-container input.wp-color-picker[type=text]{width:68px!important;float:left!important;padding:2px 4px!important;border-width:1px!important}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} \ No newline at end of file +.um-form-table .um-forms-line[data-conditional]{display:none}.um-form-table .um-forms-line label .um-req{color:#a00;margin:0 0 0 3px;font-weight:400}.um-form-table .um-forms-line .um-text-delete{color:#a00;float:left}.um-form-table .um-forms-line .um-text-delete:hover{color:red}.um-form-table .um-forms-line .um-multi-text-add-option{margin-bottom:14px}.um-form-table .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-form-table .um-forms-line td .um-same-page-update-wrapper{display:none;margin:7px 0 0 0}.um-form-table .um-forms-line td .um-same-page-update-wrapper input.um-admin-form-same-page-update{margin:7px 0 0 0}.um-form-table .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-form-table .um-forms-line[data-field_type=same_page_update]{vertical-align:baseline}.um-form-table .um-forms-line[data-field_type=same_page_update] td,.um-form-table .um-forms-line[data-field_type=same_page_update] th{vertical-align:baseline}.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-external-link-icon{width:1em;height:1em;margin:0;vertical-align:middle;fill:currentcolor}.um_admin_fonticon_wrapper{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap}.um_admin_fonticon_wrapper .um-admin-icon-value{line-height:1}.um_admin_fonticon_wrapper .um-admin-icon-value i{top:0}input[type=date].um-forms-field,input[type=number].um-forms-field,input[type=password].um-forms-field,input[type=text].um-forms-field,input[type=time].um-forms-field,input[type=url].um-forms-field,select.um-forms-field,textarea.um-forms-field{box-sizing:border-box}input[type=date].um-forms-field.um-long-field,input[type=number].um-forms-field.um-long-field,input[type=password].um-forms-field.um-long-field,input[type=text].um-forms-field.um-long-field,input[type=time].um-forms-field.um-long-field,input[type=url].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=date].um-forms-field.um-medium-field,input[type=number].um-forms-field.um-medium-field,input[type=password].um-forms-field.um-medium-field,input[type=text].um-forms-field.um-medium-field,input[type=time].um-forms-field.um-medium-field,input[type=url].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=date].um-forms-field.um-small-field,input[type=number].um-forms-field.um-small-field,input[type=password].um-forms-field.um-small-field,input[type=text].um-forms-field.um-small-field,input[type=time].um-forms-field.um-small-field,input[type=url].um-forms-field.um-small-field,select.um-forms-field.um-small-field,textarea.um-forms-field.um-small-field{width:25%!important}input[type=number].um-forms-field{padding-right:0}.um-md-default-filters-list,.um-multi-selects-list,.um-multi-text-list{float:left;width:100%;margin:0 0 10px 0}.um-hidden-md-default-filters,.um-hidden-multi-selects,.um-hidden-multi-text{display:none!important}.um-md-default-filters-option-line{float:left;width:100%;clear:both;border-bottom:1px solid #eee;padding:0 0 5px 0;margin:5px 0 0 0}.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.um{margin:5px 0 0 0}.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-datepicker-filter,.um-md-default-filters-option-line .um-field-wrapper2>input.um-timepicker-filter{width:calc(50% - 7px)!important;float:left}.um-md-default-filters-option-line .um-field-wrapper2>input.um-datepicker-filter:first-child,.um-md-default-filters-option-line .um-field-wrapper2>input.um-timepicker-filter:first-child{margin-right:11px}.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-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-selects-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-selects-option-line.um-admin-drag-fld{display:flex;flex-direction:row;justify-content:flex-start;align-items:center;flex-wrap:nowrap;background:0 0;border:none}.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper{width:calc(100% - 90px)}.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:700;display:flex;flex-direction:row;justify-content:space-beetween;align-items:baseline;flex-wrap:nowrap}.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label input[type=text],.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{width:auto;display:inline;font-weight:400;max-width:70%;flex:.9}.um-multi-selects-option-line .um-field-wrapper input,.um-multi-selects-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-selects-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.um-multi-text-option-line{float:left;width:100%;padding:0;clear:both;margin:0 0 5px 0}.um-multi-text-option-line .um-field-wrapper{float:left;width:calc(100% - 90px);line-height:30px;box-sizing:border-box}.um-multi-text-option-line .um-field-wrapper input,.um-multi-text-option-line .um-field-wrapper select{float:left;width:100%;margin:0}.um-multi-text-option-line .um-field-control{float:left;width:60px;line-height:30px;padding:0 10px;box-sizing:border-box}.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)}@media screen and (max-width:782px){input[type=text].um-forms-field.um-medium-field,select.um-forms-field.um-medium-field,textarea.um-forms-field.um-medium-field{width:100%!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:50%!important}.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-admin-metabox .um-form-fields-section label span{width:calc(100% - 30px)}.um-multi-selects-option-line,.um-multi-text-option-line{margin:0 0 6px 0}.um-forms-line label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line th,.um-form-table.um-third-column .um-forms-line th,.um-form-table.um-two-thirds-column .um-forms-line th{float:left;width:100%;margin-bottom:5px}.um-form-table.um-half-column .um-forms-line th label,.um-form-table.um-third-column .um-forms-line th label,.um-form-table.um-two-thirds-column .um-forms-line th label{float:left;width:100%}.um-form-table.um-half-column .um-forms-line td,.um-form-table.um-third-column .um-forms-line td,.um-form-table.um-two-thirds-column .um-forms-line td{float:left;width:100%}}.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:#fff;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{width:20px;text-align:left;margin:0 10px 0 0}.wp-picker-container input.wp-color-picker[type=text]{width:68px!important;float:left!important;padding:2px 4px!important;border-width:1px!important}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} \ No newline at end of file diff --git a/assets/css/admin/forms.sass b/assets/css/admin/forms.sass index 2b7d5c60..b74f1ef5 100644 --- a/assets/css/admin/forms.sass +++ b/assets/css/admin/forms.sass @@ -84,6 +84,7 @@ label margin: 0 0 5px 0 display: inline-block + //font-weight: bold &[data-field_type="icon"] td @@ -95,6 +96,13 @@ // font-style: italic // clear: both +.um-external-link-icon + width: 1em + height: 1em + margin: 0 + vertical-align: middle + fill: currentcolor + .um_admin_fonticon_wrapper +flex( row, flex-start, center, nowrap ) .#{$prefix}admin-icon-value diff --git a/assets/css/admin/roles.css b/assets/css/admin/roles.css index a6bc71a9..039088db 100644 --- a/assets/css/admin/roles.css +++ b/assets/css/admin/roles.css @@ -32,3 +32,8 @@ float: left; display: block; line-height: 37px; } + +#um-admin-form-publish #major-publishing-actions { + padding-top: 0; + padding-left: 0; + padding-right: 0; } diff --git a/assets/css/admin/roles.min.css b/assets/css/admin/roles.min.css index 8343788a..9d13aba0 100644 --- a/assets/css/admin/roles.min.css +++ b/assets/css/admin/roles.min.css @@ -1 +1 @@ -#um-roles .row-actions .reset a{color:#a00}#um-roles .row-actions .reset a:hover{color:red}.wp-list-table.roles .column-core,.wp-list-table.roles .column-users{width:15%;text-align:center!important}.wp-list-table.roles .column-admin_access,.wp-list-table.roles .column-priority{width:10%;text-align:center!important}@media screen and (max-width:782px){.wp-list-table.roles .column-admin_access,.wp-list-table.roles .column-core,.wp-list-table.roles .column-priority,.wp-list-table.roles .column-users{text-align:left!important}}#um-admin-form-wp-capabilities .um-metadata-line th{width:auto}#um-admin-form-wp-capabilities .um-metadata-line td{width:20px}#um_edit_role #titlewrap>span{width:40px;font-size:24px;float:left;display:block;line-height:37px} \ No newline at end of file +#um-roles .row-actions .reset a{color:#a00}#um-roles .row-actions .reset a:hover{color:red}.wp-list-table.roles .column-core,.wp-list-table.roles .column-users{width:15%;text-align:center!important}.wp-list-table.roles .column-admin_access,.wp-list-table.roles .column-priority{width:10%;text-align:center!important}@media screen and (max-width:782px){.wp-list-table.roles .column-admin_access,.wp-list-table.roles .column-core,.wp-list-table.roles .column-priority,.wp-list-table.roles .column-users{text-align:left!important}}#um-admin-form-wp-capabilities .um-metadata-line th{width:auto}#um-admin-form-wp-capabilities .um-metadata-line td{width:20px}#um_edit_role #titlewrap>span{width:40px;font-size:24px;float:left;display:block;line-height:37px}#um-admin-form-publish #major-publishing-actions{padding-top:0;padding-left:0;padding-right:0} \ No newline at end of file diff --git a/assets/css/admin/roles.sass b/assets/css/admin/roles.sass index 08869811..fb78b1ca 100644 --- a/assets/css/admin/roles.sass +++ b/assets/css/admin/roles.sass @@ -42,3 +42,10 @@ float: left display: block line-height: 37px + +#um-admin-form-publish + #major-publishing-actions + padding-top: 0 + padding-left: 0 + padding-right: 0 + diff --git a/includes/admin/class-site-health.php b/includes/admin/class-site-health.php index 77501694..69e59ab2 100644 --- a/includes/admin/class-site-health.php +++ b/includes/admin/class-site-health.php @@ -348,7 +348,7 @@ class Site_Health { } $account_settings['um-account_email'] = array( - 'label' => __( 'Allow users to change e-mail', 'ultimate-member' ), + 'label' => __( 'Allow users to change email', 'ultimate-member' ), 'value' => UM()->options()->get( 'account_email' ) ? $labels['yes'] : $labels['no'], ); @@ -543,7 +543,7 @@ class Site_Health { // Email settings $email_settings = array( 'um-admin_email' => array( - 'label' => __( 'Admin E-mail Address', 'ultimate-member' ), + 'label' => __( 'Admin Email Address', 'ultimate-member' ), 'value' => UM()->options()->get( 'admin_email' ), ), 'um-mail_from' => array( @@ -555,7 +555,7 @@ class Site_Health { 'value' => UM()->options()->get( 'mail_from_addr' ), ), 'um-email_html' => array( - 'label' => __( 'Use HTML for E-mails?', 'ultimate-member' ), + 'label' => __( 'Use HTML for Emails?', 'ultimate-member' ), 'value' => UM()->options()->get( 'email_html' ) ? $labels['yes'] : $labels['no'], ), ); @@ -1420,7 +1420,7 @@ class Site_Health { $info[ 'ultimate-member-' . $key ]['fields'], array( 'um-url_email_activate' => array( - 'label' => __( 'URL redirect after e-mail activation', 'ultimate-member' ), + 'label' => __( 'URL redirect after email activation', 'ultimate-member' ), 'value' => $rolemeta['_um_url_email_activate'], ), ) @@ -1846,7 +1846,7 @@ class Site_Health { 'first_name' => __( 'First Name', 'ultimate-member' ), 'last_name' => __( 'Last Name', 'ultimate-member' ), 'nickname' => __( 'Nickname', 'ultimate-member' ), - 'secondary_user_email' => __( 'Secondary E-mail Address', 'ultimate-member' ), + 'secondary_user_email' => __( 'Secondary Email Address', 'ultimate-member' ), 'description' => __( 'Biography', 'ultimate-member' ), 'phone_number' => __( 'Phone Number', 'ultimate-member' ), 'mobile_number' => __( 'Mobile Number', 'ultimate-member' ), diff --git a/includes/admin/core/class-admin-forms.php b/includes/admin/core/class-admin-forms.php index 70528b08..69a579d1 100644 --- a/includes/admin/core/class-admin-forms.php +++ b/includes/admin/core/class-admin-forms.php @@ -1852,5 +1852,24 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) { return $value; } + + public function render_external_link( $data ) { + $defaults = array( + 'url' => '', + 'html' => '', + ); + $data = wp_parse_args( $data, $defaults ); + if ( empty( $data['url'] ) || empty( $data['html'] ) ) { + return ''; + } + ob_start(); + ?> + + + + + child-theme for Ultimate Member customization, which hasn\'t dependencies with the official themes repo, so your custom files cannot be rewritten after a theme upgrade.
Otherwise, the customization files may be deleted after every theme upgrade.', 'ultimate-member' ), 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ), UM()->get_allowed_html( 'admin_notice' ) ); + echo wp_kses( sprintf( __( 'We recommend using a child-theme for Ultimate Member customization. Unlike official theme repositories, child themes don\'t have dependencies that could lead to your custom files being overwritten during a theme upgrade.
Without a child theme, your customization files may be deleted after every theme update.', 'ultimate-member' ), 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ), UM()->get_allowed_html( 'admin_notice' ) ); ?>

diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index 6d6c555d..22bbed5e 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -1099,7 +1099,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { 'sections' => array( '' => array( 'title' => __( 'Pages', 'ultimate-member' ), - 'description' => __( 'This section enables you to assign a page to one of the core elements necessary for the plugin\'s proper function. The plugin automatically creates and configures the required pages upon installation.
You only need to use this tab if you accidentally deleted pages that were automatically created during the initial plugin activation.', 'ultimate-member' ), + 'description' => sprintf( __( 'This section enables you to assign a page to one of the core elements necessary for the plugin\'s proper function. The plugin automatically creates and configures the required pages upon installation.
You only need to use this tab if you accidentally deleted pages that were automatically created during the initial plugin activation. Learn more about manually creating pages.', 'ultimate-member' ), 'https://docs.ultimatemember.com/article/1903-creating-plugin-core-pages-manually' ), 'fields' => $general_pages_fields, ), 'users' => array( @@ -1562,7 +1562,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { 'id' => 'blocked_emails', 'type' => 'textarea', 'label' => __( 'Blocked Email Addresses (Enter one email per line)', 'ultimate-member' ), - 'description' => __( 'This will block the specified e-mail addresses from being able to sign up or sign in to your site. To block an entire domain, use something like `*@domain.com`.', 'ultimate-member' ), + 'description' => __( 'This will block the specified email addresses from being able to sign up or sign in to your site. To block an entire domain, use something like `*@domain.com`.', 'ultimate-member' ), ), array( 'id' => 'blocked_words', @@ -1586,7 +1586,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { array( 'id' => 'admin_email', 'type' => 'text', - 'label' => __( 'Admin E-mail Address', 'ultimate-member' ), + 'label' => __( 'Admin Email Address', 'ultimate-member' ), 'description' => __( 'e.g. admin@companyname.com.', 'ultimate-member' ), ), array( @@ -1611,8 +1611,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { 'id' => 'email_html', 'type' => 'checkbox', 'label' => __( 'Content type', 'ultimate-member' ), - 'checkbox_label' => __( 'Enable HTML for E-mails', 'ultimate-member' ), - 'description' => __( 'If you plan use e-mails with HTML, please make sure that this option is enabled. Otherwise, HTML will be displayed as plain text.', 'ultimate-member' ), + 'checkbox_label' => __( 'Enable HTML for Emails', 'ultimate-member' ), + 'description' => __( 'If you plan use emails with HTML, please make sure that this option is enabled. Otherwise, HTML will be displayed as plain text.', 'ultimate-member' ), ), ), ), @@ -2193,7 +2193,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { 'form_sections' => array( 'developers' => array( 'title' => __( 'Developers', 'ultimate-member' ), - 'description' => __( 'This section allows you to manage settings that will be more developer-friendly. If you are not a developer, edit these settings at your own risk.', 'ultimate-member' ), + 'description' => __( 'This section is designed to modify settings that are tailored for developers. If you are not a developer, please be cautious when changing these settings.', 'ultimate-member' ), 'fields' => array( array( 'id' => 'allowed_choice_callbacks', diff --git a/includes/admin/core/class-admin-users.php b/includes/admin/core/class-admin-users.php index bcb05c8c..0857740e 100644 --- a/includes/admin/core/class-admin-users.php +++ b/includes/admin/core/class-admin-users.php @@ -247,7 +247,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) { 'label' => __( 'Put as Pending Review', 'ultimate-member' ) ), 'um_resend_activation' => array( - 'label' => __( 'Resend Activation E-mail', 'ultimate-member' ) + 'label' => __( 'Resend Activation Email', 'ultimate-member' ) ), 'um_deactivate' => array( 'label' => __( 'Deactivate', 'ultimate-member' ) @@ -407,7 +407,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) { $status = array( 'approved' => __( 'Approved', 'ultimate-member' ), 'awaiting_admin_review' => __( 'Pending review', 'ultimate-member' ), - 'awaiting_email_confirmation' => __( 'Waiting e-mail confirmation', 'ultimate-member' ), + 'awaiting_email_confirmation' => __( 'Waiting email confirmation', 'ultimate-member' ), 'inactive' => __( 'Inactive', 'ultimate-member' ), 'rejected' => __( 'Rejected', 'ultimate-member' ), ); diff --git a/includes/admin/templates/dashboard/users.php b/includes/admin/templates/dashboard/users.php index e7718757..a018976a 100644 --- a/includes/admin/templates/dashboard/users.php +++ b/includes/admin/templates/dashboard/users.php @@ -70,7 +70,7 @@ - + diff --git a/includes/admin/templates/role/publish.php b/includes/admin/templates/role/publish.php index bdbaf33c..9273d006 100644 --- a/includes/admin/templates/role/publish.php +++ b/includes/admin/templates/role/publish.php @@ -1,12 +1,14 @@ - +$role = $object['data']; +?>
admin_forms( + $form = UM()->admin_forms( array( 'class' => 'um-role-publish um-top-label', 'prefix_id' => 'role', @@ -20,7 +22,8 @@ $role = $object['data']; ?> ), ), ) - )->render_form(); + ); + $form->render_form(); ?>
@@ -31,3 +34,10 @@ $role = $object['data']; ?>
+render_external_link( + array( + 'html' => __( 'Learn more about role priorities', 'ultimate-member' ), + 'url' => 'https://docs.ultimatemember.com/article/1494-how-to-set-role-priority-for-user-roles', + ) +); diff --git a/includes/admin/templates/role/register.php b/includes/admin/templates/role/register.php index 5b2ba4df..3952a31b 100644 --- a/includes/admin/templates/role/register.php +++ b/includes/admin/templates/role/register.php @@ -76,8 +76,8 @@ array( 'id' => '_um_url_email_activate', 'type' => 'text', - 'label' => __( 'URL redirect after e-mail activation', 'ultimate-member' ), - 'tooltip' => __( 'If you want users to go to a specific page other than login page after e-mail activation, enter the URL here.', 'ultimate-member' ), + 'label' => __( 'URL redirect after email activation', 'ultimate-member' ), + 'tooltip' => __( 'If you want users to go to a specific page other than login page after email activation, enter the URL here.', 'ultimate-member' ), 'value' => ! empty( $role['_um_url_email_activate'] ) ? __( $role['_um_url_email_activate'], 'ultimate-member' ) : '', 'conditional' => array( '_um_status', '=', 'checkmail' ), ), diff --git a/includes/class-config.php b/includes/class-config.php index aa8e1bf6..a7b64e2f 100644 --- a/includes/class-config.php +++ b/includes/class-config.php @@ -282,14 +282,14 @@ if ( ! class_exists( 'um\Config' ) ) { ) ); $this->core_form_meta['register'] = array( - '_um_custom_fields' => 'a:6:{s:10:"user_login";a:15:{s:5:"title";s:8:"Username";s:7:"metakey";s:10:"user_login";s:4:"type";s:4:"text";s:5:"label";s:8:"Username";s:8:"required";i:1;s:6:"public";i:1;s:8:"editable";b:0;s:8:"validate";s:15:"unique_username";s:9:"min_chars";i:3;s:9:"max_chars";i:24;s:8:"position";s:1:"1";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:10:"user_email";a:13:{s:5:"title";s:14:"E-mail Address";s:7:"metakey";s:10:"user_email";s:4:"type";s:4:"text";s:5:"label";s:14:"E-mail Address";s:8:"required";i:0;s:6:"public";i:1;s:8:"editable";b:1;s:8:"validate";s:12:"unique_email";s:8:"position";s:1:"4";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:13:"user_password";a:16:{s:5:"title";s:8:"Password";s:7:"metakey";s:13:"user_password";s:4:"type";s:8:"password";s:5:"label";s:8:"Password";s:8:"required";i:1;s:6:"public";i:1;s:8:"editable";b:1;s:9:"min_chars";i:8;s:9:"max_chars";i:30;s:15:"force_good_pass";i:1;s:18:"force_confirm_pass";i:1;s:8:"position";s:1:"5";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:10:"first_name";a:12:{s:5:"title";s:10:"First Name";s:7:"metakey";s:10:"first_name";s:4:"type";s:4:"text";s:5:"label";s:10:"First Name";s:8:"required";i:0;s:6:"public";i:1;s:8:"editable";b:1;s:8:"position";s:1:"2";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:9:"last_name";a:12:{s:5:"title";s:9:"Last Name";s:7:"metakey";s:9:"last_name";s:4:"type";s:4:"text";s:5:"label";s:9:"Last Name";s:8:"required";i:0;s:6:"public";i:1;s:8:"editable";b:1;s:8:"position";s:1:"3";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:9:"_um_row_1";a:4:{s:4:"type";s:3:"row";s:2:"id";s:9:"_um_row_1";s:8:"sub_rows";s:1:"1";s:4:"cols";s:1:"1";}}', + '_um_custom_fields' => 'a:6:{s:10:"user_login";a:15:{s:5:"title";s:8:"Username";s:7:"metakey";s:10:"user_login";s:4:"type";s:4:"text";s:5:"label";s:8:"Username";s:8:"required";i:1;s:6:"public";i:1;s:8:"editable";b:0;s:8:"validate";s:15:"unique_username";s:9:"min_chars";i:3;s:9:"max_chars";i:24;s:8:"position";s:1:"1";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:10:"user_email";a:13:{s:5:"title";s:14:"Email Address";s:7:"metakey";s:10:"user_email";s:4:"type";s:4:"text";s:5:"label";s:14:"E-mail Address";s:8:"required";i:0;s:6:"public";i:1;s:8:"editable";b:1;s:8:"validate";s:12:"unique_email";s:8:"position";s:1:"4";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:13:"user_password";a:16:{s:5:"title";s:8:"Password";s:7:"metakey";s:13:"user_password";s:4:"type";s:8:"password";s:5:"label";s:8:"Password";s:8:"required";i:1;s:6:"public";i:1;s:8:"editable";b:1;s:9:"min_chars";i:8;s:9:"max_chars";i:30;s:15:"force_good_pass";i:1;s:18:"force_confirm_pass";i:1;s:8:"position";s:1:"5";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:10:"first_name";a:12:{s:5:"title";s:10:"First Name";s:7:"metakey";s:10:"first_name";s:4:"type";s:4:"text";s:5:"label";s:10:"First Name";s:8:"required";i:0;s:6:"public";i:1;s:8:"editable";b:1;s:8:"position";s:1:"2";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:9:"last_name";a:12:{s:5:"title";s:9:"Last Name";s:7:"metakey";s:9:"last_name";s:4:"type";s:4:"text";s:5:"label";s:9:"Last Name";s:8:"required";i:0;s:6:"public";i:1;s:8:"editable";b:1;s:8:"position";s:1:"3";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:9:"_um_row_1";a:4:{s:4:"type";s:3:"row";s:2:"id";s:9:"_um_row_1";s:8:"sub_rows";s:1:"1";s:4:"cols";s:1:"1";}}', '_um_mode' => 'register', '_um_core' => 'register', '_um_register_use_custom_settings' => 0, ); $this->core_form_meta['login'] = array( - '_um_custom_fields' => 'a:3:{s:8:"username";a:13:{s:5:"title";s:18:"Username or E-mail";s:7:"metakey";s:8:"username";s:4:"type";s:4:"text";s:5:"label";s:18:"Username or E-mail";s:8:"required";i:1;s:6:"public";i:1;s:8:"editable";b:0;s:8:"validate";s:24:"unique_username_or_email";s:8:"position";s:1:"1";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:13:"user_password";a:16:{s:5:"title";s:8:"Password";s:7:"metakey";s:13:"user_password";s:4:"type";s:8:"password";s:5:"label";s:8:"Password";s:8:"required";i:1;s:6:"public";i:1;s:8:"editable";b:1;s:9:"min_chars";i:8;s:9:"max_chars";i:30;s:15:"force_good_pass";i:1;s:18:"force_confirm_pass";i:1;s:8:"position";s:1:"2";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:9:"_um_row_1";a:4:{s:4:"type";s:3:"row";s:2:"id";s:9:"_um_row_1";s:8:"sub_rows";s:1:"1";s:4:"cols";s:1:"1";}}', + '_um_custom_fields' => 'a:3:{s:8:"username";a:13:{s:5:"title";s:18:"Username or Email";s:7:"metakey";s:8:"username";s:4:"type";s:4:"text";s:5:"label";s:18:"Username or E-mail";s:8:"required";i:1;s:6:"public";i:1;s:8:"editable";b:0;s:8:"validate";s:24:"unique_username_or_email";s:8:"position";s:1:"1";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:13:"user_password";a:16:{s:5:"title";s:8:"Password";s:7:"metakey";s:13:"user_password";s:4:"type";s:8:"password";s:5:"label";s:8:"Password";s:8:"required";i:1;s:6:"public";i:1;s:8:"editable";b:1;s:9:"min_chars";i:8;s:9:"max_chars";i:30;s:15:"force_good_pass";i:1;s:18:"force_confirm_pass";i:1;s:8:"position";s:1:"2";s:6:"in_row";s:9:"_um_row_1";s:10:"in_sub_row";s:1:"0";s:9:"in_column";s:1:"1";s:8:"in_group";s:0:"";}s:9:"_um_row_1";a:4:{s:4:"type";s:3:"row";s:2:"id";s:9:"_um_row_1";s:8:"sub_rows";s:1:"1";s:4:"cols";s:1:"1";}}', '_um_mode' => 'login', '_um_core' => 'login', '_um_login_use_custom_settings' => 0, @@ -343,7 +343,7 @@ if ( ! class_exists( 'um\Config' ) ) { 'Thank you for signing up with {site_name}! Your account is now active.

' . '{action_title}:

' . '{action_url}

' . - 'Your account e-mail: {email}
' . + 'Your account email: {email}
' . 'Your account username: {username}

' . 'If you have any problems, please contact us at {admin_email}

' . 'Thanks,
' . @@ -362,7 +362,7 @@ if ( ! class_exists( 'um\Config' ) ) { 'If you have any problems, please contact us at {admin_email}

' . 'Thanks,
' . '{site_name}', - 'description' => __('Whether to send the user an email when his account needs e-mail activation','ultimate-member'), + 'description' => __('Whether to send the user an email when his account needs email activation','ultimate-member'), 'recipient' => 'user' ), 'pending_email' => array( @@ -386,7 +386,7 @@ if ( ! class_exists( 'um\Config' ) ) { 'Thank you for signing up with {site_name}! Your account has been approved and is now active.

' . 'To login please visit the following url:

' . '{login_url}

' . - 'Your account e-mail: {email}
' . + 'Your account email: {email}
' . 'Your account username: {username}
' . 'Set your account password: {password_reset_link}

' . 'If you have any problems, please contact us at {admin_email}

' . diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php index d1391022..4939fbd2 100644 --- a/includes/core/class-builtin.php +++ b/includes/core/class-builtin.php @@ -782,10 +782,10 @@ if ( ! class_exists( 'um\core\Builtin' ) ) { ), 'username' => array( - 'title' => __('Username or E-mail','ultimate-member'), + 'title' => __('Username or Email','ultimate-member'), 'metakey' => 'username', 'type' => 'text', - 'label' => __('Username or E-mail','ultimate-member'), + 'label' => __('Username or Email','ultimate-member'), 'required' => 1, 'public' => 1, 'editable' => false, @@ -871,10 +871,10 @@ if ( ! class_exists( 'um\core\Builtin' ) ) { ), 'user_email' => array( - 'title' => __('E-mail Address','ultimate-member'), + 'title' => __('Email Address','ultimate-member'), 'metakey' => 'user_email', 'type' => 'text', - 'label' => __('E-mail Address','ultimate-member'), + 'label' => __('Email Address','ultimate-member'), 'required' => 0, 'public' => 1, 'validate' => 'unique_email', @@ -882,10 +882,10 @@ if ( ! class_exists( 'um\core\Builtin' ) ) { ), 'secondary_user_email' => array( - 'title' => __('Secondary E-mail Address','ultimate-member'), + 'title' => __('Secondary Email Address','ultimate-member'), 'metakey' => 'secondary_user_email', 'type' => 'text', - 'label' => __('Secondary E-mail Address','ultimate-member'), + 'label' => __('Secondary Email Address','ultimate-member'), 'required' => 0, 'public' => 1, 'editable' => true, @@ -1271,7 +1271,7 @@ if ( ! class_exists( 'um\core\Builtin' ) ) { ), 'username_b' => array( - 'title' => __('Username or E-mail','ultimate-member'), + 'title' => __('Username or Email','ultimate-member'), 'metakey' => 'username_b', 'type' => 'text', 'placeholder' => __('Enter your username or email','ultimate-member'), @@ -1558,11 +1558,11 @@ if ( ! class_exists( 'um\core\Builtin' ) ) { $array['skype'] = __('Skype ID','ultimate-member'); $array['soundcloud'] = __( 'SoundCloud Profile', 'ultimate-member' ); $array['twitter_url'] = __( 'X (formerly Twitter) URL', 'ultimate-member' ); - $array['is_email'] = __('E-mail( Not Unique )','ultimate-member'); - $array['unique_email'] = __('Unique E-mail','ultimate-member'); + $array['is_email'] = __('Email( Not Unique )','ultimate-member'); + $array['unique_email'] = __('Unique Email','ultimate-member'); $array['unique_value'] = __('Unique Metakey value','ultimate-member'); $array['unique_username'] = __('Unique Username','ultimate-member'); - $array['unique_username_or_email'] = __('Unique Username/E-mail','ultimate-member'); + $array['unique_username_or_email'] = __('Unique Username/Email','ultimate-member'); $array['url'] = __('Website URL','ultimate-member'); $array['youtube_url'] = __('YouTube Profile','ultimate-member'); $array['youtube_video'] = __('YouTube Video','ultimate-member'); diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php index 8deccf7f..021bd54c 100644 --- a/includes/core/class-member-directory.php +++ b/includes/core/class-member-directory.php @@ -425,7 +425,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { 'first_name' => __( 'First Name', 'ultimate-member' ), 'last_name' => __( 'Last Name', 'ultimate-member' ), 'nickname' => __( 'Nickname', 'ultimate-member' ), - 'secondary_user_email' => __( 'Secondary E-mail Address', 'ultimate-member' ), + 'secondary_user_email' => __( 'Secondary Email Address', 'ultimate-member' ), 'description' => __( 'Biography', 'ultimate-member' ), 'phone_number' => __( 'Phone Number', 'ultimate-member' ), 'mobile_number' => __( 'Mobile Number', 'ultimate-member' ), diff --git a/includes/core/class-permalinks.php b/includes/core/class-permalinks.php index 5d66a799..b2714d45 100644 --- a/includes/core/class-permalinks.php +++ b/includes/core/class-permalinks.php @@ -174,7 +174,7 @@ if ( ! class_exists( 'um\core\Permalinks' ) ) { do_action( 'um_after_email_confirmation', $user_id ); if ( empty( $set_password_required ) ) { - $redirect = empty( $user_role_data['url_email_activate'] ) ? um_get_core_page( 'login', 'account_active' ) : trim( $user_role_data['url_email_activate'] ); // Role setting "URL redirect after e-mail activation" + $redirect = empty( $user_role_data['url_email_activate'] ) ? um_get_core_page( 'login', 'account_active' ) : trim( $user_role_data['url_email_activate'] ); // Role setting "URL redirect after email activation" } $redirect = apply_filters( 'um_after_email_confirmation_redirect', $redirect, $user_id, $login ); diff --git a/includes/core/class-user.php b/includes/core/class-user.php index 9a96da1f..573924b1 100644 --- a/includes/core/class-user.php +++ b/includes/core/class-user.php @@ -1301,7 +1301,7 @@ if ( ! class_exists( 'um\core\User' ) ) { } if ( $this->usermeta['account_status'][0] == 'awaiting_email_confirmation' ) { - $this->usermeta['account_status_name'][0] = __( 'Awaiting E-mail Confirmation', 'ultimate-member' ); + $this->usermeta['account_status_name'][0] = __( 'Awaiting Email Confirmation', 'ultimate-member' ); } if ( $this->usermeta['account_status'][0] == 'awaiting_admin_review' ) { @@ -1676,7 +1676,7 @@ if ( ! class_exists( 'um\core\User' ) ) { /** - * This method approves a user membership and sends them an optional welcome/approval e-mail. + * This method approves a user membership and sends them an optional welcome/approval email. * * @usage user()->approve(); ?> * @@ -1758,7 +1758,7 @@ if ( ! class_exists( 'um\core\User' ) ) { /** - * This method puts a user under manual review by administrator and sends them an optional e-mail. + * This method puts a user under manual review by administrator and sends them an optional email. * * @usage user()->pending(); ?> * @@ -1784,7 +1784,7 @@ if ( ! class_exists( 'um\core\User' ) ) { /** - * This method rejects a user membership and sends them an optional e-mail. + * This method rejects a user membership and sends them an optional email. * * @usage user()->reject(); ?> * @@ -1811,7 +1811,7 @@ if ( ! class_exists( 'um\core\User' ) ) { /** - * This method deactivates a user membership and sends them an optional e-mail. + * This method deactivates a user membership and sends them an optional email. * * @usage user()->deactivate(); ?> * diff --git a/includes/core/um-actions-account.php b/includes/core/um-actions-account.php index 41e520dc..84544975 100644 --- a/includes/core/um-actions-account.php +++ b/includes/core/um-actions-account.php @@ -157,15 +157,15 @@ function um_submit_account_errors_hook( $args ) { if ( isset( $args['user_email'] ) ) { if ( strlen( trim( $args['user_email'] ) ) === 0 ) { - UM()->form()->add_error( 'user_email', __( 'You must provide your e-mail', 'ultimate-member' ) ); + UM()->form()->add_error( 'user_email', __( 'You must provide your email', 'ultimate-member' ) ); } if ( ! is_email( $args['user_email'] ) ) { - UM()->form()->add_error( 'user_email', __( 'Please provide a valid e-mail', 'ultimate-member' ) ); + UM()->form()->add_error( 'user_email', __( 'Please provide a valid email', 'ultimate-member' ) ); } if ( email_exists( $args['user_email'] ) && email_exists( $args['user_email'] ) !== get_current_user_id() ) { - UM()->form()->add_error( 'user_email', __( 'Please provide a valid e-mail', 'ultimate-member' ) ); + UM()->form()->add_error( 'user_email', __( 'Please provide a valid email', 'ultimate-member' ) ); } } diff --git a/includes/core/um-actions-misc.php b/includes/core/um-actions-misc.php index 1327d024..9525b5a1 100644 --- a/includes/core/um-actions-misc.php +++ b/includes/core/um-actions-misc.php @@ -168,7 +168,7 @@ function um_add_update_notice( $args ) { $err = __( 'Your account has not been approved yet.', 'ultimate-member' ); break; case 'awaiting_email_confirmation': - $err = __( 'Your account is awaiting e-mail verification.', 'ultimate-member' ); + $err = __( 'Your account is awaiting email verification.', 'ultimate-member' ); break; case 'rejected': $err = __( 'Your membership request has been rejected.', 'ultimate-member' ); diff --git a/includes/core/um-filters-login.php b/includes/core/um-filters-login.php index 2f697ea0..a5369469 100644 --- a/includes/core/um-filters-login.php +++ b/includes/core/um-filters-login.php @@ -78,7 +78,7 @@ function um_wp_form_errors_hook_logincheck( $user ) { $error = new WP_Error( $status, __( 'Your account has not been approved yet.', 'ultimate-member' ) ); break; case 'awaiting_email_confirmation': - $error = new WP_Error( $status, __( 'Your account is awaiting e-mail verification.', 'ultimate-member' ) ); + $error = new WP_Error( $status, __( 'Your account is awaiting email verification.', 'ultimate-member' ) ); break; case 'rejected': $error = new WP_Error( $status, __( 'Your membership request has been rejected.', 'ultimate-member' ) ); diff --git a/includes/core/um-filters-user.php b/includes/core/um-filters-user.php index 455651ca..2ff9e293 100644 --- a/includes/core/um-filters-user.php +++ b/includes/core/um-filters-user.php @@ -34,7 +34,7 @@ function um_admin_user_actions_hook( $actions, $user_id ) { } if ( 'awaiting_email_confirmation' === $account_status ) { - $actions['um_resend_activation'] = array( 'label' => __( 'Resend Activation E-mail', 'ultimate-member' ) ); + $actions['um_resend_activation'] = array( 'label' => __( 'Resend Activation Email', 'ultimate-member' ) ); } if ( 'inactive' !== $account_status ) { diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php index 2a63b100..0b8e7d98 100644 --- a/includes/um-short-functions.php +++ b/includes/um-short-functions.php @@ -1751,7 +1751,7 @@ function um_can_edit_my_profile() { /** - * Short for admin e-mail + * Short for admin email * * @return mixed|string|void */ @@ -1761,7 +1761,7 @@ function um_admin_email() { /** - * Get admin e-mails + * Get admin emails * * @return array */ diff --git a/templates/email/approved_email.php b/templates/email/approved_email.php index d5276526..c76c9bd6 100644 --- a/templates/email/approved_email.php +++ b/templates/email/approved_email.php @@ -29,7 +29,7 @@ if ( ! defined( 'ABSPATH' ) ) {
Account Information
-
Your account e-mail: {email}
+
Your account email: {email}
Your account username: {username}
Set your password: {password_reset_link}
diff --git a/templates/email/checkmail_email.php b/templates/email/checkmail_email.php index 92cb56fc..2c86633d 100644 --- a/templates/email/checkmail_email.php +++ b/templates/email/checkmail_email.php @@ -1,7 +1,7 @@