From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/cluster resource-form-macros
Date: 2 Oct 2006 22:42:53 -0000 [thread overview]
Message-ID: <20061002224253.14025.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-10-02 22:42:53
Modified files:
luci/cluster : resource-form-macros
Log message:
cleanups
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.18&r2=1.19
--- conga/luci/cluster/resource-form-macros 2006/10/02 20:21:47 1.18
+++ conga/luci/cluster/resource-form-macros 2006/10/02 22:42:53 1.19
@@ -232,23 +232,23 @@
</div>
<div metal:define-macro="resourceconfig-form">
- <tal:block tal:condition="request/resourcename"
+ <script type="text/javascript"
+ src="/luci/homebase/homebase_common.js">
+ </script>
+ <script type="text/javascript"
+ src="/luci/cluster/resource_form_handlers.js">
+ </script>
+
+ <tal:block tal:define="global resourcename request/resourcename | request/form/resourceName | nothing" />
+ <tal:block tal:condition="resourcename"
tal:define="
global msg python: here.appendModel(request, modelb);
global res python: here.getResourceInfo(modelb, request);
global type python: 'tag_name' in res and res['tag_name'] or ''">
- <script type="text/javascript"
- src="/luci/homebase/homebase_common.js">
- </script>
- <script type="text/javascript"
- src="/luci/cluster/resource_form_handlers.js">
- </script>
-
- <h2>Configure <span tal:replace="res/name | string: resource" /></h2>
-
- <div class="reschoose">
+ <h2>Configure <span tal:replace="res/name | string: resource" /></h2>
+ <div class="reschoose">
<span tal:omit-tag="" tal:condition="python: type == 'ip'">
<div metal:use-macro="here/resource-form-macros/macros/ip_macro" />
</span>
@@ -280,7 +280,7 @@
<span tal:omit-tag="" tal:condition="python: type == 'script'">
<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
</span>
- </div>
+ </div>
</tal:block>
</div>
@@ -290,11 +290,11 @@
<p class="reshdr">IP Address Resource Configuration</p>
<form method="post"
- tal:define="editDisabled resourceIsRef | nothing"
- tal:attributes="name res/parent_uuid | nothing">
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
<input name="edit" type="hidden"
- tal:attributes="value python: ptype == '33' and True or False" />
+ tal:condition="python: ptype == '33' and True or False" />
<input name="pagetype" type="hidden"
tal:attributes="value python: ptype" />
@@ -355,7 +355,7 @@
tal:define="editDisabled resourceIsRef | nothing">
<input name="edit" type="hidden"
- tal:attributes="value python: ptype == '33' and True or False" />
+ tal:condition="python: ptype == '33' and True or False" />
<input name="pagetype" type="hidden"
tal:attributes="value python: ptype" />
@@ -494,7 +494,7 @@
tal:define="editDisabled resourceIsRef | nothing">
<input name="edit" type="hidden"
- tal:attributes="value python: ptype == '33' and True or False" />
+ tal:condition="python: ptype == '33' and True or False" />
<input name="pagetype" type="hidden"
tal:attributes="value python: ptype" />
@@ -596,7 +596,7 @@
tal:define="editDisabled resourceIsRef | nothing">
<input name="edit" type="hidden"
- tal:attributes="value python: ptype == '33' and True or False" />
+ tal:condition="python: ptype == '33' and True or False" />
<input name="pagetype" type="hidden"
tal:attributes="value python: ptype" />
@@ -716,7 +716,7 @@
tal:define="editDisabled resourceIsRef | nothing">
<input name="edit" type="hidden"
- tal:attributes="value python: ptype == '33' and True or False" />
+ tal:condition="python: ptype == '33' and True or False" />
<input name="pagetype" type="hidden"
tal:attributes="value python: ptype" />
@@ -788,7 +788,7 @@
tal:define="editDisabled resourceIsRef | nothing">
<input name="edit" type="hidden"
- tal:attributes="value python: ptype == '33' and True or False" />
+ tal:condition="python: ptype == '33' and True or False" />
<input name="pagetype" type="hidden"
tal:attributes="value python: ptype" />
@@ -836,11 +836,11 @@
<p class="reshdr">Script Resource Configuration</p>
<form method="post"
- tal:define="editDisabled resourceIsRef | nothing"
- tal:attributes="name res/parent_uuid | nothing">
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
<input name="edit" type="hidden"
- tal:attributes="value python: ptype == '33' and True or False" />
+ tal:condition="python: ptype == '33' and True or False" />
<input name="pagetype" type="hidden"
tal:attributes="value python: ptype" />
@@ -898,11 +898,11 @@
<p class="reshdr">Samba Server Configuration</p>
<form method="post"
- tal:define="editDisabled resourceIsRef | nothing"
- tal:attributes="name res/parent_uuid | nothing">
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
<input name="edit" type="hidden"
- tal:attributes="value python: ptype == '33' and True or False" />
+ tal:condition="python: ptype == '33' and True or False" />
<input name="pagetype" type="hidden"
tal:attributes="value python: ptype" />
next reply other threads:[~2006-10-02 22:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-02 22:42 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-25 20:02 [Cluster-devel] conga/luci/cluster resource-form-macros rmccabe
2008-07-30 21:14 rmccabe
2008-07-30 21:00 rmccabe
2008-04-28 3:58 rmccabe
2008-04-28 3:57 rmccabe
2007-09-18 21:45 rmccabe
2007-01-18 2:49 rmccabe
2006-09-19 17:50 rmccabe
2006-08-02 17:18 rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061002224253.14025.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).