dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9023
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-11-14 13:20:31 +0100
message:
  Cosmetic fix for history in data entry
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.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-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2012-08-12 20:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2012-11-14 12:20:31 +0000
@@ -13,7 +13,7 @@
 	<tr>		
 		<!-- Comment -->
 		<td style="height:24px" valign="bottom">
-            <h4>$i18n.getString( "dataelement_comment" )
+            <div class="historyHeader">$i18n.getString( "dataelement_comment" )
 
 			#if ( $dataValue && $dataValue.isFollowup() )
 		        <img id="followup" src="../images/marked.png" alt="$i18n.getString( 'mark_value_for_followup' )" onclick="markValueForFollowup()" style="cursor:pointer"/>
@@ -22,11 +22,11 @@
 			#else
 			    <img id="followup" src="../images/unmarked.png"/>
 			#end			
-			</h4>
+			</div>
 		</td>
-		<!-- Min-max -->        
+		<!-- Min-max -->
 		<td style="height:24px" valign="bottom">       
-            <h4>$encoder.htmlEncode( $i18n.getString( "min_max_limits" ) )</h4>
+            <div class="historyHeader">$encoder.htmlEncode( $i18n.getString( "min_max_limits" ) )</div>
         </td>
     </tr>
     <tr>
@@ -79,9 +79,9 @@
 		<!-- History chart -->
 		<td colspan="2">
 			#if( $historyInvalid )
-			<h4>$encoder.htmlEncode( $i18n.getString( "history_not_valid" ) )</h4>	
+			<div class="historyHeader">$encoder.htmlEncode( $i18n.getString( "history_not_valid" ) )</div>	
 			#else
-			<h4>$encoder.htmlEncode( $i18n.getString( "dataelement_history" ) )</h4>
+			<div class="historyHeader">$encoder.htmlEncode( $i18n.getString( "dataelement_history" ) )</div>
 			<img id="historyChart" src="getHistoryChart.action?dataElementId=${dataElementHistory.dataElement.id}&categoryOptionComboId=${dataElementHistory.optionCombo.id}&organisationUnitId=${dataElementHistory.organisationUnit.id}&periodId=${periodId}"/>
 			#end
         </td>
@@ -90,7 +90,7 @@
 	<tr>
 		<!-- Data Value History -->
 		<td colspan="2">
-			<h4>$encoder.htmlEncode( $i18n.getString( "datavalue_history" ) )</h4>
+			<<div class="historyHeader">>$encoder.htmlEncode( $i18n.getString( "datavalue_history" ) )</div>
 			#foreach( $eachDataValueAudit in $dataValueAudits )
 				<p>
 					$encoder.htmlEncode( $i18n.getString( "on" ) ) $eachDataValueAudit.timeStamp, 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-11-14 10:34:24 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-11-14 12:20:31 +0000
@@ -1369,10 +1369,10 @@
 function displayHistoryDialog( operandName )
 {
     $( '#historyDiv' ).dialog( {
-        modal : true,
-        title : operandName,
-        width : 580,
-        height : 710
+        modal: true,
+        title: operandName,
+        width: 580,
+        height: 660
     } );
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2012-10-15 08:45:08 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2012-11-14 12:20:31 +0000
@@ -53,3 +53,10 @@
   outline: 0;
   color: #333;
 }
+
+.historyHeader
+{
+  color: #606060;
+  font-size: 17px;
+  padding: 5px 0;
+}