Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into feature/map_layout

# Conflicts:
#	assets/js/um-members.min.js

includes/admin/assets/css/um-admin-forms.css

@@ -14,6 +14,28 @@
     padding: 0 0 15px 0;
 }
 
+.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 {

includes/admin/assets/js/um-admin-modal.js

@@ -387,13 +387,13 @@ 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 {
 				v_id = '.postbox';
 			}
-			jQuery( v_id ).find('input#_icon,input#_um_icon,input#notice__um_icon').val( icon_selected );
+			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();
 		}

includes/admin/core/class-admin-forms.php

@@ -523,7 +523,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 			$value = $this->get_field_value( $field_data );
 			$value_attr = ' value="' . $value . '" ';
 
-			$html = '<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="">' . __( 'Choose Icon', 'ultimate-member' ) . '</a>
 				<span class="um-admin-icon-value">';
 
 			if ( ! empty( $value ) ) {
@@ -540,7 +540,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 				$html .= '<span class="um-admin-icon-clear"><i class="um-icon-android-cancel"></i></span>';
 			}
 
-			$html .= '</span>';
+			$html .= '</span></span>';
 
 			return $html;
 		}

includes/admin/templates/extensions.php

@@ -128,6 +128,12 @@ $premium['unsplash'] = array(
 	'desc' => 'Allow users to select a profile cover photo from <a href="https://unsplash.com/" target="_blank">Unsplash</a> from their profile',
 );
 
+$premium['profile-tabs'] = array(
+	'url' => 'https://ultimatemember.com/extensions/profile-tabs/',
+	'name' => 'Profile Tabs',
+	'desc' => 'Allow users to add custom tabs to profiles',
+);
+
 $free['forumwp'] = array(
 	'url' => 'https://ultimatemember.com/extensions/forumwp/',
 	'name' => 'ForumWP',