← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7293: minor layout changes to Person identifier type management

 

------------------------------------------------------------
revno: 7293
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-06-14 09:37:44 +0300
message:
  minor layout changes to Person identifier type management
modified:
  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/updatePatientIdentifierType.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== 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	2012-06-13 04:13:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm	2012-06-14 06:37:44 +0000
@@ -14,20 +14,20 @@
 	<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" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
+			<td><input style="width: 330px;" type="text" id="name" name="name" 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" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
+			<td><input style="width: 330px;" type="text" id="description" name="description" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
 			<td><label for="mandatory">$i18n.getString( "mandatory" )</label></td>
 			<td>
-				<input type='checkbox' id="mandatory" name="mandatory" value='true' >
+				<input style="margin: 0;" type='checkbox' id="mandatory" name="mandatory" value='true' >
 			</td>
 			<td></td>
 		</tr>
@@ -35,14 +35,14 @@
 		<tr>
 			<td><label for="related">$i18n.getString( "related" )</label></td>
 			<td>
-				<input type='checkbox' id="related" name="related" value='true' >
+				<input style="margin: 0;" type='checkbox' id="related" name="related" value='true' >
 			</td>
 			<td></td>
 		</tr>
 		<tr>
 			<td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
 			<td>
-				<input type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" />
+				<input style="width: 330px;" type="text" name="noChars" id="noChars" class="{validate:{required:false, number:true}}" />
 			</td>
 			<td></td>
 		</tr>
@@ -50,7 +50,7 @@
 		<tr>
 			<td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="type" name="type" class="{validate:{required:true}}">
+				<select style="width: 336px;" id="type" name="type" class="{validate:{required:true}}">
 					<option value="text" selected="selected">$i18n.getString( "text" )</option>
 					<option value="number">$i18n.getString( "number" )</option>
 					<option value="letter">$i18n.getString( "letter_only" )</option>
@@ -62,7 +62,7 @@
 		<tr>
 			<td><label for="programId">$i18n.getString( "program" )</label></td>
 			<td>
-				<select type="text" name="programId" id="programId" value="$!patientIdentifierType.program" >
+				<select style="width: 336px;" type="text" name="programId" id="programId" value="$!patientIdentifierType.program" >
 					<option value=''>[$i18n.getString('all')]</option>
 					#foreach( $program in $programs)
 						<option value='$program.id'>$program.name</option>
@@ -83,4 +83,4 @@
 	</tbody>
 </table>
 
-</form>
\ No newline at end of file
+</form>

=== 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	2012-06-13 04:13:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm	2012-06-14 06:37:44 +0000
@@ -14,20 +14,20 @@
 	<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($patientIdentifierType.name)" class="{validate:{required:true,rangelength:[4,100]}}"/></td>
+			<td><input style="width: 330px;" type="text" id="name" name="name"  value="$encoder.htmlEncode($patientIdentifierType.name)" 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" value="$encoder.htmlEncode($!patientIdentifierType.description)" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
+			<td><input style="width: 330px;" type="text" id="description" name="description" value="$encoder.htmlEncode($!patientIdentifierType.description)" class="{validate:{required:true,minlength:4, maxlength: 150}}"/></td>
 			<td></td>
 		</tr>	
 		
 		<tr>
 			<td><label for="mandatory">$i18n.getString( "mandatory" )</label></td>
 			<td>
-				<input type='checkbox' id="mandatory" name="mandatory" #if( $patientIdentifierType.mandatory ) checked #end >
+				<input style="margin: 0;" type='checkbox' id="mandatory" name="mandatory" #if( $patientIdentifierType.mandatory ) checked #end >
 			</td>		
 			<td></td>				
 		</tr>
@@ -35,7 +35,7 @@
 		<tr>
 			<td><label for="related">$i18n.getString( "related" )</label></td>
 			<td>
-				<input type='checkbox' name="related" #if( $patientIdentifierType.related ) checked #end >
+				<input style="margin: 0;" type='checkbox' name="related" #if( $patientIdentifierType.related ) checked #end >
 			</td>		
 			<td></td>				
 		</tr>
@@ -43,7 +43,7 @@
 		<tr>
 			<td><label for="noChars">$i18n.getString( "no_of_char" )</label></td>
 			<td>
-				<input type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" />
+				<input style="width: 330px;" type="text" name="noChars" id="noChars" value="$!patientIdentifierType.noChars" class="{validate:{required:false, number:true}}" />
 			</td>		
 			<td></td>				
 		</tr> 	
@@ -51,7 +51,7 @@
 		<tr>
 			<td><label for="type">$i18n.getString( "type" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td>
-				<select id="type" name="type" class="{validate:{required:true}}">
+				<select style="width: 336px;" id="type" name="type" class="{validate:{required:true}}">
 					<option value="text" #if( $patientIdentifierType.type=='text' ) selected="selected" #end>$i18n.getString( "text" )</option>
 					<option value="number" #if( $patientIdentifierType.type=='number' ) selected="selected" #end>$i18n.getString( "number" )</option>
 					<option value="letter" #if( $patientIdentifierType.type=='letter' ) selected="selected" #end>$i18n.getString( "letter_only" )</option>
@@ -63,7 +63,7 @@
 		<tr>
 			<td><label for="programId">$i18n.getString( "program" )</label></td>
 			<td>
-				<select type="text" name="programId" id="programId" value="$!patientIdentifierType.program" >
+				<select style="width: 336px;" type="text" name="programId" id="programId" value="$!patientIdentifierType.program" >
 					<option value=''>[$i18n.getString('all')]</option>
 					#foreach( $program in $programs)
 						<option value='$program.id' #if($patientIdentifierType.program.id==$program.id) selected #end>$program.name</option>