geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r372358 - in /geronimo/trunk/applications/console-framework/src/webapp: login.jsp loginerror.jsp
Date Wed, 25 Jan 2006 23:15:35 GMT
Author: ammulder
Date: Wed Jan 25 15:15:33 2006
New Revision: 372358

URL: http://svn.apache.org/viewcvs?rev=372358&view=rev
Log:
Merge fix for GERONIMO-1379 from branch

Modified:
    geronimo/trunk/applications/console-framework/src/webapp/login.jsp
    geronimo/trunk/applications/console-framework/src/webapp/loginerror.jsp

Modified: geronimo/trunk/applications/console-framework/src/webapp/login.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/login.jsp?rev=372358&r1=372357&r2=372358&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/login.jsp (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/login.jsp Wed Jan 25 15:15:33
2006
@@ -9,10 +9,6 @@
 
 <form name="login" action="j_security_check" method="POST">
   <%--  Top table is the banner --%>
-<%--
-  <table width="100%"  border="0" cellspacing="0" cellpadding="0">
-    <tr>
---%>
       <TABLE width="100%" HEIGHT="86" BORDER="0" CELLSPACING="0" CELLPADDING="0">
         <TR>
           <td height="86" class="LoginLogo" border="0"></td>
@@ -30,10 +26,6 @@
           <td>&nbsp;</td>
         </TR>
       </TABLE>
-<%--
-    </tr>
-  </TABLE>
---%>
 
   <%--  Main body --%>
   <table WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
@@ -142,71 +134,6 @@
       </td>
 
       <td width="30%" >&nbsp;</td>
-<%--
-      <td width="30%" align="Center" valign="top">   
-          <table width="200" border cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="50%" class="BrightTitle"><STRONG>&nbsp;Geronimo
Related Links</td>
-              </tr>
-              <tr>
-                <td>
-                <table width="100%"  border="0" cellspacing="0" cellpadding="0">
-                  <tr>
-                    <td align="center">&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="http://geronimo.apache.org/">Geronimo Home Page</a></td>
-                    <td width="10">&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td align="center">&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="http://wiki.apache.org/geronimo/">Geronimo Wiki</a>
</td>
-                    <td width="10">&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td align="center">&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="http://opensource2.atlassian.com/confluence/oss/display/GERONIMO/Home">Geronimo
Documentation</a></td>
-                    <td width="10">&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td align="center">&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="mailto:user@geronimo.apache.org">Geronimo User
Mailing List</a></td>
-                    <td width="10">&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                </table>
-                </td>
-              </tr>
-            </table>
-      </TD>
---%>
     </tr>
   </table>
 </form>

Modified: geronimo/trunk/applications/console-framework/src/webapp/loginerror.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/loginerror.jsp?rev=372358&r1=372357&r2=372358&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/loginerror.jsp (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/loginerror.jsp Wed Jan 25 15:15:33
2006
@@ -9,12 +9,13 @@
 
 <form name="login" action="j_security_check" method="POST">
   <%--  Top table is the banner --%>
-  <table width="100%"  border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0">
+      <TABLE width="100%" HEIGHT="86" BORDER="0" CELLSPACING="0" CELLPADDING="0">
         <TR>
-          <td width="200"><img src="<%=request.getContextPath()%>/images/head_left_login_586x86.gif"></td>
-          <td class="Top" width="100%" border="0"></td>
+          <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">
+<a href="<%=request.getContextPath()%>/about.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_about_51x86.gif"></a>
+          </td>
         </TR>
         <TR>
           <td>&nbsp;</td>
@@ -25,84 +26,77 @@
           <td>&nbsp;</td>
         </TR>
       </TABLE>
-    </tr>
-  </TABLE>
+
   <%--  Main body --%>
   <table WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
     <TR CLASS="Content">
       <td width="30%" >&nbsp;</td>
-      <td class="Body" align="CENTER" height="300" valign="top">
 
+      <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;Log In to the Geronimo
Console</td>
         </tr>
         <tr>
-          <td class="LightBackground" align="center"><font color="red"><b><i>Invalid
Username and/or Password!</i></b></font></td>
+          <td class="MediumBackground" align="center"><font color="red"><b><i>Invalid
Username and/or Password!</i></b></font></td>
         </tr>
         <tr>
           <td>
           <table width="100%"  border="0" cellspacing="0" cellpadding="0">
               <tr>
-                <td width="25%" class="LightBackground">&nbsp;</td> 
-                <td align="right" class="LightBackground">&nbsp;</td>
-                <td width="6" class="LightBackground">&nbsp;</td>
-                <td width="1" class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td width="25%" class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="LightBackground" ROWSPAN=3 ALIGN="center" ><img border="0"
align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif"></td>

-                <td align="right" class="LightBackground"><strong>Username</strong></td>
-                <td class="LightBackground"><strong>:</strong></td>
-                <td width="1" class="LightBackground">&nbsp;</td>
-                <td class="LightBackground"><input name="j_username" type="text"
class="InputField" value="" size="20px" maxlength="25"/></td>
-                <td width="17" class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td align="right" class="LightBackground"><strong>Password</strong></td>
-                <td class="LightBackground"><strong>:</strong></td>
-                <td width="1" class="LightBackground">&nbsp;</td>
-                <td class="LightBackground"><input name="j_password" type="password"
class="InputField" value="" size="20px" maxlength="25"/></td>
-                <td class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="LightBackground">&nbsp;</td>
-                <td colspan="4" align="center" class="LightBackground"><input name="submit"
type="submit" value="Login"/></td>
-                <td class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
+                <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"></td>

+                <td align="right" class="MediumBackground"><strong>Username</strong></td>
+                <td class="MediumBackground"><strong>:</strong></td>
+                <td width="1" class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground"><input name="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>Password</strong></td>
+                <td class="MediumBackground"><strong>:</strong></td>
+                <td width="1" class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground"><input name="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="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 class="LightBackground">&nbsp;</td>
-        </tr>
---%>
+
         <tr>
-          <td><font size="1"><STRONG>Welcome to the Geronimo Console&#8482;</FONT></td>
+          <td><font size="1"><STRONG>Welcome to the Geronimo&#8482;
Console</FONT></td>
         </TR>
         <tr>
-<%--           <TD><font size="1">All the other stuff that we need to say
and that will take up several lines worth of information on the screen</FONT></TD>
 --%>
           <TD>
           <table width="100%"  border="0" cellspacing="1" cellpadding="5">
             <tr>
@@ -119,83 +113,29 @@
 
             <tr>
               <td>&nbsp;</td>
-              <td> <strong>Geronimo Console&#8482;</strong> has integrated
the following components:<BR/>
-                &nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/>
-                &nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/>
-                &nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/>
-                &nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/>
-                &nbsp;&#149;&nbsp; JSR 168 portlet container (Apache Pluto)<br/>
-                &nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
-                &nbsp;&#149;&nbsp; User management services<br/>
-                &nbsp;&#149;&nbsp; Centralized administration console<br/>
+              <td> <strong>Geronimo&#8482;</strong> has integrated
the following components:<BR/>
+                &nbsp;&nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Tomcat)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; User management services<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Centralized administration console<br/>
               <td>&nbsp;</td>
             </tr>
           </table>
           </TD>
         </TR>
       </table>
-
       </TD>
       </TR>
       </TABLE>
 
-      </td>
-<%--      <td class="Body" width="30%" align="Center" valign="top">     --%>
-      <td width="30%" align="Center" valign="top">   
-          <table width="200" border cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="50%" class="BrightTitle"><STRONG>&nbsp;Related
Links</td>
-              </tr>
-              <tr>
-                <td>
-                <table width="100%"  border="0" cellspacing="0" cellpadding="0">
-                  <tr>
-                    <td align="center">&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="http://">Technical Support</a></td>
-                    <td width="10">&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td align="center">&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="http://">Download Updates</a> </td>
-                    <td width="10">&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td align="center">&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="mailto:user@geronimo.apache.org">Mailing List</a></td>
-                    <td width="10">&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                  <tr>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                    <td>&nbsp;</td>
-                  </tr>
-                </table>
-                </td>
-              </tr>
-            </table>
-      </TD>
+      <td width="30%" >&nbsp;</td>
     </tr>
   </table>
 </form>
 </body>
 </html>
+



Mime
View raw message