=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2011-03-31 01:42:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2011-04-28 08:15:18 +0000
@@ -19,7 +19,7 @@
     <tbody>
 	
     <tr>
-        <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+        <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
         <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"></td>
     </tr>
     
@@ -36,7 +36,7 @@
 	</tr>
     
     <tr>
-		<td width="20em"><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td width="20em"><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="aggregationDataElementId" name="aggregationDataElementId" style="min-width:30.5em" class="{validate:{required:true}}" >
 			</select>
@@ -44,7 +44,7 @@
 	</tr>
 	
 	<tr>
-		<input type="radio" id="operator" name="operator" value="COUNT" checked style='display:none;'>
+		<input type="radio" id="operator" name="operator" value="COUNT" checked style='display:none;'/>
 	</tr>
 	<tr>
         <td colspan="2"><p></p></td>
@@ -53,8 +53,6 @@
     </tbody>
 </table>
 
-
-   
 <table>
 	<thead>
 		<tr>
@@ -106,7 +104,7 @@
 			</tr>
 			<tr>
 				<td>
-					<input type='text' style="min-width:19.8em" onkeyup="filterDE(event, this.value, 'programstageDE');">
+					<input type='text' style="min-width:19.8em" onkeyup="filterDE(event, this.value, 'programstageDE');"/>
 				</td>
 			</tr>
 			<tr>
@@ -146,7 +144,6 @@
 		<legend>$i18n.getString( "program_properties" )</legend>
 		
 		<table>
-		
 			<tr>
 				<td>
 					<select id="caseProperty" name="caseProperty" size="8" ondblclick="insertInfo(this);" style="width:18em; height:16.5em" >
@@ -158,7 +155,6 @@
 			</tr>
 		</table>
 		</td>
-		
 	</tr>	
 	<tr>
 		<td colspan='3'>
@@ -166,26 +162,26 @@
 			<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "<=" );' style="cursor:pointer;">
 			<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( ">" );' style="cursor:pointer;">
 			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "=" );' style="cursor:pointer;">
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "!=" );' style="cursor:pointer;">
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "+" );' style="cursor:pointer;">
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/is_null.png" alt="$i18n.getString( 'is_null' )" onclick='insertOperator( "is null" );' style="cursor:pointer;">
-			<img src="../images/not_null.png" alt="$i18n.getString( 'not_null' )" onclick='insertOperator( "is not null" );' style="cursor:pointer;">
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/and.png" alt="$i18n.getString( 'and' )" onclick='insertOperator( "AND" );' style="cursor:pointer;">
-			<img src="../images/or.png" alt="$i18n.getString( 'or' )" onclick='insertOperator( "OR" );' style="cursor:pointer;">
-			<img src="../images/in.png" alt="$i18n.getString( 'in' )" onclick='insertOperator( "IN" );' style="cursor:pointer;">
+			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "=" );' style="cursor:pointer;"/>
+			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "!=" );' style="cursor:pointer;"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "+" );' style="cursor:pointer;"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/is_null.png" alt="$i18n.getString( 'is_null' )" onclick='insertOperator( "is null" );' style="cursor:pointer;"/>
+			<img src="../images/not_null.png" alt="$i18n.getString( 'not_null' )" onclick='insertOperator( "is not null" );' style="cursor:pointer;"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/and.png" alt="$i18n.getString( 'and' )" onclick='insertOperator( "AND" );' style="cursor:pointer;"/>
+			<img src="../images/or.png" alt="$i18n.getString( 'or' )" onclick='insertOperator( "OR" );' style="cursor:pointer;"/>
+			<img src="../images/in.png" alt="$i18n.getString( 'in' )" onclick='insertOperator( "IN" );' style="cursor:pointer;"/>
 			
-			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onclick="byId('aggregationCondition').value='';" style="cursor:pointer;">
+			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onclick="byId('aggregationCondition').value='';" style="cursor:pointer;"/>
 		</td>
 	</tr>
     </tbody>
 	
 	<tr>
 		<td colspan='3'>
-			<fieldset style="border: 1px solid #3f5d8e; ">
+			<fieldset style="border: 1px solid #3f5d8e;">
 				<legend>$i18n.getString( "condition" )</legend>
 				<textarea id="aggregationCondition" name="aggregationCondition" style="width:62.5em; height:10em" class="{validate:{required:true}}" onkeyup='getConditionDescription();'></textarea>
 			</fieldset>
@@ -202,8 +198,8 @@
 	
 	<tr>
 		<td colspan='3'>
-			<input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-			<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='caseAggregation.action'" style="width:10em">
+			<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action'" style="width:10em"/>
 		</td>
 	</tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm	2011-01-18 09:28:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm	2011-04-28 08:15:18 +0000
@@ -33,26 +33,24 @@
 
 <table id="attrTable"> 
 	<thead>
-      <tr>
-        <th colspan="2">$i18n.getString( "patient_attribute_details" )</th>
-      </tr>
+		<tr><th colspan="2">$i18n.getString( "patient_attribute_details" )</th></tr>
     </thead>
+	
     <tbody>
-	
     <tr>
-        <td width="20em"><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )"  class="required">*</em></label></td>
-        <td><input type="text" id="name" name="name"  style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
+        <td width="20em"><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><input type="text" id="name" name="name"  style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
         <td></td>
     </tr>   
     
     <tr>
-        <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"></td>
+        <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"/></td>
         <td></td>
     </tr>
     
     <tr>
-		<td width="20em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td width="20em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="mandatory" name="mandatory" style="min-width:30.5em">
 				<option value="true" >$i18n.getString( "yes" )</option>
@@ -63,7 +61,7 @@
 	</tr>
     
     <tr>
-    	<td width="20em"><label for="inheritable">$i18n.getString( "inheritable" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+    	<td width="20em"><label for="inheritable">$i18n.getString( "inheritable" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="inheritable" name="inheritable" style="min-width:30.5em">
 				<option value="true" >$i18n.getString( "yes" )</option>
@@ -75,12 +73,12 @@
     <tr>
 		<td width="30em"><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
 		<td>
-			<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" >
+			<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
 		</td>		
 		<td></td>				
 	</tr>
     <tr>
-        <td width="20em"><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+        <td width="20em"><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
         <td>
             <select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
                 <option value="NUMBER" selected="selected">$i18n.getString( "number" )</option>
@@ -93,21 +91,21 @@
         <td></td>
     </tr>  
 	<tr id="attributeComboRow"> 
-		<td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td ><table id="attrOptionContainer"></table><a href="#" style="text-decoration: none;margin-top: 0.5em"  onclick="ATTRIBUTE_OPTION.addOption()">[ $i18n.getString( "add_more_option" ) ]</a>
+		<td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td ><table id="attrOptionContainer"></table><a href="#" style="text-decoration: none;margin-top: 0.5em" onclick="ATTRIBUTE_OPTION.addOption()">[ $i18n.getString( "add_more_option" ) ]</a>
 		</td>
 		<td><span id="attrMessage"  name="attrMessage" style="color:red;"></span></td>
 	</tr>
 	<tr>
     	<td width="20em"><label for="groupBy">$i18n.getString( "groupBy" )</td>
-    	<td><input type="checkbox" name="groupBy" value="true"></td>
+    	<td><input type="checkbox" name="groupBy" value="true"/></td>
     </tr>
      </tbody>
 </table>
 <span id='message'></span>
 <p>
-    <input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patientAttribute.action'" style="width:10em">
+    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttribute.action'" style="width:10em"/>
 </p>
 
 </form>   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm	2011-04-28 08:15:18 +0000
@@ -2,17 +2,17 @@
 	var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
 
 	jQuery(document).ready(	function(){
-			
-			jQuery('name').focus();
-			
-			validation( 'addPatientAttributeGroupForm', function(form){
-				form.submit();
-			}, function()
-			{
-				beforeSubmit();
-			}); 
-			
-			checkValueIsExist( "name", "validatePatientAttributeGroup.action");			
+		
+		jQuery('name').focus();
+		
+		validation( 'addPatientAttributeGroupForm', function(form){
+			form.submit();
+		}, function()
+		{
+			beforeSubmit();
+		}); 
+		
+		checkValueIsExist( "name", "validatePatientAttributeGroup.action");			
 	});		
 </script>
 	
@@ -20,19 +20,19 @@
 <div id="tooltip"></div>																				
 <form id="addPatientAttributeGroupForm" action="addPatientAttributeGroup.action" method="post" >
 
-<table> 
+<table>
     <tr>
       <th colspan="4">$i18n.getString( "attribute_group_deltails" ) </th>
     </tr>
     <tr>
-        <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="name" name="name"  style="width:20em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
+        <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><input type="text" id="name" name="name" style="width:20em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
         </td>
     </tr>   
     
     <tr>
-        <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" style="width:20em" class="{validate:{required:true,minlength:2}}"></td>
+        <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><input type="text" id="description" name="description" style="width:20em" class="{validate:{required:true,minlength:2}}"/></td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
     </tr>
@@ -47,37 +47,36 @@
       <th colspan="2">$i18n.getString( "availableAttribute" ) </th>
       <th>$i18n.getString( "filter" ) </th>
       <th>$i18n.getString( "selectedAttribute" )
-		<select id="memberValidator" multiple="multiple" style="display:none" class="{validate:{required:true}}"/>
+		<select id="memberValidator" multiple="multiple" style="display:none" class="{validate:{required:true}}"></select>
 	  </th>
     </tr>
     <tr>
         <td colspan="2">
-              <select multiple id="availableAttributes" name="availableAttributes" size="15" style="width:25em " ondblclick="moveSelectedById( 'availableAttributes', 'selectedAttributes' )" >
-                #foreach($patientAttribute in $patientAttributes)
-                <option value='$patientAttribute.id' >$patientAttribute.name</option>
-				#end
-              </select>
-        </em></label>        </td>
+			<select multiple id="availableAttributes" name="availableAttributes" size="15" style="width:25em " ondblclick="moveSelectedById( 'availableAttributes', 'selectedAttributes' )" >
+			#foreach($patientAttribute in $patientAttributes)
+				<option value='$patientAttribute.id' >$patientAttribute.name</option>
+			#end
+			</select>
+		</td>
         <td>
-          <input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableAttributes', 'selectedAttributes' )">
-          <br>
-          <input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'selectedAttributes', 'availableAttributes' )">
+          <input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableAttributes', 'selectedAttributes' )"/>
+          <br/>
+          <input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'selectedAttributes', 'availableAttributes' )"/>
         </td>
