[freeside-commits] freeside/httemplate/view/svc_acct communigate.html, NONE, 1.1 basics.html, 1.9, 1.10

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/svc_acct
In directory wavetail.420.am:/tmp/cvs-serv14727/httemplate/view/svc_acct

Modified Files:
	basics.html 
Added Files:
	communigate.html 
Log Message:
communigate (phase 2): rules.  RT#7514

--- NEW FILE: communigate.html ---
%# settings

  <% include('/view/elements/tr.html', label=>'Mailbox type', value=>$svc_acct->cgp_type) %>

  <% include('/view/elements/tr.html', label=>'Enabled services',
                        value=>$svc_acct->cgp_accessmodes ) %>

  <% include('/view/elements/tr.html', label=>'Mail storage limit',
                        value=>$svc_acct->quota ) %>

  <% include('/view/elements/tr.html', label=>'File storage limit',
                        value=>$svc_acct->file_quota ) %>

  <% include('/view/elements/tr.html', label=>'Number of files limit',
                        value=>$svc_acct->file_maxnum ) %>

  <% include('/view/elements/tr.html', label=>'File size limit',
                        value=>$svc_acct->file_maxsize ) %>

  <% include('/view/elements/tr.html', label=>'Password recovery',
               value=>$svc_acct->password_recover ? 'YES' : 'NO' ) %>

  <% include('/view/elements/tr.html', label=>'Allowed mail rules',
                        value=>$svc_acct->cgp_rulesallowed || 'default (No)') %>

  <% include('/view/elements/tr.html', label=>'RPOP modifications',
                        value=>$svc_acct->cgp_rpopallowed ? 'YES' : 'NO' ) %>

  <% include('/view/elements/tr.html', label=>'Accepts mail to "all"',
                        value=>$svc_acct->cgp_mailtoall ? 'YES' : 'NO' ) %>

  <% include('/view/elements/tr.html', label=>'Add trailer to sent mail',
                        value=>$svc_acct->cgp_addmailtrailer ? 'YES' : 'NO' ) %>

%# preferences

  <% include('/view/elements/tr.html', label=>'Message delete method',
                        value=>$svc_acct->cgp_deletemode ) %>

  <% include('/view/elements/tr.html', label=>'On logout remove trash',
                        value=>$svc_acct->cgp_emptytrash ) %>

  <% include('/view/elements/tr.html', label=>'Language',
                        value=>$svc_acct->cgp_language || 'default (English)' ) %>
  <% include('/view/elements/tr.html', label=>'Time zone',
                        value=>$svc_acct->cgp_timezone || 'default (HostOS)' ) %>
  <% include('/view/elements/tr.html', label=>'Layout',
                        value=>$svc_acct->cgp_skinname || 'default (***)' ) %>

  <% include('/view/elements/tr.html', label=>'Pronto style',
                        value=>$svc_acct->cgp_prontoskinname ) %>

  <% include('/view/elements/tr.html', label=>'Send read receipts',
                        value=>$svc_acct->cgp_sendmdnmode ) %>

%#XXX vacation message, redirect all mail

%# mail rules

  <% include('/view/elements/tr.html', label=>'Mail rules',
               value=>$rule_link,
            )
  %>

<%init>

my %opt = @_;

#my $conf = new FS::Conf;

my $svc_acct = $opt{'svc_acct'};
#my $part_svc = $opt{'part_svc'};

my $rule_link = qq(<A HREF="${p}browse/cgp_rule.html?svcnum=).
                      $svc_acct->svcnum. '">View/edit mail rules</A>';

</%init>

Index: basics.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_acct/basics.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- basics.html	20 Apr 2010 04:13:33 -0000	1.9
+++ basics.html	23 Apr 2010 06:43:40 -0000	1.10
@@ -68,62 +68,7 @@
 
 % } elsif ( $opt{'communigate'} ) {
 
-%# settings
-
-  <% include('/view/elements/tr.html', label=>'Mailbox type', value=>$svc_acct->cgp_type) %>
-
-  <% include('/view/elements/tr.html', label=>'Enabled services',
-                        value=>$svc_acct->cgp_accessmodes ) %>
-
-  <% include('/view/elements/tr.html', label=>'Mail storage limit',
-                        value=>$svc_acct->quota ) %>
-
-  <% include('/view/elements/tr.html', label=>'File storage limit',
-                        value=>$svc_acct->file_quota ) %>
-
-  <% include('/view/elements/tr.html', label=>'Number of files limit',
-                        value=>$svc_acct->file_maxnum ) %>
-
-  <% include('/view/elements/tr.html', label=>'File size limit',
-                        value=>$svc_acct->file_maxsize ) %>
-
-  <% include('/view/elements/tr.html', label=>'Password recovery',
-               value=>$svc_acct->password_recover ? 'YES' : 'NO' ) %>
-
-  <% include('/view/elements/tr.html', label=>'Allowed mail rules',
-                        value=>$svc_acct->cgp_rulesallowed || 'default (No)') %>
-
-  <% include('/view/elements/tr.html', label=>'RPOP modifications',
-                        value=>$svc_acct->cgp_rpopallowed ? 'YES' : 'NO' ) %>
-
-  <% include('/view/elements/tr.html', label=>'Accepts mail to "all"',
-                        value=>$svc_acct->cgp_mailtoall ? 'YES' : 'NO' ) %>
-
-  <% include('/view/elements/tr.html', label=>'Add trailer to sent mail',
-                        value=>$svc_acct->cgp_addmailtrailer ? 'YES' : 'NO' ) %>
-
-%# preferences
-
-  <% include('/view/elements/tr.html', label=>'Message delete method',
-                        value=>$svc_acct->cgp_deletemode ) %>
-
-  <% include('/view/elements/tr.html', label=>'On logout remove trash',
-                        value=>$svc_acct->cgp_emptytrash ) %>
-
-  <% include('/view/elements/tr.html', label=>'Language',
-                        value=>$svc_acct->cgp_language || 'default (English)' ) %>
-  <% include('/view/elements/tr.html', label=>'Time zone',
-                        value=>$svc_acct->cgp_timezone || 'default (HostOS)' ) %>
-  <% include('/view/elements/tr.html', label=>'Layout',
-                        value=>$svc_acct->cgp_skinname || 'default (***)' ) %>
-
-  <% include('/view/elements/tr.html', label=>'Pronto style',
-                        value=>$svc_acct->cgp_prontoskinname ) %>
-
-  <% include('/view/elements/tr.html', label=>'Send read receipts',
-                        value=>$svc_acct->cgp_sendmdnmode ) %>
-
-%#XXX vacation message, redirect all mail, mail rules
+  <% include( 'communigate.html', %opt ) %>
 
 % }