From: Stephen Soltesz Date: Thu, 20 May 2010 17:46:14 +0000 (+0000) Subject: add a CVS Format link to the advanced query page X-Git-Tag: Monitor-3.0-35~2 X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=06409c9bae9a08d225d934d9a55018a2136ada15 add a CVS Format link to the advanced query page --- diff --git a/web/MonitorWeb/monitorweb/templates/links.py b/web/MonitorWeb/monitorweb/templates/links.py index 1a951bd..dbcc4b5 100644 --- a/web/MonitorWeb/monitorweb/templates/links.py +++ b/web/MonitorWeb/monitorweb/templates/links.py @@ -3,7 +3,7 @@ import turbogears as tg import urllib def plc_myops_uri(): - return "http://" + config.MONITOR_HOSTNAME + return "https://" + config.MONITOR_HOSTNAME def plc_mail_uri(ticketid): return config.RT_WEB_SERVER + "/Ticket/Display.html?id=" + str(ticketid) def plc_node_uri(hostname): diff --git a/web/MonitorWeb/monitorweb/templates/query.kid b/web/MonitorWeb/monitorweb/templates/query.kid index 29d896e..5a6774f 100644 --- a/web/MonitorWeb/monitorweb/templates/query.kid +++ b/web/MonitorWeb/monitorweb/templates/query.kid @@ -6,13 +6,14 @@ from monitor import config from time import mktime from pcucontrol.reboot import pcu_name, model_to_object from links import * +import cherrypy ?>
-

Functional, but Under Development...

+

Advanced Search

Monitor Query @@ -26,6 +27,7 @@ from links import *

Results

+ CSV Format