-        <td><select multiple id="selectedAttributes" name="selectedAttributes" size="15" style="width:25em " ondblclick="moveSelectedById( 'selectedAttributes', 'availableAttributes' )">
-        </select></td>
-        
+        <td><select multiple id="selectedAttributes" name="selectedAttributes" size="15" style="width:25em " ondblclick="moveSelectedById( 'selectedAttributes', 'availableAttributes' )"></select>
+		</td>
         <td>
-			<a href="javascript:moveUpSelectedOption( 'selectedAttributes')" title="$i18n.getString( "move_up" )"><img src="../images/move_up.png" alt="$i18n.getString( "move_up" )"></a>
-			<br><br>
-			<a href="javascript:moveDownSelectedOption( 'selectedAttributes' )" title="$i18n.getString( "move_down" )"><img src="../images/move_down.png" alt="$i18n.getString( "move_up" )"></a>
+			<a href="javascript:moveUpSelectedOption( 'selectedAttributes')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" alt="$i18n.getString( 'move_up' )"/></a>
+			<br/><br/>
+			<a href="javascript:moveDownSelectedOption( 'selectedAttributes' )" title="$i18n.getString( 'move_down' )"><img src="../images/move_down.png" alt="$i18n.getString( 'move_up' )"/></a>
 		</td>
     </tr>  
         
 </table>
 
 <p>
-    <input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patientAttributeGroup.action'" style="width:10em">
+    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttributeGroup.action'" style="width:10em"/>
 </p>
 
-</form>     
+</form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm	2011-02-23 04:24:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm	2011-04-28 08:15:18 +0000
@@ -51,17 +51,15 @@
 <input type="hidden" id="representativeId" name="representativeId"/> 
 <input type="hidden" id="relationshipTypeId" name="relationshipTypeId"/>
 <table>
-
     <tr><td>&nbsp;</td></tr>
-	
 	<tr>
-		<th colspan="2" class="heading-column">$i18n.getString( "name" )<em title="$i18n.getString( "required" )" class="required">*</em></th>
+		<th colspan="2" class="heading-column">$i18n.getString( "name" )<em title="$i18n.getString( 'required' )" class="required">*</em></th>
 	</tr>
 	<tr>
 		<td><label for="fullName">$i18n.getString( "full_name" )</label></td>
 		<td class="input-column" >
-			<input type="text" id="fullName" name="fullName" style="width:28em" class="{validate:{required:true, unicodechars:true, rangelength:[7,50]}}">
-			<img src='../images/magnifier.png' onclick='startSearch();' style="cursor: pointer;">
+			<input type="text" id="fullName" name="fullName" style="width:28em" class="{validate:{required:true, unicodechars:true, rangelength:[7,50]}}"/>
+			<img src='../images/magnifier.png' onclick='startSearch();' style="cursor: pointer;"/>
 		</td>
 	</tr>
 	<tr><td>&nbsp;</td></tr>	
@@ -70,7 +68,7 @@
 	</tr>
 		
 	<tr>
-		<td><label for="gender">$i18n.getString( "gender" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td><label for="gender">$i18n.getString( "gender" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td class="input-column">
 			<select id="gender" name="gender" style="min-width:20em" class="{validate:{required:true}}">
 				<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
@@ -82,7 +80,7 @@
 	</tr>
 	
 	<tr>
-		<td><label for="dobType">$i18n.getString( "dob_type" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td><label for="dobType">$i18n.getString( "dob_type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td class="input-column">
 			<select id='dobType' name="dobType" style="min-width:20em" onchange="dobTypeOnChange();" class="{validate:{required:false}}">
 				<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
@@ -95,22 +93,22 @@
 	</tr>
 	
 	<tr id='birthdaySpan' style="display:none" >
-		<td><label for="birthDate">$i18n.getString( "date_of_birth" )<em title="$i18n.getString( "required" )" class="required">*</em> </label></td>
+		<td><label for="birthDate">$i18n.getString( "date_of_birth" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>			
-			<input type="text" id="birthDate" name="birthDate" style="width:26.5em" onchange="bdOnchange()" >
+			<input type="text" id="birthDate" name="birthDate" style="width:26.5em" onchange="bdOnchange()" />
 		</td>
 		<td></td>
 	</tr>
 	
 	<tr id='ageSpan' style="display:none" >
-		<td><label for="age">$i18n.getString( "age" ) </label><em title="$i18n.getString( "required" )" class="required">*</em> </label></td>
+		<td><label for="age">$i18n.getString( "age" ) </label><em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="ageType" name="ageType" style="width:18em" >
 				<option value="D"> $i18n.getString('day')</option>
 				<option value="M"> $i18n.getString('month')</option>
 				<option value="Y"> $i18n.getString('year')</option>
 			</select>
-			<input type="text" id="age" name="age"  style="width:10em"  style="width:4em" onchange="ageOnchange()" class="{validate:{number:true, alphanumeric: true}}">
+			<input type="text" id="age" name="age"  style="width:10em"  style="width:4em" onchange="ageOnchange()" class="{validate:{number:true, alphanumeric: true}}"/>
 		</td>
 		<td></td>
 	</tr>
@@ -124,7 +122,7 @@
 		<td><label for="bloodGroup">$i18n.getString( "blood_group" )</label></td>
 		<td class="input-column">
 			<select type="text" id="bloodGroup" name="bloodGroup"  >
-				 <option value="">[$i18n.getString( "please_select" )]</option>
+				<option value="">[$i18n.getString( "please_select" )]</option>
 				<option value="A+">A+</option>
 				<option value="A-">A-</option>
 				<option value="AB+">AB+</option>
@@ -154,7 +152,7 @@
 	<tr><th colspan="2" class="heading-column">$i18n.getString( "patient_identifiers" )</th></tr>
 	#foreach ($identifierType in $identifierTypes)
 	<tr>
-		<td><label>$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+		<td><label>$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
 
         #if($identifierType.format == "State Format")
             <td><input type="hidden" id="iden$identifierType.id" name="iden$identifierType.id"/>
@@ -167,13 +165,12 @@
 						<td> - <input type="text" id="progcode" name="progcode" maxlength="1" size="6" class='idfield  {validate:{required:$identifierType.mandatory,minlength:1,lettersdigitsonly:true}}' /> <br/> <div class='stateformat'>$i18n.getString('program')<br>$i18n.getString('code')</div></td>
 						<td> - <input type="text" id="yearcode" name="yearcode" maxlength="2" size="6" value="$year" class="{validate:{required:true,minlength:2}}"/> <br/> <div class='stateformat'>$i18n.getString('year')</div></td>
 						<td> - <input type="text" id="benicode" name="benicode" maxlength="4" size="9" class="{validate:{required:true,number:true,minlength:4}}"/> <br/> <div class='stateformat'>$i18n.getString('patient')<br>$i18n.getString('code')</div></td>
-						
 					</tr>
 				</table>
             </td>
         #else
             <td class="input-column">
-			<input type="text" id="iden$identifierType.id" name="iden$identifierType.id" class='idfield' data="{related:$identifierType.related}" class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" /></td> 
+			<input type="text" id="iden$identifierType.id" name="iden$identifierType.id" class='idfield' data="{related:$identifierType.related}" class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" /></td>
         #end
 
 	</tr>
@@ -187,28 +184,28 @@
 		#foreach($attribute in $attributeGroup.attributes )
 			#if($!attribute)
 			<tr>
-				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
 				<td class="input-column">
 					#if( $attribute.valueType == "YES/NO" )
-		                <select id="attr$attribute.id"  name="attr$attribute.id" style="width:100%"  > 
+		                <select id="attr$attribute.id" name="attr$attribute.id" style="width:100%"> 
                             <option value="">[$i18n.getString( "please_select" )]</option>
 		                    <option value="true">$i18n.getString( "yes" )</option>
 		                    <option value="false" selected="selected">$i18n.getString( "no" )</option>
 		                </select>                
 		            #elseif( $attribute.valueType == "DATE" )
-	                	<input type="text" id="attr$attribute.id"  name="attr$attribute.id"  class=' #validate( "default"  $attribute.mandatory )'>
+	                	<input type="text" id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default"  $attribute.mandatory )'/>
 	                    <script type="text/javascript">
 							datePickerValid( 'attr$attribute.id' );
 	                    </script>                    
 					#elseif( $attribute.valueType == "COMBO" )
-						<select  id="attr$attribute.id"  name="attr$attribute.id"  class=' #validate( "default"  $attribute.mandatory )' >
+						<select  id="attr$attribute.id"  name="attr$attribute.id" class='#validate( "default"  $attribute.mandatory )'>
 							<option value="">[$i18n.getString( "please_select" )]</option>
 							#foreach ($option in $attribute.attributeOptions )
 								<option value="$option.id" >$option.name</option>
 							#end
 						</select>
 					#else 
-						<input type="text"  id="attr$attribute.id"  name="attr$attribute.id" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}" >
+						<input type="text" id="attr$attribute.id" name="attr$attribute.id" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}" />
 					#end
 				</td>		
 			</tr>
@@ -223,7 +220,7 @@
 		<tr><th colspan="2" class="heading-column">$i18n.getString( "other_details" )</th></tr>
 		#foreach($attribute in $noGroupAttributes )
 			<tr>
-				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
 				<td class="input-column">
 					#if( $attribute.valueType == "YES/NO" )
 		                <select id="attr$attribute.id"  name="attr$attribute.id"  style="width:100%" > 
@@ -232,19 +229,19 @@
 		                    <option value="false" >$i18n.getString( "no" )</option>
 		                </select>                
 		            #elseif( $attribute.valueType == "DATE" )
-		                	<input type="text" id="attr$attribute.id"   name="attr$attribute.id"  class=' #validate( "default"  $attribute.mandatory )' >
+		                	<input type="text" id="attr$attribute.id" name="attr$attribute.id" class='#validate( "default"  $attribute.mandatory )' />
 		                    <script type="text/javascript">
 		                       datePickerValid( 'attr$attribute.id' );
 		                    </script>                    
 					#elseif( $attribute.valueType == "COMBO" )
-						<select  id="attr$attribute.id"  name="attr$attribute.id"   class=' #validate( "default"  $attribute.mandatory )'>
-							 <option value="">[$i18n.getString( "please_select" )]</option>
+						<select  id="attr$attribute.id" name="attr$attribute.id" class='#validate( "default"  $attribute.mandatory )'>
+							<option value="">[$i18n.getString( "please_select" )]</option>
 							#foreach ($option in $attribute.attributeOptions )
 								<option value="$option.id" >$option.name</option>
 							#end
 						</select>
 					#else 
-						<input type="text"  id="attr$attribute.id" name="attr$attribute.id" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}" >
+						<input type="text" id="attr$attribute.id" name="attr$attribute.id" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}" />
 					#end
 				</td>		
 			</tr>
@@ -253,22 +250,24 @@
 </table>
 
 <p style="margin-top:10px">
-	<input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patient.action'" style="width:10em">
+	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patient.action'" style="width:10em"/>
 </p>
 </form>
 #end
 
 <div id="hiddenModalContent" style="display:none">
-<style> 
-div#hiddenModalContent label { font-weight: bold;}  
-div#hiddenModalContent td {padding: 2px 5px}
-</style>
-<span>$i18n.getString( "duplicate_warning" )</span>
-<input type="button" value="$i18n.getString( 'create_new_patient' )"  id="btnCreateNew"/>
-<script>function edit(this_){window.parent.tb_remove(); window.parent.location.href="showUpdatePatientForm.action?id="+jQuery(this_).attr("id");}
-</script>
-<div id="thickboxContainer"></div>
+	<style> 
+		div#hiddenModalContent label { font-weight: bold;}  
+		div#hiddenModalContent td {padding: 2px 5px}
+	</style>
+	
+	<span>$i18n.getString( "duplicate_warning" )</span>
+	<input type="button" value="$i18n.getString( 'create_new_patient' )"  id="btnCreateNew"/>
+	
+	<script>function edit(this_){window.parent.tb_remove(); window.parent.location.href="showUpdatePatientForm.action?id="+jQuery(this_).attr("id");}
+	</script>
+	<div id="thickboxContainer"></div>
 </div>
 
 <script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm	2011-04-28 08:15:18 +0000
@@ -18,56 +18,56 @@
 
 <table>	
 	<tr>
-		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"></td>
+		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><input type="text" id="name" name="name"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
 		<td></td>
 	</tr>	
 	
 	<tr>
-		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"></td>
+		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
 		<td></td>
 	</tr>	
 	
 	<tr>
 		<td><label>$i18n.getString( "identifier_format" ) </label></td>
-		<td><input type="checkbox" name="formater" id="formater" value="State Format">$i18n.getString('state_format')</td>
+		<td><input type="checkbox" name="formater" id="formater" value="State Format"/>$i18n.getString('state_format')</td>
 		<td></td>
 	</tr>	
 	
 	 <tr>
-		<td width="30em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td width="30em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="mandatory" name="mandatory" style="min-width:30.2em" class="{validate:{required:true}}">
 				<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
 				<option value="true" >$i18n.getString( "yes" )</option>
 				<option value="false">$i18n.getString( "no" )</option>
 			</select>
-		</td>		
-		<td></td>				
+		</td>
+		<td></td>
 	</tr>
 	
-	 <tr>
-		<td width="30em"><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+	<tr>
+		<td width="30em"><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="related" name="related" style="min-width:30.2em" class="{validate:{required:true}}">
 				<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
 				<option value="true" >$i18n.getString( "yes" )</option>
 				<option value="false">$i18n.getString( "no" )</option>
 			</select>
-		</td>		
-		<td></td>				
+		</td>
+		<td></td>
 	</tr>
   	<tr>
 		<td width="30em"><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
 		<td>
-			<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" >
-		</td>		
-		<td></td>				
-	</tr> 	
+			<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
+		</td>
+		<td></td>
+	</tr>
 	
 	<tr>
-		<td width="30em"><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td width="30em"><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="type" name="type" style="min-width:30.2em" class="{validate:{required:true}}">
 				<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
@@ -75,16 +75,16 @@
 				<option value="number">$i18n.getString( "number" )</option>
 				<option value="letter">$i18n.getString( "letter" )</option>
 			</select>
-		</td>		
-		<td></td>				
+		</td>
+		<td></td>
 	</tr>
 	<tr>
 		<td></td>
 		<td>
-			<input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-			<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='program.action'" style="width:10em">
+			<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='program.action'" style="width:10em"/>
 		</td>
 	</tr>
 </table>
 
-</form> 	
+</form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm	2010-11-09 02:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramAttributeForm.vm	2011-04-28 08:15:18 +0000
@@ -18,8 +18,7 @@
 						isSubmit = false;
 					}
 				});
