X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fmsg_template.html;h=8e859e6e65672f29f09fc50c6d07176c670a8b29;hb=e0a26680d75fc2000bde195eba7946805a3aaa28;hp=460f4dcc2f74b77f97e32ef4a1661203a81b01ee;hpb=4774ede40353662ddcb4181d824ab2167c68ff8c;p=freeside.git

diff --git a/httemplate/edit/msg_template.html b/httemplate/edit/msg_template.html
index 460f4dcc2..8e859e6e6 100644
--- a/httemplate/edit/msg_template.html
+++ b/httemplate/edit/msg_template.html
@@ -5,19 +5,19 @@
               'viewall_dir'   => 'browse',
               'agent_virt'    => 1,
               'agent_null'    => 1,
-              'agent_null_right' => 'Edit global templates',
+              'agent_null_right' => ['Edit global templates', 'Configuration'],
 
               'fields' => [ 'msgname',
-                            'subject',
-                            'from_addr',
-                            'bcc_addr',
+                            { field=>'from_addr', size=>60, },
+                            { field=>'bcc_addr',  size=>60, },
+                            { field=>'subject',   size=>80, },
                             { field=>'body', type=>'htmlarea', width=>763 },
                           ],
               'labels' => { 'msgnum'    => 'Template',
                             'msgname'   => 'Template name',
-                            'from_addr' => 'Return address',
-                            'bcc_addr'  => 'Bcc address (optional)',
-                            'subject'   => 'Message subject',
+                            'from_addr' => 'From: ',
+                            'bcc_addr'  => 'Bcc: ',
+                            'subject'   => 'Subject: ',
                             'body'      => 'Message template',
                           },
               'html_foot' => "</TD>$sidebar</TR></TABLE>",
@@ -48,6 +48,7 @@ my %substitutions = (
     '$classname'      => 'Customer class',
     '$categoryname'   => 'Customer category',
     '$balance'        => 'Current balance',
+    '$credit_limit'   => 'Credit limit',
     '$invoicing_list_emailonly' => 'Billing email address',
     '$cust_status'    => 'Status',
     '$ucfirst_cust_status'  => 'Status, capitalized',
@@ -79,8 +80,8 @@ my %substitutions = (
   ],
   'cust_pkg' => [
     '$pkgnum'         => 'Package#',
-    '$pkg_label'      => 'Package label (short)',
-    '$pkg_label_long' => 'Package label (long)',
+    '$pkg'            => 'Package description',
+    '$pkg_label'      => 'Description + comment',
     '$status'         => 'Status',
     '$statuscolor'    => 'Status color code',
     '$start_ymd'      => 'Start date',
@@ -95,8 +96,29 @@ my %substitutions = (
     '$location_label' => 'Service location',
   ],
   'svc_acct'  => [
+    '$svcnum'         => 'Service#',
     '$username'       => 'Login name',
     '$password'       => 'Password',
+    '$domain'         => 'Domain name',
+  ],
+  'svc_domain' => [
+    '$svcnum'         => 'Service#',
+    '$domain'         => 'Domain name',
+    '$registrar'      => 'Registrar name',
+    '$catchall'       => 'Catchall email',
+  ],
+  'svc_phone' => [
+    '$svcnum'         => 'Service#',
+    '$phonenum'       => 'Phone number',
+    '$countrycode'    => 'Country code',
+    '$domain'         => 'Domain name'
+  ],
+  'svc_broadband' => [
+    '$svcnum'         => 'Service#',
+    '$ip_addr'        => 'IP address',
+    '$mac_addr'       => 'MAC address',
+    '$speed_up'       => 'Upstream speed',
+    '$speed_down'     => 'Downstream speed',
   ],
   'cust_pay'  => [
     '$paynum'         => 'Payment#',
@@ -121,6 +143,9 @@ tie my %sections, 'Tie::IxHash', (
 'cust_bill' => 'Invoice fields',
 'cust_pay'  => 'Payment fields',
 'svc_acct'  => 'Login service fields',
+'svc_domain'=> 'Domain service fields',
+'svc_phone' => 'Phone service fields',
+'svc_broadband' => 'Broadband service fields',
 );
 
 my $widget = new HTML::Widgets::SelectLayers(