X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct%2Fbasics.html;h=f4c83888df5d1862153e7e86a3aabc199ac8d8f4;hb=b5c4237a34aef94976bc343c8d9e138664fc3984;hp=6eddd492dd2f57d9f57f996d87b5d7d6729a5fe5;hpb=259eacca8b815b2bf159e7ee14385e2ac28ed9ee;p=freeside.git
diff --git a/httemplate/view/svc_acct/basics.html b/httemplate/view/svc_acct/basics.html
index 6eddd492d..f4c83888d 100644
--- a/httemplate/view/svc_acct/basics.html
+++ b/httemplate/view/svc_acct/basics.html
@@ -1,149 +1,85 @@
<% &ntable("#cccccc") %>
<% &ntable("#cccccc",2) %>
- |
- Service |
- <% $part_svc->svc %> |
-
+<% include('/view/elements/tr.html', label=>'Service', value=>$part_svc->svc) %>
+<% include('/view/elements/tr.html', label=>'Username', value=>$svc_acct->username) %>
+<% include('/view/elements/tr.html', label=>'Domain', value=>$domain) %>
-
- Username |
- <% $svc_acct->username %> |
-
-
-
- Domain |
- <% $domain %> |
-
+% if ( $opt{'communigate'} ) {
+ <% include('/view/elements/tr.html', label=>'Aliases', value=>$svc_acct->cgp_aliases) %>
+%}
% if ( $svc_acct->pbxsvc ) {
-
- PBX |
- <% $svc_acct->pbx_title %> |
-
+ <% include('/view/elements/tr.html', label=>'PBX', value=>$svc_acct->pbx_title) %>
%}
-
- Password |
-
+% my $show_pw = '';
% my $password = $svc_acct->get_cleartext_password;
% if ( $password =~ /^\*\w+\* (.*)$/ ) {
-% $password = $1;
- (login disabled)
+% $password = $1;
+% $show_pw .= '(login disabled) ';
% }
-% if ( !$password and
-% $svc_acct->_password_encryption ne 'plain' and
-% $svc_acct->_password ) {
- (<% uc($svc_acct->_password_encryption) %> encrypted)
+% if ( ! $password
+% && $svc_acct->_password_encryption ne 'plain'
+% && $svc_acct->_password
+% )
+% {
+% $show_pw .= '('. uc($svc_acct->_password_encryption). ' encrypted)';
% } elsif ( $conf->exists('showpasswords') ) {
- <% encode_entities($password) %>
+% $show_pw .= ''. encode_entities($password). ' ';
% } else {
- (hidden)
+% $show_pw .= '(hidden)';
% }
- |
-
% $password = '';
+<% include('/view/elements/tr.html', label=>'Password', value=>$show_pw) %>
+
% if ( $conf->exists('security_phrase') ) {
-% my $sec_phrase = $svc_acct->sec_phrase;
-%
-
- Security phrase |
- <% $svc_acct->sec_phrase %> |
-
+ <%include('/view/elements/tr.html', label=>'Security phrase', value=>$svc_acct->sec_phrase)%>
% }
% if ( $svc_acct->popnum ) {
-% my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-
- Access number |
- <% $svc_acct_pop->text %> |
-
+% my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+ <% include('/view/elements/tr.html', label=>'Access number', value=>$svc_acct_pop->text) %>
% }
% if ($svc_acct->uid ne '') {
-
- UID |
- <% $svc_acct->uid %> |
-
+ <% include('/view/elements/tr.html', label=>'UID', value=>$svc_acct->uid) %>
% }
% if ($svc_acct->gid ne '') {
-
- GID |
- <% $svc_acct->gid %> |
-
+ <% include('/view/elements/tr.html', label=>'GID', value=>$svc_acct->gid) %>
% }
% if ($svc_acct->finger ne '') {
-
- Real Name |
- <% $svc_acct->finger %> |
-
+ <% include('/view/elements/tr.html', label=>'Real Name', value=>$svc_acct->finger) %>
% }
% if ($svc_acct->dir ne '') {
-
- Home directory |
- <% $svc_acct->dir %> |
-
+ <% include('/view/elements/tr.html', label=>'Home directory', value=>$svc_acct->dir) %>
% }
% if ($svc_acct->shell ne '') {
-
- Shell |
- <% $svc_acct->shell %> |
-
+ <% include('/view/elements/tr.html', label=>'Shell', value=>$svc_acct->shell) %>
% }
% if ($svc_acct->quota ne '' && ! $opt{'communigate'} ) {
-
- Quota |
- <% $svc_acct->quota %> |
-
-% } elsif ( $opt{'communigate'} ) {
-
-
- Mailbox type |
- <% $svc_acct->cgp_type %> |
-
-
- Enabled services |
- <% $svc_acct->cgp_accessmodes |h %> |
-
+ <% include('/view/elements/tr.html', label=>'Quota', value=>$svc_acct->quota) %>
-
- Mail storage limit |
- <% $svc_acct->quota %> |
-
-
-
- File storage limit |
- <% $svc_acct->file_quota %> |
-
-
-
- Number of files limit |
- <% $svc_acct->file_maxnum %> |
-
+% } elsif ( $opt{'communigate'} ) {
-
- File size limit |
- <% $svc_acct->file_maxsize %> |
-
+ <% include( 'communigate.html', %opt ) %>
% }
% if ($svc_acct->slipip) {
-
- IP address |
-
- <% ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
- ? "(Dynamic)"
- : $svc_acct->slipip
- %>
- |
-
+ <% include('/view/elements/tr.html',
+ label=>'IP address',
+ value=> ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
+ ? "(Dynamic)"
+ : $svc_acct->slipip
+ )
+ %>
% }
<% include('usage.html',
@@ -152,27 +88,25 @@
%>
% foreach my $attribute ( grep /^radius_/, $svc_acct->fields ) {
-% $attribute =~ /^radius_(.*)$/;
-% my $pattribute = $FS::raddb::attrib{$1};
-
- Radius (reply) <% $pattribute %> |
- <% $svc_acct->getfield($attribute) %> |
-
-
+% $attribute =~ /^radius_(.*)$/;
+% my $pattribute = $FS::raddb::attrib{$1};
+ <% include('/view/elements/tr.html', label=>"Radius (reply) $pattribute",
+ value=>$svc_acct->getfield($attribute)
+ )
+ %>
% }
+
% foreach my $attribute ( grep /^rc_/, $svc_acct->fields ) {
-% $attribute =~ /^rc_(.*)$/;
-% my $pattribute = $FS::raddb::attrib{$1};
-
- Radius (check) <% $pattribute %> |
- <% $svc_acct->getfield($attribute) %> |
-
+% $attribute =~ /^rc_(.*)$/;
+% my $pattribute = $FS::raddb::attrib{$1};
+ <% include('/view/elements/tr.html', label=>"Radius (check) $pattribute",
+ value=>$svc_acct->getfield($attribute)
+ )
+ %>
% }
-
- RADIUS groups |
- <% join(' ', $svc_acct->radius_groups) %> |
-
+<% include('/view/elements/tr.html', label=>'RADIUS groups',
+ value=>join('
', $svc_acct->radius_groups) ) %>
%# Can this be abstracted further? Maybe a library function like
%# widget('HTML', 'view', $svc_acct) ? It would definitely make UI