-			}); 
-			
+			});
 		
 		jQuery("#attributeComboRow").hide();
 			
@@ -33,49 +32,48 @@
 
 <table id="attrTable"> 
 	<thead>
-      <tr>
-        <th colspan="2">$i18n.getString( "program_attribute_details" )</th>
-      </tr>
+		<tr><th colspan="2">$i18n.getString( "program_attribute_details" )</th></tr>
     </thead>
+	
     <tbody>
-	
-    <tr>
-        <td width="20em"><label>$i18n.getString( "name" )</label></td>
-        <td><input type="text" id="name" name="name" style="width:30em"></td>
-        <td></td>
-    </tr>   
-    
-    <tr>
-        <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"></td>
-        <td></td>
-    </tr>
-    
-    <tr>
-        <td width="20em"><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td>
-            <select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
-                <option value="NUMBER" selected="selected">$i18n.getString( "number" )</option>
-                <option value="TEXT">$i18n.getString( "text" )</option>
-                <option value="YES/NO">$i18n.getString( "yes_no" )</option>
-                <option value="DATE">$i18n.getString( "date" )</option>
-                <option value="COMBO">$i18n.getString( "attribute_combo_type" )</option>
-            </select>
-        </td>
-        <td></td>
-    </tr>  
-    <tr id="attributeComboRow"> 
-    	<td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-    	<td ><table id="attrOptionContainer"></table><a href="#" style="text-decoration: none;margin-top: 0.5em"  onclick="ATTRIBUTE_OPTION.addOption()">[ $i18n.getString( "add_more_option" ) ]</a>
-		</td>
-    	<td><span id="attrMessage"  name="attrMessage" style="color:red;"></span></td>
-    </tr>
-     </tbody>
+		<tr>
+			<td width="20em"><label>$i18n.getString( "name" )</label></td>
+			<td><input type="text" id="name" name="name" style="width:30em"/></td>
+			<td></td>
+		</tr>   
+		
+		<tr>
+			<td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"/></td>
+			<td></td>
+		</tr>
+		
+		<tr>
+			<td width="20em"><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td>
+				<select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
+					<option value="NUMBER" selected="selected">$i18n.getString( "number" )</option>
+					<option value="TEXT">$i18n.getString( "text" )</option>
+					<option value="YES/NO">$i18n.getString( "yes_no" )</option>
+					<option value="DATE">$i18n.getString( "date" )</option>
+					<option value="COMBO">$i18n.getString( "attribute_combo_type" )</option>
+				</select>
+			</td>
+			<td></td>
+		</tr>
+		
+		<tr id="attributeComboRow"> 
+			<td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td ><table id="attrOptionContainer"></table><a href="#" style="text-decoration: none;margin-top: 0.5em" onclick="ATTRIBUTE_OPTION.addOption()">[ $i18n.getString( "add_more_option" ) ]</a>
+			</td>
+			<td><span id="attrMessage"  name="attrMessage" style="color:red;"></span></td>
+		</tr>
+    </tbody>
 </table>
 
 <p>
-    <input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='programAttribute.action'" style="width:10em">
+    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programAttribute.action'" style="width:10em"/>
 </p>
 
 </form>   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2011-03-28 04:11:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2011-04-28 08:15:18 +0000
@@ -31,32 +31,29 @@
 																		
 <form id="addProgramStageForm" name="addProgramStageForm" action="addProgramStage.action" method="post">
 
-
 <div style="display:inline">
-  <input type="hidden" id="id" name="id" value="$program.id">
+	<input type="hidden" id="id" name="id" value="$program.id"/>
 </div>
 
-
 <table>
-
 	<tr>
-		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name"  maxlength="30" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><input type="text" id="name" name="name" maxlength="30" style="width:30em" class="{validate:{required:true,minlength:4}}"/></td>
 	</tr>	
 	
 	<tr>
-		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
+		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:4}}"/></td>
 	</tr>
 		
 	<tr>
         <td><label>$i18n.getString( "min_days_from_start" )</label></td>
-        <td><input type="text" id="minDaysFromStart" name="minDaysFromStart" maxlength="30" style="width:30em" class="{validate:{number:true,min:0}}"></td>
+        <td><input type="text" id="minDaysFromStart" name="minDaysFromStart" maxlength="30" style="width:30em" class="{validate:{number:true,min:0}}"/></td>
     </tr>
     
     <tr>
         <td><label>$i18n.getString( "program" )</label></td>
-        <td><input type="text" id="program" name="program" maxlength="30" value="$encoder.htmlEncode( $program.name )" style="width:30em" disabled="disabled">
+        <td><input type="text" id="program" name="program" maxlength="30" value="$encoder.htmlEncode( $program.name )" style="width:30em" disabled="disabled"/></td>
     </tr>    
       
     <tr><td>&nbsp;</td><td>&nbsp;</td></tr>      	  	
@@ -74,7 +71,7 @@
     <tbody>
 	 <tr>
 		<td>
-			<input type='text' style="width:29.5em" onkeyup="filterDE(event, this.value, 'availableList');">
+			<input type='text' style="width:29.5em" onkeyup="filterDE(event, this.value, 'availableList');"/>
 		</td>
 		<td></td>
 		<td></td>
@@ -89,8 +86,8 @@
             </select>
         </td>
         <td valign="top" align="center">         
-            <input type="button" value="&gt;" onclick="selectDataElements()"><br>    
-            <input type="button" value="&lt;" onclick="unSelectDataElements()"><br><br>                    
+            <input type="button" value="&gt;" onclick="selectDataElements()"/><br/>    
+            <input type="button" value="&lt;" onclick="unSelectDataElements()"/><br/><br/>                    
         <td>
 			<div style="overflow:auto; height:20em; width:40em;border:1px solid #9DA1AA">
 				<table width="100%">
@@ -110,8 +107,8 @@
 </table>
 
 <p>
-	<input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='programStage.action'" style="width:10em">
+	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programStage.action'" style="width:10em"/>
 </p>
 
 </form> 	
@@ -121,4 +118,4 @@
     var i18n_value_must_positive = '$encoder.jsEscape( $i18n.getString( "value_must_positive" ) , "'")';
     var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
     var i18n_compulsory_checkbox_title = '$encoder.jsEscape( $i18n.getString( "compulsory_checkbox_title" ) , "'")';   
