dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14994
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-04-25 19:04:15 +0200
message:
  Program stage custom form, cosmetic fix
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewDataEntryForm.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.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-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewDataEntryForm.js	2013-05-27 04:33:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewDataEntryForm.js	2014-04-25 17:04:15 +0000
@@ -6,7 +6,7 @@
 jQuery(function(){
 	dataElementSelector = jQuery("#dataElementDiv").dialog({
 		title: i18n_dataelement,
-		height: 420,
+		height: 360,
 		width: 480,
 		position: [$("body").width()- 50, 0],
 		autoOpen: false,

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm	2013-12-17 01:29:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm	2014-04-25 17:04:15 +0000
@@ -130,7 +130,7 @@
 	<table id='dataElementSelection'>
 		<tr>
 			<td>
-				$i18n.getString( "dataelement" )
+				$i18n.getString( "filter" )&nbsp;
 				<input type="text" id='dataElementFilter' style="width:240px;" onkeyup="filterDataElements( this.value, '#dataElementSelection', '#dataElementIds')"/>
 			</td>
 			<td>	
@@ -154,7 +154,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td colspan='2' style="background-color:#DFEFEC;">
+			<td colspan='2'>
 				<table>
 					<tr>
 						<td>$i18n.getString("display_name")</td>
@@ -177,7 +177,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td colspan='2'><hr/>
+			<td colspan='2'>
 				#if(!$programStages.isEmpty())
 				<input type="button" value="$i18n.getString('other_program_stages')" onclick="hideById('dataElementSelection');showById('otherProgramStageDataElements');" >
 				#end
@@ -243,7 +243,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td colspan='2'><hr/>
+			<td colspan='2'>
 				<input type="button" value="$i18n.getString('selected_program_stages')" onclick="hideById('otherProgramStageDataElements');showById('dataElementSelection');" >
 				<input type="button" value="Insert" id="insert" name="insert" onclick="insertDataElement( '#otherProgramStageDataElements', byId('programStageIds').value )"/>
 			</td>