diff options
author | Christopher Burger <burgerc@freeside.biz> | 2018-08-29 14:09:58 -0400 |
---|---|---|
committer | Christopher Burger <burgerc@freeside.biz> | 2018-08-29 14:09:58 -0400 |
commit | ded6a5654efd56d2f271970c992133600e0223b1 (patch) | |
tree | 15c1e3ad4e052881609573757ac1ae96a11dfead /httemplate/elements | |
parent | 5df83a73541d983c51eff47e875cf63fc45e53ff (diff) |
RT# 75817 - updated UI to be more intuitive
Diffstat (limited to 'httemplate/elements')
-rw-r--r-- | httemplate/elements/contact.html | 45 | ||||
-rw-r--r-- | httemplate/elements/validate_password.html | 3 |
2 files changed, 35 insertions, 13 deletions
diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html index 43e5201..85cecd0 100644 --- a/httemplate/elements/contact.html +++ b/httemplate/elements/contact.html @@ -40,6 +40,8 @@ % } % } elsif ( $field eq 'emailaddress' ) { % $value = join(', ', map $_->emailaddress, $contact->contact_email); +% } elsif ( $field eq 'password' ) { +% $value = $contact->get('_password') ? '********' : ''; % } elsif ( $field eq 'selfservice_access' % or $field eq 'comment' % or $field eq 'invoice_dest' @@ -56,7 +58,7 @@ ID = "<%$id%>_<%$field%>" STYLE = "width: 140px" > - <OPTION VALUE="">Disabled + <OPTION VALUE="" <% !$value ? 'SELECTED' : '' %>>Disabled % if ( $value || $self_base_url ) { <OPTION VALUE="<% $value eq 'Y' ? 'Y' : 'E' %>" <% $value eq 'Y' ? 'SELECTED' : '' %>>Enabled % if ( $value eq 'Y' && $self_base_url ) { @@ -65,18 +67,33 @@ % } % } </SELECT> - <& /elements/change_password.html, - 'contact_num' => $curr_value, - 'custnum' => $opt{'custnum'}, - 'curr_value' => '', - 'no_label_display' => '1', - 'noformtag' => '1', - 'pre_pwd_field_label' => $id.'_', - &> +% #password form +% } elsif ( $field eq 'password') { + <INPUT TYPE = "text" + NAME = "<%$name%>_<%$field%>" + ID = "changepw<%$id%>_<%$field%>" + SIZE = "<% $size{$field} || 14 %>" + VALUE = "" + placeholder = "<% $value |h %>" + > +% my $contactnum = $curr_value ? $curr_value : '0'; + <& '/elements/validate_password.html', + 'fieldid' => "changepw".$id."_password", + 'svcnum' => '', + 'contactnum' => $contactnum, + 'submitid' => "submit", + &> + <SCRIPT TYPE="text/javascript"> - document.getElementById("<%$id%>_<%$field%>").onchange = function() { - if (this.value == "P" || this.value == "E") { changepw<%$id%>_toggle(true); } - return false + var selfService = document.getElementById("<%$id%>_selfservice_access").value; + + if (selfService !== "Y") { document.getElementById("changepw<%$id%>_password").disabled = 'true'; } + document.getElementById("<%$id%>_selfservice_access").onchange = function() { + if (this.value == "P" || this.value == "E" || this.value =="Y") { + document.getElementById("changepw<%$id%>_password").disabled = ''; + } + else { document.getElementById("changepw<%$id%>_password").disabled = 'true'; } + return false; } </SCRIPT> % } elsif ( $field eq 'invoice_dest' || $field eq 'message_dest' ) { @@ -101,6 +118,9 @@ % } <BR> <FONT SIZE="-1"><% $label{$field} %></FONT> +% if ( $field eq 'password' ) { + <div id="changepw<%$id%>_<%$field%>_result"></div> +% } </TD> % } </TR> @@ -171,6 +191,7 @@ unless ($opt{'for_prospect'}) { $label{'invoice_dest'} = 'Send invoices'; $label{'message_dest'} = 'Send messages'; $label{'selfservice_access'} = 'Self-service'; + $label{'password'} = 'Password'; } my $first = 0; diff --git a/httemplate/elements/validate_password.html b/httemplate/elements/validate_password.html index 4057f5d..73c0db2 100644 --- a/httemplate/elements/validate_password.html +++ b/httemplate/elements/validate_password.html @@ -29,7 +29,7 @@ function add_password_validation (fieldid, submitid) { // some browsers allow the enter key to submit a form even if the submit button is disabled // below prevents enter key from submiting form if password has not been validated. if (key == '13') { - var check = checkPasswordValidation(); + var check = checkPasswordValidation(fieldid); return check; } } @@ -61,6 +61,7 @@ function add_password_validation (fieldid, submitid) { ); } else { resultfield.innerHTML = ''; + if (submitid){ document.getElementById(submitid).disabled = false; } } }; } |