geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1153401 - /geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
Date Wed, 03 Aug 2011 09:11:41 GMT
Author: rwonly
Date: Wed Aug  3 09:11:40 2011
New Revision: 1153401

URL: http://svn.apache.org/viewvc?rev=1153401&view=rev
Log:
GERONIMO-6059 missed loginerror page

Modified:
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=1153401&r1=1153400&r2=1153401&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
Wed Aug  3 09:11:40 2011
@@ -1,3 +1,5 @@
+<!doctype html>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
 <%--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -17,158 +19,109 @@
 
 <%-- $Rev$ $Date$ --%>
 
-<%@ page language="java" 
-         contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setLocale value="<%=request.getLocale()%>"/>
-<fmt:setBundle basename="portaldriver"/> 
+<fmt:setBundle basename="portaldriver"/>
 
 <html lang="en">
 <head>
 <title><fmt:message key="console.common.ConsoleLogIn"/></title>
-<link href="<%=request.getContextPath()%>/main.css" rel="stylesheet" type="text/css">
+<link href="<%=request.getContextPath()%>/main.css" rel="stylesheet" type="text/css"/>
+<link href="<%=request.getContextPath()%>/pluto.css" rel="stylesheet" type="text/css"/>
 <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
 </head>
 
-<body onload="document.login.j_username.focus()" leftmargin="0" topmargin="0" rightmargin="0">
+<%-- Avoid the login page displayed in the iframe --%>
+<script type="text/javascript">
+    if(window.parent!=window.self){
+        window.parent.location.reload();
+    }
+</script>
 
+<body onload="document.login.j_username.focus()" style="margin:0px">
+
+<%--  Top table is the banner --%>
+<table class="Banner" cellpadding="0" cellspacing="0" border="0">
+    <tr>
+        <td class="Logo" border="0">&nbsp;</td>
+    </tr>
+</table>
+
+<%--  Main body --%>
+<br/>
 <form name="login" action="j_security_check" method="POST">
-  <%--  Top table is the banner --%>
-      <TABLE width="100%" HEIGHT="86" BORDER="0" CELLSPACING="0" CELLPADDING="0">
-        <TR>
-          <td height="86" class="LoginLogo" border="0"></td>
-          <td height="86" class="Top" border="0">&nbsp; </TD>
-          <td height="86" class="Top" border="0" width="40">
-          </td>
-        </TR>
-        <TR>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </TR>
-        <TR>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </TR>
-      </TABLE>
-
-  <%--  Main body --%>
-  <table WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
-    
+<div style="width:550px;margin-left:auto;margin-right:auto">
+<!-- Error message table : Start -->
+<table width="550px" style="background-color:#F7F7F7; border:1px dashed #88A4D7;" border="0">
     <tr>
-      <td width="30%" >&nbsp;</td>
-      <td class="Body" align="CENTER" valign="top">
-        <table align="center" cellspacing="0" cellpadding="0" width="550" border="0" valign="top"
style="background-color:#F7F7F7; border:1px solid #88A4D7;">
-          <tbody>
-            <tr valign="top">
-              <td style="width: 20px;"><img height="16" align="baseline" width="16"
title="Error" alt="Error" src="/console/images/msg_error.gif"/></td>
-              <td><span style="color:#CC0000; font-family:Verdana,Helvetica,sans-serif;
font-size:120%;"><fmt:message key="console.login_error.invalid"/></span></td>
-            </tr>
-          </tbody>
-        </table>
-      </td> 
-      <td width="30%" >&nbsp;</td>
+        <td>
+            <img style="vertical-align:middle;" title="Error" alt="Error" src="/console/images/msg_error.gif"/>
+            <span style="color:#CC0000; font-family:Verdana,Helvetica,sans-serif;"><fmt:message
key="console.login_error.invalid"/></span>
+        </td>
     </tr>
+</table>
+<br/>
+<!-- Error message table : End -->
+<table width="550px" class="DarkTableLine" border="0">
     <tr>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
