Reverted menu-left-example.png back to original and cleaned up menu-top-example to...

[freeside.git] / httemplate / browse / router.cgi

diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 069ca9b..85512f8 100644 (file)
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -9,6 +9,7 @@
                 'count_query'     => "SELECT count(*) from router $count_sql",
                 'header'          => [ 'Router name',
                                        'Address block(s)',
+                                       'IP addressing',
                                        'Action',
                                      ],
                 'fields'          => [ 'routername',
@@ -16,10 +17,12 @@
                                                                shift->addr_block
                                                  );
                                            },
+                                       sub { shift->manual_addr ? 'Manual' : 'Automatic' },
                                        sub { 'Delete' },
                                      ],
                 'links'           => [ [ "${p2}edit/router.cgi?", 'routernum' ],
                                        '',
+                                       '',
                                        [ "${p}misc/delete-router.html?", 'routernum' ],
                                      ],
                 'agent_virt'      => 1,
@@ -40,11 +43,13 @@ my @menubar = ( 'Add a new router', "${p2}edit/router.cgi" );
 
 if ($cgi->param('hidecustomerrouters') eq '1') {
   $extra_sql = 'WHERE svcnum > 0';
-  $cgi->param('hidecustomerrouters', 0);
+  $cgi->delete('hidecustomerrouters');
   push @menubar, 'Show customer routers', $cgi->self_url();
+  $cgi->param('hidecustomerrouters', 1);
 } else {
   $cgi->param('hidecustomerrouters', 1);
   push @menubar, 'Hide customer routers', $cgi->self_url();
+  $cgi->delete('hidecustomerrouters');
 }
 
 my $count_sql = $extra_sql.  ( $extra_sql =~ /WHERE/ ? ' AND' : 'WHERE' ).
@@ -52,4 +57,5 @@ my $count_sql = $extra_sql.  ( $extra_sql =~ /WHERE/ ? ' AND' : 'WHERE' ).
     'null_right' => 'Broadband global configuration',
   );
 
+
 </%init>