dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19250
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-06-02 13:55:38 +0200
message:
  Program indicator ui, placeholder instead of labels
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.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/programIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm	2015-06-02 11:47:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm	2015-06-02 11:55:38 +0000
@@ -11,11 +11,8 @@
 	<div id="tab-1">
 	  <table style="width:100%">
         <tr>
-			<td><label for="dataelement">$i18n.getString( "dataelement" )</label></td>
-		</tr>
-        <tr>
 			<td>
-				<input type='text' id='txtSearchValue' name='txtSearchValue' onKeyUp="filterDE(event, this.value, 'dataElements');" />
+				<input type='text' id='txtSearchValue' name='txtSearchValue' onKeyUp="filterDE(event, this.value, 'dataElements');" placeholder="$i18n.getString('filter')" />
 				<input type='button' value='$i18n.getString("clear")' onClick="setFieldValue('txtSearchValue', '');" />			
 			</td>
         </tr>
@@ -31,9 +28,6 @@
 	<div id="tab-2">
 		<table style="width:100%">
 			<tr>
-				<td><label for="programProperty">$i18n.getString('program_properties')</label></td>
-			</tr>
-			<tr>
 				<td>
 					<select multiple id="programProperty" name="programProperty" size="10" style="width:100%" ondblclick="insertInfo(this, false);" >
 						<option value="V{incident_date}">$i18n.getString( "incident_date" )</option>
@@ -50,11 +44,8 @@
 	<div id="tab-3">
 		<table style="width:100%">
         <tr>
-			<td><label for="attributes">$i18n.getString( "attribute" )</label></td>
-		</tr>
-        <tr>
 			<td>
-				<input type='text' id='txtSearchAttrValue' name='txtSearchAttrValue' onKeyUp="filterAttr(event, this.value, 'attributes');" />
+				<input type='text' id='txtSearchAttrValue' name='txtSearchAttrValue' onKeyUp="filterAttr(event, this.value, 'attributes');" placeholder="$i18n.getString('filter')" />
 				<input type='button' value='$i18n.getString("clear")' onClick="setFieldValue('txtSearchAttrValue', '');" />			
 			</td>
         </tr>
@@ -77,11 +68,8 @@
 	<div id="tab-4">
 		<table style="width:100%">
         <tr>
-			<td><label for="constant">$i18n.getString( "constant" )</label></td>
-		</tr>
-        <tr>
 			<td>
-				<input type='text' id='txtSearchContsValue' name='txtSearchAttrValue' onKeyUp="filterAttr(event, this.value, 'attributes');" />
+				<input type='text' id='txtSearchContsValue' name='txtSearchAttrValue' onKeyUp="filterAttr(event, this.value, 'attributes');" placeholder="$i18n.getString('filter')" />
 				<input type='button' value='$i18n.getString("clear")' onClick="setFieldValue('txtSearchAttrValue', '');" />			
 			</td>
         </tr>