dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19466
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8498: Minor fix ui for resolution with 1024px width; Add back button for person management.
------------------------------------------------------------
revno: 8498
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-12 10:37:31 +0700
message:
Minor fix ui for resolution with 1024px width; Add back button for person management.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm
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/caseAggregationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js
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-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm 2012-09-24 05:02:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm 2012-10-12 03:37:31 +0000
@@ -51,6 +51,7 @@
<td></td>
<td>
<input type="submit" class="button" value="$i18n.getString( 'add' )"/>
+ <input type='button' class="button" value="$i18n.getString( 'cancel' )" onclick="loadPatientList();" />
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2012-10-11 04:30:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2012-10-12 03:37:31 +0000
@@ -112,7 +112,7 @@
<tr>
<td>
<input type="button" value="$i18n.getString( 'assign_relationship' )" onclick="javascript:validateAddRelationship()" />
- <input type="button" value="$i18n.getString( 'back_to_relationship' )" onclick="showRelationshipList($patient.id)" />
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="showRelationshipList($patient.id)" />
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-10-03 07:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-10-12 03:37:31 +0000
@@ -78,7 +78,8 @@
<tr>
<td></td>
<td>
- <input type="submit" class='button' value="$i18n.getString( 'update' )" >
+ <input type="submit" class='button' value="$i18n.getString( 'update' )" />
+ <input type='button' class="button" value="$i18n.getString( 'cancel' )" onclick="loadPatientList();" />
</td>
</tr>
</table>
=== 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-03 04:27:41 +0000
+++ 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
@@ -81,7 +81,7 @@
<table id="programStageMembersArea">
<thead>
<tr>
- <th>$i18n.getString( "available_identifiers_and_attributes" )</th>
+ <th style="width:200px;">$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 +91,7 @@
</thead>
<tr>
<td>
- <select size="15" style="width: 330px;" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();">
+ <select size="15" style="width:300px;" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();">
#foreach( $identifier in $availableIdentifierTypes )
<option value="iden_$identifier.id">$identifier.name</option>
#end
@@ -111,8 +111,8 @@
<table>
<thead>
<tr>
- <th>$i18n.getString( "identifiers_and_attributes" )</th>
- <th width="20px">$i18n.getString( "displayed_in_list" )</th>
+ <th style="width:180px;">$i18n.getString( "identifiers_and_attributes" )</th>
+ <th style="width:20px;">$i18n.getString( "displayed_in_list" )</th>
</thead>
<tbody id="selectedList"></tbody>
</table>
@@ -124,7 +124,7 @@
</td>
</tr>
<tr>
- <td>
+ <td colspan='3'>
<input type="submit" value="$i18n.getString( 'add' )" >
<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='program.action'" >
</td>
=== 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-03 05:23:27 +0000
+++ 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
@@ -57,7 +57,7 @@
<table id="programStageMembersArea">
<thead>
<tr>
- <th>$i18n.getString( "available_data_elements" )</th>
+ <th style='width:300px;'>$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 +70,7 @@
<tbody>
<tr>
<td>
- <select size="15" id="availableList" name='availableList' multiple="multiple" ondblclick="selectDataElements()">
+ <select style='width:300px;' size="15" id="availableList" name='availableList' multiple="multiple" ondblclick="selectDataElements()">
</select>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm 2012-10-03 02:46:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm 2012-10-12 03:37:31 +0000
@@ -16,7 +16,7 @@
<tr>
<td>
- <input type='text' id='txtSearchValue' name='txtSearchValue' onKeyUp="filterDE(event, this.value, 'dataElements');" style='width:270px'/>
+ <input type='text' id='txtSearchValue' name='txtSearchValue' onKeyUp="filterDE(event, this.value, 'dataElements');" style='width:265px;'/>
<input type='button' value='$i18n.getString("clear")' onClick="setFieldValue('txtSearchValue', '');" style='width:50px'> </td>
<td rowspan="4">
<select name="suggestedDEValues" size="10" multiple id='suggestedDEValues' ondblclick="insertSingleValue('suggestedDEValues');" >
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2012-10-03 02:46:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2012-10-12 03:37:31 +0000
@@ -80,10 +80,8 @@
input.autocomplete( "close" );
return;
}
-
// work around a bug (likely same cause as #5265)
$( this ).blur();
-
// pass empty string as value to search for, displaying all results
input.autocomplete( "search", "" );
input.focus();
=== 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-09-28 06:26:01 +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 03:37:31 +0000
@@ -66,7 +66,7 @@
{
overflow:auto;
height:20em;
- width:30em;
+ 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-06 13:46:23 +0000
+++ 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
@@ -87,7 +87,7 @@
<table>
<thead>
<tr>
- <th>$i18n.getString( "available_identifiers_and_attributes" )</th>
+ <th style="width:200px;">$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 +98,7 @@
<tr>
<td>
- <select size="15" style="width: 330px;" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();" #if( $program.type=='3' ) disabled #end>
+ <select size="15" style="width:300px;" 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
@@ -118,8 +118,8 @@
<table>
<thead>
<tr>
- <th>$i18n.getString( "identifiers_and_attributes" )</th>
- <th width="20px">$i18n.getString( "displayed_in_list" )</th>
+ <th style="width:180px;">$i18n.getString( "identifiers_and_attributes" )</th>
+ <th style="width:20px;">$i18n.getString( "displayed_in_list" )</th>
</thead>
<tbody id="selectedList" #if($program.type==3) style="display:none;" #end>
#foreach( $identifier in $program.patientIdentifierTypes )
@@ -144,7 +144,7 @@
</td>
</tr>
<tr>
- <td>
+ <td colspan='3'>
<input type="submit" value="$i18n.getString( 'update' )">
<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='program.action'">
</td>
=== 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-03 05:23:27 +0000
+++ 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
@@ -60,7 +60,7 @@
<table id="programStageMembersArea">
<thead>
<tr>
- <th>$i18n.getString( "available_data_elements" )</th>
+ <th style='width:300px;'>$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 +74,7 @@
<tr>
<td>
- <select size="15" id="availableList" multiple="multiple" ondblclick="selectDataElements( )">
+ <select style='width:300px;' size="15" id="availableList" multiple="multiple" ondblclick="selectDataElements( )">
</select>
</td>
