From 06409c9bae9a08d225d934d9a55018a2136ada15 Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Thu, 20 May 2010 17:46:14 +0000
Subject: [PATCH] add a CVS Format link to the advanced query page
---
web/MonitorWeb/monitorweb/templates/links.py | 2 +-
web/MonitorWeb/monitorweb/templates/query.kid | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
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
?>
<html py:layout="'sitemenu.kid'"
xmlns:py="http://purl.org/kid/ns#"
xmlns:mochi="http://www.mochi.org">
<div py:match="item.tag == 'content'">
- <h2>Functional, but Under Development...</h2>
+ <h2>Advanced Search</h2>
<img id="toggle-image-visible-query" src="/plekit/icons/toggle-visible.png" style="height:18px;" onclick="plc_toggle('query')" />
<img id="toggle-image-hidden-query" src="/plekit/icons/toggle-hidden.png" style="height:18px;display:none" onclick="plc_toggle('query')" /> <span style="font-size:2em;">Monitor Query</span>
@@ -26,6 +27,7 @@ from links import *
</div>
<h4>Results</h4>
+ <a href="${link('query', tg_format='plain', **cherrypy.request.params)}">CSV Format</a>
<table py:if="fields and len(fields.keys()) > 0" id="querylist" cellpadding="0" border="0" class="plekit_table sortable-onload-0 colstyle-alt no-arrow paginationcallback-querylist_paginator max-pages-10 paginate-999" width="100%">
<thead>
<tr class='pagesize_area'><td class='pagesize_area' colspan='5'>
--
2.47.0