[Cluster-devel] conga/luci/cluster form-macros form-chooser in ...

[Cluster-devel] conga/luci/cluster form-macros form-chooser in ...

[jparsons]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-08-13 17:16:17

Modified files:
	luci/cluster   : form-macros form-chooser index_html 

Log message:
	logging support

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-chooser.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.8&r2=1.9

--- conga/luci/cluster/form-macros	2006/08/13 14:54:08	1.34
+++ conga/luci/cluster/form-macros	2006/08/13 16:16:17	1.35
@@ -720,6 +720,7 @@
               </span>
 						</td>
 					</tr>
+          <tr><td><a href="" tal:attributes="href nd/logurl" onClick="return popup_log(this, 'notes')">Show recent log activity for this node</a>
 				</table>
 			</td>
 		</tr>
@@ -738,6 +739,13 @@
 	<h2>Node Configuration Form</h2>
 </div>
 
+<div metal:define-macro="nodelogs-form">
+	<h2>Recent Log Activity for <span tal:content="request/nodename"/></h2>
+  ---------------------------------------------------------------------------------------
+  <br/>
+  <span tal:content="python:here.getLogsForNode(request)"/>
+</div>
+
 <div metal:define-macro="nodeadd-form">
 	<script type="text/javascript" src="/luci/homebase/homebase_common.js">
 	</script>
--- conga/luci/cluster/form-chooser	2006/08/02 17:20:20	1.5
+++ conga/luci/cluster/form-chooser	2006/08/13 16:16:17	1.6
@@ -56,6 +56,9 @@
     <span tal:omit-tag="" tal:condition="python: ptype == '16'">
      <div metal:use-macro="here/form-macros/macros/nodeprocess-form"/>
     </span>
+    <span tal:omit-tag="" tal:condition="python: ptype == '17'">
+     <div metal:use-macro="here/form-macros/macros/nodelogs-form"/>
+    </span>
     <span tal:omit-tag="" tal:condition="python: ptype == '20'">
      <div metal:use-macro="here/form-macros/macros/servicelist-form"/>
     </span>
--- conga/luci/cluster/index_html	2006/08/03 18:45:13	1.8
+++ conga/luci/cluster/index_html	2006/08/13 16:16:17	1.9
@@ -76,6 +76,18 @@
           }
          return false;
         }
+        function popup_log(mylink, windowname)
+        {
+        //Thanks to htmlcodetutorial.com
+        if (! window.focus)return true;
+          var href;
+        if (typeof(mylink) == 'string')
+          href=mylink;
+        else
+          href=mylink.href;
+        window.open(href, windowname, 'width=400,height=200,scrollbars=yes');
+        return false;
+        }
         //-->
        </SCRIPT>
       <metal:javascriptslot define-slot="javascript_head_slot" />