------------------------------------------------------------
revno: 11327
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Thu 2013-07-04 11:50:21 +0700
message:
Minor fix for default registration form.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.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/defaultPatientRegistationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm 2013-07-03 15:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm 2013-07-04 04:50:21 +0000
@@ -108,7 +108,7 @@
</td>
<td>
<input type="button" value=">" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableFixedAttributes', 'fixedAttributes' )" class='filterButton'/><br/>
- <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'fixedAttributes', 'availableFixedAttributes' )" class='filterButton'/>
+ <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'fixedAttributes', 'availableFixedAttributes' )" class='filterButton'/><br/>
<input type="button" value=">>" onclick="moveAllById( 'availableFixedAttributes', 'fixedAttributes' )" class='filterButton' /><br/>
<input type="button" value="<<" onclick="moveAllById( 'fixedAttributes', 'availableFixedAttributes' )" class='filterButton' />
</td>
@@ -147,7 +147,7 @@
</td>
<td>
<input type="button" value=">" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableIdentifierTypes', 'identifierTypeIds' )" class='filterButton'/><br/>
- <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'identifierTypeIds', 'availableIdentifierTypes' )" class='filterButton'/>
+ <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'identifierTypeIds', 'availableIdentifierTypes' )" class='filterButton'/><br/>
<input type="button" value=">>" onclick="moveAllById( 'availableIdentifierTypes', 'identifierTypeIds' )" class='filterButton' /><br/>
<input type="button" value="<<" onclick="moveAllById( 'identifierTypeIds', 'availableIdentifierTypes' )" class='filterButton' />
</td>
@@ -186,7 +186,7 @@
</td>
<td>
<input type="button" value=">" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableAttributes', 'dynamicAttributeIds' )" class='filterButton'/><br/>
- <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'dynamicAttributeIds', 'availableAttributes' )" class='filterButton'/>
+ <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'dynamicAttributeIds', 'availableAttributes' )" class='filterButton'/><br/>
<input type="button" value=">>" onclick="moveAllById( 'availableAttributes', 'dynamicAttributeIds' )" class='filterButton' /><br/>
<input type="button" value="<<" onclick="moveAllById( 'dynamicAttributeIds', 'availableAttributes' )" class='filterButton' />
</td>
@@ -206,7 +206,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientAttributeGroup.action'"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientRegistrationForm.action'"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-07-03 15:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-07-04 04:50:21 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "patient_registration_form_management" ) #openHelp( "person_registration_form" )</h3>
-<table width="70%">
+<table class='mainPageTable'>
#set($display = 'block')
#foreach( $registrationForm in $registrationForms )
#if( $!registrationForm.program )
@@ -38,11 +38,11 @@
#end
</td>
<td style="text-align:center">
- <a id='update_$registrationForm.program.id' href="javascript:updateNewForm($registrationForm.id, '$!registrationForm.program.id')" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
- <a id='add_$registrationForm.program.id' href="javascript:addNewForm($registrationForm.program.id)" title="$i18n.getString( 'design_data_entry_form' )" style='display:none;'><img src="../images/add.png" alt="$i18n.getString( 'design_data_entry_form' )" ></a>
-
- <a href="javascript:showDefaultRegistrationForm('$!registrationForm.program.id');"><img src='../images/edit_layout.png' alt="$i18n.getString( 'design_data_entry_form' )"></a>
-
+ <a href="javascript:showDefaultRegistrationForm('$!registrationForm.program.id');"><img src='../images/edit.png' alt="$i18n.getString( 'edit' )"></a>
+
+ <a id='update_$registrationForm.program.id' href="javascript:updateNewForm($registrationForm.id, '$!registrationForm.program.id')" title="$i18n.getString( 'edit' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
+ <a id='add_$registrationForm.program.id' href="javascript:addNewForm($registrationForm.program.id)" title="$i18n.getString( 'design_data_entry_form' )" style='display:none;'><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )" ></a>
+
<a href="javascript:removeRegistrationForm( '$!registrationForm.program.id', '$!encoder.jsEncode( $registrationForm.program.name )')" title="$i18n.getString( "remove" )"><img id='active_$registrationForm.program.id' src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
<img id='define_$registrationForm.program.id' style='display:none;' src='../images/delete-denied.png' title='$i18n.getString("remove")'>
</td>
@@ -54,9 +54,9 @@
<td>$encoder.htmlEncode( $program.name )</td>
<td>[$i18n.getString('none')]</td>
<td style="text-align:center">
- <a href="javascript:addNewForm($program.id)" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/add.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
- <a href="javascript:showDefaultRegistrationForm($program.id);"><img src='../images/edit_layout.png' alt="$i18n.getString( 'design_data_entry_form' )"></a>
- <img src='../images/delete-denied.png' title='$i18n.getString("remove")'>
+ <a href="javascript:showDefaultRegistrationForm($program.id);"><img src='../images/edit.png' alt="$i18n.getString( 'design_data_entry_form' )"></a>
+ <a href="javascript:addNewForm($program.id)" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
+ <img src='../images/delete-denied.png' title='$i18n.getString("remove")'>
</td>
</tr>
#end
@@ -65,8 +65,8 @@
<td>$i18n.getString('all')</td>
<td>[$i18n.getString('none')]</td>
<td style="text-align:center">
- <a href="javascript:addNewForm('')" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/add.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
- <a href="javascript:showDefaultRegistrationForm('');"><img src='../images/edit_layout.png' alt="$i18n.getString( 'design_data_entry_form' )"></a>
+ <a href="javascript:showDefaultRegistrationForm('');"><img src='../images/edit.png' alt="$i18n.getString( 'design_data_entry_form' )"></a>
+ <a href="javascript:addNewForm('')" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
<img src='../images/delete-denied.png' title='$i18n.getString("remove")'>
</td>
</tr>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
