dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22821
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11097: Data entry, internationalized message
------------------------------------------------------------
revno: 11097
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-29 23:44:35 +0200
message:
Data entry, internationalized message
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
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/select.vm
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/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2013-04-15 12:48:18 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2013-05-29 21:44:35 +0000
@@ -16,6 +16,7 @@
filter_on_section=Filter on section
filter_in_section=Filter in section
show_all_sections=Show all sections
+show_all_items=Show all items
earlier_periods=Earlier periods
later_periods=Later periods
value_of_data_element_less=The value of the following data element is less than the minimum accepted value
=== 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 2013-05-29 21:21:25 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2013-05-29 21:44:35 +0000
@@ -410,7 +410,8 @@
saveBoolean( dataElementId, optionComboId, id );
} );
- $( this ).css( 'width', '90%' );
+ $( this ).css( 'width', '88%' );
+ $( this ).css( 'margin-right', '2px' );
} );
$( '[name="entrytrueonly"]' ).each( function( i )
@@ -2361,6 +2362,7 @@
return;
}
+ input.css( "width", "85%" );
input.autocomplete( {
delay: 0,
minLength: 0,
@@ -2387,7 +2389,7 @@
var button = $( "<a style='width:20px; margin-bottom:-5px;height:20px;'>" )
.attr( "tabIndex", -1 )
- .attr( "title", 'i18n_show_all_items' )
+ .attr( "title", i18n_show_all_items )
.appendTo( wrapper )
.button( {
icons: {
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2013-02-05 12:34:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2013-05-29 21:44:35 +0000
@@ -37,6 +37,7 @@
var i18n_register_complete_failed_dataset_is_locked = '$encoder.jsEscape( $i18n.getString( "register_complete_failed_dataset_is_locked" ) , "'")';
var i18n_unregister_complete_failed_dataset_is_locked = '$encoder.jsEscape( $i18n.getString( "unregister_complete_failed_dataset_is_locked" ) , "'")';
var i18n_show_all_sections = '$encoder.jsEscape( $i18n.getString( "show_all_sections" ) , "'")';
+var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
var i18n_all_values_for_data_element_must_be_filled = '$encoder.jsEscape( $i18n.getString( "all_values_for_data_element_must_be_filled" ) , "'")';
var i18n_validation_result = '$encoder.jsEscape( $i18n.getString( "validation_result" ) , "'")';
var i18n_successful_validation = '$encoder.jsEscape( $i18n.getString( "successful_validation" ) , "'")';
=== 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 2013-05-29 21:15:22 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2013-05-29 21:44:35 +0000
@@ -45,6 +45,7 @@
padding-right: 2px;
padding-left: 2px;
height: 28px;
+ white-space: nowrap;
}
.formSection th