dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8499
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-12 11:09:53 +0700
message:
  Small changes Add/Update form of program and program-stage.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm
  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/style/basic.css
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.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/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2012-10-12 03:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2012-10-12 04:09:53 +0000
@@ -78,10 +78,15 @@
 	<tbody>
 </table>
 	
-<table id="programStageMembersArea">    
+<table>
+	<colgroup>
+        <col style="width: 550px;"/>
+        <col/>
+        <col style="width: 500px;"/>
+    </colgroup>
 	<thead>
 	  <tr>        
-		<th style="width:200px;">$i18n.getString( "available_identifiers_and_attributes" )</th>
+		<th>$i18n.getString( "available_identifiers_and_attributes" )</th>
 		<th></th>
 		<th>$i18n.getString( "select_identifiers_and_attributes" )							
 			<select style='display:none;' multiple id="selectedPropertyIds" name="selectedPropertyIds" ></select>
@@ -91,7 +96,7 @@
 	</thead>
 	<tr>
 		<td>
-			<select size="15" style="width:300px;" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();">
+			<select style="width:100%;" size="15" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();">
 				#foreach( $identifier in $availableIdentifierTypes )
 					<option value="iden_$identifier.id">$identifier.name</option>
 				#end
@@ -109,10 +114,14 @@
 		<td>
 			<div class="dataElementDiv">
 				<table>
+					<colgroup>
+						<col/>
+						<col style="width:20px;"/>
+					</colgroup>
 					<thead>
 						<tr>
-							<th style="width:180px;">$i18n.getString( "identifiers_and_attributes" )</th>
-							<th style="width:20px;">$i18n.getString( "displayed_in_list" )</th>
+							<th>$i18n.getString( "identifiers_and_attributes" )</th>
+							<th>$i18n.getString( "displayed_in_list" )</th>
 					</thead>
 					<tbody id="selectedList"></tbody>
 				</table>

=== 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	2012-10-12 03:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2012-10-12 04:09:53 +0000
@@ -55,9 +55,14 @@
 </table>
 
 <table id="programStageMembersArea">    
-    <thead>
+    <colgroup>
+		<col style="width:550px;"/>
+		<col/>
+		<col style="width:500px;"/>
+	</colgroup>
+	<thead>
       <tr>        
-        <th style='width:300px;'>$i18n.getString( "available_data_elements" )</th>
+        <th>$i18n.getString( "available_data_elements" )</th>
         <th></th>
         <th>$i18n.getString( "selected_data_elements" )							
 			<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="hidden" ></select>
@@ -70,7 +75,7 @@
     <tbody>
       <tr>
         <td>
-            <select style='width:300px;' size="15" id="availableList" name='availableList' multiple="multiple" ondblclick="selectDataElements()">
+            <select style='width:100%' size="15" id="availableList" name='availableList' multiple="multiple" ondblclick="selectDataElements()">
             </select>
         </td>
         
@@ -84,11 +89,16 @@
 		<td>
 			<div class="dataElementDiv">
 				<table>
+					<colgroup>
+						<col/>
+						<col style="width:20px;"/>
+						<col style="width:20px;"/>
+					</colgroup>
 					<thead>
 						<tr>
 							<th>$i18n.getString( "dataelement" )</th>
-							<th width="20px">$i18n.getString( "compulsory" )</th>
-							<th width="20px">$i18n.getString( "allow_provided_elsewhere" )</th>
+							<th>$i18n.getString( "compulsory" )</th>
+							<th>$i18n.getString( "allow_provided_elsewhere" )</th>
 					</thead>
 					<tbody id="selectedList"></tbody>
 				</table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css	2012-10-12 03:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css	2012-10-12 04:09:53 +0000
@@ -66,7 +66,6 @@
 {
 	overflow:auto; 
 	height:20em; 
-	width:300px;
 	border:1px solid #9DA1AA;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2012-10-12 03:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2012-10-12 04:09:53 +0000
@@ -85,9 +85,14 @@
 	</table>
 
 	<table>
+		<colgroup>
+			<col style="width: 550px;"/>
+			<col/>
+			<col style="width: 500px;"/>
+		</colgroup>
 		<thead>
 		  <tr>        
-			<th style="width:200px;">$i18n.getString( "available_identifiers_and_attributes" )</th>
+			<th>$i18n.getString( "available_identifiers_and_attributes" )</th>
 			<th></th>
 			<th>$i18n.getString( "select_identifiers_and_attributes" )							
 				<select style='display:none;' multiple id="selectedPropertyIds" name="selectedPropertyIds" ></select>
@@ -98,7 +103,7 @@
 	
 		<tr>
 			<td>
-				<select size="15" style="width:300px;" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();" #if( $program.type=='3' ) disabled #end>
+				<select size="15" style="width:100%;" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();" #if( $program.type=='3' ) disabled #end>
 					#foreach( $identifier in $availableIdentifierTypes )
 						<option value="iden_$identifier.id">$identifier.name</option>
 					#end
@@ -116,6 +121,10 @@
 			<td>
 				<div class="dataElementDiv">
 					<table>
+						<colgroup>
+							<col/>
+							<col style="width:20px;"/>
+						</colgroup>
 						<thead>
 							<tr>
 								<th style="width:180px;">$i18n.getString( "identifiers_and_attributes" )</th>

=== 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	2012-10-12 03:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-10-12 04:09:53 +0000
@@ -58,9 +58,14 @@
 	</table>
 
 	<table id="programStageMembersArea">
+		<colgroup>
+			<col style="width:550px;"/>
+			<col/>
+			<col style="width:500px;"/>
+		</colgroup>
 		<thead>
 			<tr>
-				<th style='width:300px;'>$i18n.getString( "available_data_elements" )</th>
+				<th>$i18n.getString( "available_data_elements" )</th>
 				<th></th>
 				<th>$i18n.getString( "selected_data_elements" )
 					<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="hidden" > </select>
@@ -74,7 +79,7 @@
 		
 		<tr>
 			<td>
-				<select style='width:300px;' size="15" id="availableList" multiple="multiple" ondblclick="selectDataElements( )">
+				<select style='width:100%;' size="15" id="availableList" multiple="multiple" ondblclick="selectDataElements( )">
 				</select>
 			</td>
 			
@@ -88,11 +93,16 @@
 			<td>
 				<div class="dataElementDiv">
 					<table>
+						<colgroup>
+							<col/>
+							<col style="width:20px;"/>
+							<col style="width:20px;"/>
+						</colgroup>
 						<thead>
 							<tr>
 								<th>$i18n.getString( "dataelement" )</th>
-								<th width="20px">$i18n.getString( "compulsory" )</th>
-								<th width="20px">$i18n.getString( "allow_provided_elsewhere" )</th>
+								<th>$i18n.getString( "compulsory" )</th>
+								<th>$i18n.getString( "allow_provided_elsewhere" )</th>
 							</tr>
 						</thead>
 						<tbody id="selectedList">