-</script>
+</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipForm.vm	2011-04-26 02:06:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipForm.vm	2011-04-28 08:15:18 +0000
@@ -11,16 +11,13 @@
 	});		
 </script>
 <div>
-    <input type="button" value="$i18n.getString( "back_to_search" )"  onclick="window.location.href='patient.action'" style="width:10em">
+    <input type="button" value="$i18n.getString( 'back_to_search' )" onclick="window.location.href='patient.action'" style="width:10em"/>
 </div>
 
 <h3>$i18n.getString( "adding_new_relationship_for" )</h3>
 
 <form id="relationshipSelectForm" name="relationshipSelectForm" method="post" action="showAddRelationshipForm.action" onsubmit="return validateSearchPartner()">
-
-    <div>
-        <input type="hidden" id="id" name="id" value="$patient.id">    
-    </div>
+<input type="hidden" id="id" name="id" value="$patient.id"/>
 
 <table>
 <tr>
@@ -81,9 +78,9 @@
                             <option value="$attribute.id" #if( $searchingAttributeId && $attribute.id == $searchingAttributeId ) selected="selected" #end>$encoder.htmlEncode( $attribute.name )</option>
                         #end
                     </select> 
-                    <em title="$i18n.getString( "required" )" class="required">*</em>
-                    <input type="text" id="searchText" name="searchText" maxlength="30">        
-                    <input type="submit" value="$i18n.getString( "search" )">
+                    <em title="$i18n.getString( 'required' )" class="required">*</em>
+                    <input type="text" id="searchText" name="searchText" maxlength="30"/>        
+                    <input type="submit" value="$i18n.getString( 'search' )"/>
                 </td> 
             </tr>                  
             <tr>  
@@ -104,7 +101,7 @@
                 </td>                     
             </tr>
             <tr>
-            	<td><input type="button" value="$i18n.getString( "assign_relationship" )" onclick="javascript:addRelationship()" style="width:10em"></td>
+            	<td><input type="button" value="$i18n.getString( 'assign_relationship' )" onclick="javascript:addRelationship()" style="width:10em"/></td>
             </tr>            
         </table>
     </td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipPatientForm.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipPatientForm.vm	2011-04-28 08:15:18 +0000
@@ -52,7 +52,7 @@
 	</tr>
 	<tr><td>&nbsp;</td></tr>
 	<tr>
-		<th colspan="2" class="heading-column">$i18n.getString( "name" )<em title="$i18n.getString( "required" )" class="required">*</em></th>
+		<th colspan="2" class="heading-column">$i18n.getString( "name" )<em title="$i18n.getString( 'required' )" class="required">*</em></th>
 	</tr>
 	<tr>
 		<td><label for="fullName">$i18n.getString( "full_name" )</label></td>
@@ -67,7 +67,7 @@
 	</tr>
 		
 	<tr>
-		<td><label for="gender">$i18n.getString( "gender" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td><label for="gender">$i18n.getString( "gender" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td class="input-column">
 			<select id="gender" name="gender" class="{validate:{required:true}}">
 				<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
@@ -79,7 +79,7 @@
 	</tr>
 	
 	<tr>
-		<td><label for="dobType">$i18n.getString( "dob_type" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td><label for="dobType">$i18n.getString( "dob_type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td class="input-column">
 			<select id='dobType' name="dobType" style="min-width:20em" onchange="dobTypeOnChange();" class="{validate:{required:false}}">
 				<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
@@ -92,22 +92,22 @@
 	</tr>
 	
 	<tr id='birthdaySpan' style="display:none" >
-		<td><label for="birthDate">$i18n.getString( "date_of_birth" )<em title="$i18n.getString( "required" )" class="required">*</em> </label></td>
+		<td><label for="birthDate">$i18n.getString( "date_of_birth" )<em title="$i18n.getString( 'required' )" class="required">*</em> </label></td>
 		<td class="input-column">			
-			<input type="text" id="birthDate" name="birthDate" style="width:26.5em" onchange="bdOnchange()" >
+			<input type="text" id="birthDate" name="birthDate" style="width:26.5em" onchange="bdOnchange()" />
 		</td>
 		<td></td>
 	</tr>
 	
 	<tr id='ageSpan' style="display:none" >
-		<td><label for="age">$i18n.getString( "age" ) </label><em title="$i18n.getString( "required" )" class="required">*</em> </label></td>
+		<td><label for="age">$i18n.getString( "age" ) </label><em title="$i18n.getString( 'required' )" class="required">*</em> </label></td>
 		<td class="input-column">
 			<select id="ageType" name="ageType" style="width:18em" >
 				<option value="D"> $i18n.getString('day')</option>
 				<option value="M"> $i18n.getString('month')</option>
 				<option value="Y"> $i18n.getString('year')</option>
 			</select>
-			<input type="text" id="age" name="age"  style="width:10em"  style="width:4em" onchange="ageOnchange()" class="{validate:{number:true, alphanumeric: true}}">
+			<input type="text" id="age" name="age" style="width:4em" onchange="ageOnchange()" class="{validate:{number:true, alphanumeric: true}}"/>
 		</td>
 		<td></td>
 	</tr>
@@ -154,7 +154,7 @@
 		#set( $identifier = "" )
 		#set( $identifier = $identiferMap.get( $identifierType.id ) )
 		<tr>
-			<td><label>$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+			<td><label>$identifierType.name #if($identifierType.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
 			<td class="input-column"><input type="text" id="iden$identifierType.id" name="iden$identifierType.id"  data="{related:$identifierType.related,id:'$identifier'}"  class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}"/></td>	
 		</tr>
 	#end
@@ -168,7 +168,7 @@
 		#set( $attributeValue = "" ) 
 		#set( $attributeValue = $attributeMap.get( $attribute.id ) ) 
 			<tr >
-				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
 				<td class="input-column">
 					#if( $attribute.valueType == "YES/NO" )
 		                <select id="attr$attribute.id"  name="attr$attribute.id" style="width:100%" class="attrField" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" >  
@@ -177,19 +177,19 @@
 		                    <option value="false" selected="selected">$i18n.getString( "no" )</option>
 		                </select>                
 		            #elseif( $attribute.valueType == "DATE" )
-	                	<input type="text" id="attr$attribute.id"  name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( "default"  $attribute.mandatory )'>
+	                	<input type="text" id="attr$attribute.id" name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( "default"  $attribute.mandatory )'/>
 	                    <script type="text/javascript">
 							datePickerValid( 'attr$attribute.id' );
                         </script>                  
 					#elseif( $attribute.valueType == "COMBO" )
-						<select  id="attr$attribute.id"  name="attr$attribute.id"  data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( "default"  $attribute.mandatory )' >
+						<select  id="attr$attribute.id" name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( "default"  $attribute.mandatory )' >
 							 <option value="">[$i18n.getString( "please_select" )]</option>
 							#foreach ($option in $attribute.attributeOptions )
 								<option value="$option.id" >$option.name</option>
 							#end
 						</select>
 					#else 
-						<input type="text"  id="attr$attribute.id"  name="attr$attribute.id"  data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( $attribute.valueType  $attribute.mandatory )'   >
+						<input type="text" id="attr$attribute.id" name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( $attribute.valueType  $attribute.mandatory )' />
 					#end
 				</td>		
 			</tr>
@@ -205,28 +205,28 @@
 		#set( $attributeValue = "" ) 
 		#set( $attributeValue = $attributeMap.get( $attribute.id ) ) 
 			<tr>
-				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
 				<td class="input-column">
 					#if( $attribute.valueType == "YES/NO" )
-		               <select id="attr$attribute.id"  name="attr$attribute.id"  style="width:100%"  data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" >  
+		               <select id="attr$attribute.id" name="attr$attribute.id" style="width:100%" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" >  
 		                	<option value="" >[$i18n.getString( "please_select" )]</option>             
 		                    <option value="true">$i18n.getString( "yes" )</option>
 		                    <option value="false" >$i18n.getString( "no" )</option>
 		                </select>                
 		            #elseif( $attribute.valueType == "DATE" )
-		                	<input type="text" id="attr$attribute.id"   name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}"  class='attrField #validate( "default"  $attribute.mandatory )' >
+		                	<input type="text" id="attr$attribute.id"   name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( "default"  $attribute.mandatory )' />
 		                    <script type="text/javascript">
                                datePickerValid( 'attr$attribute.id' );
                             </script>                    
 					#elseif( $attribute.valueType == "COMBO" )
-						<select  id="attr$attribute.id"  name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}"   class='attrField #validate( "default"  $attribute.mandatory )'>
+						<select id="attr$attribute.id" name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( "default"  $attribute.mandatory )'>
 							 <option value="">[$i18n.getString( "please_select" )]</option>
 							#foreach ($option in $attribute.attributeOptions )
 								<option value="$option.id" >$option.name</option>
 							#end
 						</select>
 					#else 
-						<input type="text"  id="attr$attribute.id" name="attr$attribute.id"  data="{inheritable:$attribute.inheritable,value:'$attributeValue'}"  class='attrField #validate( $attribute.valueType  $attribute.mandatory )'    >
+						<input type="text" id="attr$attribute.id" name="attr$attribute.id" data="{inheritable:$attribute.inheritable,value:'$attributeValue'}" class='attrField #validate( $attribute.valueType  $attribute.mandatory )' />
 					#end
 				</td>		
 			</tr>
@@ -235,8 +235,8 @@
 </table>
 
 <p style="margin-top:10px">
-	<input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patient.action'" style="width:10em">
+	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patient.action'" style="width:10em"/>
 </p>
 </form> 	
 	
@@ -252,7 +252,7 @@
 <div id="thickboxContainer"></div>
 </div>
 
-<script>
+<script type="text/javascript">
 	var i18n_patient_identifiers = '$encoder.jsEscape( $i18n.getString( "patient_identifiers" ) , "'")';
 	var i18n_patient_attributes = '$encoder.jsEscape( $i18n.getString( "patient_attributes" ) , "'")';
 	var i18n_patient_fullName = '$encoder.jsEscape( $i18n.getString( "full_name" ) , "'")';
@@ -268,6 +268,4 @@
 	var i18n_no_patients_found = '$encoder.jsEscape( $i18n.getString( "no_patients_found" ) , "'")';
 	var i18n_search_result = '$encoder.jsEscape( $i18n.getString( "search_result" ) , "'")';
 	var checkedDuplicate = false;
-</script>
-
-
+</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm	2011-04-28 08:15:18 +0000
@@ -15,26 +15,25 @@
 
 <table> 
     <tr>
-        <td><label>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="aIsToB" name="aIsToB"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
-    </tr>   
-    
-    <tr>
-        <td><label>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="bIsToA" name="bIsToA"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
-    </tr>   
-    
-    <tr>
-        <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
+        <td><label>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><input type="text" id="aIsToB" name="aIsToB"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+    </tr>   
+    
+    <tr>
+        <td><label>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><input type="text" id="bIsToA" name="bIsToA"  maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+    </tr>   
+    
+    <tr>
+        <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
     </tr>   
         
 </table>
 
 <p>
-    <input type="submit" value="$i18n.getString( "add" )" style="width:10em">
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='relationshipType.action'" style="width:10em">
+    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='relationshipType.action'" style="width:10em"/>
 </p>
 
-</form>     
-
+</form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm	2011-04-28 08:15:18 +0000
@@ -13,40 +13,38 @@
 
 <h3>$i18n.getString( "add_validation_criteria" )</h3>
 <form id="validationCriteriaForm" action="addValidationCriteria.action" method="post" >
-  <table>
-	<tr>
-      <th colspan="3">$i18n.getString('details')</th>
-    </tr>
-    <tr>
-      <td><label>$i18n.getString('name')<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-      <td colspan="2"><input type='text' id='name' name='name' style='width: 40em' class="{validate:{required:true,rangelength:[2,160]}}"></td>
-    </tr>
-    <tr>
-      <td><label>$i18n.getString('description')</label></td>
-      <td colspan="2"><input type='text' id='description' name='description' style='width: 40em'></td>
-    </tr>
-    <tr>
-		<td><label>$i18n.getString('criteria')<em title="$i18n.getString( "required" )"  class="required">*</em></label></td>
+<table>
+	<tr><th colspan="3">$i18n.getString('details')</th></tr>
+    <tr>
+		<td><label>$i18n.getString('name')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td colspan="2"><input type='text' id='name' name='name' style='width: 40em' class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+    </tr>
+    <tr>
+		<td><label>$i18n.getString('description')</label></td>
+		<td colspan="2"><input type='text' id='description' name='description' style='width: 40em'></td>
+	</tr>
+    <tr>
+		<td><label>$i18n.getString('criteria')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>	  
 		<table>
 			<tr>
-			  <td>
-			  <!-- Property -->
-			  <select id='property' name='property' style='width: 16em' onChange="showDivValue();">
-				   <option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
-				   <option value="gender">$i18n.getString( "gender" )</option>
-				   <option value="dobType">$i18n.getString( "dob_type" )</option>
-				   <option value="birthDate">$i18n.getString( "date_of_birth" )</option>
-				   <option value="integerValueOfAge">$i18n.getString( "age" )</option>
-				   <option value="bloodGroup">$i18n.getString( "blood_group" )</option>
-			  </select>
-				
-				<!-- Operator -->
-				<select id='operator' name='operator' style='width: 7em'>
-				  <option value='-1'>$i18n.getString('operator_less_then')</option>
-				  <option value='0'>$i18n.getString('operator_equal_to')</option>
-				  <option value='1'>$i18n.getString('operator_greater_then')</option>
-				</select>
+				<td>
+				<!-- Property -->
+					<select id='property' name='property' style='width: 16em' onChange="showDivValue();">
+						<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
+						<option value="gender">$i18n.getString( "gender" )</option>
+						<option value="dobType">$i18n.getString( "dob_type" )</option>
+						<option value="birthDate">$i18n.getString( "date_of_birth" )</option>
+						<option value="integerValueOfAge">$i18n.getString( "age" )</option>
+						<option value="bloodGroup">$i18n.getString( "blood_group" )</option>
+					</select>
+
+					<!-- Operator -->
+					<select id='operator' name='operator' style='width: 7em'>
+						<option value='-1'>$i18n.getString('operator_less_then')</option>
+						<option value='0'>$i18n.getString('operator_equal_to')</option>
+						<option value='1'>$i18n.getString('operator_greater_then')</option>
+					</select>
 				</td>
 			   <td>
 				
@@ -72,12 +70,12 @@
 				
 				<!-- age -->
 				<div id="integerValueOfAgeDiv" style="display:none ">
-					<input type="text" id='integerValueOfAgeValue' name='integerValueOfAgeValue' onChange="fillValue(this.value);"  class="{validate:{digits:true,rangelength:[1,2]}}" style="width: 16em">
+					<input type="text" id='integerValueOfAgeValue' name='integerValueOfAgeValue' onChange="fillValue(this.value);"  class="{validate:{digits:true,rangelength:[1,2]}}" style="width: 16em"/>
 				</div>
 				
 				<!-- birthDate -->
 				<div id="birthDateDiv" style="display:none ">
-					<input type="text" id="birthDateValue" name="birthDateValue" onChange="fillValue(this.value);"style="width: 14em">			
+					<input type="text" id="birthDateValue" name="birthDateValue" onChange="fillValue(this.value);"style="width: 14em"/>			
 					<script type="text/javascript">
 						datePickerValid( 'birthDateValue' );
 					</script> 
@@ -98,16 +96,18 @@
 					</select>
 				</div>
 				<!-- value -->
-				<input type="hidden" id="value" name="value" class="{validate:{required:true,rangelength:[1,160]}}">
+				<input type="hidden" id="value" name="value" class="{validate:{required:true,rangelength:[1,160]}}"/>
 				</td>
 			</tr>
 		</table>
 		</td>
     </tr>
     <tr>
-      <td>&nbsp;</td>
-      <td colspan="2"><input type="submit" value="$i18n.getString('save')" style="width:10em">	  <input name="button" type="button" style="width:10em" onClick="javascript:window.location.href = 'validationCriteria.action'" value="$i18n.getString('cancel')"></td>
+		<td>&nbsp;</td>
+		<td colspan="2">
+			<input type="submit" value="$i18n.getString('save')" style="width:10em"/>
+			<input name="button" type="button" style="width:10em" onclick="javascript:window.location.href= 'validationCriteria.action'" value="$i18n.getString('cancel')"/>
+		</td>
     </tr>
   </table>
-
-</form>
+</form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm	2011-04-28 08:15:18 +0000
@@ -19,7 +19,7 @@
 <form id="updatePatientAttributeGroupForm" name="updatePatientAttributeGroupForm" action="updatePatientAttributeGroup.action" method="post" onsubmit="return validateUpdatePatientAttributeGroup();">
 
 <div style="display:inline">
-  <input type="hidden" id="id" name="id" value="$!patientAttributeGroup.id">
+  <input type="hidden" id="id" name="id" value="$!patientAttributeGroup.id"/>
 </div>
   
   <table id="detailsList">
@@ -30,12 +30,12 @@
     </thead>
     <tbody>
       <tr>
-        <td>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
-        <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $patientAttributeGroup.name )" style="width:20em"></td>
+        <td>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+        <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $patientAttributeGroup.name )" style="width:20em"/></td>
 		</tr>   
       <tr>
