[rhmessaging-commits] rhmessaging commits: r2293 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-08-13 11:01:10 -0400 (Wed, 13 Aug 2008)
New Revision: 2293

Modified:
   mgmt/trunk/cumin/python/cumin/brokerlink.py
   mgmt/trunk/cumin/python/cumin/brokerlink.strings
Log:
Made optional fields obvious on Add Broker Link form.

Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py	2008-08-12 23:40:57 UTC (rev 2292)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py	2008-08-13 15:01:10 UTC (rev 2293)
@@ -313,6 +313,9 @@
         if "port" in self.errors:
             return "<ul class=\"errors\" style=\"float:left;\"><li>%s</li></ul>" % \
                 self.errors["port"]
+                
+    def render_optional_prompt(self, session, *args):
+        return "Optional"
         
     def process_cancel(self, session):
         self.host.clear()

Modified: mgmt/trunk/cumin/python/cumin/brokerlink.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.strings	2008-08-12 23:40:57 UTC (rev 2292)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.strings	2008-08-13 15:01:10 UTC (rev 2293)
@@ -81,7 +81,7 @@
 	margin-bottom: 0.25em;
 }
 
-div.multiple div.field {
+div.multiple {
 	margin-bottom: 1em;
 }
 
@@ -99,19 +99,46 @@
     clear: left;
     visibility: hidden;
 }
+div.multiple div.optional {
+	background-color: #fcfcfc;
+	border: 1px solid #999999;
+	margin: 1.25em 1em 1em;
+}
 
+div.optional_prompt {
+	background-color: #fcfcfc;
+	border: 1px solid #cccccc;
+	color: #999999;
+	float:left;
+	margin-left: 0.5em;
+	padding: 0.25em 0.5em;
+	position: relative;
+	top: -1em;
+}
+
+div.optional_inputs {
+	clear: left;
+	position: relative;
+	top: -0.5em;
+}
+
 [BrokerLinkAdd.html]
 <form id="{id}" class="mform" method="post" action="?">
   <div class="head">{title}</div>
-  <div class="body multiple">
- 	<div class="field">
-	  <div class="title">Source Broker</div>
-	  <div class="inputs"><div class="input_prompt">Address</div><input type="text" name="{broker_name_path}" value="{broker_name_value}" tabindex="100"  size="32"/>{broker_name_error}</div>
-	  <div class="inputs"><div class="input_prompt">Port</div><input type="text" name="{broker_port_path}" value="{broker_port_value}" tabindex="100"  size="5"/>{broker_port_error}</div>
-	  <div class="inputs"><div class="input_prompt">Username</div><input type="text" name="{broker_username_path}" value="{broker_username_value}" tabindex="100" size="32"/></div>
-	  <div class="inputs"><div class="input_prompt">Password</div><input type="text" name="{broker_password_path}" value="{broker_password_value}" tabindex="100" size="32"/></div>
+  <div class="body">
+ 	<div class="field multiple">
+		<div class="title">Source Broker</div>
+		<div class="inputs"><div class="input_prompt">Address</div><input type="text" name="{broker_name_path}" value="{broker_name_value}" tabindex="100"  size="32"/>{broker_name_error}</div>
+		<div class="optional">
+			<div class="optional_prompt">{optional_prompt}</div>
+			<div class="optional_inputs">
+			  <div class="inputs"><div class="input_prompt">Port</div><input type="text" name="{broker_port_path}" value="{broker_port_value}" tabindex="100"  size="5"/>{broker_port_error}</div>
+			  <div class="inputs"><div class="input_prompt">Username</div><input type="text" name="{broker_username_path}" value="{broker_username_value}" tabindex="100" size="32"/></div>
+			  <div class="inputs"><div class="input_prompt">Password</div><input type="text" name="{broker_password_path}" value="{broker_password_value}" tabindex="100" size="32"/></div>
+			</div>
+		</div>
 	</div> 
-  {fields}
+    {fields}
   </div>
   {form_error}
   <div class="foot">