show/hide advance query form.

Setting tag Monitor-3.0-22

--This line, and those below, will be ignored--
Please write a changelog for this new tag in the section above
DIFF=========
Index: web/MonitorWeb/monitorweb/controllers.py
===================================================================
--- web/MonitorWeb/monitorweb/controllers.py	(.../tags/Monitor-3.0-21)	(révision 15272)
+++ web/MonitorWeb/monitorweb/controllers.py	(.../trunk)	(révision 15272)
@@ -63,6 +63,7 @@
 class QueryForm(widgets.TableForm):
     template = """
     <form xmlns:py="http://purl.org/kid/ns#"
+        id="queryform"
         name="${name}"
         action="${action}"
         method="${method}"
Index: web/MonitorWeb/monitorweb/templates/sitemenu.kid
===================================================================
--- web/MonitorWeb/monitorweb/templates/sitemenu.kid	(.../tags/Monitor-3.0-21)	(révision 15272)
+++ web/MonitorWeb/monitorweb/templates/sitemenu.kid	(.../trunk)	(révision 15272)
@@ -7,11 +7,13 @@

     <script type="text/javascript" src="/plekit/prototype/prototype.js"></script>

+    <script type="text/javascript" src="/plekit/toggle/toggle.js"></script>
     <script type="text/javascript" src="/plekit/tablesort/tablesort.js"></script>
     <script type="text/javascript" src="/plekit/tablesort/customsort.js"></script>
     <script type="text/javascript" src="/plekit/tablesort/paginate.js"></script>
     <script type="text/javascript" src="/plekit/table/table.js"></script>
     <link href="/plekit/table/table.css" rel="stylesheet" type="text/css" />
+    <link href="/plekit/toggle/toggle.css" rel="stylesheet" type="text/css" />

     <script type="text/javascript" src="/plekit/niftycorner/niftycube.js"></script>
     <script type="text/javascript" src="/plekit/niftycorner/nifty_init.js"></script>
Index: web/MonitorWeb/monitorweb/templates/query.kid
===================================================================
--- web/MonitorWeb/monitorweb/templates/query.kid	(.../tags/Monitor-3.0-21)	(révision 15272)
+++ web/MonitorWeb/monitorweb/templates/query.kid	(.../trunk)	(révision 15272)
@@ -13,11 +13,18 @@

   <div py:match="item.tag == 'content'">
   		<h2>Functional, but Under Development...</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>
+
+<div id="toggle-area-query">
 		<table>
 			<tr>
 				<td>${queryform.display(method="GET", value=data)}</td>
 			</tr>
 		</table>
+</div>
+
 <h4>Results</h4>
 	<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-50" width="100%">
 	<thead>
@@ -64,5 +71,16 @@
 		</tr>
       </tbody>
 	</table>
+<script type="text/javascript">
+var lst = $("querylist");
+var tbody = lst.getElementsBySelector("tbody")[0];
+var trs = tbody.getElementsBySelector("tr");
+if (trs.length > 2) {
+ plc_toggle("query");
+}
+</script>
+
   </div>
+
+
 </html>

diff --git a/Monitor.spec b/Monitor.spec
index 7be4afc..cc90984 100644 (file)
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -6,7 +6,7 @@
 
 %define name monitor
 %define version 3.0
 
 %define name monitor
 %define version 3.0

-%define taglevel 21
+%define taglevel 22

 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )


@@ -303,6 +303,9 @@ fi
 
 
 %changelog
 
 
 %changelog

+* Fri Oct 09 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-22
+- show/hide advance query form.
+

 * Thu Sep 24 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-21
 - fixed pause_penalty bug.
 - fixed IPAL pcucontrol bug
 * Thu Sep 24 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-21
 - fixed pause_penalty bug.
 - fixed IPAL pcucontrol bug

diff --git a/zabbix.spec b/zabbix.spec
index f6818c4..ae0938a 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -290,6 +290,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
 %{zabbix_webdir}
 
 %changelog

+* Fri Oct 09 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-22
+- show/hide advance query form.
+

 * Thu Sep 24 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-21
 - fixed pause_penalty bug.
 - fixed IPAL pcucontrol bug
 * Thu Sep 24 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-21
 - fixed pause_penalty bug.
 - fixed IPAL pcucontrol bug


@@ -445,6 +448,6 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 
 %define module_current_branch 2.0
 
 
 %define module_current_branch 2.0
 

-%define taglevel 21
+%define taglevel 22

 
 %define version 3.0
 
 %define version 3.0