diff options
| author | ivan <ivan> | 2010-07-23 10:02:40 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2010-07-23 10:02:40 +0000 |
| commit | 22e59cf0fddecd4808a6ce91fe2b1712f3ab3c87 (patch) | |
| tree | c7a99c8945765677fbec24b4e59b6696a961caba /httemplate | |
| parent | abdb0f8539d8604b3e1ba6218e36a8717e96f88d (diff) | |
add EmptyTrash values and finish consolidating the CGP timezone arrays, RT#7083
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/edit/svc_acct.cgi | 16 | ||||
| -rwxr-xr-x | httemplate/edit/svc_domain.cgi | 10 |
2 files changed, 19 insertions, 7 deletions
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 09a4cfd64..59b5d10f3 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -392,10 +392,16 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR> </TD> </TR> - <TR> - <TD ALIGN="right">On logout remove trash</TD> - <TD><INPUT TYPE="text" NAME="cgp_emptytrash" VALUE="<% $svc_acct->cgp_emptytrash %>"></TD> - </TR> + <% include('/elements/tr-select.html', + 'label' => 'On logout remove trash', + 'field' => 'cgp_emptytrash', + 'options' => $svc_acct->cgp_emptytrash_values, + 'labels' => { + '' => 'default (92 days)', #right? + }, + 'curr_value' => $svc_acct->cgp_emptytrash, + ) + %> <% include('/elements/tr-select.html', 'label' => 'Language', @@ -411,7 +417,7 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR> <% include('/elements/tr-select.html', 'label' => 'Time zone', 'field' => 'cgp_timezone', - 'options' => $svc_acct->cgp_timezone, + 'options' => $svc_acct->cgp_timezone_values, 'labels' => { '' => 'default (HostOS)', }, diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi index 5fe095d07..5abe9d6b5 100755 --- a/httemplate/edit/svc_domain.cgi +++ b/httemplate/edit/svc_domain.cgi @@ -220,11 +220,17 @@ Account defaults </TD> </TR> - <% include('/elements/tr-input-text.html', + <% include('/elements/tr-select.html', 'label' => 'On logout remove trash', + 'field' => 'acct_def_cgp_emptytrash', + 'options' => $svc_domain->cgp_emptytrash_values, + 'labels' => { + '' => 'default (92 days)', #right? + }, 'curr_value' => $svc_domain->acct_def_cgp_emptytrash, ) %> + <% include('/elements/tr-select.html', 'label' => 'Language', 'field' => 'acct_def_cgp_language', @@ -239,7 +245,7 @@ Account defaults <% include('/elements/tr-select.html', 'label' => 'Time zone', 'field' => 'acct_def_cgp_timezone', - 'options' => $svc_domain->cgp_timezone, + 'options' => $svc_domain->cgp_timezone_values, 'labels' => { '' => 'default (HostOS)', }, |