RT# 82949 - fixed error where form submits on cancel

[freeside.git] / httemplate / pref / pref.html

diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index 882975a..29aeb4c 100644 (file)
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -6,11 +6,6 @@
 
 <% include('/elements/error.html') %>
 
-<<<<<<< HEAD
-=======
-<& /elements/alert.html &>
-
-% if ( FS::Auth->auth_class->can('change_password') ) {
 
 <% mt('Change password (leave blank for no change)') |h %>
 <% ntable("#cccccc",2) %>
@@ -182,7 +177,7 @@ Email Address
 <% ntable("#cccccc",2) %>
 
   <TR>
-    <TH>Email Address(es) (comma separated) </TH>
+    <TH><% emt("Email Address(es) (comma separated) ") %></TH>
     <TD>
    <TD><INPUT TYPE="text" NAME="email_address" VALUE="<% $email_address %>">
     </TD>
@@ -289,8 +284,6 @@ Vonage integration (see <a href="https://secure.click2callu.com/">Click2Call</a>
 % );
 <% include("/elements/footer.html", %footerdata) %>
 
-%#<&/elements/footer.html &>
-
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;