------------------------------------------------------------
revno: 5691
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Wed 2012-01-11 11:28:26 +0530
message:
(mobile) minor fixes
modified:
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/settings.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.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-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2012-01-09 14:29:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2012-01-11 05:58:26 +0000
@@ -46,3 +46,5 @@
subject=Subject
reply=Reply
write_feedback=Write feedback
+successfully_marked_as_complete=Successfully marked as complete
+successfully_marked_as_not_complete=Successfully marked as not complete
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm 2012-01-09 14:29:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm 2012-01-11 05:58:26 +0000
@@ -7,6 +7,14 @@
<h2>$encoder.htmlEncode( $dataSetName )</h2>
+<div class="header-box" align="center">
+#if( $markComplete == true )
+ <h3 style="text-align: left;">$i18n.getString( "successfully_marked_as_complete" )</h3>
+#elseif( $markComplete == false )
+ <h3 style="text-align: left;">$i18n.getString( "successfully_marked_as_not_complete" )</h3>
+#end
+</div>
+
#*
#if( $validationRuleViolations.size() > 0 )
<div class="header-box" align="center">
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/settings.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/settings.vm 2012-01-04 11:36:32 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/settings.vm 2012-01-11 05:58:26 +0000
@@ -7,10 +7,10 @@
<h3 style="text-align: left;">$i18n.getString( "update_user" )</h3>
<p style="text-align: left;">
$i18n.getString("first_name") *<br/>
- <input type="text" id="firstName" name="firstName" value="$!firstName" /> <br />
+ <input type="text" id="firstName" name="firstName" value="$!firstName" />
$i18n.getString("surname") *<br />
- <input type="text" id="surname" name="surname" value="$!surname" /> <br />
+ <input type="text" id="surname" name="surname" value="$!surname" />
$i18n.getString("phone_number") <br />
<input type="text" id="phoneNumber" name="phoneNumber" value="$!phoneNumber" />
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css 2012-01-09 14:29:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css 2012-01-11 05:58:26 +0000
@@ -84,7 +84,7 @@
body div#content ul li
{
- padding-bottom : 8px;
+ padding-bottom : 4px;
}
/*
@@ -95,9 +95,9 @@
{
height : 20px;
background-color : #1d5288;
- border-bottom : 4px solid #184572;
- padding-top : 2px;
- padding-bottom : 2px;
+ border-bottom : 2px solid #184572;
+ padding-top : 1px;
+ padding-bottom : 1px;
margin-bottom : .5em;
}
@@ -345,7 +345,7 @@
/* compensates for smaller Opera Mini margins */
ol, ul, dl
{
- margin-left : 2%;
+ margin-left : 1%;
padding-left : 5px;
}
@@ -356,7 +356,7 @@
dd
{
- margin-left : 2%;
+ margin-left : 1%;
}
/*forces native margin*/
_______________________________________________
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
