X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fconfig%2Fconfig-view.cgi;h=5f09b128a383fcc6e6f531039a5c2341d41dbc11;hb=7b0bbc4117a7959b9f7b7b2cf999b8188ba34160;hp=a2e908847013205f994336f19108e9038c88a940;hpb=817c1ce0e1cbcfd1f684222c66f46dd13b2d6dd7;p=freeside.git
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index a2e908847..5f09b128a 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -7,7 +7,7 @@ Click on a configuration value to change it.
%
% if ( $cgi->param('showagent') ) {
% $cgi->param('showagent', 0);
- ( hide agent overrides )
+ ( show global configuration )
% $cgi->param('showagent', 1);
% } else {
% $cgi->param('showagent', 1);
@@ -58,24 +58,28 @@ invoice language options:
% foreach my $section (@sections) {
-
+
% foreach my $nav_section (@sections) {
%
% if ( $section eq $nav_section ) {
- [<% ucfirst($nav_section || 'unclassified') %>]
+ <% section_title($nav_section) %>
% } else {
- [<% ucfirst($nav_section || 'unclassified') %>]
+ <% section_title($nav_section) %>
% }
%
+% unless ( $nav_section eq $sections[-1] ) {
+ |
+% }
+%
% }
- <% ucfirst($section || 'unclassified') %> + <% section_title($section) %> % if ( $curuser->option('show_confitem_counts') ) { (<% scalar( @{ $section_items{$section} } ) %> items) % } @@ -114,7 +118,10 @@ invoice language options: % 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" @@ -125,16 +132,21 @@ invoice language options: % ";agentnum=$agentnum" . ($locale ? ";locale=$locale" : ''); | ||
---|---|---|
<% include('/elements/popup_link.html', - 'action' => $action, - 'width' => $width, - 'height' => $height, - 'actionlabel' => 'Enter configuration value', - 'label' => "$label", - 'aname' => $i->key, #agentnum - # if $cgi->param('showagent')? +% unless ( $cgi->param('showagent') ) { + | + <% include('/elements/popup_link.html', + 'action' => $action, + 'width' => $width, + 'height' => $height, + 'actionlabel' => 'Enter configuration value', + 'html_label' => "$label", + 'aname' => $i->key, ) - %>: <% $i->description %> + %>: +% } else { + | <% $label %>: +% } + <% $i->description %> % if ( $agent && $cgi->param('showagent') ) { % my $confnum = $conf->conf( $i->key, $agent->agentnum, 1 )->confnum; (delete agent override) @@ -200,11 +212,15 @@ invoice language options: |
-<% encode_entities(join("\n", - map { length($_) > 88 ? substr($_,0,88).'...' : $_ } - $conf->config($i->key, $agentnum) - ) ) -%>+ +% my $escaped = eval { encode_entities(join("\n", +% map { length($_) > 88 ? substr($_,0,88).'...' : $_ } +% $conf->config($i->key, $agentnum) +% ) ); +% }; +% $escaped = $@ ? '('.encode_entities($@).')' : $escaped; + <% $escaped %>+ |
||
+ |