%
% if ( $cgi->param('showagent') ) {
% $cgi->param('showagent', 0);
- ( <a href="<% $cgi->self_url %>">hide agent overrides</a> )
+ ( <a href="<% $cgi->self_url %>">show global configuration</a> )
% $cgi->param('showagent', 1);
% } else {
% $cgi->param('showagent', 1);
<form action="<% $cgi->self_url %>" method="GET" style="display:inline;">
<& /elements/select.html,
'field' => 'locale',
- 'options' => [ '', @locales ],
+ 'options' => [ '', grep { $_ ne 'en_US'} @locales ],
'labels' => { map {
my %info = FS::Locales->locale_info($_);
$_ => "$info{name} ($info{country})"
- } @locales },
+ } grep { $_ ne 'en_US' } @locales },
'curr_value' => $locale,
'id' => 'select-locale',
'onchange' => 'changeLocale'
% foreach my $section (@sections) {
- <A NAME="<% $section || 'unclassified' %>"></A>
+ <A NAME="<% $section || 'misc' %>"></A>
<FONT SIZE="-2">
% foreach my $nav_section (@sections) {
%
% if ( $section eq $nav_section ) {
- [<A NAME="not<% $nav_section || 'unclassified' %>" style="background-color: #cccccc"><% ucfirst($nav_section || 'unclassified') %></A>]
+ <A NAME="not<% $nav_section || 'misc' %>" style="background-color: #cccccc"><% section_title($nav_section) %></A>
% } else {
- [<A HREF="#<% $nav_section || 'unclassified' %>"><% ucfirst($nav_section || 'unclassified') %></A>]
+ <A HREF="#<% $nav_section || 'misc' %>"><% section_title($nav_section) %></A>
% }
%
+% unless ( $nav_section eq $sections[-1] ) {
+ |
+% }
+%
% }
</FONT><BR>
<TABLE BGCOLOR="#cccccc" BORDER=1 CELLSPACING=0 CELLPADDING=0 BORDERCOLOR="#999999">
<tr>
<th colspan="2" bgcolor="#dcdcdc">
- <% ucfirst($section || 'unclassified') %>
+ <% section_title($section) %>
% if ( $curuser->option('show_confitem_counts') ) {
(<% scalar( @{ $section_items{$section} } ) %> items)
% }
% foreach my $agent ( @agents ) {
% my $agentnum = $agent ? $agent->agentnum : '';
%
-% next if $section eq 'deprecated' && ! $conf->exists($i->key, $agentnum);
+% next if $section eq 'deprecated'
+% && ( ! $conf->exists($i->key, $agentnum)
+% || $conf->config($i->key, $agentnum) eq ''
+% );
%
% my $label = $i->key;
% $label = '['. $agent->agent. "] $label"
% ";agentnum=$agentnum" . ($locale ? ";locale=$locale" : '');
<tr>
- <td><% include('/elements/popup_link.html',
- 'action' => $action,
- 'width' => $width,
- 'height' => $height,
- 'actionlabel' => 'Enter configuration value',
- 'label' => "<b>$label</b>",
- 'aname' => $i->key, #agentnum
- # if $cgi->param('showagent')?
+% unless ( $cgi->param('showagent') ) {
+ <td>
+ <% include('/elements/popup_link.html',
+ 'action' => $action,
+ 'width' => $width,
+ 'height' => $height,
+ 'actionlabel' => 'Enter configuration value',
+ 'html_label' => "<b>$label</b>",
+ 'aname' => $i->key,
)
- %>: <% $i->description %>
+ %>:
+% } else {
+ <td><b><% $label %></b>:
+% }
+ <% $i->description %>
% if ( $agent && $cgi->param('showagent') ) {
% my $confnum = $conf->conf( $i->key, $agent->agentnum, 1 )->confnum;
(<A HREF="javascript:areyousure('delete this agent override', 'config-delete.cgi?confnum=<% $confnum %>;redirect=config_view_showagent')">delete agent override</A>)
<tr>
<td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
-<font size="-2"><pre><% encode_entities(join("\n",
- map { length($_) > 88 ? substr($_,0,88).'...' : $_ }
- $conf->config($i->key, $agentnum)
- ) )
-%></pre></font>
+
+% my $escaped = eval { encode_entities(join("\n",
+% map { length($_) > 88 ? substr($_,0,88).'...' : $_ }
+% $conf->config($i->key, $agentnum)
+% ) );
+% };
+% $escaped = $@ ? '('.encode_entities($@).')' : $escaped;
+<font size="-2"><pre><% $escaped %></pre></font>
+
</td>
</tr>
% } elsif ( $type eq 'checkbox' ) {
<tr>
- <td id="<% $agentnum.$i->key.$n %>" bgcolor="#<% $conf->exists($i->key, $agentnum) ? '00ff00">YES' : 'ff0000">NO' %></td>
+ <td id="<% $agentnum.$i->key.$n %>" bgcolor="#<% $conf->config_bool($i->key, $agentnum) ? '00ff00">YES' : 'ff0000">NO' %></td>
</tr>
% } elsif ( $type eq 'select' && $i->select_hash ) {
% if ( @add_agents ) {
<tr>
- <td>
+ <td COLSPAN=2>
<FORM>
Add <b><% $i->key %></b> override for
<% include('/elements/select-agent.html',
} elsif ($page_agent) {
$title = 'Agent Configuration for '. $page_agent->agent;
$title .= ", $locale_desc" if $locale;
+} elsif ( $cgi->param('showagent') ) {
+ $title = 'Agent Configuration Overrides'
} else {
$title = 'Global Configuration';
}
+my $show_over = $page_agent || $cgi->param('showagent');
+
my @config_items = grep { !defined($locale) or $_->per_locale }
- grep { $page_agent ? $_->per_agent : 1 }
- grep { $page_agent ? 1 : !$_->agentonly }
+ grep { $show_over ? $_->per_agent : 1 }
+ grep { $show_over ? 1 : !$_->agentonly }
$conf->config_items;
my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress );
my %deleteable = map { $_ => 1 } @deleteable;
-my @sections = qw(required billing invoicing notification UI self-service ticketing network_monitoring username password session shell BIND telephony );
-push @sections, '', 'deprecated';
+my @sections = (qw(
+ important
+ billing payments payment_batching credit_cards e-checks taxation
+ packages suspension cancellation
+ printing print_services email_to_voice_services
+ invoicing invoice_email invoice_balances invoice_templates quotations
+ notification UI addresses customer_number customer_fields reporting
+ localization scalability backup
+ signup self-service self-service_skinning
+ API ticketing appointments network_monitoring
+ services
+ username password
+ telephony telephony_invoicing RADIUS wireless_broadband shell BIND hosting
+ ), '', qw( development deprecated )
+);
my %section_items = ();
foreach my $section (@sections) {
@all_agents = qsearch('agent', { 'disabled' => '' } );
}
+sub section_title {
+ my $sec = ucfirst(shift || 'misc');
+ $sec =~ s/_/ /;
+ $sec;
+}
+
</%init>
projects / freeside.git / blobdiff