-        <td>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
-        <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $patientAttributeGroup.description )" style="width:20em"></td>
+        <td>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+        <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $patientAttributeGroup.description )" style="width:20em"/></td>
       </tr>
       <tr>
         <td>&nbsp;</td>
@@ -50,18 +50,18 @@
     </tr>
     <tr>
         <td colspan="2">
-              <select multiple id="availableAttributes" name="availableAttributes" size="15" style="width:25em " ondblclick="moveSelectedById( 'availableAttributes', 'selectedAttributes' )">
-                #foreach($patientAttribute in $patientAttributes)
-                <option value='$patientAttribute.id'>$patientAttribute.name</option>
-				#end
-              </select>
-        </em></label>        </td>
+			<select multiple id="availableAttributes" name="availableAttributes" size="15" style="width:25em " ondblclick="moveSelectedById( 'availableAttributes', 'selectedAttributes' )">
+			#foreach($patientAttribute in $patientAttributes)
+				<option value='$patientAttribute.id'>$patientAttribute.name</option>
+			#end
+			</select>
+		</td>
         <td>
-          <input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableAttributes', 'selectedAttributes' )">
-          <br>
-          <input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'selectedAttributes', 'availableAttributes' )">
+          <input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableAttributes', 'selectedAttributes' )"/>
+          <br/>
+          <input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'selectedAttributes', 'availableAttributes' )"/>
         </td>
-        <td><select multiple id="selectedAttributes" name="selectedAttributes" size="15" style="width:25em " ondblclick="moveSelectedById( 'selectedAttributes', 'availableAttributes' )">
+        <td><select multiple id="selectedAttributes" name="selectedAttributes" size="15" style="width:25em" ondblclick="moveSelectedById( 'selectedAttributes', 'availableAttributes' )">
         	 #foreach($patientAttribute in $patientAttributeGroup.attributes)
 				#if($!patientAttribute)
 					<option value='$patientAttribute.id'>$patientAttribute.name</option>
@@ -69,10 +69,10 @@
 			 #end
 		</select></td>
 		
-	  <td>
-			<a href="javascript:moveUpSelectedOption( 'selectedAttributes')" title="$i18n.getString( "move_up" )"><img src="../images/move_up.png" alt="$i18n.getString( "move_up" )"></a>
-			<br><br>
-			<a href="javascript:moveDownSelectedOption( 'selectedAttributes' )" title="$i18n.getString( "move_down" )"><img src="../images/move_down.png" alt="$i18n.getString( "move_up" )"></a>
+		<td>
+			<a href="javascript:moveUpSelectedOption( 'selectedAttributes')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" alt="$i18n.getString( 'move_up' )"/></a>
+			<br/><br/>
+			<a href="javascript:moveDownSelectedOption( 'selectedAttributes' )" title="$i18n.getString( 'move_down' )"><img src="../images/move_down.png" alt="$i18n.getString( 'move_up' )"/></a>
 		</td>
     </tr>  
         
@@ -83,8 +83,8 @@
   </table>  
 
 <p>
-    <input type="submit" value="$i18n.getString( "update" )" style="width:10em">
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patientAttributeGroup.action'" style="width:10em">
+    <input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
+    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttributeGroup.action'" style="width:10em"/>
 </p>
 
 </form>     

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm	2011-04-26 02:06:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm	2011-04-28 08:15:18 +0000
@@ -1,5 +1,5 @@
 <div>
-    <input type="button" value="$i18n.getString( "back_to_search" )" onclick="window.location.href='patient.action'" style="width:10em">
+    <input type="button" value="$i18n.getString( 'back_to_search' )" onclick="window.location.href='patient.action'" style="width:10em"/>
 </div>
 
 
