Added a Module Config option to show managed systems in a table

diff --git a/cluster-webmin/CHANGELOG b/cluster-webmin/CHANGELOG
index d63392a..d13ea98 100644 (file)
--- a/cluster-webmin/CHANGELOG
+++ b/cluster-webmin/CHANGELOG
@@ -15,3 +15,5 @@ Users can now have their passwords set to use external authentication.
 Added support for cluster upgrading the Debian package of Webmin.
 ---- Changes since 1.300 ----
 Added an option to not re-install deleted or new modules when upgrading.
+---- Changes since 1.380 ----
+Added a Module Config option to show managed systems in a table.

diff --git a/cluster-webmin/config b/cluster-webmin/config
index 9a3ce07..470eaee 100644 (file)
--- a/cluster-webmin/config
+++ b/cluster-webmin/config
@@ -1 +1,2 @@
 sort_mode=0
+table_mode=0

diff --git a/cluster-webmin/config.info b/cluster-webmin/config.info
index 6264e71..b6b7a1e 100644 (file)
--- a/cluster-webmin/config.info
+++ b/cluster-webmin/config.info
@@ -1 +1,2 @@
 sort_mode=Sort hosts by,1,1-Hostname,0-Order added,2-Description
+table_mode=Show hosts as,1,1-Table,0-Icons

diff --git a/cluster-webmin/index.cgi b/cluster-webmin/index.cgi
index 88c22e2..7dd8b58 100755 (executable)
--- a/cluster-webmin/index.cgi
+++ b/cluster-webmin/index.cgi
@@ -31,9 +31,34 @@ foreach $h (@hosts) {
        $gothost{$h->{'id'}}++;
        }
 if (@links) {
-       &icons_table(\@links, \@titles, \@icons);
+       if ($config{'table_mode'}) {
+               # Show as table
+               print &ui_columns_start([ $text{'index_thost'},
+                                         $text{'index_tdesc'},
+                                         $text{'index_tver'},
+                                         $text{'index_ttype'} ]);
+               foreach $h (@hosts) {
+                       local ($s) = grep { $_->{'id'} == $h->{'id'} } @servers;
+                       next if (!$s);
+                       local ($type) = grep { $_->[0] eq $s->{'type'} }
+                                            @servers::server_types;
+                       print &ui_columns_row([
+                               "<a href='edit_host.cgi?id=$h->{'id'}'>".
+                               ($s->{'host'} || &get_system_hostname())."</a>",
+                               $s->{'desc'},
+                               $h->{'version'},
+                               $type->[1],
+                               ]);
+                       }
+               print &ui_columns_end();
+               }
+       else {
+               # Show as icons
+               &icons_table(\@links, \@titles, \@icons);
+               }
        }
 else {
+       # Nothing to show
        print "<b>$text{'index_nohosts'}</b><p>\n";
        }
 

diff --git a/cluster-webmin/lang/en b/cluster-webmin/lang/en
index 753b08b..e21f34d 100644 (file)
--- a/cluster-webmin/lang/en
+++ b/cluster-webmin/lang/en
@@ -35,6 +35,10 @@ index_upgradeon=Servers to upgrade
 index_update=Update Modules
 index_updateon=Servers to update
 index_updatedesc=This form allows you to upgrade Webmin modules that have been found to contain bugs or security holes from the <a href=http://www.webmin.com/updates.html>Webmin Updates</a> page or from another source.
+index_thost=Hostname
+index_tdesc=Description
+index_tver=Version
+index_ttype=OS type
 
 this_server=this server