=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-06-01 17:36:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-06-01 19:40:49 +0000
@@ -1,76 +1,120 @@
-
-*
-{
-  font-family: LiberationSansRegular, sans-serif;
-  line-height: 125%;
-}
-
-html,body
-{
-  background-color: #1d5288;  
-  color: white;
-  font-size: 15px;
-}
-
-.loginField
-{
-  margin-top: 7%;
-}
-
-.loginField td
-{
-  padding-right: 5px;
-}
-
-.loginMessage
-{
-    background-color: #3b6da1;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #D0D0D0;
-    padding: 11px;
-    display: block;
-    width: 400px;
-}
-
-.button {
-  font-family: LiberationSansBold, arial;
-  background: -webkit-linear-gradient(top, #f1f1f1, #d1d1d1);
-  background: -moz-linear-gradient(top, #f1f1f1, #d1d1d1);
-  background: -ms-linear-gradient(top, #f1f1f1, #d1d1d1);
-  background: -o-linear-gradient(top, #f1f1f1, #d1d1d1);
-  height: 26px;
-  border: 1px solid #444;
-  border-radius: 3px;
-  color: #222;
-}
-
-.button:hover {
-  background: -webkit-linear-gradient(top, #fafafa, #dadada);
-  background: -moz-linear-gradient(top, #fafafa, #dadada);
-  background: -ms-linear-gradient(top, #fafafa, #dadada);
-  background: -o-linear-gradient(top, #fafafa, #dadada);
-  border: 1px solid #333333;
-}
-
-@font-face {
-    font-family: 'LiberationSansRegular';
-    src: url('../fonts/LiberationSans-Regular-webfont.eot');
-    src: url('../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
-         url('../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
-         url('../fonts/LiberationSans-Regular-webfont.ttf') format('truetype'),
-         url('../fonts/LiberationSans-Regular-webfont.svg#webfontc8rbNdBe') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'LiberationSansBold';
-    src: url('../fonts/LiberationSans-Bold-webfont.eot');
-    src: url('../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
-         url('../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
-         url('../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
-         url('../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
+
+*
+{
+  font-family: LiberationSansRegular, sans-serif;
+  line-height: 125%;
+  overflow: hidden;
+}
+
+html,body
+{
+  background-color: #1d5288;  
+  color: white;
+  font-size: 15px;
+}
+
+a, a:hover
+{
+  color: #fff;
+  text-decoration: none;
+}
+
+#flagArea
+{
+  position: absolute;
+  top: 15px;
+  left: 15px;
+  border: 1px solid #ddd;
+  border-radius: 2px;
+  width: 135px;
+  margin-bottom: 5%;
+}
+
+#titleArea
+{
+  position: absolute;
+  top: 15px;
+  left: 180px;
+  font-size: 20px;
+}
+
+#loginField
+{
+  position: relative;
+  margin: 7% auto 0 auto;
+  width: 330px;
+  text-align: center;
+}
+
+#bannerArea
+{
+  margin-bottom: 9%;
+}
+
+#loginField td
+{
+  padding-right: 5px;
+}
+
+#loginMessage
+{
+  background-color: #3b6da1;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #D0D0D0;
+  padding: 11px;
+  display: block;
+  width: 400px;
+}
+
+#footerArea
+{
+  position: absolute;
+  bottom: 20px;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  text-align: center;
+}
+
+.button {
+  font-family: LiberationSansBold, arial;
+  background: -webkit-linear-gradient(top, #f1f1f1, #d1d1d1);
+  background: -moz-linear-gradient(top, #f1f1f1, #d1d1d1);
+  background: -ms-linear-gradient(top, #f1f1f1, #d1d1d1);
+  background: -o-linear-gradient(top, #f1f1f1, #d1d1d1);
+  height: 26px;
+  border: 1px solid #444;
+  border-radius: 3px;
+  color: #222;
+}
+
+.button:hover {
+  background: -webkit-linear-gradient(top, #fafafa, #dadada);
+  background: -moz-linear-gradient(top, #fafafa, #dadada);
+  background: -ms-linear-gradient(top, #fafafa, #dadada);
+  background: -o-linear-gradient(top, #fafafa, #dadada);
+  border: 1px solid #333333;
+}
+
+@font-face {
+    font-family: 'LiberationSansRegular';
+    src: url('../fonts/LiberationSans-Regular-webfont.eot');
+    src: url('../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
+         url('../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
+         url('../fonts/LiberationSans-Regular-webfont.ttf') format('truetype'),
+         url('../fonts/LiberationSans-Regular-webfont.svg#webfontc8rbNdBe') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'LiberationSansBold';
+    src: url('../fonts/LiberationSans-Bold-webfont.eot');
+    src: url('../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
+         url('../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
+         url('../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
+         url('../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2012-02-16 22:55:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2012-06-01 19:40:49 +0000
@@ -19,11 +19,19 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     </head>
     <body>
-        <div class="loginField" align="center">
-            <div><img alt="" src="logo_banner.png"></div>
+    	<div id="headerArea">		
+		#if ( $keyFlag )
+			<img id="flagArea" src="../flags/${keyFlagImage}">
+		#end
+		#if ( $applicationTitle )
+        	<span id="titleArea">$encoder.htmlEncode( $applicationTitle )</span>
+        #end
+	    </div>
+        <div id="loginField">
+            <div id="bannerArea"><a href="http://dhis2.org"><img alt="" src="logo_banner.png"></a></div>
             
-            <div style="margin-top:2%">
-            <form id='loginForm' action="../../dhis-web-commons-security/login.action" method="post">
+            <div>
+            <form id="loginForm" action="../../dhis-web-commons-security/login.action" method="post">
                 <table>
                     <tr>
                         <td><label for="j_username">Username</label></td>
@@ -44,8 +52,11 @@
             </form>
             </div>
             #if( $failed == true )
-            <span class="loginMessage">Wrong username or password. Please try again.</span>
+            <span id="loginMessage">Wrong username or password. Please try again.</span>
 			#end            
         </div>
+        <div id="footerArea">
+			<a href="http://dhis2.org">Powered by DHIS 2</a>
+        </div>
     </body>
 </html>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-05-29 19:08:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-06-01 19:40:49 +0000
@@ -56,7 +56,7 @@
   </head>
   
   <body>    
-    #parse( "macros.vm" )        
+    #parse( "macros.vm" )
     <div id="header">
       <img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png" 
         onclick="window.location.href='../dhis-web-commons-about/modules.action'" style="cursor:pointer" title="$i18n.getString( 'go_to_system_overview' )">

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2012-06-01 17:36:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2012-06-01 19:40:49 +0000
@@ -25,6 +25,7 @@
 
   <sec:http pattern="/dhis-web-commons/javascripts/**" security="none" />
   <sec:http pattern="/dhis-web-commons/css/**" security="none" />
+  <sec:http pattern="/dhis-web-commons/flags/**" security="none" />
   <sec:http pattern="/dhis-web-commons/fonts/**" security="none" />
   <sec:http pattern="/favicon.ico" security="none" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-04-10 20:15:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-06-01 19:40:49 +0000
@@ -54,10 +54,10 @@
         <interceptor-ref name="staticParams" />
         <interceptor-ref name="params" />
         <interceptor-ref name="i18nInterceptor" />
+        <interceptor-ref name="systemSettingInterceptor" />
         <!-- The securityInterceptor is put after the i18nInterceptor so that the access denied error pages can use internationalisation. -->
         <interceptor-ref name="securityInterceptor" />
         <interceptor-ref name="loginInterceptor" />
-        <interceptor-ref name="systemSettingInterceptor" />
         <interceptor-ref name="userSettingInterceptor" />
         <interceptor-ref name="contextInterceptor" />
         <interceptor-ref name="portalParamsInterceptor" />