dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7808
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-08-01 16:15:58 +0200
message:
  Improved color help dialog
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/colorHelp.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-07-30 03:39:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-08-01 14:15:58 +0000
@@ -375,10 +375,10 @@
 color_quick_help = Color quick help
 color = Color
 what_do_colors_mean = What do colors mean ?
-completed_stages = Completed stages.
-data_entered_and_uncompleted_stages = Data entered and uncompleted stages.
-coming_stages = Coming stages.
-stages_open_but_no_data_entered_while_the_date_estimated_for_closing_completing_is_over = Stages open but no data entered while the date estimated for closing/completing is over.
+completed_stages = Stage is complete
+data_entered_and_uncompleted_stages = Stage is incomplete but has registered data
+coming_stages = Stage is scheduled in future
+stages_open_but_no_data_entered = Stage is overdue and incomplete
 value_is_invalid = Value is invalid
 value_is_valid = Value is valid
 incomplete_confirm_message=Are you sure this event is incompleted ?

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm	2012-08-01 14:06:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm	2012-08-01 14:15:58 +0000
@@ -20,7 +20,7 @@
 		</tr>
 		<tr>
 			<td id='colorRedTD'><script>byId('colorRedTD').style.backgroundColor = COLOR_RED;</script></td>
-			<td>$i18n.getString('stages_open_but_no_data_entered_while_the_date_estimated_for_closing_completing_is_over')</td>
+			<td>$i18n.getString('stages_open_but_no_data_entered')</td>
 		</tr>
 	</table>
 </div>
\ No newline at end of file

=== 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:00:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-08-01 14:15:58 +0000
@@ -426,7 +426,7 @@
 		maximize: true, 
 		closable: true,
 		modal:false,
-		width: 500,
-		height: 220
+		width: 380,
+		height: 250
 	}).show('fast');
 }

=== 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 14:06:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-08-01 14:15:58 +0000
@@ -201,3 +201,8 @@
 {
     display: none;
 }
+
+.colorHelpTable td
+{
+	height: 32px;
+}