@@ -8,7 +8,7 @@
 <form id="updatePatientAttributeValueForm" name="updatePatientAttributeValueForm" action="updatePatientAttribute.action" method="post" onsubmit="return validateUpdatePatientAttribute()">
 
 <div>
-    <input type="hidden" id="patientId" name="patientId" value="$patient.id">
+    <input type="hidden" id="patientId" name="patientId" value="$patient.id"/>
 </div>
 
 <table>
@@ -44,10 +44,10 @@
 
 <br/><br/>
 <table width="100%">
-	<col width="10%">
-    <col width="40%">    
-    <col width="20%">
-    <col width="30">
+	<col width="10%"/>
+    <col width="40%"/>    
+    <col width="20%"/>
+    <col width="30"/>
     <tr>
         <th style="text-align: center">$i18n.getString( "nr" )</th>
         <th>$i18n.getString( "attribute" )</th>  
@@ -93,8 +93,8 @@
                     <option value="false" #if( $patientAttributeValue.value == "false" ) selected="selected" #end>$i18n.getString( "no" )</option>
                 </select>                
             #elseif( $patientAttribute.valueType == "DATE" )
-                <input type="text" id="value[$patientAttribute.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveDate( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $patientAttribute.name )' )" tabindex="$tabIndex" >
-                    <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$patientAttribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
+                <input type="text" id="value[$patientAttribute.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveDate( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $patientAttribute.name )' )" tabindex="$tabIndex" />
+                <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$patientAttribute.id" style="cursor: pointer;" title="$i18n.getString( 'date_selector' )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( 'date' )"/>
                     <script type="text/javascript">
                         Calendar.setup({
                             inputField     :    "value[$patientAttribute.id].date",      // id of the input field
@@ -103,16 +103,16 @@
                         });
                     </script>     
             #elseif( $patientAttribute.valueType == "COMBO" )
-					<select name="entryselect" id="value[$patientAttribute.id].combo"  name="entryfield" onchange="saveCombo( $patient.id, $patientAttribute.id, this)" tabindex="$tabIndex"  >
-						 <option value="">[$i18n.getString( "please_select" )]</option>
+					<select name="entryselect" id="value[$patientAttribute.id].combo"  name="entryfield" onchange="saveCombo( $patient.id, $patientAttribute.id, this)" tabindex="$tabIndex" >
+						<option value="">[$i18n.getString( "please_select" )]</option>
 						#foreach ($option in $patientAttribute.attributeOptions )
 							<option value="$option.id" #if($patientAttributeValue.patientAttributeOption.id == $option.id ) selected="selected" #end>$option.name</option>
 						#end
 					</select>
             #else
-                <input name="entryfield" id="value[$patientAttribute.id].value" type="text" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveAttributeValue( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $dataElement.name )' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" >
+                <input name="entryfield" id="value[$patientAttribute.id].value" type="text" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveAttributeValue( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $dataElement.name )' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" />
             #end
-        </td>       
+        </td>
     </tr>
     #set( $tabIndex = $tabIndex + 1 )
 #end
@@ -151,7 +151,7 @@
                 </select>                
             #elseif( $patientAttribute.valueType == "DATE" )
                 <input type="text" id="value[$patientAttribute.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveDate( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $patientAttribute.name )' )" tabindex="$tabIndex" >
-                    <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$patientAttribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
+                    <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$patientAttribute.id" style="cursor: pointer;" title="$i18n.getString( 'date_selector' )" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( 'date' )"/>
                     <script type="text/javascript">
                         Calendar.setup({
                             inputField     :    "value[$patientAttribute.id].date",      // id of the input field
@@ -161,13 +161,13 @@
                     </script>     
             #elseif( $patientAttribute.valueType == "COMBO" )
 					<select name="entryselect" id="value[$patientAttribute.id].combo"  name="entryfield" onchange="saveCombo( $patient.id, $patientAttribute.id, this )" tabindex="$tabIndex"  >
-						 <option value="">[$i18n.getString( "please_select" )]</option>
+						<option value="">[$i18n.getString( "please_select" )]</option>
 						#foreach ($option in $patientAttribute.attributeOptions )
 							<option value="$option.id" #if($patientAttributeValue.patientAttributeOption.id == $option.id ) selected="selected" #end>$option.name</option>
 						#end
 					</select>
             #else
-                <input name="entryfield" id="value[$patientAttribute.id].value" type="text" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveAttributeValue( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $dataElement.name )' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" >
+                <input name="entryfield" id="value[$patientAttribute.id].value" type="text" value="$!encoder.htmlEncode( $patientAttributeValue.value )" onchange="saveAttributeValue( $patient.id, $patientAttribute.id, '$encoder.jsEncode( $dataElement.name )' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" />
             #end
         </td>       
     </tr>
@@ -175,7 +175,7 @@
 #end
 </table>
 
-</form>     
+</form>
 
 <script type="text/javascript">    
     var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
@@ -184,4 +184,4 @@
     var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
     var i18n_searching_patient_failed = '$encoder.jsEscape( $i18n.getString( "searching_patient_failed" ) , "'")';
     var i18n_duplicate_identifier = 'Duplicate Identifier';
-</script>
+</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm	2011-02-23 04:24:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm	2011-04-28 08:15:18 +0000
@@ -138,7 +138,7 @@
 	
 	<tr>
 		<td>$i18n.getString("is_underage")</td>
-		<td class="input-column" >
+		<td>
 			<input type="checkbox" name="underAge" id="underAge" onclick="toggleUnderAge(this);" value="true" #if($patient.underAge) checked="checked" #end/>
 		</td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm	2011-04-28 08:15:18 +0000
@@ -15,28 +15,28 @@
 <h3>$i18n.getString( "update_patient_identifier_type" )</h3>
 									
 <form id="updatePatientIdentifierTypeForm" action="updatePatientIdentifierType.action" method="post" >
- <input type="hidden" id="id" name="id" value="$patientIdentifierType.id">
+<input type="hidden" id="id" name="id" value="$patientIdentifierType.id"/>
 <table>	
 	<tr>
-		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name"  value="$encoder.htmlEncode($patientIdentifierType.name)" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"></td>
+		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><input type="text" id="name" name="name"  value="$encoder.htmlEncode($patientIdentifierType.name)" maxlength="30" style="width:30em" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
 		<td></td>
-	</tr>	
+	</tr>
 	
 	<tr>
-		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="description" name="description" value="$encoder.htmlEncode($patientIdentifierType.description)" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"></td>
+		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><input type="text" id="description" name="description" value="$encoder.htmlEncode($patientIdentifierType.description)" style="width:30em" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
 		<td></td>
 	</tr>	
 	
 	<tr>
 		<td><label>$i18n.getString( "identifier_format" ) </label></td> 
-		<td><input type="checkbox" name="formater" id="formater" value="State Format" #if(!$!patientIdentifierType.format.isEmpty()) checked="checked" #end >$i18n.getString('state_format')</td>
+		<td><input type="checkbox" name="formater" id="formater" value="State Format" #if(!$!patientIdentifierType.format.isEmpty()) checked="checked" #end />$i18n.getString('state_format')</td>
 		<td></td>
 	</tr>	
 	
-	 <tr>
-		<td width="20em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+	<tr>
+		<td width="20em"><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="mandatory" name="mandatory" style="min-width:20em">
 				<option value="true" #if( $patientIdentifierType.mandatory ) selected="selected" #end>$i18n.getString( "yes" )</option>
@@ -47,7 +47,7 @@
 	</tr>
 	
 	<tr>
-		<td width="20em"><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td width="20em"><label for="related">$i18n.getString( "related" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="related" name="related" style="min-width:20em" class="{validate:{required:true}}">
 				<option value="" >[$i18n.getString( "please_select" )]</option>
@@ -61,13 +61,13 @@
 	<tr>
 		<td width="30em"><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
 		<td>
-			<input type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" >
+			<input type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" style="min-width:30em" />
 		</td>		
 		<td></td>				
 	</tr> 	
 	
 	<tr>
-		<td width="30em"><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+		<td width="30em"><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="type" name="type" style="min-width:30.2em"  class="{validate:{required:true}}">
 				<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
@@ -81,8 +81,8 @@
 </table>
 
 <p>
-	<input type="submit" value="$i18n.getString( "update" )" style="width:10em">
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='patientIdentifierType.action'" style="width:10em">
+	<input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientIdentifierType.action'" style="width:10em"/>
 </p>
 
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm	2010-11-16 08:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramAttributeForm.vm	2011-04-28 08:15:18 +0000
@@ -26,29 +26,27 @@
 																		
 <h3>$i18n.getString( "update_new_program_attribute" )</h3>
 <form id="updateProgramAttributeForm" action="updateProgramAttribute.action" method="post" >
-<input type="hidden" id="id" name='id' value='$programAttribute.id'>
+<input type="hidden" id="id" name='id' value='$programAttribute.id'/>
 <table id="attrTable"> 
 	<thead>
-      <tr>
-        <th colspan="2">$i18n.getString( "program_attribute_details" )</th>
-      </tr>
+		<tr><th colspan="2">$i18n.getString( "program_attribute_details" )</th></tr>
     </thead>
     <tbody>
 	
     <tr>
         <td width="20em"><label>$i18n.getString( "name" )</label></td>
-        <td><input type="text" id="name" name="name" value='$programAttribute.name' style="width:30em"></td>
+        <td><input type="text" id="name" name="name" value='$programAttribute.name' style="width:30em"/></td>
         <td></td>
     </tr>   
     
     <tr>
-        <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" value='$programAttribute.description' style="width:30em" class="{validate:{required:true,minlength:2}}"></td>
+        <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+        <td><input type="text" id="description" name="description" value='$programAttribute.description' style="width:30em" class="{validate:{required:true,minlength:2}}"/></td>
         <td></td>
     </tr>
     
     <tr>
-        <td>$i18n.getString( "value_type" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
+        <td>$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
         <td>
             <select id="valueType" name="valueType" style="min-width:30.5em" onchange="ATTRIBUTE_OPTION.selectValueType(this);">
                 <option value="NUMBER" #if( $programAttribute.valueType == 'NUMBER' ) selected="selected" #end>$i18n.getString( "number" )</option>
@@ -58,29 +56,32 @@
                 <option value="COMBO" #if( $programAttribute.valueType == 'COMBO' ) selected="selected" ; #end>$i18n.getString( "attribute_combo_type" )</option>
             </select>
         </td>
-      </tr>
-      <tr id="attributeComboRow"> 
-    	<td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-    	<td >
-    		<table id="attrOptionContainer">
-    			 #foreach($option in $programAttribute.attributeOptions) 
-    			 	<tr><td>
-    			 		<input type='text' id='attrOption$option.id' name='attrOption$option.id' value="$option.name" style="width:28em;"/><a href='#' style='text-decoration: none; margin-left:0.5em;' title='$i18n.getString( "remove_option" )'  onClick='ATTRIBUTE_OPTION.remove(this,$option.id)'>[ - ]</a>
-   			 		</td>
-					</tr>
-    			 #end
-    		</table><a href="#" style="text-decoration: none;margin-top: 0.5em"  onclick="ATTRIBUTE_OPTION.addOption()">[ $i18n.getString( "add_more_option" ) ]</a></td>
-    	<td><span id="attrMessage"  name="attrMessage" style="color:red;"></span></td>
-      </tr>
-      <tr>
-        <td colspan="3" style="height:15px"></td>
-      </tr>
-     </tbody>
+	</tr>
+	<tr id="attributeComboRow"> 
+		<td width="20em"><label>$i18n.getString( "attribute_options" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td>
+			<table id="attrOptionContainer">
+			#foreach($option in $programAttribute.attributeOptions) 
+				<tr>
+					<td>
+						<input type='text' id='attrOption$option.id' name='attrOption$option.id' value="$option.name" style="width:28em;"/><a href='#' style='text-decoration: none; margin-left:0.5em;' title='$i18n.getString( "remove_option" )'  onClick='ATTRIBUTE_OPTION.remove(this,$option.id)'>[ - ]</a>
+					</td>
+				</tr>
+			#end
+			</table>
+			<a href="#" style="text-decoration: none;margin-top: 0.5em" onclick="ATTRIBUTE_OPTION.addOption()">[ $i18n.getString( "add_more_option" ) ]</a>
+		</td>
+	<td><span id="attrMessage"  name="attrMessage" style="color:red;"></span></td>
+	</tr>
+	<tr>
+		<td colspan="3" style="height:15px"></td>
+	</tr>
+    </tbody>
 </table>
 
 <p>
-    <input type="submit" value="$i18n.getString( "update" )" style="width:10em">
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='programAttribute.action'" style="width:10em">
+    <input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
+    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programAttribute.action'" style="width:10em"/>
 </p>
 
 </form>   
@@ -92,4 +93,4 @@
 	}else{
 		jQuery("#attributeComboRow").hide();
 	}
-</script>
+</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2011-03-28 04:11:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2011-04-28 08:15:18 +0000
@@ -33,62 +33,58 @@
 <form id="updateProgramStageForm" name="updateProgramStageForm" action="updateProgramStage.action" method="post">
 
 <div style="display:inline">
-  <input type="hidden" id="id" name="id" value="$programStage.id">
+	<input type="hidden" id="id" name="id" value="$programStage.id"/>
 </div>
   
-  <table id="detailsList">
+<table id="detailsList">
     <thead>
-      <tr>
-        <th colspan="2">$i18n.getString( "program_stage_details" )</th>
-      </tr>
+		<tr><th colspan="2">$i18n.getString( "program_stage_details" )</th></tr>
     </thead>
     <tbody>
-      <tr>
-		<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $programStage.name )" style="width:30em"  class="{validate:{required:true,minlength:4}}"/></td>
-	  </tr>
-	  	  
-      <tr>
-		<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $programStage.description )" style="width:30em"  class="{validate:{required:true,minlength:4}}"/></td>
-	  </tr>  
-	  
-	  <tr>
-        <td><label>$i18n.getString( "min_days_from_start" )</label></td>
-        <td><input type="text" id="minDaysFromStart" name="minDaysFromStart" maxlength="30" value="$programStage.minDaysFromStart" style="width:30em" class="{validate:{number:true,min:0}}"/></td>
-      </tr> 
-      
-      <tr>
-        <td><label>$i18n.getString( "program" )</label></td>
-        <td><input type="text" id="program" name="program" maxlength="30" value="$encoder.htmlEncode( $programStage.program.name )" style="width:30em" disabled="disabled">
-      </tr>     
-         
-      <tr><td>&nbsp;</td><td>&nbsp;</td></tr>       
+		<tr>
+			<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $programStage.name )" style="width:30em"  class="{validate:{required:true,minlength:4}}"/></td>
+		</tr>
+
+		<tr>
+			<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $programStage.description )" style="width:30em"  class="{validate:{required:true,minlength:4}}"/></td>
+		</tr>  
+
+		<tr>
+			<td><label>$i18n.getString( "min_days_from_start" )</label></td>
+			<td><input type="text" id="minDaysFromStart" name="minDaysFromStart" maxlength="30" value="$programStage.minDaysFromStart" style="width:30em" class="{validate:{number:true,min:0}}"/></td>
+		</tr> 
+
+		<tr>
+			<td><label>$i18n.getString( "program" )</label></td>
+			<td><input type="text" id="program" name="program" maxlength="30" value="$encoder.htmlEncode( $programStage.program.name )" style="width:30em" disabled="disabled"/></td>
+		</tr>     
+
+		<tr><td>&nbsp;</td><td>&nbsp;</td></tr>       
       
     </tbody>
