From 9b360f2de6da94fbc492b48ae0277892bddf7aa9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Fri, 15 May 2009 14:07:52 +0000 Subject: [PATCH] - use plekit tables - depend on plewww-plekit - fix nodeview in controlers.py although it seems that it's not used. --- Monitor.spec | 5 + web/MonitorWeb/monitorweb/controllers.py | 8 +- .../monitorweb/templates/node_template.kid | 7 +- .../monitorweb/templates/nodelist.kid | 96 +++++++----- .../monitorweb/templates/pculist.kid | 143 ++++++++++-------- .../monitorweb/templates/sitelist.kid | 107 +++++++------ .../monitorweb/templates/sitemenu.kid | 14 +- 7 files changed, 226 insertions(+), 154 deletions(-) diff --git a/Monitor.spec b/Monitor.spec index 1843fe2..c9b71fc 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -61,6 +61,7 @@ Requires: MySQL-python Requires: nmap Requires: rt3 +Requires: plewww-plekit #Requires: python-sqlalchemy #Requires: python-elixir #Requires: zabbix-client @@ -246,6 +247,10 @@ chkconfig --add monitor-runlevelagent chkconfig monitor-runlevelagent on %changelog +* Fri May 15 2009 Baris Metin +- use plekit tables from plewww. +- depend on plewww-plekit + * Tue May 12 2009 Stephen Soltesz - Monitor-3.0-7 - make docs a noop - fix for package name dependency diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index 45c2a08..68f9d6a 100644 --- a/web/MonitorWeb/monitorweb/controllers.py +++ b/web/MonitorWeb/monitorweb/controllers.py @@ -164,10 +164,10 @@ class Root(controllers.RootController, MonitorXmlrpcServer): def nodeview(self, hostname=None): nodequery=[] if hostname: - for node in FindbadNodeRecord.get_latest_by(hostname=hostname): - # NOTE: reformat some fields. - prep_node_for_display(node) - nodequery += [node] + node = FindbadNodeRecord.get_latest_by(hostname=hostname) + # NOTE: reformat some fields. + prep_node_for_display(node) + nodequery += [node] return self.pcuview(None, None, hostname) # dict(nodequery=nodequery) diff --git a/web/MonitorWeb/monitorweb/templates/node_template.kid b/web/MonitorWeb/monitorweb/templates/node_template.kid index a9ab0e4..e067596 100644 --- a/web/MonitorWeb/monitorweb/templates/node_template.kid +++ b/web/MonitorWeb/monitorweb/templates/node_template.kid @@ -7,9 +7,11 @@ from links import * Site + Ping + SSH + Boot Status pcu Hostname - kernel last_contact @@ -17,6 +19,9 @@ from links import * ${node.loginbase} + ping + ssh + boot