From 9adcc24b63ea2482d150fe24ce33e846313148b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= <Talip-Baris.Metin@sophia.inria.fr> Date: Fri, 9 Oct 2009 15:52:11 +0000 Subject: [PATCH] show/hide advance query form. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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> --- coblitz-tags.mk | 2 +- onelab-tags.mk | 2 +- planetbridge-tags.mk | 2 +- planetlab-k27-tags.mk | 2 +- planetlab-tags.mk | 2 +- trellis-tags.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coblitz-tags.mk b/coblitz-tags.mk index c7d6bb80..3084be66 100644 --- a/coblitz-tags.mk +++ b/coblitz-tags.mk @@ -30,7 +30,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-30 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-21 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-22 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/onelab-tags.mk b/onelab-tags.mk index 454b1ed2..e93c0cb0 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -36,7 +36,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-30 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-21 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-22 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk index 5f0de825..9075dedb 100644 --- a/planetbridge-tags.mk +++ b/planetbridge-tags.mk @@ -30,7 +30,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-30 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-21 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-22 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index faa35837..203da1f1 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -39,7 +39,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-30 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-21 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-22 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/planetlab-tags.mk b/planetlab-tags.mk index cfdfe351..4c190979 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -31,7 +31,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-27 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-30 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-21 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-22 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/trellis-tags.mk b/trellis-tags.mk index 4ee3accd..3207208a 100644 --- a/trellis-tags.mk +++ b/trellis-tags.mk @@ -35,7 +35,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-30 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-21 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-22 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 -- 2.47.0