dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4750
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-09-28 21:31:03 +0200
message:
  (mobile) made login screen work a bit better on windows phone 7
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm
  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/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-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css	2011-09-26 07:51:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css	2011-09-28 19:31:03 +0000
@@ -176,9 +176,9 @@
  * 
  */
 body h1 {
-	font-size: 1.4em;
+	font-size: 1.0em;
 	padding-left: 2%;
-	padding-right: 2%; 
+	padding-right: 2%;
 	margin-top: 0;
 	margin-bottom: 0.4em;
 	line-height: normal;
@@ -186,13 +186,13 @@
 }
 
 body h2 {
-	font-size: 1.3em;
+	font-size: 0.9em;
 	padding-left: 2%;
 	padding-right: 2%;
-	color: white;
-	background-color: #327FA9;
-	border-top: 1px solid #67DD30;
-	border-bottom: 2px solid #378C29;
+	color: black;
+	background-color: #F6F6F6;
+	border-top: 1px solid #D8D8D8;
+	border-bottom: 2px solid #D8D8D8;
 	margin-top: 0;
 	margin-bottom: 0.4em;
 	line-height: normal;
@@ -200,27 +200,18 @@
 }
 
 body h3 {
-/*	font-size: 1.2em;
-	padding-left: 2%;
-	padding-right: 2%;
-	background-color: #0038E1;
-	color: #FFFFFF;
-	margin-top: 0;
-	margin-bottom: 0.4em;
-	border-top: 1px solid #0081CA;
-	border-bottom: 2px solid #000C30;
-	*/
 	font-size: 0.8em;
-	border: 2px solid #0038E1;
+	border: 2px solid #D8D8D8;
 	width: 95%;
 	margin: 0em auto;
 	padding: 0.3em 0.3em;
-	background-color: #1d5288;
-	color: white;
+	background-color: #F6F6F6;
+	margin-bottom: 0.4em;
+	color: black;
 }
 
 body h4 {
-	font-size: 1.1em;
+	font-size: 0.7em;
 	padding-left: 2%;
 	padding-right: 2%;
 	color: #CC0066;
@@ -230,7 +221,7 @@
 }
 
 body h5 {
-	font-size: 1.0em;
+	font-size: 0.6em;
 	background-color: #F6F6F6;
 	border-bottom: 1px solid #D8D8D8;
 	border-top: 1px solid #D8D8D8;
@@ -240,16 +231,10 @@
 	padding-bottom: .3em;
 	margin-top: 0;
 	margin-bottom: 0.6em;
-
-/*	padding-left: 2%;
-	padding-right: 2%;
-	color: #333333;
-	margin-top: 0;
-	margin-bottom: 0.4em; */
 }
 
 body h6 {
-	font-size: 0.9em;
+	font-size: 0.5em;
 	background-color: #F6F6F6;
 	border-bottom: 1px solid #D8D8D8;
 	border-top: 1px solid #D8D8D8;
@@ -260,6 +245,7 @@
 	margin-top: 0;
 	margin-bottom: 0.6em;
 }
+
 /*
  * IMAGE WITH OPTIONAL CAPTION
  * 
@@ -343,13 +329,13 @@
 }
 
 body form {
-	font-size: 1.15em;
+	font-size: 1.0em;
 	margin: 0;
 	color: #333333;
 }
 
 body form label {
-	font-size: medium;
+	font-size: 1.1em;
 	width: 100%;
 	margin-bottom: .5em;
 	margin-top: .5em;
@@ -448,7 +434,7 @@
 }
 
 body div.header-box p {
-	font-size: 1em;
+	font-size: 0.8em;
 	border: 1px solid #D8D8D8;
 	width: 92%;
 	margin: 0 auto 0.6em auto;
@@ -458,7 +444,8 @@
 
 /* 2px border is required to ensure header is flush with the box */
 body div.header-box h3 {
-	font-size: 1.2em;
+	font-size: 1.15em;
+    font-weight: bold;
 	border: 2px solid #1D5287;
 	width: 92%;
 	margin: 0em auto;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2011-09-26 07:51:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2011-09-28 19:31:03 +0000
@@ -16,12 +16,12 @@
 	<a href="login.action" tabindex="-1"><img src="logo_banner.png" alt="DHIS2" width="47" height="20"></a>
 </div>
 
-<div id="content">
+<div id="content" align="center" style="text-align: left;">
 <form id='loginForm' action="../../dhis-web-commons-security/login.action" method="POST">
 
-<div class="header-box">
-	<h3>Login</h3>
-	<p>
+<div class="header-box" align="center">
+	<h3 style="text-align: left;">Login</h3>
+	<p style="text-align: left;">
 		<label>Username</label> <input type="text" id="j_username" name="j_username" size="24"> <br />
 		<label>Password</label> <input type="password" id="j_password" name="j_password" size="24"> <br />
 	</p>

=== 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 19:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-09-28 19:31:03 +0000
@@ -30,11 +30,11 @@
 #end
 
 #if( $dataSet.sections.size() > 0 )
-#foreach( $section in $dataSet.sections )
-	#createSection( $section.name $section.dataElements )
-#end
+    #foreach( $section in $dataSet.sections )
+        #createSection( $section.name $section.dataElements )
+    #end
 #else
-	#createSection( "Default" $dataSet.dataElements )
+    #createSection( "Default" $dataSet.dataElements )
 #end
 
 <div class="header-box" align="center">

=== 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	2011-09-26 07:51:12 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css	2011-09-28 19:31:03 +0000
@@ -176,7 +176,7 @@
  * 
  */
 body h1 {
-	font-size: 1.4em;
+	font-size: 1.0em;
 	padding-left: 2%;
 	padding-right: 2%; 
 	margin-top: 0;
@@ -186,7 +186,7 @@
 }
 
 body h2 {
-	font-size: 1.3em;
+	font-size: 0.9em;
 	padding-left: 2%;
 	padding-right: 2%;
 	color: black;
@@ -200,16 +200,6 @@
 }
 
 body h3 {
-/*	font-size: 1.2em;
-	padding-left: 2%;
-	padding-right: 2%;
-	background-color: #0038E1;
-	color: #FFFFFF;
-	margin-top: 0;
-	margin-bottom: 0.4em;
-	border-top: 1px solid #0081CA;
-	border-bottom: 2px solid #000C30;
-	*/
 	font-size: 0.8em;
 	border: 2px solid #D8D8D8;
 	width: 95%;
@@ -221,7 +211,7 @@
 }
 
 body h4 {
-	font-size: 1.1em;
+	font-size: 0.7em;
 	padding-left: 2%;
 	padding-right: 2%;
 	color: #CC0066;
@@ -231,7 +221,7 @@
 }
 
 body h5 {
-	font-size: 1.0em;
+	font-size: 0.6em;
 	background-color: #F6F6F6;
 	border-bottom: 1px solid #D8D8D8;
 	border-top: 1px solid #D8D8D8;
@@ -241,16 +231,10 @@
 	padding-bottom: .3em;
 	margin-top: 0;
 	margin-bottom: 0.6em;
-
-/*	padding-left: 2%;
-	padding-right: 2%;
-	color: #333333;
-	margin-top: 0;
-	margin-bottom: 0.4em; */
 }
 
 body h6 {
-	font-size: 0.9em;
+	font-size: 0.5em;
 	background-color: #F6F6F6;
 	border-bottom: 1px solid #D8D8D8;
 	border-top: 1px solid #D8D8D8;