-    </tr>    
-    
-    <TR CLASS="Content">
-      <td width="30%" >&nbsp;</td>
-
-      <td class="Body" align="CENTER" height="300" valign="top">
-      <TABLE border>
-      <TR>
-      <TD>
-      <table width="550" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="ReallyDarkBackground"><strong>&nbsp;<fmt:message
key="console.common.loginToConsole"/></td>
-        </tr>
-        <tr>
-          <td>
-          <table width="100%"  border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="25%" class="MediumBackground">&nbsp;</td> 
-                <td align="right" class="MediumBackground">&nbsp;</td>
-                <td width="6" class="MediumBackground">&nbsp;</td>
-                <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td width="25%" class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="MediumBackground" ROWSPAN=3 ALIGN="center" ><img border="0"
align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif" alt=""/></td>

-                <td align="right" class="MediumBackground"><strong><label
for="<portlet:namespace/>j_username"><fmt:message key="console.common.username"/></label></strong></td>
-                <td class="MediumBackground"><strong>:</strong></td>
-                <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground"><input name="j_username" id="<portlet:namespace/>j_username"
type="text" class="InputField" value="" size="20px" maxlength="25"/></td>
-                <td width="17" class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td align="right" class="MediumBackground"><strong><label
for="<portlet:namespace/>j_password"><fmt:message key="console.common.password"/></label></strong></td>
-                <td class="MediumBackground"><strong>:</strong></td>
-                <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground"><input name="j_password" id="<portlet:namespace/>j_password"
type="password" class="InputField" value="" size="20px" maxlength="25"/></td>
-                <td class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="MediumBackground">&nbsp;</td>
-                <td colspan="4" align="center" class="MediumBackground"><input name="submit"
type="submit" value="<fmt:message key="console.common.login"/>"/></td>
-                <td class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-              </tr>
-          </table>
-          </td>
-        </tr>
-
-        <tr>
-          <td><font size="1"><STRONG>&nbsp;<fmt:message key="console.login.welcome"/></STRONG></FONT></td>
-        </TR>
-        <tr>
-          <TD>
-          <table width="100%"  border="0" cellspacing="1" cellpadding="5">
-            <tr>
-              <td width="5">&nbsp;</td>
-              <td><fmt:message key="console.login.introduction"/></td>
-              <td width="5">&nbsp;</td>
-            </tr>
-
-            <tr>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-            </tr>
-
-            <tr>
-              <td>&nbsp;</td>
-              <td><fmt:message key="console.login.components"/></td>
-              <td>&nbsp;</td>
-            </tr>
-          </table>
-          </TD>
-        </TR>
-      </table>
-      </TD>
-      </TR>
-      </TABLE>
-
-      <td width="30%" >&nbsp;</td>
+        <td class="ReallyDarkBackground">
+            &nbsp;<fmt:message key="console.common.loginToConsole"/>
+        </td>
     </tr>
-  </table>
+    <tr>
+        <td class="MediumBackground">
+            <br/>
+            <div style="width:350px;margin-left:auto;margin-right:auto">
+                <table border="0" cellspacing="0" cellpadding="5">
+                    <tr>
+                        <td>
+                            <img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif"
alt=""/>
+                        </td>
+                        <td>
+                            <table width="100%" border="0" cellspacing="2" cellpadding="0">
+                                <tr>
+                                    <td align="right"><strong><label for="<portlet:namespace/>j_username"><fmt:message
key="console.common.username"/></label>:</strong></td>
+                                    <td align="left"><input name="j_username" id="<portlet:namespace/>j_username"
type="text" class="InputField" value="" size="20px"/></td>
+                                </tr>
+                                <tr>
+                                    <td align="right"><strong><label for="<portlet:namespace/>j_password"><fmt:message
key="console.common.password"/></label>:</strong></td>
+                                    <td align="left"><input name="j_password" id="<portlet:namespace/>j_password"
type="password" class="InputField" value="" size="20px"/></td>
+                                </tr>
+                                <tr>
+                                    <td>&nbsp;</td>
+                                    <td align="left"><input name="submit" type="submit"
value="<fmt:message key="console.common.login"/>"/></td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <br/>
+            <br/>
+            <div style="width:500px;margin-left:auto;margin-right:auto">
+                <table class="TableLine" width="100%" border="0">
+                    <tr>
+                        <td class="DarkBackground">
+                            <strong>&nbsp;<fmt:message key="console.login.welcome"/></strong>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="LightBackground">
+                            <div style="padding:10px;">
+                                <fmt:message key="console.login.introduction"/>
+                                <br/><br/>    
+                                <fmt:message key="console.login.components"/>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <br/>
+        </td>
+    </tr>
+</table>
+</div>
 </form>
+
 </body>
 </html>
-



Mime
View raw message