-  </table>
+</table>
 
-  <table id="programStageMembersArea">
-    
+<table id="programStageMembersArea">
     <thead>
-      <tr>        
-        <th>$i18n.getString( "available_data_elements" )</th>
-        <th></th>
-        <th>$i18n.getString( "selected_data_elements" )</th>
-      </tr>
+		<tr>
+			<th>$i18n.getString( "available_data_elements" )</th>
+			<th></th>
+			<th>$i18n.getString( "selected_data_elements" )</th>
+		</tr>
     </thead>
 	
 	<tbody>
 	 
 	<tr>
 		<td>
-			<input type='text' style="width:29.5em" onkeyup="filterDE(event, this.value, 'availableList');">
+			<input type='text' style="width:29.5em" onkeyup="filterDE(event, this.value, 'availableList');"/>
 		</td>
-		<td></td>
-		<td></td>
+		<td></td><td></td>
 	 </tr>
 	 
-      <tr>
+	<tr>
         <td>
             <select size="15" id="availableList" multiple="multiple" style="width:30em;height:20em" ondblclick="selectDataElements( )">
                 #foreach ( $dataElement in $dataElements )
@@ -97,8 +93,8 @@
             </select>
         </td>
         <td valign="top" align="center">         
-            <input type="button" value="&gt;" onclick="selectDataElements()"><br>    
-            <input type="button" value="&lt;" onclick="unSelectDataElements()"><br><br>                    
+            <input type="button" value="&gt;" onclick="selectDataElements()"/><br/>    
+            <input type="button" value="&lt;" onclick="unSelectDataElements()"/><br/><br/>                    
         <td>
 			<div style="overflow:auto; height:20em; width:40em;border:1px solid #9DA1AA">
 				<table width="100%">
@@ -109,30 +105,28 @@
 						#foreach ( $programStageDataElement in $programStageDataElements )
 							<tr ondblclick="unSelectDataElement( this )" id="$programStageDataElement.dataElement.id" class="selected">
 								<td onclick="select(this)">$encoder.htmlEncode( $programStageDataElement.dataElement.name )</td>
-								<td><input type="checkbox" name="compulsory" value="$programStageDataElement.dataElement.id"></td>
+								<td><input type="checkbox" name="compulsory" value="$programStageDataElement.dataElement.id"/></td>
 							</tr>
 						#end
 					</tbody>
 				</table>
 			</div>
         </td>
-      </tr>
+    </tr>
     </tbody>
-  </table>
+</table>
 <select id="selectedDataElementsValidator" name="selectedList" multiple="multiple" class="{validate:{required:true}}" style="display:none"> </select>
 <select id="compulsories" name="compulsories" multiple="multiple" style="display:none"></select>
 <p>
-	<input type="submit" value="$i18n.getString( "update" )" style="width:10em">
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='programStage.action'" style="width:10em">
+	<input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programStage.action'" style="width:10em"/>
 </p>
 
 </form> 	
 
-
-
 <script type="text/javascript">     
     var i18n_invalid_min_max_days = '$encoder.jsEscape( $i18n.getString( "invalid_min_max_days" ) , "'")';
     var i18n_value_must_positive = '$encoder.jsEscape( $i18n.getString( "value_must_positive" ) , "'")';
     var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
     var i18n_compulsory_checkbox_title = '$encoder.jsEscape( $i18n.getString( "compulsory_checkbox_title" ) , "'")';      
-</script>
+</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm	2011-04-28 08:15:18 +0000
@@ -15,37 +15,36 @@
 <form id="updateRelationshipTypeForm" name="updateRelationshipTypeForm" action="updateRelationshipType.action" method="post">
 
 <div style="display:inline">
-  <input type="hidden" id="id" name="id" value="$relationshipType.id">
+	<input type="hidden" id="id" name="id" value="$relationshipType.id"/>
 </div>
   
-  <table id="detailsList">
+<table id="detailsList">
     <thead>
-      <tr>
-        <th colspan="2">$i18n.getString( "relationship_type_details" )</th>
-      </tr>
+      <tr><th colspan="2">$i18n.getString( "relationship_type_details" )</th></tr>
     </thead>
