From db77c295018c47092811f05c17177a76c2a45070 Mon Sep 17 00:00:00 2001
From: petter <petter@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 19 Feb 2009 14:10:35 +0000
Subject: [PATCH] Some minor cosmetics and bugs discovered during documentation
 writing.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3787 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-tools/webgui/Varnish/DB.pm                  |  2 +-
 varnish-tools/webgui/Varnish/RequestHandler.pm      | 10 ++++++++--
 varnish-tools/webgui/css/web.css                    |  4 ----
 varnish-tools/webgui/templates/node_management.tmpl |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/varnish-tools/webgui/Varnish/DB.pm b/varnish-tools/webgui/Varnish/DB.pm
index 3f3f1fc4..d03df496 100644
--- a/varnish-tools/webgui/Varnish/DB.pm
+++ b/varnish-tools/webgui/Varnish/DB.pm
@@ -131,7 +131,7 @@ use Varnish::DB_Data;
 		my $sth = $dbh->prepare($sql);
 		$sth->execute($node->get_id());
 
-		$sql = "DELETE FROM parameters WHERE node_id = ?";
+		$sql = "DELETE FROM stat WHERE node_id = ?";
 		$sth = $dbh->prepare($sql);
 		$sth->execute($node->get_id());
 	
diff --git a/varnish-tools/webgui/Varnish/RequestHandler.pm b/varnish-tools/webgui/Varnish/RequestHandler.pm
index 21395264..358c72e7 100644
--- a/varnish-tools/webgui/Varnish/RequestHandler.pm
+++ b/varnish-tools/webgui/Varnish/RequestHandler.pm
@@ -837,11 +837,13 @@ FIND_ACTIVE_VCL:
 				Varnish::NodeManager->add_node($node, $inherit_settings);
 				$status .= "Node " . $node->get_name() . " added successfully.";
 				
+				my $group = Varnish::NodeManager->get_group($param{'group_id'});
+				my $group_name = ($group ? $group->get_name() : "");
 				log_info("[" . $node->get_name() . "] [Added node]"
 					. " [name=" . $node->get_name() . "]"
 					. " [address=" . $node->get_address() . "]"
 					. " [port=" . $node->get_port() . "]"
-					. " [group=" . $param{'group_name'} . "]"
+					. " [group=" . $group_name . "]"
 					. " [management_port=" . $node->get_management_port() . "]");
 			}
 			else {
@@ -864,11 +866,15 @@ FIND_ACTIVE_VCL:
 				
 				Varnish::NodeManager->update_node($node);
 
+				$status .= "Node " . $node->get_name() . " updated successfully.";
+
+				my $group = Varnish::NodeManager->get_group($param{'node_group_id'});
+				my $group_name = ($group ? $group->get_name() : "");
 				log_info("[" . $node->get_name() . "] [Updated node]"
 					. " [name=" . $node->get_name() . "]"
 					. " [address=" . $node->get_address() . "]"
 					. " [port=" . $node->get_port() . "]"
-					. " [group=" . $param{'group_name'} . "]"
+					. " [group=" . $group_name . "]"
 					. " [management_port=" . $node->get_management_port() . "]");
 			}
 		}
diff --git a/varnish-tools/webgui/css/web.css b/varnish-tools/webgui/css/web.css
index 1fa1bcc2..f25a23c2 100644
--- a/varnish-tools/webgui/css/web.css
+++ b/varnish-tools/webgui/css/web.css
@@ -189,10 +189,6 @@ input.removeNode {
 	padding: 5px;
 }
 
-td.addNodeBorder {
-	margin: 15px;
-}
-
 img.goToNodeManagement {
 	border-width: 0 0 1px 0;
 }
diff --git a/varnish-tools/webgui/templates/node_management.tmpl b/varnish-tools/webgui/templates/node_management.tmpl
index ba78c545..056f424b 100644
--- a/varnish-tools/webgui/templates/node_management.tmpl
+++ b/varnish-tools/webgui/templates/node_management.tmpl
@@ -42,7 +42,7 @@ document.getElementById('group_name').focus();
 </TMPL_IF>
 <td class="header">Address</td>
 <td class="header">Port</td>
-<td class="header">Management port</td>
+<td class="header">Management<br/>port</td>
 <td></td></tr>
 <TMPL_LOOP NAME=NODE_INFOS>
 <TMPL_IF NAME=__ODD__>
@@ -155,7 +155,7 @@ value="<TMPL_VAR NAME=ID>">
 <td><input type="text" name="port" size=5/></td>
 <td><input type="text" name="management_port" value="<TMPL_VAR NAME=DEFAULT_MANAGEMENT_PORT>"/></td>
 <TMPL_IF NAME=SHOW_INHERIT_SETTINGS>
-<td><input type="checkbox" name="inherit_settings" value="true" <TMPL_IF NAME=INHERIT_SETTINGS>checked</TMPL_IF>></td><td>Group inherit settings</td>
+<td colspan=3> <input type="checkbox" name="inherit_settings" value="true" <TMPL_IF NAME=INHERIT_SETTINGS>checked</TMPL_IF>>Group inherit<br/> settings</td>
 </TMPL_IF>
 <td>
 <input type="hidden" name="group_id" value="<TMPL_VAR NAME=GROUP_ID>"/>
-- 
2.39.5