* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2011-03-25 20:02 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2011-03-25 20:02 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2011-03-25 20:02:15
Modified files:
luci/cluster : resource-form-macros
Log message:
Fix bz640329 - fields in Luci are too short
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.20&r2=1.21.2.21
--- conga/luci/cluster/resource-form-macros 2011/03/25 20:01:43 1.21.2.20
+++ conga/luci/cluster/resource-form-macros 2011/03/25 20:02:15 1.21.2.21
@@ -492,7 +492,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing"/>
@@ -525,7 +525,7 @@
<tr class="systemsTable">
<td class="systemsTable">Mount point</td>
<td class="systemsTable">
- <input type="text" size="20" name="mountpoint"
+ <input type="text" size="40" name="mountpoint"
tal:attributes="
disabled python: editDisabled;
value res/attrs/mountpoint | nothing" />
@@ -535,7 +535,7 @@
<tr class="systemsTable">
<td class="systemsTable">Device</td>
<td class="systemsTable">
- <input type="text" size="20" name="device"
+ <input type="text" size="40" name="device"
tal:attributes="
disabled python: editDisabled;
value res/attrs/device | nothing" />
@@ -545,7 +545,7 @@
<tr class="systemsTable">
<td class="systemsTable">Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="options"
+ <input type="text" size="40" name="options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/options | nothing" />
@@ -555,7 +555,7 @@
<tr class="systemsTable">
<td class="systemsTable">File system ID (optional)</td>
<td class="systemsTable">
- <input type="text" size="20" name="fsid"
+ <input type="text" size="40" name="fsid"
tal:attributes="
disabled python: editDisabled;
value res/attrs/fsid | nothing" />
@@ -650,7 +650,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -660,7 +660,7 @@
<tr class="systemsTable">
<td class="systemsTable">Mount point</td>
<td class="systemsTable">
- <input type="text" size="20" name="mountpoint"
+ <input type="text" size="40" name="mountpoint"
tal:attributes="
disabled python: editDisabled;
value res/attrs/mountpoint | nothing" />
@@ -670,7 +670,7 @@
<tr class="systemsTable">
<td class="systemsTable">Device</td>
<td class="systemsTable">
- <input type="text" size="20" name="device"
+ <input type="text" size="40" name="device"
tal:attributes="
disabled python: editDisabled;
value res/attrs/device | nothing" />
@@ -693,7 +693,7 @@
<tr class="systemsTable">
<td class="systemsTable">Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="options"
+ <input type="text" size="40" name="options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/options | nothing" />
@@ -703,7 +703,7 @@
<tr class="systemsTable">
<td class="systemsTable">File system ID (optional)</td>
<td class="systemsTable">
- <input type="text" size="20" name="fsid"
+ <input type="text" size="40" name="fsid"
tal:attributes="
disabled python: editDisabled;
value res/attrs/fsid | nothing" />
@@ -785,7 +785,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -795,7 +795,7 @@
<tr class="systemsTable">
<td class="systemsTable">Mount point</td>
<td class="systemsTable">
- <input type="text" size="20" name="mountpoint"
+ <input type="text" size="40" name="mountpoint"
tal:attributes="
disabled python: editDisabled;
value res/attrs/mountpoint | nothing" />
@@ -805,7 +805,7 @@
<tr class="systemsTable">
<td class="systemsTable">Host</td>
<td class="systemsTable">
- <input type="text" size="20" name="host"
+ <input type="text" size="40" name="host"
tal:attributes="
disabled python: editDisabled;
value res/attrs/host | nothing" />
@@ -815,7 +815,7 @@
<tr class="systemsTable">
<td class="systemsTable">Export path</td>
<td class="systemsTable">
- <input type="text" size="20" name="exportpath"
+ <input type="text" size="40" name="exportpath"
tal:attributes="
disabled python: editDisabled;
value res/attrs/export | nothing" />
@@ -841,7 +841,7 @@
<tr class="systemsTable">
<td class="systemsTable">Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="options"
+ <input type="text" size="40" name="options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/options | nothing" />
@@ -910,7 +910,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -920,7 +920,7 @@
<tr class="systemsTable">
<td class="systemsTable">Target</td>
<td class="systemsTable">
- <input type="text" size="20" name="target"
+ <input type="text" size="40" name="target"
tal:attributes="
disabled python: editDisabled;
value res/attrs/target | nothing"/>
@@ -930,7 +930,7 @@
<tr class="systemsTable">
<td class="systemsTable">Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="options"
+ <input type="text" size="40" name="options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/options | nothing" />
@@ -994,7 +994,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -1004,7 +1004,7 @@
<tr class="systemsTable">
<td class="systemsTable">Config File</td>
<td class="systemsTable">
- <input type="text" size="20" name="config_file"
+ <input type="text" size="40" name="config_file"
tal:attributes="
disabled python: editDisabled;
value res/attrs/config_file | string:/var/lib/pgsql/data/postgresql.conf" />
@@ -1014,7 +1014,7 @@
<tr class="systemsTable">
<td class="systemsTable">Postmaster User</td>
<td class="systemsTable">
- <input type="text" size="20" name="postmaster_user"
+ <input type="text" size="40" name="postmaster_user"
tal:attributes="
disabled python: editDisabled;
value res/attrs/postmaster_user | string:postgres" />
@@ -1024,7 +1024,7 @@
<tr class="systemsTable">
<td class="systemsTable">Postmaster Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="postmaster_options"
+ <input type="text" size="40" name="postmaster_options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/postmaster_options | nothing" />
@@ -1034,7 +1034,7 @@
<tr class="systemsTable">
<td class="systemsTable">Shutdown Wait (seconds)</td>
<td class="systemsTable">
- <input type="text" size="20" name="shutdown_wait"
+ <input type="text" size="40" name="shutdown_wait"
tal:attributes="
disabled python: editDisabled;
value res/attrs/shutdown_wait | string:0" />
@@ -1087,7 +1087,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -1097,7 +1097,7 @@
<tr class="systemsTable">
<td class="systemsTable">Server Root</td>
<td class="systemsTable">
- <input type="text" size="20" name="server_root"
+ <input type="text" size="40" name="server_root"
tal:attributes="
disabled python: editDisabled;
value res/attrs/server_root | string:/etc/httpd" />
@@ -1107,7 +1107,7 @@
<tr class="systemsTable">
<td class="systemsTable">Config File</td>
<td class="systemsTable">
- <input type="text" size="20" name="config_file"
+ <input type="text" size="40" name="config_file"
tal:attributes="
disabled python: editDisabled;
value res/attrs/config_file | string:conf/httpd.conf" />
@@ -1117,7 +1117,7 @@
<tr class="systemsTable">
<td class="systemsTable">httpd Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="httpd_options"
+ <input type="text" size="40" name="httpd_options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/httpd_options | nothing" />
@@ -1127,7 +1127,7 @@
<tr class="systemsTable">
<td class="systemsTable">Shutdown Wait (seconds)</td>
<td class="systemsTable">
- <input type="text" size="20" name="shutdown_wait"
+ <input type="text" size="40" name="shutdown_wait"
tal:attributes="
disabled python: editDisabled;
value res/attrs/shutdown_wait | string:0" />
@@ -1180,7 +1180,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -1190,7 +1190,7 @@
<tr class="systemsTable">
<td class="systemsTable">Config File</td>
<td class="systemsTable">
- <input type="text" size="20" name="config_file"
+ <input type="text" size="40" name="config_file"
tal:attributes="
disabled python: editDisabled;
value res/attrs/config_file | string:/etc/openldap/slapd.conf" />
@@ -1200,7 +1200,7 @@
<tr class="systemsTable">
<td class="systemsTable">URL List</td>
<td class="systemsTable">
- <input type="text" size="20" name="url_list"
+ <input type="text" size="40" name="url_list"
tal:attributes="
disabled python: editDisabled;
value res/attrs/url_list | string:ldap:///" />
@@ -1210,7 +1210,7 @@
<tr class="systemsTable">
<td class="systemsTable">slapd Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="slapd_options"
+ <input type="text" size="40" name="slapd_options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/slapd_options | nothing" />
@@ -1220,7 +1220,7 @@
<tr class="systemsTable">
<td class="systemsTable">Shutdown Wait (seconds)</td>
<td class="systemsTable">
- <input type="text" size="20" name="shutdown_wait"
+ <input type="text" size="40" name="shutdown_wait"
tal:attributes="
disabled python: editDisabled;
value res/attrs/shutdown_wait | string:0" />
@@ -1274,7 +1274,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -1283,7 +1283,7 @@
<tr class="systemsTable">
<td class="systemsTable">Volume Group Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="vg_name"
+ <input type="text" size="40" name="vg_name"
tal:attributes="
disabled python: editDisabled;
value res/attrs/vg_name | nothing" />
@@ -1292,7 +1292,7 @@
<tr class="systemsTable">
<td class="systemsTable">Logical Volume Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="lv_name"
+ <input type="text" size="40" name="lv_name"
tal:attributes="
disabled python: editDisabled;
value res/attrs/lv_name | nothing" />
@@ -1355,7 +1355,7 @@
<tr class="systemsTable">
<td class="systemsTable">SAP Instance Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="26" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -1367,7 +1367,7 @@
<span title="The fully qualified path to sapstartsrv and sapcontrol">SAP executable directory</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="DIR_EXECUTABLE"
+ <input type="text" size="26" name="DIR_EXECUTABLE"
tal:attributes="
disabled python: editDisabled;
value res/attrs/DIR_EXECUTABLE | nothing" />
@@ -1379,7 +1379,7 @@
<span title="The fully qualified path to the directory containing the SAP START profile">Directory containing the SAP START profile</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="DIR_PROFILE"
+ <input type="text" size="26" name="DIR_PROFILE"
tal:attributes="
disabled python: editDisabled;
value res/attrs/DIR_PROFILE | nothing" />
@@ -1389,7 +1389,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name of the SAP START profile</td>
<td class="systemsTable">
- <input type="text" size="20" name="START_PROFILE"
+ <input type="text" size="26" name="START_PROFILE"
tal:attributes="
disabled python: editDisabled;
value res/attrs/START_PROFILE | nothing" />
@@ -1402,7 +1402,7 @@
<span title="After that time in seconds a monitor operation is executed by the resource agent. Does the monitor return SUCCESS, the start is handled as SUCCESS. This is useful to resolve timing problems with e.g. the J2EE-Addin instance.">Number of seconds to wait before checking startup status</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="START_WAITTIME"
+ <input type="text" size="26" name="START_WAITTIME"
tal:attributes="
disabled python: editDisabled;
value res/attrs/START_WAITTIME | nothing" />
@@ -1428,7 +1428,7 @@
<span title="The fully qualified path where to find a script or program which should be executed before this resource gets started.">Path to a pre-start script</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="PRE_START_USEREXIT"
+ <input type="text" size="26" name="PRE_START_USEREXIT"
tal:attributes="
disabled python: editDisabled;
value res/attrs/PRE_START_USEREXIT | nothing" />
@@ -1441,7 +1441,7 @@
<span title="The fully qualified path where to find a script or program which should be executed after this resource got started.">Path to a post-start script</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="POST_START_USEREXIT"
+ <input type="text" size="26" name="POST_START_USEREXIT"
tal:attributes="
disabled python: editDisabled;
value res/attrs/POST_START_USEREXIT | nothing" />
@@ -1454,7 +1454,7 @@
<span title="The fully qualified path where to find a script or program which should be executed before this resource gets stopped.">Path to a pre-stop script</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="PRE_STOP_USEREXIT"
+ <input type="text" size="26" name="PRE_STOP_USEREXIT"
tal:attributes="
disabled python: editDisabled;
value res/attrs/PRE_STOP_USEREXIT | nothing" />
@@ -1467,7 +1467,7 @@
<span title="The fully qualified path where to find a script or program which should be executed after this resource got stopped.">Path to a post-stop script</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="POST_STOP_USEREXIT"
+ <input type="text" size="26" name="POST_STOP_USEREXIT"
tal:attributes="
disabled python: editDisabled;
value res/attrs/POST_STOP_USEREXIT | nothing" />
@@ -1520,7 +1520,7 @@
<tr class="systemsTable">
<td class="systemsTable">Instance name (SID) of Oracle instance</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -1529,7 +1529,7 @@
<tr class="systemsTable">
<td class="systemsTable">Oracle user name</td>
<td class="systemsTable">
- <input type="text" size="20" name="user"
+ <input type="text" size="40" name="user"
tal:attributes="
disabled python: editDisabled;
value res/attrs/user | nothing" />
@@ -1538,7 +1538,7 @@
<tr class="systemsTable">
<td class="systemsTable">Oracle application home directory</td>
<td class="systemsTable">
- <input type="text" size="20" name="home"
+ <input type="text" size="40" name="home"
tal:attributes="
disabled python: editDisabled;
value res/attrs/home | nothing" />
@@ -1568,7 +1568,7 @@
<tr class="systemsTable">
<td class="systemsTable">Virtual hostname (optional)</td>
<td class="systemsTable">
- <input type="text" size="20" name="vhost"
+ <input type="text" size="40" name="vhost"
tal:attributes="
disabled python: editDisabled;
value res/attrs/vhost | nothing" />
@@ -1784,7 +1784,7 @@
<tr class="systemsTable">
<td class="systemsTable">Instance Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -1796,7 +1796,7 @@
<span title="">ASE server name</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="server_name"
+ <input type="text" size="40" name="server_name"
tal:attributes="
disabled python: editDisabled;
value res/attrs/server_name | nothing" />
@@ -1808,7 +1808,7 @@
<span title="">SYBASE home directory</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="sybase_home"
+ <input type="text" size="40" name="sybase_home"
tal:attributes="
disabled python: editDisabled;
value res/attrs/sybase_home | nothing" />
@@ -1820,7 +1820,7 @@
<span title="">Login file</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="login_file"
+ <input type="text" size="40" name="login_file"
tal:attributes="
disabled python: editDisabled;
value res/attrs/login_file | nothing" />
@@ -1829,7 +1829,7 @@
<tr class="systemsTable">
<td class="systemsTable">Interfaces file</td>
<td class="systemsTable">
- <input type="text" size="20" name="interfaces_file"
+ <input type="text" size="40" name="interfaces_file"
tal:attributes="
disabled python: editDisabled;
value res/attrs/interfaces_file | nothing" />
@@ -1838,7 +1838,7 @@
<tr class="systemsTable">
<td class="systemsTable">SYBASE_ASE directory name</td>
<td class="systemsTable">
- <input type="text" size="20" name="sybase_ase"
+ <input type="text" size="40" name="sybase_ase"
tal:attributes="
disabled python: editDisabled;
value res/attrs/sybase_ase | nothing" />
@@ -1847,7 +1847,7 @@
<tr class="systemsTable">
<td class="systemsTable">SYBASE_OCS directory name</td>
<td class="systemsTable">
- <input type="text" size="20" name="sybase_ocs"
+ <input type="text" size="40" name="sybase_ocs"
tal:attributes="
disabled python: editDisabled;
value res/attrs/sybase_ocs | nothing" />
@@ -1856,7 +1856,7 @@
<tr class="systemsTable">
<td class="systemsTable">Sybase user</td>
<td class="systemsTable">
- <input type="text" size="20" name="sybase_user"
+ <input type="text" size="40" name="sybase_user"
tal:attributes="
disabled python: editDisabled;
value res/attrs/sybase_user | nothing" />
@@ -1865,7 +1865,7 @@
<tr class="systemsTable">
<td class="systemsTable">Deep probe timeout</td>
<td class="systemsTable">
- <input type="text" size="20" name="deep_probe_timeout"
+ <input type="text" size="40" name="deep_probe_timeout"
tal:attributes="
disabled python: editDisabled;
value res/attrs/deep_probe_timeout | nothing" />
@@ -1920,7 +1920,7 @@
<tr class="systemsTable">
<td class="systemsTable">SAP Database Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="26" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -1932,7 +1932,7 @@
<span title="The fully qualified path to sapstartsrv and sapcontrol">SAP executable directory</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="DIR_EXECUTABLE"
+ <input type="text" size="26" name="DIR_EXECUTABLE"
tal:attributes="
disabled python: editDisabled;
value res/attrs/DIR_EXECUTABLE | nothing" />
@@ -1966,7 +1966,7 @@
<tr class="systemsTable">
<td class="systemsTable">Oracle TNS listener name</td>
<td class="systemsTable">
- <input type="text" size="20" name="NETSERVICENAME"
+ <input type="text" size="26" name="NETSERVICENAME"
tal:attributes="
disabled python: editDisabled;
value res/attrs/NETSERVICENAME | nothing" />
@@ -2011,7 +2011,7 @@
<span title="The fully qualified path to the Java SDK">Path to Java SDK</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="JAVA_HOME"
+ <input type="text" size="26" name="JAVA_HOME"
tal:attributes="
disabled python: editDisabled;
value res/attrs/JAVA_HOME | nothing" />
@@ -2024,7 +2024,7 @@
<span title="The fully qualified filename of the jdbc driver for the database connection test. It will be automaticaly read from the bootstrap.properties file in Java engine 6.40 and 7.00. For Java engine 7.10 the parameter is mandatory">File name of the JDBC driver</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="DB_JARS"
+ <input type="text" size="26" name="DB_JARS"
tal:attributes="
disabled python: editDisabled;
value res/attrs/DB_JARS | nothing" />
@@ -2037,7 +2037,7 @@
<span title="The fully qualified path where to find a script or program which should be executed before this resource gets started.">Path to a pre-start script</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="PRE_START_USEREXIT"
+ <input type="text" size="26" name="PRE_START_USEREXIT"
tal:attributes="
disabled python: editDisabled;
value res/attrs/PRE_START_USEREXIT | nothing" />
@@ -2050,7 +2050,7 @@
<span title="The fully qualified path where to find a script or program which should be executed after this resource got started.">Path to a post-start script</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="POST_START_USEREXIT"
+ <input type="text" size="26" name="POST_START_USEREXIT"
tal:attributes="
disabled python: editDisabled;
value res/attrs/POST_START_USEREXIT | nothing" />
@@ -2063,7 +2063,7 @@
<span title="The fully qualified path where to find a script or program which should be executed before this resource gets stopped.">Path to a pre-stop script</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="PRE_STOP_USEREXIT"
+ <input type="text" size="26" name="PRE_STOP_USEREXIT"
tal:attributes="
disabled python: editDisabled;
value res/attrs/PRE_STOP_USEREXIT | nothing" />
@@ -2076,7 +2076,7 @@
<span title="The fully qualified path where to find a script or program which should be executed after this resource got stopped.">Path to a post-stop script</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="POST_STOP_USEREXIT"
+ <input type="text" size="26" name="POST_STOP_USEREXIT"
tal:attributes="
disabled python: editDisabled;
value res/attrs/POST_STOP_USEREXIT | nothing" />
@@ -2088,7 +2088,7 @@
<span title="The fully qualified path to the J2EE instance bootstrap directory">J2EE instance bootstrap directory</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="DIR_BOOTSTRAP"
+ <input type="text" size="26" name="DIR_BOOTSTRAP"
tal:attributes="
disabled python: editDisabled;
value res/attrs/DIR_BOOTSTRAP | nothing" />
@@ -2100,7 +2100,7 @@
<span title="The fully qualified path to the J2EE security store directory">J2EE security store path</span>
</td>
<td class="systemsTable">
- <input type="text" size="20" name="DIR_SECSTORE"
+ <input type="text" size="26" name="DIR_SECSTORE"
tal:attributes="
disabled python: editDisabled;
value res/attrs/DIR_SECSTORE | nothing" />
@@ -2153,7 +2153,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -2163,7 +2163,7 @@
<tr class="systemsTable">
<td class="systemsTable">Config File</td>
<td class="systemsTable">
- <input type="text" size="20" name="config_file"
+ <input type="text" size="40" name="config_file"
tal:attributes="
disabled python: editDisabled;
value res/attrs/config_file | string:/etc/my.cnf" />
@@ -2173,7 +2173,7 @@
<tr class="systemsTable">
<td class="systemsTable">Listen Address</td>
<td class="systemsTable">
- <input type="text" size="20" name="listen_address"
+ <input type="text" size="40" name="listen_address"
tal:attributes="
disabled python: editDisabled;
value res/attrs/listen_address | nothing" />
@@ -2183,7 +2183,7 @@
<tr class="systemsTable">
<td class="systemsTable">mysqld Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="mysqld_options"
+ <input type="text" size="40" name="mysqld_options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/mysqld_options | nothing" />
@@ -2193,7 +2193,7 @@
<tr class="systemsTable">
<td class="systemsTable">Shutdown Wait (seconds)</td>
<td class="systemsTable">
- <input type="text" size="20" name="shutdown_wait"
+ <input type="text" size="40" name="shutdown_wait"
tal:attributes="
disabled python: editDisabled;
value res/attrs/shutdown_wait | string:0" />
@@ -2246,7 +2246,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -2256,7 +2256,7 @@
<tr class="systemsTable">
<td class="systemsTable">Config File</td>
<td class="systemsTable">
- <input type="text" size="20" name="config_file"
+ <input type="text" size="40" name="config_file"
tal:attributes="
disabled python: editDisabled;
value res/attrs/config_file | string:/etc/tomcat5/tomcat5.conf" />
@@ -2266,7 +2266,7 @@
<tr class="systemsTable">
<td class="systemsTable">Tomcat User</td>
<td class="systemsTable">
- <input type="text" size="20" name="tomcat_user"
+ <input type="text" size="40" name="tomcat_user"
tal:attributes="
disabled python: editDisabled;
value res/attrs/tomcat_user | string:tomcat" />
@@ -2276,7 +2276,7 @@
<tr class="systemsTable">
<td class="systemsTable">Catalina Options</td>
<td class="systemsTable">
- <input type="text" size="20" name="catalina_options"
+ <input type="text" size="40" name="catalina_options"
tal:attributes="
disabled python: editDisabled;
value res/attrs/catalina_options | nothing" />
@@ -2286,7 +2286,7 @@
<tr class="systemsTable">
<td class="systemsTable">Catalina Base</td>
<td class="systemsTable">
- <input type="text" size="20" name="catalina_base"
+ <input type="text" size="40" name="catalina_base"
tal:attributes="
disabled python: editDisabled;
value res/attrs/catalina_base | string:/usr/share/tomcat5" />
@@ -2296,7 +2296,7 @@
<tr class="systemsTable">
<td class="systemsTable">Shutdown Wait (seconds)</td>
<td class="systemsTable">
- <input type="text" size="20" name="shutdown_wait"
+ <input type="text" size="40" name="shutdown_wait"
tal:attributes="
disabled python: editDisabled;
value res/attrs/shutdown_wait | string:30" />
@@ -2350,7 +2350,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -2405,7 +2405,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -2415,7 +2415,7 @@
<tr class="systemsTable">
<td class="systemsTable">Full path to script file</td>
<td class="systemsTable">
- <input type="text" size="20" name="file"
+ <input type="text" size="40" name="file"
tal:attributes="
disabled python: editDisabled;
value res/attrs/file | nothing" />
@@ -2470,7 +2470,7 @@
<tr class="systemsTable">
<td class="systemsTable">Name</td>
<td class="systemsTable">
- <input type="text" size="20" name="resourcename"
+ <input type="text" size="40" name="resourcename"
tal:attributes="
disabled python: editDisabled;
value res/name | nothing" />
@@ -2480,7 +2480,7 @@
<tr class="systemsTable">
<td class="systemsTable">Workgroup</td>
<td class="systemsTable">
- <input type="text" size="20" name="workgroup"
+ <input type="text" size="40" name="workgroup"
tal:attributes="
disabled python: editDisabled;
value res/attrs/workgroup | nothing" />
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2008-07-30 21:14 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2008-07-30 21:14 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2008-07-30 21:14:38
Modified files:
luci/cluster : resource-form-macros
Log message:
Fix a bug that caused oracle resource attributes to be left out of form input fields
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.14&r2=1.21.2.15
--- conga/luci/cluster/resource-form-macros 2008/05/12 17:37:38 1.21.2.14
+++ conga/luci/cluster/resource-form-macros 2008/07/30 21:14:38 1.21.2.15
@@ -1397,7 +1397,7 @@
<input type="text" size="20" name="user"
tal:attributes="
disabled python: editDisabled;
- value res/user | nothing" />
+ value res/attrs/user | nothing" />
</td>
</tr>
<tr class="systemsTable">
@@ -1406,7 +1406,7 @@
<input type="text" size="20" name="home"
tal:attributes="
disabled python: editDisabled;
- value res/home | nothing" />
+ value res/attrs/home | nothing" />
</td>
</tr>
<tr class="systemsTable">
@@ -1415,7 +1415,7 @@
<input type="text" size="20" name="vhost"
tal:attributes="
disabled python: editDisabled;
- value res/vhost | nothing" />
+ value res/attrs/vhost | nothing" />
</td>
</tr>
</table>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2008-07-30 21:00 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2008-07-30 21:00 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2008-07-30 21:00:37
Modified files:
luci/cluster : resource-form-macros
Log message:
fix a bug that caused oracle resource attributes to not appear in the input fields
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.52&r2=1.53
--- conga/luci/cluster/resource-form-macros 2008/05/12 18:03:39 1.52
+++ conga/luci/cluster/resource-form-macros 2008/07/30 21:00:37 1.53
@@ -1397,7 +1397,7 @@
<input type="text" size="20" name="user"
tal:attributes="
disabled python: editDisabled;
- value res/user | nothing" />
+ value res/attrs/user | nothing" />
</td>
</tr>
<tr class="systemsTable">
@@ -1406,7 +1406,7 @@
<input type="text" size="20" name="home"
tal:attributes="
disabled python: editDisabled;
- value res/home | nothing" />
+ value res/attrs/home | nothing" />
</td>
</tr>
<tr class="systemsTable">
@@ -1415,7 +1415,7 @@
<input type="text" size="20" name="vhost"
tal:attributes="
disabled python: editDisabled;
- value res/vhost | nothing" />
+ value res/attrs/vhost | nothing" />
</td>
</tr>
</table>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2008-04-28 3:58 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2008-04-28 3:58 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2008-04-28 03:58:42
Modified files:
luci/cluster : resource-form-macros
Log message:
Fix so export path shows up when editing an existing netfs resource
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.12&r2=1.21.2.13
--- conga/luci/cluster/resource-form-macros 2008/04/23 17:27:10 1.21.2.12
+++ conga/luci/cluster/resource-form-macros 2008/04/28 03:58:42 1.21.2.13
@@ -758,7 +758,7 @@
<input type="text" size="20" name="exportpath"
tal:attributes="
disabled python: editDisabled;
- value res/attrs/readOnly | nothing" />
+ value res/attrs/export | nothing" />
</td>
</tr>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2008-04-28 3:57 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2008-04-28 3:57 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2008-04-28 03:57:41
Modified files:
luci/cluster : resource-form-macros
Log message:
Fix so export path shows up when editing an existing netfs resource
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.31.2.10&r2=1.31.2.11
--- conga/luci/cluster/resource-form-macros 2008/04/21 18:15:17 1.31.2.10
+++ conga/luci/cluster/resource-form-macros 2008/04/28 03:57:41 1.31.2.11
@@ -758,7 +758,7 @@
<input type="text" size="20" name="exportpath"
tal:attributes="
disabled python: editDisabled;
- value res/attrs/readOnly | nothing" />
+ value res/attrs/export | nothing" />
</td>
</tr>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2007-09-18 21:45 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2007-09-18 21:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-09-18 21:45:40
Modified files:
luci/cluster : resource-form-macros
Log message:
add the ability to set the self_fence attribute on clusterfs resources (will need agent script support)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.39&r2=1.40
--- conga/luci/cluster/resource-form-macros 2007/07/11 22:47:07 1.39
+++ conga/luci/cluster/resource-form-macros 2007/09/18 21:45:39 1.40
@@ -613,6 +613,16 @@
checked res/attrs/force_unmount | nothing" />
</td>
</tr>
+
+ <tr class="systemsTable">
+ <td class="systemsTable">Reboot host node if unmount fails</td>
+ <td class="systemsTable">
+ <input type="checkbox" name="selffence"
+ tal:attributes="
+ disabled python: editDisabled;
+ checked res/attrs/self_fence | nothing" />
+ </td>
+ </tr>
</table>
<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2007-01-18 2:49 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2007-01-18 2:49 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-18 02:49:29
Modified files:
luci/cluster : resource-form-macros
Log message:
frontend bits for the new resource agents
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.26&r2=1.27
--- conga/luci/cluster/resource-form-macros 2007/01/17 20:50:38 1.26
+++ conga/luci/cluster/resource-form-macros 2007/01/18 02:49:29 1.27
@@ -106,7 +106,10 @@
<form>
<select onChange="swap_div_elem(this.form.parentNode,
this.options[this.selectedIndex].value);">
- <option name="blank" value="blank" checked>Select a resource type</option>
+ <option name="blank" value="blank" checked>
+ Select a resource type
+ </option>
+
<option name="IP" value="IP">IP address</option>
<option name="FS" value="FS">File system</option>
<option name="GFS" value="GFS">GFS file system</option>
@@ -115,6 +118,22 @@
<option name="NFSX" value="NFSX">NFS export</option>
<option name="SCR" value="SCR">Script</option>
<option name="SMB" value="SMB">Samba</option>
+
+ <tal:block
+ tal:condition="python: os_version and os_version == 'rhel4'">
+ <option name="APACHE" value="APACHE">Apache</option>
+ <option name="MYSQL" value="MYSQL">MySQL</option>
+ <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
+ <option name="POSTGRES-8" value="POSTGRES-8">
+ PostgreSQL 8
+ </option>
+ <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
+ </tal:block>
+
+ <tal:block
+ tal:condition="python: os_version and os_version == 'rhel5'">
+ <option name="VM" value="VM">Virtual Machine</option>
+ </tal:block>
</select>
</form>
</p>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2006-10-02 22:42 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2006-10-02 22:42 UTC (permalink / raw)
To: cluster-devel.redhat.com
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" />
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2006-09-19 17:50 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2006-09-19 17:50 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-09-19 17:50:28
Modified files:
luci/cluster : resource-form-macros
Log message:
fix a bug on the service composition form
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- conga/luci/cluster/resource-form-macros 2006/09/14 21:24:24 1.11
+++ conga/luci/cluster/resource-form-macros 2006/09/19 17:50:28 1.12
@@ -23,7 +23,7 @@
<tal:block tal:condition="exists:res">
<tal:block tal:define="
- global expclass python: ((res['max_depth'] == 0 and 'invisible ') + 'expander')" />
+ global expclass python: ((res['max_depth'] == 0 and 'invisible ' or '') + 'expander')" />
</tal:block>
<p tal:attributes="class expclass">
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cluster-devel] conga/luci/cluster resource-form-macros
@ 2006-08-02 17:18 rmccabe
0 siblings, 0 replies; 10+ messages in thread
From: rmccabe @ 2006-08-02 17:18 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-08-02 17:18:40
Modified files:
luci/cluster : resource-form-macros
Log message:
committing for stephen
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.1&r2=1.2
--- conga/luci/cluster/resource-form-macros 2006/07/27 16:32:46 1.1
+++ conga/luci/cluster/resource-form-macros 2006/08/02 17:18:40 1.2
@@ -8,6 +8,7 @@
Resources for <span tal:content="request/clustername" />
</h2>
<span tal:define="global rescInf python:here.getResourcesInfo(modelb, request)"/>
+ <span tal:define="msg python:here.appendModel(request, modelb)"/>
<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
<thead>
<tr border="0" cellspacing="5" align="left">
@@ -15,6 +16,7 @@
<th width="100">Type</th>
<th width="75">Link</th>
<th width="75">Configure</th>
+ <th width="75">Delete</th>
</tr>
</thead>
<span tal:repeat="rs rescInf">
@@ -29,6 +31,10 @@
<a href="" tal:attributes="HREF rs/cfgurl" />
configure
</td>
+ <td>
+ <a href="" tal:attributes="HREF rs/delurl" />
+ delete
+ </td>
</tr>
</span>
</table>
@@ -36,9 +42,16 @@
<div metal:define-macro="resourceslist-form">
<h2>Resources List Form</h2>
</div>
+ <div metal:define-macro="resourceremove-form">
+ <h2>Resources Remove Form</h2>
+ <span tal:define="global cluname request/clustername;
+ global ragent python:here.getRicciAgentForCluster(request);"/>
+ <span tal:define="global edited request/edit|nothing" />
+ <span tal:define="global msg python:here.delResource(request, ragent)" />
+ <div tal:condition="msg" tal:content="msg">Something returned from delResource().</div>
+ </div>
<div metal:define-macro="resourceadd-form">
<script type="text/javascript" src="luci/cluster/resource_form_handlers.js" />
- <span tal:define="msg python:here.appendModel(request, modelb)"/>
<h2>Add a Resource</h2>
<strong>Select Resource Type:</strong><br/>
<form name="filler">
@@ -92,45 +105,49 @@
</table>
</div>
+
<div metal:define-macro="resourceprocess-form">
+ <span tal:define="global cluname request/clustername;
+ global ragent python:here.getRicciAgentForCluster(request);"/>
<span tal:define="global edited request/edit|nothing" />
- <h2 tal:condition="not: edited">Resource Added Form</h2>
- <h2 tal:condition="edited">Resource Edited Form</h2>
- <span tal:define="global msg python:here.addResource(request)" />
- <strong>Errors:</strong>
+ <h2 tal:condition="not: edited">Resource Added</h2>
+ <h2 tal:condition="edited">Resource Edited</h2>
+ <span tal:define="global msg python:here.addResource(request, ragent)" />
<div tal:condition="msg" tal:content="msg">Something returned from addResource.</div>
- <hr/>
- These are the request vars <em tal:replace="structure request">template id</em>.
</div>
<div metal:define-macro="resourceconfig-form">
<script type="text/javascript" src="luci/cluster/resource_form_handlers.js" />
- <span tal:define="global res python:here.getResourceInfo(modelb, request)" />
- <span tal:define="global type res/tag_name" />
- <h2>Configure <span tal:content="res/name" /></h2>
- <span tal:omit-tag="" tal:condition="python:type == 'ip'">
- <div metal:use-macro="here/resource-form-macros/macros/ip_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python:type == 'fs'">
- <div metal:use-macro="here/resource-form-macros/macros/fs_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python:type == 'gfs'">
- <div metal:use-macro="here/resource-form-macros/macros/gfs_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python:type == 'nfsm'">
- <div metal:use-macro="here/resource-form-macros/macros/nfsm_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python:type == 'nfsx'">
- <div metal:use-macro="here/resource-form-macros/macros/nfsx_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python:type == 'nfsc'">
- <div metal:use-macro="here/resource-form-macros/macros/nfsc_macro"/>
- </span>
- <span tal:omit-tag="" tal:condition="python:type == 'smb'">
- <div metal:use-macro="here/resource-form-macros/macros/smb_macro" />
- </span>
- <span tal:omit-tag="" tal:condition="python:type == 'src'">
- <div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
+ <span tal:define="msg python:here.appendModel(request, modelb)"/>
+ <span tal:define="global restoedit request/resourcename|nothing"/>
+ <span tal:condition="restoedit">
+ <span tal:define="global res python:here.getResourceInfo(modelb, request)" />
+ <span tal:define="global type res/tag_name" />
+ <h2>Configure <span tal:content="res/name" /></h2>
+ <span tal:omit-tag="" tal:condition="python:type == 'ip'">
+ <div metal:use-macro="here/resource-form-macros/macros/ip_macro"/>
+ </span>
+ <span tal:omit-tag="" tal:condition="python:type == 'fs'">
+ <div metal:use-macro="here/resource-form-macros/macros/fs_macro"/>
+ </span>
+ <span tal:omit-tag="" tal:condition="python:type == 'gfs'">
+ <div metal:use-macro="here/resource-form-macros/macros/gfs_macro"/>
+ </span>
+ <span tal:omit-tag="" tal:condition="python:type == 'nfsm'">
+ <div metal:use-macro="here/resource-form-macros/macros/nfsm_macro"/>
+ </span>
+ <span tal:omit-tag="" tal:condition="python:type == 'nfsx'">
+ <div metal:use-macro="here/resource-form-macros/macros/nfsx_macro"/>
+ </span>
+ <span tal:omit-tag="" tal:condition="python:type == 'nfsc'">
+ <div metal:use-macro="here/resource-form-macros/macros/nfsc_macro"/>
+ </span>
+ <span tal:omit-tag="" tal:condition="python:type == 'smb'">
+ <div metal:use-macro="here/resource-form-macros/macros/smb_macro" />
+ </span>
+ <span tal:omit-tag="" tal:condition="python:type == 'src'">
+ <div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
+ </span>
</span>
</div>
@@ -143,6 +160,7 @@
global ip2 python:address[1];
global ip3 python:address[2];
global ip4 python:address[3];
+ global monitor_link res/monitor_link;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname+'&edit=1'"/>
@@ -150,9 +168,10 @@
<span tal:condition="python:ptype != '33'">
<span tal:define="
+ global monitor_link string:1;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
- global processURL string:?pagetype=35&clustername='+cluname+'&edit=0" />
+ global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname" />
</span>
<h2>IP Address Resource Configuration</h2>
<form name="ip_form" id="ip_form" method="get" tal:attributes="action processURL">
@@ -167,12 +186,6 @@
<table id="ipResourceTable" border="0" cellspacing="0" width="200" style="background-color: #dee7ec">
<tr>
<div>
- <strong>Resource Name:</strong>
- <input type="text" id="resourceName" name="resourceName" tal:attributes="VALUE resName|nothing" />
- </div>
- </tr>
- <tr>
- <div>
<strong>IP:</strong>
<input size="3" name="ip1" type="text" maxlength="3" tal:attributes="VALUE ip1|nothing"/>.
<input size="3" name="ip2" type="text" maxlength="3" tal:attributes="VALUE ip2|nothing"/>.
@@ -181,8 +194,12 @@
</div>
<div>
<strong>Monitor Link</strong>
- <input type="checkbox" name="monitorLink" tal:condition="python:ptype != '33'">
- <input type="checkbox" name="monitorLink" checked tal:condition="python:ptype == '33'">
+ <span tal:condition="python: monitor_link == '1'">
+ <input type="checkbox" name="monitorLink" checked >
+ </span>
+ <span tal:condition="python: monitor_link == '0'">
+ <input type="checkbox" name="monitorLink">
+ </span>
</div>
</tr>
</table>
@@ -212,7 +229,7 @@
global fscheck string:0;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
- global processURL string:?pagetype=35&clustername='+cluname+'&edit=0" />
+ global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname" />
</span>
<h2>File System Resource Configuration</h2>
<form name="fs_form" action="" method="get" tal:attributes="action processURL">
@@ -235,8 +252,15 @@
<div>
<strong>File System Type:</strong>
<select id="fstype" name="fstype">
- <option name="ext2" value="ext2">ext2</option>
- <option name="ext3" value="ext3">ext3</option>
+ <span tal:condition="python: fstype == 'ext2'">
+ <option name="ext2" value="ext2">ext2</option>
+ <option name="ext3" value="ext3" selected>ext3</option>
+ </span>
+ <span tal:condition="python: fstype != 'ext3'">
+ <option name="ext2" value="ext2" selected>ext2</option>
+ <option name="ext3" value="ext3">ext3</option>
+ </span>
+ </select>
</div>
</tr>
<tr>
@@ -313,7 +337,7 @@
global force_unmount string:0;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
- global processURL string:?pagetype=35&clustername='+cluname+'&edit=0" />
+ global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname" />
</span>
<h2>GFS Resource Configuration</h2>
<form name="gfs_form" action="" method="post" tal:attributes="action processURL">
@@ -394,7 +418,7 @@
global force_unmount string:0;
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
- global processURL string:?pagetype=35&clustername='+cluname+'&edit=0" />
+ global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname" />
</span>
<h2>NFS Mount Resource Configuration</h2>
<form name="nfsm_form" action="" method="post">
@@ -438,8 +462,14 @@
</tr>
<tr>
<div>
- <input type="radio" name="nfstype" value="nfs" checked>NFS
- <input type="radio" name="nfstype" value="nfs4">NFS4
+ <span tal:condition="python: nfstype == 'nfs'">
+ <input type="radio" name="nfstype" value="nfs" checked>NFS
+ <input type="radio" name="nfstype" value="nfs4">NFS4
+ </span>
+ <span tal:condition="python: nfstype != 'nfs4'">
+ <input type="radio" name="nfstype" value="nfs">NFS
+ <input type="radio" name="nfstype" value="nfs4" checked>NFS4
+ </span>
</div>
</tr>
<tr>
@@ -478,7 +508,7 @@
<span tal:define="
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
- global processURL string:?pagetype=35&clustername='+cluname+'&edit=0" />
+ global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname" />
</span>
<h2>NFS Client Resource Configuration</h2>
<form name="nfsc_form" action="" method="post" tal:attributes="action processURL">
@@ -529,7 +559,7 @@
<span tal:define="
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
- global processURL string:?pagetype=35&clustername='+cluname+'&edit=0" />
+ global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname" />
</span>
<h2>NFS Export Resource Configuration</h2>
<form name="nfsx_form" action="" method="post" tal:attributes="action processURL">
@@ -567,7 +597,7 @@
<span tal:define="
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
- global processURL string:?pagetype=35&clustername='+cluname+'&edit=0" />
+ global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname"/>
</span>
<h2>Script Resource Configuration</h2>
<form name="scr_form" action="" method="post" tal:attributes="action processURL">
@@ -612,7 +642,7 @@
<span tal:define="
global cluname request/clustername;
tmp_URL context/cluster/index_html/absolute_url;
- global processURL string:?pagetype=35&clustername='+cluname+'&edit=0" />
+ global processURL python:tmp_URL+'?pagetype=35&clustername='+cluname"/>
</span>
<h2>Samba Server Configuration</h2>
<form name="smb_form" action="" method="post" tal:attributes="action processURL">
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-03-25 20:02 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-25 20:02 [Cluster-devel] conga/luci/cluster resource-form-macros rmccabe
-- strict thread matches above, loose matches on Subject: below --
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-10-02 22:42 rmccabe
2006-09-19 17:50 rmccabe
2006-08-02 17:18 rmccabe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.