← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 510: Removed the progress bar from the login screen as this now is obsolete.

 

------------------------------------------------------------
revno: 510
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Wed 2009-08-26 15:53:35 +0200
message:
  Removed the progress bar from the login screen as this now is obsolete.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.html
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.html


--
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/security/login.html'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.html	2009-03-12 10:42:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.html	2009-08-26 13:53:35 +0000
@@ -3,24 +3,7 @@
 <head>
 <title>DHIS 2</title>
 <script language="javascript" src="../util/jquery.js"></script>
-<script language="javascript" src="../util/jquery-ui.js"> </script>
-<script language="javascript">
-		$(document).ready(function() {
-			$('#j_username').focus();
- 		});
-		function showProgress() {
-			$('#loginmsg').show();
-			i=0;
-			$("#progressbar").progressbar();
-			setInterval(updateProgress,1000);   			
- 		}
-		function updateProgress(){
-			i++;
-			$("#progressbar").progressbar('value',i);
-		}
-    </script>
 <link type="text/css" rel="stylesheet" media="screen" href="../css/login.css">
-<link type="text/css" rel="stylesheet" media="screen" href="../util/css/redmond/jquery-ui.css">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 <body>
@@ -47,10 +30,6 @@
       </tr>
     </table>
   </form>
-  <p></p>
-  <p></p>
-  <p id="loginmsg" style="display:none">Please wait... Loading</p>
-  <div style="width:200px; height:10px; margin-right:-40px;" id="progressbar"></div>
 </div>
 </body>
 </html>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.html'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.html	2009-03-12 10:42:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.html	2009-08-26 13:53:35 +0000
@@ -3,25 +3,7 @@
 <head>
 <title>DHIS 2</title>
 <script language="javascript" src="../util/jquery.js"></script>
-<script language="javascript" src="../util/jquery-ui.js"> </script>
-<script language="javascript">
-		$(document).ready(function() {
-			$('#j_username').focus();
- 		});
-		function showProgress() {
-			$('#loginmsg').show();
-			$('.loginMessage').hide();
-			i=0;
-			$("#progressbar").progressbar();
-			setInterval(updateProgress,1000);   			
- 		}
-		function updateProgress(){
-			i++;
-			$("#progressbar").progressbar('value',i);
-		}
-    </script>
 <link type="text/css" rel="stylesheet" media="screen" href="../css/login.css">
-<link type="text/css" rel="stylesheet" media="screen" href="../util/css/redmond/jquery-ui.css">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 <body>
@@ -51,10 +33,6 @@
       <tr>
     </table>
   </form>
-  <p></p>
-  <p></p>
-  <p id="loginmsg" style="display:none">Please wait... Loading</p>
-  <div style="width:200px; height:10px; margin-right:-40px;" id="progressbar"></div>
   <span class="loginMessage">Wrong username or password. Please try again.</span> </div>
 </body>
 </html>


Follow ups