Ultimate Member update

Signed-off-by: Jeff <jeff@gotenzing.com>

@@ -383,6 +383,32 @@ p.um-notice.warning a {
 	word-wrap: break-word;
 	word-wrap: break-word;
 }
 }
 
 
+.um-field-area-password {
+	position: relative;
+}
+
+.um-toggle-password {
+	cursor: pointer;
+	display: block;
+	position: absolute;
+	right: 0;
+	top: 0;
+	height: 100%;
+	width: 40px;
+	text-align: center;
+	box-sizing: border-box;
+	font-size: 20px;
+	line-height: 2;
+}
+
+.um-toggle-password i {
+	transition: all .2s linear;
+}
+
+.um-toggle-password:hover i {
+	color: #44b0ec;
+}
+
 .um-field-value p {
 .um-field-value p {
 	margin: 0 0 6px 0 !important;
 	margin: 0 0 6px 0 !important;
 	padding: 0;
 	padding: 0;
@@ -432,11 +458,11 @@ p.um-notice.warning a {
 	line-height: 1.7em;
 	line-height: 1.7em;
 }
 }
 
 
-.um-form input[type=text],
-.um-form input[type=search],
-.um-form input[type=tel],
-.um-form input[type=number],
-.um-form input[type=password] {
+.um-form input[type="text"],
+.um-form input[type="search"],
+.um-form input[type="tel"],
+.um-form input[type="number"],
+.um-form input[type="password"] {
 	padding: 0 12px !important;
 	padding: 0 12px !important;
 	width: 100%;
 	width: 100%;
 	display: block !important;
 	display: block !important;
@@ -451,32 +477,35 @@ p.um-notice.warning a {
 	box-shadow: none !important;
 	box-shadow: none !important;
 	margin: 0 !important;
 	margin: 0 !important;
 	position: static;
 	position: static;
-	outline: none !important;
 }
 }
 
 
-.um-form input[type=number] {
+.um-form .um-field-area-password input[type="password"] {
+	padding-right: 40px !important;
+}
+
+.um-form input[type="number"] {
 	width: auto;
 	width: auto;
 	padding: 0 0 0 5px !important;
 	padding: 0 0 0 5px !important;
 	height: 30px !important;
 	height: 30px !important;
 }
 }
 
 
-.um-form input[type=text]:focus,
-.um-form input[type=search]:focus,
-.um-form input[type=tel]:focus,
-.um-form input[type=number]:focus,
-.um-form input[type=password]:focus,
+.um-form input[type="text"]:focus,
+.um-form input[type="search"]:focus,
+.um-form input[type="tel"]:focus,
+.um-form input[type="number"]:focus,
+.um-form input[type="password"]:focus,
 .um-form textarea:focus {
 .um-form textarea:focus {
 	box-shadow: none !important;
 	box-shadow: none !important;
 	outline: none !important;
 	outline: none !important;
 }
 }
 
 
-.um-form input[type=text].um-iconed,
-.um-form input[type=tel].um-iconed,
-.um-form input[type=password].um-iconed { padding-left: 44px !important }
+.um-form input[type="text"].um-iconed,
+.um-form input[type="tel"].um-iconed,
+.um-form input[type="password"].um-iconed { padding-left: 44px !important }
 
 
-.um-form input[type=text].um-error,
-.um-form input[type=tel].um-error,
-.um-form input[type=password].um-error { border-color: #C74A4A !important }
+.um-form input[type="text"].um-error,
+.um-form input[type="tel"].um-error,
+.um-form input[type="password"].um-error { border-color: #C74A4A !important }
 
 
 .um-form textarea {
 .um-form textarea {
 	width: 100%;
 	width: 100%;
@@ -633,15 +662,15 @@ p.um-notice.warning a {
 
 
 .um div.disabled,
 .um div.disabled,
 .um-disabled,
 .um-disabled,
-.um input[type=submit]:disabled,
-.um input[type=text]:disabled,
-.um input[type=number]:disabled {
+.um input[type="submit"]:disabled,
+.um input[type="text"]:disabled,
+.um input[type="number"]:disabled {
 	opacity: 0.6 !important;
 	opacity: 0.6 !important;
 	cursor: no-drop !important;
 	cursor: no-drop !important;
 }
 }
 
 
-input[type=submit].um-button,
-input[type=submit].um-button:focus {
+input[type="submit"].um-button,
+input[type="submit"].um-button:focus {
 	vertical-align: middle !important;
 	vertical-align: middle !important;
 	height: auto !important;
 	height: auto !important;
 	font-size: 15px;
 	font-size: 15px;
@@ -656,7 +685,7 @@ input[type=submit].um-button:focus {
 	-webkit-appearance: none;
 	-webkit-appearance: none;
 }
 }
 
 
-input[type=submit].um-button:hover {
+input[type="submit"].um-button:hover {
 	opacity: 1;
 	opacity: 1;
 }
 }
 
 

+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( empty( $args['css_profile_card_bg'] ) && empty( $args['css_card_thickness'] ) &&
+	empty( $args['css_profile_card_text'] ) && empty( $args['css_card_bordercolor'] ) &&
+	empty( $args['css_img_bordercolor'] ) ) {
+	return;
+}
+?>
+<style>
+	<?php if ( ! empty( $args['css_profile_card_bg'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member {
+			background: <?php echo esc_attr( $args['css_profile_card_bg'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( ! empty( $args['css_card_thickness'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member {
+			border-width: <?php echo esc_attr( $args['css_card_thickness'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( ! empty( $args['css_profile_card_text'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member-card * {
+			color: <?php echo esc_attr( $args['css_profile_card_text'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( ! empty( $args['css_card_bordercolor'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member {
+			border-color: <?php echo esc_attr( $args['css_card_bordercolor'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( ! empty( $args['css_img_bordercolor'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member-photo img {
+			border-color: <?php echo esc_attr( $args['css_img_bordercolor'] ); ?>;
+		}
+	<?php } ?>
+</style>

+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! isset( $args['max_width'] ) && ! isset( $args['align'] ) ) {
+	return;
+}
+?>
+<style>
+	<?php if ( isset( $args['max_width'] ) && $args['max_width'] ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um {
+			max-width: <?php echo esc_attr( $args['max_width'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( isset( $args['align'] ) && in_array( $args['align'], array( 'left', 'right' ), true ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um {
+			margin-<?php echo esc_attr( $args['align'] ); ?>: 0px !important;
+		}
+	<?php } ?>
+</style>

+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! isset( $args['photosize'] ) || 'original' === $args['photosize'] ) {
+	$args['photosize'] = um_get_metadefault( 'profile_photosize' ); // Cannot be more than metadefault value.
+}
+
+$args['photosize'] = absint( $args['photosize'] );
+
+$photosize_up = ( $args['photosize'] / 2 ) + 10;
+$meta_padding = ( $args['photosize'] + 60 ) . 'px';
+?>
+<style>
+	<?php if ( ! empty( $args['area_max_width'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-body {
+			max-width: <?php echo esc_attr( $args['area_max_width'] ); ?>;
+		}
+	<?php } ?>
+	.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-photo a.um-profile-photo-img {
+		width: <?php echo esc_attr( $args['photosize'] ); ?>px;
+		height: <?php echo esc_attr( $args['photosize'] ); ?>px;
+	}
+	.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-photo a.um-profile-photo-img {
+		top: -<?php echo esc_attr( $photosize_up ); ?>px;
+	}
+	<?php if ( is_rtl() ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-meta {
+			padding-right: <?php echo esc_attr( $meta_padding ); ?>;
+		}
+	<?php } else { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-meta {
+			padding-left: <?php echo esc_attr( $meta_padding ); ?>;
+		}
+	<?php } ?>
+</style>

-<style type="text/css">
-<?php
-
-if ( isset( $css_profile_card_bg ) && ! empty( $css_profile_card_bg ) ) {
-
-print ".um-$form_id .um-member {
-	background: $css_profile_card_bg;
-}";
-
-}
-
-if ( isset( $css_card_thickness ) && ! empty(  $css_card_thickness  ) ) {
-
-print ".um-$form_id .um-member {
-	border-width: $css_card_thickness;
-}";
-
-}
-
-if ( isset( $css_profile_card_text ) && ! empty( $css_profile_card_text ) ) {
-
-print ".um-$form_id .um-member-card * {
-	color: $css_profile_card_text;
-}";
-
-}
-
-if ( isset( $css_card_bordercolor ) && ! empty( $css_card_bordercolor ) ) {
-
-print ".um-$form_id .um-member {
-	border-color: $css_card_bordercolor;
-}";
-
-}
-
-if ( isset( $css_img_bordercolor ) && ! empty( $css_img_bordercolor ) ) {
-
-print ".um-$form_id .um-member-photo img {
-	border-color: $css_img_bordercolor;
-}";
-
-}
-
-?>
-</style>
\ No newline at end of file

-<style type="text/css">
-<?php
-
-if ( isset( $max_width ) && $max_width ) {
-print ".um-$form_id.um {
-	max-width: {$max_width};
-}";
-}
-
-if ( isset( $align ) && in_array( $align, array( 'left', 'right' ) ) ) {
-print ".um-$form_id.um {
-	margin-$align: 0px !important;
-}";
-}
-
-?>
-</style>

-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
-
-<style type="text/css">
-
-	<?php if ( ! $photosize || $photosize == 'original' ) {
-		//cannot be more than metadefault value
-		$photosize = um_get_metadefault( 'profile_photosize' );
-	}
-	$photosize = filter_var( $photosize, FILTER_SANITIZE_NUMBER_INT );
-
-	$photosize_up = ( $photosize / 2 ) + 10;
-	$meta_padding = ( $photosize + 60 ) . 'px';
-
-	if ( $area_max_width ) {
-		print "
-		.um-$form_id.um .um-profile-body {
-			max-width: $area_max_width;
-		}
-		";
-	}
-
-	print "
-	.um-$form_id.um .um-profile-photo a.um-profile-photo-img {
-		width: ".$photosize."px;
-		height: ".$photosize."px;
-	}
-	";
-
-	print "
-	.um-$form_id.um .um-profile-photo a.um-profile-photo-img {
-		top: -".$photosize_up."px;
-	}
-	";
-
-	if ( is_rtl() ) {
-		print "
-		.um-$form_id.um .um-profile-meta {
-			padding-right: $meta_padding;
-		}
-		";
-	} else {
-		print "
-		.um-$form_id.um .um-profile-meta {
-			padding-left: $meta_padding;
-		}
-		";
-	}
-	?>
-</style>
\ No newline at end of file

-function um_init_new_dropdown(){jQuery(".um-new-dropdown").um_dropdownMenu()}!function(p){function o(e){var i={get:function(){return i},show:function(){i.hideAll(),i.$menu=i.$element.find(".um-new-dropdown"),i.$menu.length||(i.$menu=p('div.um-new-dropdown[data-element="'+i.data.element+'"]').first()),i.$dropdown=i.$menu.clone(),i.$dropdown.on("click","li a",i.itemHandler).attr("data-cloned","1"),p(window).on("resize",i.updatePosition);var e=""!==i.data.parent?i.data.parent:document.body;return p(e).append(i.$dropdown),i.$element.trigger("um_new_dropdown_render",{dropdown_layout:i.$dropdown,trigger:i.data.trigger,element:i.data.elemen,obj:i.$element}),i.$dropdown.css(i.calculatePosition()).show(),i.$element.addClass("um-new-dropdown-shown").data("um-new-dropdown-show",!0),i},hide:function(){return i.$dropdown&&i.$dropdown.is(":visible")&&(p(window).off("resize",i.updatePosition),i.$dropdown.remove(),i.$element.removeClass("um-new-dropdown-shown").data("um-new-dropdown-show",!1)),i},hideAll:function(){return i.$element.data("um-new-dropdown-show")&&i.hide(),p('div.um-new-dropdown[data-cloned="1"]').remove(),p(".um-new-dropdown-shown").removeClass("um-new-dropdown-shown").data("um-new-dropdown-show",!1),i},calculatePosition:function(){var e,t=i.$element.get(0).getBoundingClientRect(),n=i.$dropdown.innerHeight()||150,o=i.data.width||150,d="",r=(e=""!==i.data.parent?(r=p(i.data.parent).offset(),{top:(e=i.$element.offset()).top-r.top,left:e.left-r.left}):i.$element.offset(),""!==i.data.parent?p(i.data.parent)[0].offsetWidth:window.innerWidth),a={position:"absolute",width:o+"px"};switch((""!==i.data.parent?p(i.data.parent)[0].offsetHeight:window.innerHeight)-t.bottom>n?(a.top=e.top+t.height+"px",d+="bottom"):(d+="top",a.top=e.top-n+"px"),e.left>o||e.left>r/2?(a.left=e.left+t.width-o+"px",d+="-left"):(a.left=e.left+"px",d+="-right"),d){case"bottom-right":a.borderRadius="0px 5px 5px 5px";break;case"bottom-left":a.borderRadius="5px 0px 5px 5px";break;case"top-right":a.borderRadius="5px 5px 5px 0px";break;case"top-left":a.borderRadius="5px 5px 0px 5px"}return a},updatePosition:function(){return i.$dropdown&&i.$dropdown.is(":visible")&&i.$dropdown.css(i.calculatePosition()),i},itemHandler:function(e){e.stopPropagation();e=p(e.currentTarget).attr("class");i.$menu.find('li a[class="'+e+'"]').trigger("click"),i.$element.data("um-new-dropdown-show")&&i.hide()},triggerHandler:function(e){e.stopPropagation(),i.$element=p(e.currentTarget),i.$element.data("um-new-dropdown-show")?i.hide():i.show()}};return i.$menu=p(e),i.data=i.$menu.data(),i.$element=i.$menu.closest(i.data.element),i.$element.length||(i.$element=p(i.data.element).first()),i.$dropdown=p(document.body).children('div[data-element="'+i.data.element+'"]'),void 0===i.data.initted&&(i.$menu.data("initted",!0),i.data=i.$menu.data(),void 0===o.screenTriggers&&(o.screenTriggers={}),o.screenTriggers[i.data.element]!==i.data.trigger&&(o.screenTriggers[i.data.element]=i.data.trigger,p(document.body).on(i.data.trigger,i.data.element,i.triggerHandler))),void 0===o.globalHandlersInitted&&(o.globalHandlersInitted=!0,p(document.body).on("click",function(e){p(e.target).closest(".um-new-dropdown").length||i.hideAll()})),i}p.fn.um_dropdownMenu=function(n){return"string"==typeof n&&n?this.map(function(e,t){t=o(t);return"function"==typeof t[n]?t[n]():t[n]}).toArray():this.each(function(e,t){o(t)})}}(jQuery),jQuery(document).ready(function(e){um_init_new_dropdown()});
\ No newline at end of file
+function um_init_new_dropdown(){jQuery(".um-new-dropdown").um_dropdownMenu()}!function(p){function o(e){var i={get:function(){return i},show:function(){i.hideAll(),i.$menu=i.$element.find(".um-new-dropdown"),i.$menu.length||(i.$menu=p('div.um-new-dropdown[data-element="'+i.data.element+'"]').first()),i.$dropdown=i.$menu.clone(),i.$dropdown.on("click","li a",i.itemHandler).attr("data-cloned","1"),p(window).on("resize",i.updatePosition);var e=""!==i.data.parent?i.data.parent:document.body;return p(e).append(i.$dropdown),i.$element.trigger("um_new_dropdown_render",{dropdown_layout:i.$dropdown,trigger:i.data.trigger,element:i.data.elemen,obj:i.$element}),i.$dropdown.css(i.calculatePosition()).show(),i.$element.addClass("um-new-dropdown-shown").data("um-new-dropdown-show",!0),i},hide:function(){return i.$dropdown&&i.$dropdown.is(":visible")&&(p(window).off("resize",i.updatePosition),i.$dropdown.remove(),i.$element.removeClass("um-new-dropdown-shown").data("um-new-dropdown-show",!1)),i},hideAll:function(){return i.$element.data("um-new-dropdown-show")&&i.hide(),p('div.um-new-dropdown[data-cloned="1"]').remove(),p(".um-new-dropdown-shown").removeClass("um-new-dropdown-shown").data("um-new-dropdown-show",!1),i},calculatePosition:function(){var e,t=i.$element.get(0).getBoundingClientRect(),n=i.$dropdown.innerHeight()||150,o=i.data.width||150,d="",r=(e=""!==i.data.parent?(r=p(i.data.parent).offset(),{top:(e=i.$element.offset()).top-r.top,left:e.left-r.left}):i.$element.offset(),""!==i.data.parent?p(i.data.parent)[0].offsetWidth:window.innerWidth),a={position:"absolute",width:o+"px"};switch((""!==i.data.parent?p(i.data.parent)[0].offsetHeight:window.innerHeight)-t.bottom>n?(a.top=e.top+t.height+"px",d+="bottom"):(d+="top",a.top=e.top-n+"px"),e.left>o||e.left>r/2?(a.left=e.left+t.width-o+"px",d+="-left"):(a.left=e.left+"px",d+="-right"),d){case"bottom-right":a.borderRadius="0px 5px 5px 5px";break;case"bottom-left":a.borderRadius="5px 0px 5px 5px";break;case"top-right":a.borderRadius="5px 5px 5px 0px";break;case"top-left":a.borderRadius="5px 5px 0px 5px"}return a},updatePosition:function(){return i.$dropdown&&i.$dropdown.is(":visible")&&i.$dropdown.css(i.calculatePosition()),i},itemHandler:function(e){e.stopPropagation();e=p(e.currentTarget).attr("class");i.$menu.find('li a[class="'+e+'"]').trigger("click"),i.$element.data("um-new-dropdown-show")&&i.hide()},triggerHandler:function(e){e.stopPropagation(),i.$element=p(e.currentTarget),i.$element.data("um-new-dropdown-show")?i.hide():i.show()}};return i.$menu=p(e),i.data=i.$menu.data(),i.$element=i.$menu.closest(i.data.element),i.$element.length||(i.$element=p(i.data.element).first()),i.$dropdown=p(document.body).children('div[data-element="'+i.data.element+'"]'),void 0===i.data.initted&&(i.$menu.data("initted",!0),i.data=i.$menu.data(),void 0===o.screenTriggers&&(o.screenTriggers={}),o.screenTriggers[i.data.element]!==i.data.trigger)&&(o.screenTriggers[i.data.element]=i.data.trigger,p(document.body).on(i.data.trigger,i.data.element,i.triggerHandler)),void 0===o.globalHandlersInitted&&(o.globalHandlersInitted=!0,p(document.body).on("click",function(e){p(e.target).closest(".um-new-dropdown").length||i.hideAll()})),i}p.fn.um_dropdownMenu=function(n){return"string"==typeof n&&n?this.map(function(e,t){t=o(t);return"function"==typeof t[n]?t[n]():t[n]}).toArray():this.each(function(e,t){o(t)})}}(jQuery),jQuery(document).ready(function(e){um_init_new_dropdown()});
\ No newline at end of file