-    <tbody>        
-      <tr>
-        <td>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
-        <td><input type="text" id="aIsToB" name="aIsToB" value="$encoder.htmlEncode( $relationshipType.aIsToB )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
-      </tr>   
-      <tr>
-        <td>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( "required" )" class="required">*</em></td>
-        <td><input type="text" id="bIsToA" name="bIsToA" value="$encoder.htmlEncode( $relationshipType.bIsToA )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
-      </tr>
-      <tr>
-        <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $relationshipType.description )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"></td>
-      </tr>       
-      <tr>
-        <td colspan="2" style="height:15px"></td>
-      </tr>
+	
+    <tbody>
+		<tr>
+			<td>$i18n.getString( "a_is_to_b" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+			<td><input type="text" id="aIsToB" name="aIsToB" value="$encoder.htmlEncode( $relationshipType.aIsToB )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+		</tr>   
+		<tr>
+			<td>$i18n.getString( "b_is_to_a" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
+			<td><input type="text" id="bIsToA" name="bIsToA" value="$encoder.htmlEncode( $relationshipType.bIsToA )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+		</tr>
+		<tr>
+			<td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $relationshipType.description )" style="width:30em" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+		</tr>       
+		<tr>
+			<td colspan="2" style="height:15px"></td>
+		</tr>
     </tbody>
   </table>  
 
 <p>
-    <input type="submit" value="$i18n.getString( "update" )" style="width:10em">
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='relationshipType.action'" style="width:10em">
+    <input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
+    <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='relationshipType.action'" style="width:10em"/>
 </p>
 
 </form>     

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateValidationCriteria.vm	2011-04-28 08:15:18 +0000
@@ -16,101 +16,100 @@
 <h3>$i18n.getString( "update_validation_criteria" )</h3>
 
 <form id="validationCriteriaForm" action="updateValidationCriteria.action" method="post" >
-  <table >
-	<input type='hidden' id='id' name='id' value='$validationCriteria.id'>
-	<tr>
-      <th colspan="3">$i18n.getString('criteria_details')</th>
-    </tr>
-    <tr>
-      <td><label>$i18n.getString('name')<em title="$i18n.getString( "required" )"  class="required">*</em></label></td>
-      <td colspan="2"><input type='text' id='name' name='name' style='width: 40em' value="$validationCriteria.name" class="{validate:{required:true,rangelength:[2,160]}}"></td>
-    </tr>
-    <tr>
-      <td><label>$i18n.getString('description')</label></td>
-      <td colspan="2"><input type='text' id='description' name='description' style='width: 40em' value="$validationCriteria.description"></td>
-    </tr>
-    <tr>
-      <td><label>$i18n.getString('criteria')<em title="$i18n.getString( "required" )"  class="required">*</em></label></td>
-      <td>
-		<table>
-			<tr>
-				<td>
-					<select id='property' name='property' style='width: 16em' onChange="showDivValue();">
-					   <option value="">[$i18n.getString( "please_select" )]</option>
-					   <option value="gender" #if("$validationCriteria.property" == "gender") selected #end>$i18n.getString( "gender" )</option>
-					   <option value="birthDate" #if("$validationCriteria.property" == "birthDate") selected #end>$i18n.getString( "date_of_birth" )</option>
-					   <option value="dobType" #if("$validationCriteria.property" == "dobType") selected #end>$i18n.getString( "dob_type" )</option>
-					   <option value="integerValueOfAge" #if("$validationCriteria.property" == "integerValueOfAge") selected #end>$i18n.getString( "age" )</option>
-					   <option value="bloodGroup" #if("$validationCriteria.property" == "bloodGroup") selected #end>$i18n.getString( "blood_group" )</option>
-					</select>
-					<select id='operator' name='operator' style='width: 7em'>
-					  <option value='-1' #if( "$validationCriteria.operator"=='-1') selected #end>$i18n.getString('operator_less_then')</option>
-					  <option value='0'  #if( "$validationCriteria.operator"=='0') selected #end>$i18n.getString('operator_equal_to')</option>
-					  <option value='1'  #if( "$validationCriteria.operator"=='1') selected #end>$i18n.getString('operator_greater_then')</option>
-					</select>
-				</td>
-			  
-				<td>
-					<!-- gender -->
-					<div id="genderDiv" style="display:none">
-						<select id='genderValue' name='genderValue' onChange="fillValue(this.value);" style="width: 16em">
-							<option value="">[$i18n.getString( "please_select" )]</option>
-							<option value="M">$i18n.getString( "male" )</option>
-							<option value="F">$i18n.getString( "female" )</option>
-							<option value="T">$i18n.getString( "transgender" )</option>
-						</select>
-					</div>
-		
-				<!-- dobType -->
-				<div id="dobTypeDiv" style="display:none ">
-					<select type="text" id='dobTypeValue' name='dobTypeValue' onChange="fillValue(this.value);" style="width: 16em">
-						<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
-						<option value="V" >$i18n.getString( "verified" )</option>
-						<option value="D" >$i18n.getString( "declared" )</option>
-						<option value="A" >$i18n.getString( "approximated" )</option>
-					</select>
-				</div>
-				
-					<!-- age -->
-					<div id="integerValueOfAgeDiv" style="display:none ">
-						<input type="text" id='integerValueOfAgeValue' name='integerValueOfAgeValue' onChange="fillValue(this.value);" class="{validate:{digits:true,rangelength:[1,2]}}" style="width: 15.5em">
-					</div>
-					
-					<!-- birthDate -->
-					<div id="birthDateDiv" style="display:none ">
-						<input type="text" id="birthDateValue" name="birthDateValue" onChange="fillValue(this.value);"style="width: 14em">			
-						<script type="text/javascript">
-							datePickerValid( 'birthDateValue' );
-						</script> 
-					</div>
-					
-					<!-- bloodGroup -->
-					<div id="bloodGroupDiv" style="display:none ">
-						<select id="bloodGroupValue" name="bloodGroupValue" onChange="fillValue(this.value);" style="width: 16em">
-							<option value="">[$i18n.getString( "please_select" )]</option>
-							<option value="A+">A+</option>
-							<option value="A-">A-</option>
-							<option value="AB+">AB+</option>
-							<option value="AB-">AB-</option>
-							<option value="B+">B+</option>
-							<option value="B-">B-</option>
-							<option value="O+">O+</option>
-							<option value="O-">O-</option>
-						</select>
-					</div>
-					<input type='hidden' id='value' name='value' value="$validationCriteria.value" class="{validate:{required:true}}">
-				</td>
-			</tr>
-		</table>
-	  </td>
-    </tr>
-   <tr>
-      <td>&nbsp;</td>
-      <td colspan="2">
-		<input type="submit" value="$i18n.getString('save')" style="width:10em">
-		<input name="button" type="button" style="width:10em" onClick="javascript: window.location.href = 'validationCriteria.action'" value="$i18n.getString('cancel')"></td>
-    </tr>
-  </table>
+	<table>
+		<input type='hidden' id='id' name='id' value='$validationCriteria.id'/>
+		<tr>
+			<th colspan="3">$i18n.getString('criteria_details')</th>
+		</tr>
+		<tr>
+			<td><label>$i18n.getString('name')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td colspan="2"><input type='text' id='name' name='name' style='width: 40em' value="$validationCriteria.name" class="{validate:{required:true,rangelength:[2,160]}}"/></td>
+		</tr>
+		<tr>
+			<td><label>$i18n.getString('description')</label></td>
+			<td colspan="2"><input type='text' id='description' name='description' style='width: 40em' value="$validationCriteria.description"/></td>
+		</tr>
+		<tr>
+			<td><label>$i18n.getString('criteria')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td>
+				<table>
+					<tr>
+						<td>
+							<select id='property' name='property' style='width: 16em' onChange="showDivValue();">
+								<option value="">[$i18n.getString( "please_select" )]</option>
+								<option value="gender" #if("$validationCriteria.property" == "gender") selected #end>$i18n.getString( "gender" )</option>
+								<option value="birthDate" #if("$validationCriteria.property" == "birthDate") selected #end>$i18n.getString( "date_of_birth" )</option>
+								<option value="dobType" #if("$validationCriteria.property" == "dobType") selected #end>$i18n.getString( "dob_type" )</option>
+								<option value="integerValueOfAge" #if("$validationCriteria.property" == "integerValueOfAge") selected #end>$i18n.getString( "age" )</option>
+								<option value="bloodGroup" #if("$validationCriteria.property" == "bloodGroup") selected #end>$i18n.getString( "blood_group" )</option>
+							</select>
+								<select id='operator' name='operator' style='width: 7em'>
+								<option value='-1' #if( "$validationCriteria.operator"=='-1') selected #end>$i18n.getString('operator_less_then')</option>
+								<option value='0'  #if( "$validationCriteria.operator"=='0') selected #end>$i18n.getString('operator_equal_to')</option>
+								<option value='1'  #if( "$validationCriteria.operator"=='1') selected #end>$i18n.getString('operator_greater_then')</option>
+							</select>
+							</td>
+
+							<td>
+							<!-- gender -->
+							<div id="genderDiv" style="display:none">
+								<select id='genderValue' name='genderValue' onChange="fillValue(this.value);" style="width: 16em">
+									<option value="">[$i18n.getString( "please_select" )]</option>
+									<option value="M">$i18n.getString( "male" )</option>
+									<option value="F">$i18n.getString( "female" )</option>
+									<option value="T">$i18n.getString( "transgender" )</option>
+								</select>
+							</div>
+
+							<!-- dobType -->
+							<div id="dobTypeDiv" style="display:none ">
+								<select type="text" id='dobTypeValue' name='dobTypeValue' onChange="fillValue(this.value);" style="width: 16em">
+									<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
+									<option value="V" >$i18n.getString( "verified" )</option>
+									<option value="D" >$i18n.getString( "declared" )</option>
+									<option value="A" >$i18n.getString( "approximated" )</option>
+								</select>
+							</div>
+
+							<!-- age -->
+							<div id="integerValueOfAgeDiv" style="display:none ">
+								<input type="text" id='integerValueOfAgeValue' name='integerValueOfAgeValue' onChange="fillValue(this.value);" class="{validate:{digits:true,rangelength:[1,2]}}" style="width: 15.5em"/>
+							</div>
+
+							<!-- birthDate -->
+							<div id="birthDateDiv" style="display:none ">
+								<input type="text" id="birthDateValue" name="birthDateValue" onChange="fillValue(this.value);"style="width: 14em"/>
+								<script type="text/javascript">datePickerValid( 'birthDateValue' );</script> 
+							</div>
+
+							<!-- bloodGroup -->
+							<div id="bloodGroupDiv" style="display:none ">
+								<select id="bloodGroupValue" name="bloodGroupValue" onChange="fillValue(this.value);" style="width: 16em">
+									<option value="">[$i18n.getString( "please_select" )]</option>
+									<option value="A+">A+</option>
+									<option value="A-">A-</option>
+									<option value="AB+">AB+</option>
+									<option value="AB-">AB-</option>
+									<option value="B+">B+</option>
+									<option value="B-">B-</option>
+									<option value="O+">O+</option>
+									<option value="O-">O-</option>
+								</select>
+							</div>
+							<input type='hidden' id='value' name='value' value="$validationCriteria.value" class="{validate:{required:true}}"/>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td colspan="2">
+				<input type="submit" value="$i18n.getString('save')" style="width:10em">
+				<input name="button" type="button" style="width:10em" onClick="javascript: window.location.href = 'validationCriteria.action'" value="$i18n.getString('cancel')">
+			</td>
+		</tr>
+	</table>
 </form>
 
 <script language="javascript">
@@ -133,4 +132,4 @@
 	byId('value').value = byId(name + "Value").value;
 	showDivValue();
 	
-</script>
+</script>
\ No newline at end of file