dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7816
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-08-01 20:49:42 +0200
message:
  css
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css


--
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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-08-01 14:29:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-08-01 18:49:42 +0000
@@ -384,4 +384,5 @@
 remove_empty_events_success = Removed empty events successfully
 confirm_remove_empty_events = Are you sure you want to remove empty events?
 please_select_relationship_type = Please select a relationship type
-please_select_a_patient_for_setting_relationship = Please select a person for setting relationship
\ No newline at end of file
+please_select_a_patient_for_setting_relationship = Please select a person for setting relationship
+report_date_from_to=Report date (from-to)
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-08-01 18:20:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-08-01 18:49:42 +0000
@@ -71,11 +71,11 @@
 				#end
 			</tr>
 			<tr>
-				<td>$i18n.getString('report_date')</td>
+				<td>$i18n.getString('report_date_from_to')</td>
 				<td colspan='3'>&nbsp;<input type="text" id='startDate' name='startDate' style='width:240px'></td>
-				<td colspan='4'>$i18n.getString('to') <input type="text" id='endDate' name='endDate' style='width:240px'></td>
+				<td colspan='4'><input type="text" id='endDate' name='endDate' style='width:240px'></td>
 				#set($cols = $levels.size() - 7)
-				<td colspan='$cols'><input type="button" id='searchBtn' class='large-button' value='$i18n.getString( "search" )' onclick='validateSearchEvents( false )'></td>
+				<td colspan='$cols'><input type="button" id='searchBtn' value='$i18n.getString( "search" )' onclick='validateSearchEvents( false )'></td>
 			</tr>
 			<tr>
 				<td valign="top">$i18n.getString('data_elements')</td>
@@ -84,13 +84,13 @@
 					<table id='advancedSearchTB'>	
 						<tbody>
 							<tr id='advSearchBox0'>	
-								<td id='searchingAttributeIdTD' >
+								<td id='searchingAttributeIdTD' style="width:298px">
 									<select id="searchObjectId" name="searchObjectId" style='margin-right:18px;' onchange='dataElementOnChange(this);'></select>
 								</td>		
-								<td style='padding-right:30px;'>
+								<td>
 									<input type="text" id="searchText" name="searchText" value="$!searchText">
+									<input type="button" id='addSearchOptionBtn' name='addSearchOptionBtn' class='small-button' value='+' onclick='addAttributeOption()'>
 								</td>
-								<td><input type="button" id='addSearchOptionBtn' name='addSearchOptionBtn' class='small-button' value='+' onclick='addAttributeOption();'> </td>
 							</tr>
 						</tbody>
 					</table>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-08-01 14:15:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-08-01 18:49:42 +0000
@@ -77,7 +77,7 @@
 	var rowId = 'advSearchBox' + jQuery('#advancedSearchTB select[name=searchObjectId]').length + 1;
 	var contend  = '<td>' + getInnerHTML('searchingAttributeIdTD') + '</td>';
 		contend += '<td>' + searchTextBox ;
-		contend += '<input type="button" class="small-button" value="-" onclick="removeAttributeOption(' + "'" + rowId + "'" + ');"></td>';
+		contend += '&nbsp;<input type="button" class="small-button" value="-" onclick="removeAttributeOption(' + "'" + rowId + "'" + ');"></td>';
 		contend = '<tr id="' + rowId + '">' + contend + '</tr>';
 
 	jQuery('#advancedSearchTB > tbody:last').append( contend );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-08-01 18:20:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-08-01 18:49:42 +0000
@@ -90,6 +90,7 @@
   border: 1px solid #a4d2a3;
   background-color: #d5efd5;
   padding-top: 10px;
+  padding-right: 20px;
   padding-bottom: 5px;
   padding-left: 20px;
   margin-bottom: 15px;