Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / edit / cust_main / first_pkg / svc_acct.html

diff --git a/httemplate/edit/cust_main/first_pkg/svc_acct.html b/httemplate/edit/cust_main/first_pkg/svc_acct.html
index 150d4c0..8308af4 100644 (file)
--- a/httemplate/edit/cust_main/first_pkg/svc_acct.html
+++ b/httemplate/edit/cust_main/first_pkg/svc_acct.html
@@ -1,11 +1,11 @@
-<% ntable("#cccccc") %>
+<TABLE CLASS="fsinnerbox">
 
   <TR>
-    <TD ALIGN="right">Username</TD>
+    <TH ALIGN="right"><% mt('Username') |h %></TD>
     <TD>
       <INPUT TYPE      = "text"
              NAME      = "username"
-             VALUE     = "<% $opt{'username'} %>"
+             VALUE     = "<% $opt{'username'} |h %>"
              SIZE      = <% $ulen2 %>
              MAXLENGTH = <% $ulen %>
       >
@@ -13,20 +13,20 @@
   </TR>
 
   <TR>
-    <TD ALIGN="right">Domain</TD>
+    <TH ALIGN="right"><% mt('Domain') |h %></TD>
     <TD>
       <SELECT NAME="domsvc">
-        <OPTION>(none)</OPTION>
+        <OPTION>(<% mt('none') |h %>)</OPTION>
       </SELECT>
     </TD>
   </TR>
 
   <TR>
-    <TD ALIGN="right">Password</TD>
+    <TH ALIGN="right"><% mt('Password') |h %></TD>
     <TD>
       <INPUT TYPE      = "text"
              NAME      = "_password"
-             VALUE     = "<% $opt{'password'} %>"
+             VALUE     = "<% $opt{'password'} |h %>"
              SIZE      = <% $pmax2 %>
              MAXLENGTH = <% $passwordmax %>>
 %     unless ( $opt{'password_verify'} ) {
@@ -37,11 +37,11 @@
 
 % if ( $opt{'password_verify'} ) {
     <TR>
-      <TD ALIGN="right">Re-enter Password</TD>
+      <TH ALIGN="right"><% mt('Re-enter Password') |h %></TD>
       <TD>
         <INPUT TYPE      = "text"
                NAME      = "_password2"
-               VALUE     = "<% $opt{'password2'} %>"
+               VALUE     = "<% $opt{'password2'} |h %>"
                SIZE      = <% $pmax2 %>
                MAXLENGTH = <% $passwordmax %>>
       </TD>
@@ -50,8 +50,8 @@
 
 % if ( $conf->exists('security_phrase') ) {
     <TR>
-      <TD ALIGN="right">Security Phrase</TD>
-      <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="<% $opt{'sec_phrase'} %>">
+      <TH ALIGN="right"><% mt('Security Phrase') |h %></TD>
+      <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="<% $opt{'sec_phrase'} |h %>">
       </TD>
     </TR>
 % } else {
@@ -62,7 +62,7 @@
     <INPUT TYPE="hidden" NAME="popnum" VALUE="">
 % } else {
     <TR>
-      <TD ALIGN="right">Access number</TD>
+      <TH ALIGN="right"><% mt('Access number') |h %></TD>
 %#           XXX should gain "area code" selection and labels on the dropdowns
       <TD><% FS::svc_acct_pop::popselector($opt{'popnum'}) %></TD>
     </TR>
@@ -72,14 +72,10 @@
 
 <%init>
 
-#use FS::svc_acct_pop;
-
 my( %opt ) = @_;
 
 my $conf = new FS::Conf;
 
-#false laziness: (mostly) copied from edit/svc_acct.cgi
-#$ulen = $svc_acct->dbdef_table->column('username')->length;
 my $ulen = dbdef->table('svc_acct')->column('username')->length;
 my $ulen2 = $ulen+2;
 my $passwordmax = $conf->config('passwordmax') || 8;