dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4749
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-09-28 21:04:43 +0200
message:
  (mobile) made dataentry screen work a bit better on windows phone 7
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm


--
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/webapp/dhis-web-light/dataEntry.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-09-28 12:54:12 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-09-28 19:04:43 +0000
@@ -9,14 +9,14 @@
 <input type="hidden" id="validated" name="validated" value="#if($validated)true#{else}false#end" />
 
 #macro( createSection $sectionName $dataElements )
-<div class="header-box">
-	<h3>$sectionName</h3>
-	<p>
+<div class="header-box" align="center">
+	<h3 style="text-align: left;">$sectionName</h3>
+	<p style="text-align: left;">
 		#foreach( $dataElement in $dataElements)
 			#foreach( $optionCombo in $dataElement.categoryCombo.optionCombos )
 				#set( $key = "DE${dataElement.id}OC${optionCombo.id}" )
 				<label>$dataElement.name $optionCombo.name</label>
-	
+
 				#if( $validationErrors.get( $key ) )
 				#set( $validationError = $validationErrors.get( $key ) ) 
 				<br /><span style="color: red;">Value is out of bounds [ $validationError.min, $validationError.max ]</span>
@@ -37,16 +37,16 @@
 	#createSection( "Default" $dataSet.dataElements )
 #end
 
-<div class="header-box">
-	<p>
-		<input type="checkbox" id="complete" name="complete" value="true" #if($complete)checked="true"#end style="width: 15px;" />
-		<label for="complete">DataSet is complete</label>
+<div class="header-box" align="center">
+	<p style="text-align: left;">
+		<input type="checkbox" id="complete" name="complete" value="true" #if($complete)checked="true"#end style="width: 15px; height: 15px; vertical-align: middle;" />
+        <label for="complete" style="vertical-align: middle; width: auto;">DataSet is complete</label>
 	</p>
 </div>
 
 <div class="header-box" align="center">
 	<p>
-		<input type="submit" style="width: 100%;" value="Save"/> <br />
+		<input type="submit" style="width: 100%;" value="Save"/>
 	</p>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-09-26 07:51:12 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-09-28 19:04:43 +0000
@@ -14,7 +14,7 @@
 	<a href="index.action" tabindex="-1"><img src="../dhis-web-commons/security/logo_mobile.jpg" alt="DHIS2" width="47" height="20"></a>
 </div>
 
-<div id="content">
+<div id="content" align="center" style="text-align: left;">
 
 #parse( $page )
 

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2011-09-23 13:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2011-09-28 19:04:43 +0000
@@ -1,7 +1,9 @@
 
 <h2>Menu</h2>
 
-<ul>
-	<li><a href="dashboard.action">Dashboard</a></li>
-	<li><a href="selectOrganisationUnit.action">Data Entry</a></li>
-</ul>
+<p>
+    <ul>
+        <li><a href="dashboard.action">Dashboard</a></li>
+        <li><a href="selectOrganisationUnit.action">Data Entry</a></li>
+    </ul>
+</p>