2006/unicorn/WebContent/WEB-INF/resources/templates/includes macros_index.vm,1.7,1.8

Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/includes
In directory hutz:/tmp/cvs-serv13723/WebContent/WEB-INF/resources/templates/includes

Modified Files:
	macros_index.vm 
Log Message:
options now display parameter ID if no metadata is found for a parameter

Index: macros_index.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/includes/macros_index.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- macros_index.vm	11 Sep 2009 11:08:32 -0000	1.7
+++ macros_index.vm	16 Sep 2009 11:54:11 -0000	1.8
@@ -63,18 +63,20 @@
 #end
 
 #macro(createCheckbox $param)
+#if ($param.getLongName($lang)) #set($param_name=$param.getLongName($lang)) #else #set($param_name=$param.getName()) #end
 #set($defaults = $param.getMapOfDefaultValue())
-<label><span>$param.getLongName($lang):</span> 
+<label><span>$param_name:</span> 
 	<input type="checkbox" name="$param.getName()" value="$value.getName()"#if($defaults.containsKey($value.getName())) checked="checked" #end class="option_input" />
 </label>
 #end
 
 #macro(createCheckboxList $param)
+#if ($param.getLongName($lang)) #set($param_name=$param.getLongName($lang)) #else #set($param_name=$param.getName()) #end
 #set($defaults = $param.getMapOfDefaultValue())
 #set( $D = '$' )
 #set ($a = "${D}!{param_${param.Name}}")
 #set ($paramMap = "#evaluate ($a)")
-<label><span>$param.getLongName($lang):</span></label> 
+<label><span>$param_name:</span></label> 
 <span class="checkboxlist">
 #foreach ($value in $param.getMapOfValue())
 #set ($s = '')
@@ -88,11 +90,12 @@
 #end
 
 #macro(createDropdown $param $multiple)
+#if ($param.getLongName($lang)) #set($param_name=$param.getLongName($lang)) #else #set($param_name=$param.getName()) #end
 #set($defaults = $param.getMapOfDefaultValue())
 #set( $D = '$' )
 #set ($a = "${D}!{param_${param.Name}}")
 #set ($paramValue = "#evaluate ($a)")
-<label><span>$param.getLongName($lang):</span> 
+<label><span>$param_name:</span> 
 	<select name="$param.Name" #if($multiple) multiple="multiple" size="3" #end class="option_input">
 #foreach ($value in $param.getMapOfValue())
 #set ($s = '')
@@ -104,8 +107,9 @@
 #end
 
 #macro(createRadio $param)
+#if ($param.getLongName($lang)) #set($param_name=$param.getLongName($lang)) #else #set($param_name=$param.getName()) #end
 #set($defaults = $param.getMapOfDefaultValue())
-<label><span>$param.getLongName($lang):</span></label>
+<label><span>$param_name:</span></label>
 <span class="radiolist">
 #foreach ($value in $param.getMapOfValue())
 	<label>$value.getLongName($lang)
@@ -116,15 +120,17 @@
 #end
 
 #macro(createTextarea $param)
+#if ($param.getLongName($lang)) #set($param_name=$param.getLongName($lang)) #else #set($param_name=$param.getName()) #end
 #set($defaults = $param.getMapOfDefaultValue())
-<label><span>$param.getLongName($lang):</span> 
+<label><span>$param_name:</span> 
 	<textarea name="$param.getName()" class="option_input">#foreach($default in $defaults)$default.Name#end</textarea>' +
 </label>
 #end
 
 #macro(createTextfield $param)
+#if ($param.getLongName($lang)) #set($param_name=$param.getLongName($lang)) #else #set($param_name=$param.getName()) #end
 #set($defaults = $param.getMapOfDefaultValue())
-<label><span>$param.getLongName($lang):</span> 
+<label><span>$param_name:</span> 
 	<input type="text" name="$param.getName()" value="#foreach($default in $defaults)$default.Name#end" class="option_input" />
 </label>
 #end

Received on Wednesday, 16 September 2009 11:54:23 UTC