dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2255
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-09-27 17:55:41 +0700
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.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/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm	2010-04-05 12:33:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm	2010-09-27 10:55:41 +0000
@@ -34,11 +34,9 @@
             <table class="listTable">
                 <col>
                 <col>
-                <col width="20">
                 <col width="20">           
                   
                 <tr>
-                    <td></td>
                     <td></td> 
                     <td style="text-align:right">
                         <input type="button" value="$i18n.getString( "add_new" )" onclick="javascript:showAddRelationship()">                                                              
@@ -51,46 +49,37 @@
                 <tr>            
                     <th>$i18n.getString( "relationship" )</th>
                     <th>$i18n.getString( "full_name" )</th>
-                    <th colspan="3">$i18n.getString( "operations" )</th>
+                    <th style="text-align:center">$i18n.getString( "operations" )</th>
                 </tr>
                 <tbody id="list">                
-                    #set( $mark = false )
                     #foreach( $relationship in $relationships )
-                        <tr>
+                        <tr id="tr${relationship.id}">
                             #set( $partnerId = false )    
                             #if( $relationship.patientA.id == $patient.id )
                                 #set( $partnerId = $relationship.patientB.id )
-                                <td#alternate( $mark )>                                
+                                <td>                                
                                     $encoder.htmlEncode( $relationship.relationshipType.BIsToA )
                                 </td>
                                             
-                                <td#alternate( $mark )>
+                                <td>
                                     $encoder.htmlEncode( $relationship.patientB.getFullName() )
                                 </td>
                             #elseif($relationship.patientB.id == $patient.id )
                                 #set( $partnerId = $relationship.patientA.id )
-                                <td#alternate( $mark )>                                
+                                <td>                                
                                     $encoder.htmlEncode( $relationship.relationshipType.AIsToB )
                                 </td>
                                             
-                                <td#alternate( $mark )>
+                                <td>
                                     $encoder.htmlEncode( $relationship.patientA.getFullName() )
                                 </td>
                             #end                  
                             
-                            <td style="text-align:center"#alternate( $mark )>
+                            <td style="text-align:center">
                                 <a href="javascript:manageRepresentative( '$patient.id', $partnerId )" title="$i18n.getString( "manage_representative" )"><img src="../images/assign.png" alt="$i18n.getString( "manage_representative" )"></a>
-                            </td>                                       
- 
-                            <td style="text-align:center"#alternate( $mark )>
                                 <a href="javascript:removeRelationship( '$relationship.id', '$encoder.jsEncode( $relationship.patientA.getFullName() )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$encoder.jsEncode( $relationship.patientB.getFullName() )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
-                            </td>               
+                            </td>   						
                         </tr>
-                        #if( $mark )
-                            #set( $mark = false )
-                        #else
-                            #set( $mark = true )
-                        #end
                     #end
                 </tbody>
             </table>