X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fconfig%2Fconfig-view.cgi;h=bf51f15093c45372f0567805de673a8aea539d49;hp=917cc7316cfc8df994041e19b655c0c20b543363;hb=c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9;hpb=697dfd9ac2dfa36aa244e6d2d9f2e8f8a364a120

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 917cc7316..bf51f1509 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -1,26 +1,26 @@
 <!-- mason kludge -->
-<%= header('View Configuration', menubar( 'Main Menu' => $p,
+<%= include("/elements/header.html",'View Configuration', menubar( 'Main Menu' => $p,
                                      'Edit Configuration' => 'config.cgi' ) ) %>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail radius apache BIND
+                            shell BIND
                            ),
                          '', 'deprecated') { %>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail radius apache BIND
+                                  shell BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
       [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } else { %>
-      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+      [<A HREF="#<%= $nav_section || 'unclassified' %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } %>
   <% } %>
   </FONT><BR>
-  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
@@ -36,17 +36,35 @@
         <% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
-            <tr><td><font color="#ff0000">no type</font></td></tr>
-          <% } elsif ( $type eq 'textarea' || $type eq 'editlist' ) { %>
-            <tr><td bgcolor="#ffffff">
+            <tr>
+              <td><font color="#ff0000">no type</font></td>
+            </tr>
+          <% } elsif (   $type eq 'textarea'
+                      || $type eq 'editlist'
+                      || $type eq 'selectmultiple' ) { %>
+            <tr>
+              <td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
 </pre>
-            </td></tr>
+              </td>
+            </tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
-            <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
+            <tr>
+              <td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td>
+            </tr>
           <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
-            <tr><td bgcolor="#ffffff"><%=  $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
+            <tr>
+              <td bgcolor="#ffffff">
+                <%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>
+              </td></tr>
+          <% } elsif ( $type eq 'select-sub' ) { %>
+            <tr>
+              <td bgcolor="#ffffff">
+                <%= $conf->config($i->key) %>: 
+                <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
+              </td>
+            </tr>
           <% } else { %>
             <tr><td>
               <font color="#ff0000">unknown type <%= $type %></font>