------------------------------------------------------------
revno: 187
committer: Bob Jolliffe <bobjolli...@gmail.com
branch nick: dhis2
timestamp: Fri 2009-04-17 01:20:52 +0100
message:
Bug #362646: Inconsistent look and feel
Added heading to Data Entry module main page
Added data_entry string to i18n properties
Changed style of 'current_selection' box
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/select.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
=== 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
2009-03-10 10:19:13 +0000
+++
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
2009-04-17 00:20:52 +0000
@@ -96,3 +96,4 @@
greater_than_or_equal_to = >=
less_than = <
less_than_or_equal_to = <=
+data_entry = Data Entry
=== 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
2009-03-09 07:09:39 +0000
+++
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
2009-04-17 00:20:52 +0000
@@ -1,3 +1,4 @@
+<h3>$i18n.getString( "data_entry" )</h3>
<div id="currentSelection">
#if ( $organisationUnit ) $encoder.htmlEncode( $organisationUnit.name
)#else $i18n.getString( "no_organisationunit_selected" ) #end -
=== 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
2009-03-03 16:46:36 +0000
+++
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css
2009-04-17 00:20:52 +0000
@@ -1,15 +1,11 @@
#currentSelection
{
- position: fixed;
- top: 95px;
- right: 5px;
color: black;
padding: 5px;
background-color: #D5FFC5;
border: 1px solid black;
font-size: 14px;
- width: 58%;
text-align: right;
}
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
2009-03-14 06:16:14 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
2009-04-17 00:20:52 +0000
@@ -1,4 +1,4 @@
-data_locking
= Data Locking
+data_locking
= Data Locking
locked_datasets
= Locked data sets
unlocked_datasets
= Unlocked data sets
save
= Save
--
Trunk
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
