Author: prabath
Date: Thu Dec 13 03:28:12 2007
New Revision: 11078

Log:

OpenID related UI modifications

Added:
   
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidauthorization.jsp
   
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidinfocardlogin.jsp
Modified:
   
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/login.jsp
   
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/main.jsp
   
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidlogin.jsp

Modified: 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/login.jsp
==============================================================================
--- 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/login.jsp
        (original)
+++ 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/login.jsp
        Thu Dec 13 03:28:12 2007
@@ -51,13 +51,13 @@
                                        <div class="errors"><s:actionerror /> 
<s:fielderror /></div>
                                        <table cellpadding="0" cellspacing="10" 
border="0">
                                                <tr>
-                                                       <td>Username</td>
-                                                       <td><s:textfield 
name="username" label="Login name"
+                                                       <td 
valign="top">Username</td>
+                                                       <td 
valign="top"><s:textfield name="username" label="Login name"
                                                                
cssClass="text-box-normal" /></td>
                                                </tr>
                                                <tr>
-                                                       <td>Password</td>
-                                                       <td><s:password 
name="password" label="Password"
+                                                       <td 
valign="top">Password</td>
+                                                       <td 
valign="top"><s:password name="password" label="Password"
                                                                
cssClass="text-box-normal" /></td>
                                                </tr>
                                                <tr>
@@ -82,12 +82,14 @@
                                                </td>
                                        </tr>
                                        <tr>
-                                               <td valign="top"><strong>login 
with your OpenID</strong>
+                                       
+                                               <td valign="top">       <br/>   
<br/><strong>login with your OpenID</strong>
+                                               <div>you can login with
+                                               your OpenID which you obtained 
by any OpenID provider</div>
                                                <div><a 
href="/OpenIdLogin.action"
                                                        title="Login with your 
OpenId"><img
-                                                       
src="images/infocard_114x80.png" align="left"
-                                                       style="margin-right: 
10px;" border="0" /></a> you can login with
-                                               your OpenID which is obtained 
by an OpenID provider.</div>
+                                                       
src="images/openid-logo.gif" align="left" 
+                                                       style="margin-right: 
10px" border="0" /></a></div>
                                                </td>
                                        </tr>
                                </table>

Modified: 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/main.jsp
==============================================================================
--- 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/main.jsp
 (original)
+++ 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/main.jsp
 Thu Dec 13 03:28:12 2007
@@ -1,11 +1,11 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="s" uri="/struts-tags"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
-"http://www.w3.org/TR/html4/strict.dtd";>
-<html>
-<head>
-<title>WSO2 Identity Provider</title>
-<link type="text/css" rel="stylesheet" href="css/styles.css" />
-
+"http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+<head>
+<title>WSO2 Identity Provider</title>
+<link type="text/css" rel="stylesheet" href="css/styles.css" />
+
 <script language="JavaScript" type="text/JavaScript">
 function showHide(){
 
@@ -13,148 +13,187 @@
        if(top_div.style.display=='block') top_div.style.display='none';
        else top_div.style.display='block';
 }
-</script>
-
-</head>
-<body>
-<!-- Include the header -->
-<s:include value="header.jsp" />
-
-
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%;">
-       <tr>
-               <td class="right-back">
-               </td>
-               <td class="content" valign="top">
-                       <table cellpadding="0" cellspacing="0" border="0" 
style="width:100%;">
-                               <tr>
-                                       <td><h1>Welcome to the Identity 
Provider of the WSO2 Identity Solution</h1></td>
-                                       <td align="right" valign="top"><img 
src="images/wso2-identity-content-rounded.jpg" align="top" /></td>
-                               </tr>
-                       </table>
-                       <h3><font color="#FF0000">IMPORTANT :  The identity 
provider will be reset periodically.</font></h3> 
-
-            <s:iterator value="errorMessages">
-                            <p><font color="#FF0000"><s:property /></font></p>
-                       </s:iterator>
-                       
-                       <s:iterator value="infoMessages">
-                 <p><font color="#00FF00"><s:property /></font></p>
-            </s:iterator>
-            
-                       <br>
-                       <!-- New STARTS Here -->
-                       <div class="information">
-                       <table cellpadding="0" cellspacing="0" border="0" 
style="width:100%;margin-bottom:10px;">
-                               <tr>
-                                       
-                                       <td valign="top" 
style="line-height:20px;">
-                                               <a 
href="DownloadInfoCard.action" class="heading-link">Download Information 
Card</a>
-                                               <br>This card can be used with 
any identity selector that supports Microsoft CardSpace specifications and will 
allow you to login to web applications that supports information card logins.
-                                               
-                                       </td>
-                                       <td valign="top">
-                                       <div id="claim-title" 
onclick="showHide()"><img src="images/arrow-down.gif" align="top" 
style="margin-top:5px;margin-left:3px;margin-right:3px;" />Click here to see 
the claims supported by the identity provider<img src="images/arrow-down.gif" 
align="top" style="margin-top:5px;margin-left:3px;margin-right:3px;" /></div>
-                                               <div id="claim-content">
-                       
-                                                       <a href="#" 
onClick="showHide();"  class="close-link">Close [ x ]</a>
-                                                               
-                                                       
-                                                       <table cellpadding="0" 
cellspacing="0" border="0" class="data-table" style="clear:both;" >
-                                                       <s:iterator 
value="claims">
-                                                               <tr>
-                                                               <td>
-                                                                       <div 
style="font-weight:bold;line-height:18px;"><s:property value="displayTag" 
/></div>
-                                                                       <div 
style="line-height:18px;"><s:property value="uri" /></div>
-                                                                       <div 
style="line-height:18px;"><s:property value="description" /></div>
-                                                               </td>
-                                                               </tr>           
                                
-                                                       </s:iterator>
-                                                       </table>
-                                                       
-                                               
-                                               </div>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td colspan="3"><a 
href="DownloadInfoCard.action" class="download-link"></a></td>
-                               </tr>
-                               </table>
-                               
-                               <table cellpadding="0" cellspacing="0" 
border="0" class="manage-table">
-                               <tr>
-                               <td>
-                               <p class="heading-link">Managed Information 
Cards for Self Issued Information Cards</p>
-                               
-                
-                               <a href="RequestRegisterInfoCard.action" 
class="register-link">Register Self Issued Card</a>
-                                               
-                               
-                               <table cellpadding="0" cellspacing="0" 
border="0" style="margin-bottom:10px;" class="data-table">
-                                   <tr>
-                                       <th colspan="2">List of registered self 
issued information cards</th>
-                                   </tr>
-                                   <s:iterator 
value="registeredInformationCards">
-                                                       <s:url 
id="downloadCardForPPIDUrl" namespace="/" action="DownloadInfoCard">
-                                                           <s:param 
name="selfIssuedPpid" value="ppid" />
-                                                       </s:url>
-                                                       <s:url 
id="removeRegisteredCard" namespace="/" action="RemoveRegisteredInfoCard">
-                                        <s:param name="ppid" value="ppid" />
-                                    </s:url>
-                                    
-                                       <tr>
-                                           <td><s:property value="ppid"/></td>
-                                           <td><s:a 
href="%{downloadCardForPPIDUrl}">Download Information Card </s:a></td>
-                                           <td><s:a 
href="%{removeRegisteredCard}">Remove</s:a></td>
-                                       </tr>
-                                   </s:iterator>
-                               </table>
-       
-                                       </td>
-                                       </tr>
-                                       </table>
-                       
-                    
-                       
-                       
-                       
-
-
-                       <table cellpadding="0" cellspacing="0" border="0" 
class="manage-table">
-                               <tr>
-                                       <td valign="top" 
style="padding-right:10px;"><a class="manage-info-cards" src="#" /></td>
-                                       <td valign="top">
-                                               <a href="#" 
class="heading-link">Add Trusted Relying Party</a>
-                                               <br>You will be able to use the 
managed cards issued by this identity provider to log into and relying party 
that this identity provider trusts.
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td colspan="2">
-                                                       <s:form 
action="UploadRelyingPartyCertificate" method="POST" 
enctype="multipart/form-data" theme="simple">
-                                                               <div 
style="padding:5px;"><s:file name="certificateFile" label="Certificate"/></div>
-                                                               <div 
style="padding:5px;"><s:submit type="button" cssClass="button" 
label="Upload"/></div>
-                                                       </s:form>
-                                       </td>
-                               </tr>
-                       </table>
-                       
-                       <div class="relying-parties-title">Personal Trusted 
Relying Parties</div>
-                       <table cellpadding="0" cellspacing="0" border="0" 
class="data-table">
-                               <s:iterator value="personalRPs">
-                                       <tr><td><s:property 
value="identifier.hostName" /></td></tr>
-                               </s:iterator>
-                       </table>
-                       
-                       </div>
-                       <!-- New Ends Here -->
-                       
-                       
-               </td>
-       </tr>
-</table>
-
-<!-- Include footer -->
-<s:include value="footer.jsp" />
-       
-</body>
+</script>
+
+</head>
+<body>
+<!-- Include the header -->
+<s:include value="header.jsp" />
+
+
+<table cellpadding="0" cellspacing="0" border="0" style="width: 100%;">
+       <tr>
+               <td class="right-back"></td>
+               <td class="content" valign="top">
+               <table cellpadding="0" cellspacing="0" border="0" style="width: 
100%;">
+                       <tr>
+                               <td>
+                               <h1>Welcome to the Identity Provider of the 
WSO2 Identity
+                               Solution</h1>
+                               </td>
+                               <td align="right" valign="top"><img
+                                       
src="images/wso2-identity-content-rounded.jpg" align="top" /></td>
+                       </tr>
+               </table>
+               <h3><font color="#FF0000">IMPORTANT : The identity
+               provider will be reset periodically.</font></h3>
+
+               <s:iterator value="errorMessages">
+                       <p><font color="#FF0000"><s:property /></font></p>
+               </s:iterator> <s:iterator value="infoMessages">
+                       <p><font color="#00FF00"><s:property /></font></p>
+               </s:iterator> <br>
+               <!-- New STARTS Here -->
+               <div class="information">
+               <table cellpadding="0" cellspacing="0" border="0"
+                       style="width: 100%; margin-bottom: 10px;">
+                       <tr>
+
+                               <td valign="top" style="line-height: 20px;"><a
+                                       href="DownloadInfoCard.action" 
class="heading-link">Download
+                               Information Card</a> <br>
+                               This card can be used with any identity 
selector that supports
+                               Microsoft CardSpace specifications and will 
allow you to login to
+                               web applications that supports information card 
logins.</td>
+                               <td valign="top">
+                               <div id="claim-title" onclick="showHide()"><img
+                                       src="images/arrow-down.gif" align="top"
+                                       style="margin-top: 5px; margin-left: 
3px; margin-right: 3px;" />Click
+                               here to see the claims supported by the 
identity provider<img
+                                       src="images/arrow-down.gif" align="top"
+                                       style="margin-top: 5px; margin-left: 
3px; margin-right: 3px;" /></div>
+                               <div id="claim-content"><a href="#" 
onClick="showHide();"
+                                       class="close-link">Close [ x ]</a>
+
+
+                               <table cellpadding="0" cellspacing="0" 
border="0" class="data-table"
+                                       style="clear: both;">
+                                       <s:iterator value="claims">
+                                               <tr>
+                                                       <td>
+                                                       <div 
style="font-weight: bold; line-height: 18px;"><s:property
+                                                               
value="displayTag" /></div>
+                                                       <div 
style="line-height: 18px;"><s:property value="uri" /></div>
+                                                       <div 
style="line-height: 18px;"><s:property
+                                                               
value="description" /></div>
+                                                       </td>
+                                               </tr>
+                                       </s:iterator>
+                               </table>
+
+
+                               </div>
+                               </td>
+                       </tr>
+                       <tr>
+                               <td colspan="3"><a 
href="DownloadInfoCard.action"
+                                       class="download-link"></a></td>
+                       </tr>
+               </table>
+
+       
+               <table cellpadding="0" cellspacing="0" border="0"
+                       style="width: 100%; margin-bottom: 10px;">
+                       <tr>
+
+                               <td valign="top" style="line-height: 20px;"><a
+                                       href="OpenIdDownloadInfoCard.action" 
class="heading-link">Download
+                               OpenID Information Card</a> <br>
+                               This card can be used with any OpenID Provider 
which supports
+                               Microsoft CardSpace specifications.</td>
+                               <td>
+                               <img src="images/openid_infocard.png" 
align="left"      style="margin-right: 10px" border="0" />
+                               </td>
+                       </tr>
+                       <tr>
+                               <td colspan="3"><a 
href="OpenIdDownloadInfoCard.action"
+                                       class="download-link"></a></td>
+                       </tr>
+               </table>
+
+               <table cellpadding="0" cellspacing="0" border="0" 
class="manage-table">
+                       <tr>
+                               <td>
+                               <p class="heading-link">Managed Information 
Cards for Self
+                               Issued Information Cards</p>
+
+
+                               <a href="RequestRegisterInfoCard.action" 
class="register-link">Register
+                               Self Issued Card</a>
+
+
+                               <table cellpadding="0" cellspacing="0" 
border="0"
+                                       style="margin-bottom: 10px;" 
class="data-table">
+                                       <tr>
+                                               <th colspan="2">List of 
registered self issued information
+                                               cards</th>
+                                       </tr>
+                                       <s:iterator 
value="registeredInformationCards">
+                                               <s:url 
id="downloadCardForPPIDUrl" namespace="/"
+                                                       
action="DownloadInfoCard">
+                                                       <s:param 
name="selfIssuedPpid" value="ppid" />
+                                               </s:url>
+                                               <s:url 
id="removeRegisteredCard" namespace="/"
+                                                       
action="RemoveRegisteredInfoCard">
+                                                       <s:param name="ppid" 
value="ppid" />
+                                               </s:url>
+
+                                               <tr>
+                                                       <td><s:property 
value="ppid" /></td>
+                                                       <td><s:a 
href="%{downloadCardForPPIDUrl}">Download Information Card </s:a></td>
+                                                       <td><s:a 
href="%{removeRegisteredCard}">Remove</s:a></td>
+                                               </tr>
+                                       </s:iterator>
+                               </table>
+
+                               </td>
+                       </tr>
+               </table>
+
+
+
+
+
+
+
+               <table cellpadding="0" cellspacing="0" border="0" 
class="manage-table">
+                       <tr>
+                               <td valign="top" style="padding-right: 10px;"><a
+                                       class="manage-info-cards" src="#" 
/></td>
+                               <td valign="top"><a href="#" 
class="heading-link">Add
+                               Trusted Relying Party</a> <br>
+                               You will be able to use the managed cards 
issued by this identity
+                               provider to log into and relying party that 
this identity provider
+                               trusts.</td>
+                       </tr>
+                       <tr>
+                               <td colspan="2"><s:form 
action="UploadRelyingPartyCertificate"
+                                       method="POST" 
enctype="multipart/form-data" theme="simple">
+                                       <div style="padding: 5px;"><s:file 
name="certificateFile"
+                                               label="Certificate" /></div>
+                                       <div style="padding: 5px;"><s:submit 
type="button"
+                                               cssClass="button" 
label="Upload" /></div>
+                               </s:form></td>
+                       </tr>
+               </table>
+
+               <div class="relying-parties-title">Personal Trusted Relying
+               Parties</div>
+               <table cellpadding="0" cellspacing="0" border="0" 
class="data-table">
+                       <s:iterator value="personalRPs">
+                               <tr>
+                                       <td><s:property 
value="identifier.hostName" /></td>
+                               </tr>
+                       </s:iterator>
+               </table>
+
+               </div>
+               <!-- New Ends Here --></td>
+       </tr>
+</table>
+
+<!-- Include footer -->
+<s:include value="footer.jsp" />
+
+</body>
 </html>
\ No newline at end of file

Added: 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidauthorization.jsp
==============================================================================
--- (empty file)
+++ 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidauthorization.jsp
  Thu Dec 13 03:28:12 2007
@@ -0,0 +1,114 @@
+<%@ page session="true"%>
+<%@ page
+       
import="java.util.List,org.openid4java.message.AuthSuccess,org.openid4java.server.InMemoryServerAssociationStore,org.openid4java.message.DirectError,org.openid4java.message.Message,org.openid4java.message.ParameterList,org.openid4java.discovery.Identifier,org.openid4java.discovery.DiscoveryInformation,org.openid4java.message.ax.FetchRequest,org.openid4java.message.ax.FetchResponse,org.openid4java.message.ax.AxMessage,org.openid4java.message.*,org.openid4java.OpenIDException,java.util.List,java.io.IOException,javax.servlet.http.HttpSession,javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse,org.openid4java.server.ServerManager,org.openid4java.consumer.InMemoryConsumerAssociationStore,org.openid4java.consumer.VerificationResult"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
+"http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+<head>
+<title>WSO2 Identity Solution | Management Console</title>
+<link type="text/css" rel="stylesheet" href="css/styles.css" />
+</head>
+<body>
+
+<div class="page">
+<!-- START Header  --> 
+<s:include     value="header.jsp" /> 
+<!-- END Header --> 
+<%
+       
+       ParameterList requestp = (ParameterList) session
+                       .getAttribute("parameterlist");
+       String openidrealm = requestp.hasParameter("openid.realm") ? requestp
+                       .getParameterValue("openid.realm")
+                       : null;
+       String openidreturnto = requestp.hasParameter("openid.return_to") ? 
requestp
+                       .getParameterValue("openid.return_to")
+                       : null;
+       String openidclaimedid = requestp.hasParameter("openid.claimed_id") ? 
requestp
+                       .getParameterValue("openid.claimed_id")
+                       : null;
+       String openididentity = requestp.hasParameter("openid.identity") ? 
requestp
+                       .getParameterValue("openid.identity")
+                       : null;
+ %> 
+ <!-- START Content  --> 
+ <%
+               if (request.getParameter("action") == null) {
+               String site = (String) (openidrealm == null ? openidreturnto
+               : openidrealm);
+ %>
+
+<table cellpadding="0" cellspacing="0" border="0" style="width: 100%;">
+       <tr>
+               <td class="right-back"></td>
+               <td class="content" valign="top">
+               <table cellpadding="0" cellspacing="0" border="0" style="width: 
100%;">
+                       <tr>
+                               <td>
+                               <h1>WSO2 Identity Provider</h1>
+                               </td>
+                               <td align="right" valign="top"><img
+                                       
src="images/wso2-identity-content-rounded.jpg" align="top" /></td>
+                       </tr>
+               </table>
+
+        <table cellpadding="0" cellspacing="10" border="0"     
class="login-header">
+                       <tr>
+                       <td>
+                       
+                       <s:form action="/server?_action=complete" 
theme="simple" method="POST">
+                                       <div class="errors"><s:actionerror /> 
<s:fielderror /></div>
+
+                               <table>
+                                       <tr>
+                                               <td align="left">
+                                                       Identity:
+                                               </td>
+                                               <td>
+                                                       <%=openididentity%>
+                                               </td>
+                                       </tr>
+                                       <tr>
+                                               <td align="left" valign="top">
+                                                       Password:
+                                               </td>
+                                               <td  valign="top">
+                                                       <s:password 
name="password" label="Password" cssClass="text-box-normal" />
+                                               </td>
+                                       </tr>
+                                       <tr>
+                                                       <td></td>
+                                                       <td><s:submit 
value="Login" align="left" cssClass="button" /></td>
+                                               </tr>
+                       
+                       </table>
+                       </s:form>
+                       </td>
+                       <td><img src="images/line-sep.png" height="150" 
width="2" /></td>
+                               <td valign="top"><strong>Login with your OpenID 
Information Card</strong><br/>
+                                               <div><a 
href="https://localhost:12443/OpenIdInfoCardLogin.action";
+                                                       title="Login with your 
OpenID Information Card"><img
+                                                       
src="images/openid_infocard.png" align="left"
+                                                       style="margin-right: 
10px;" border="0" /></a></div>
+                                               </td>
+                       </tr>
+                       </table>
+                                       
+       
+                       <br/><br/><br/><br/>
+               </td>
+       </tr>
+</table>
+<%
+       } else // Logged in
+       {
+               session.setAttribute("authenticatedAndApproved", Boolean.TRUE);
+               response.sendRedirect("/server?_action=complete");
+       }
+%>
+</div>
+<!-- Include footer -->
+<s:include value="footer.jsp" />
+</body>
+</html>
\ No newline at end of file

Added: 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidinfocardlogin.jsp
==============================================================================
--- (empty file)
+++ 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidinfocardlogin.jsp
  Thu Dec 13 03:28:12 2007
@@ -0,0 +1,88 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
+"http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>WSO2 Identity Solution</title>
+<link type="text/css" rel="stylesheet" href="css/styles.css" />
+</head>
+<body>
+
+   <form name="frm" id="frm" method="post" 
action="OpenIdInfoCardSubmit.action">  
+            <input type="hidden" name="InfoCardSignin" value="Log in" /><br/>
+           <OBJECT type="application/x-informationCard" name="xmlToken">
+                <PARAM  Name="tokenType"
+                        Value="urn:oasis:names:tc:SAML:1.0:assertion">
+
+                <PARAM  Name="requiredClaims"
+                        
Value="http://schema.openid.net/2007/05/claims/identifier";>
+                   
+            </OBJECT>
+  </form>
+    <script language="JavaScript" type="text/JavaScript">
+         <!--
+         document.frm.submit();
+         -->
+    </script>
+
+<!-- Include the header -->
+<s:include value="header.jsp" />
+
+<table cellpadding="0" cellspacing="0" border="0" style="width:100%;">
+    <tr>
+        <td class="right-back">
+        </td>
+        <td class="content" valign="top">
+            <table cellpadding="0" cellspacing="0" border="0" 
style="width:100%;">
+                <tr>
+                    <td><h1>WSO2 Identity Provider</h1></td>
+                    <td align="right" valign="top"><img 
src="images/wso2-identity-content-rounded.jpg" align="top" /></td>
+                </tr>
+            </table>
+
+            <br>
+            
+            <table cellpadding="0" cellspacing="10" border="0" 
class="login-header">
+                <tr>
+                    <td valign="top" width="30%">
+                        <strong>Login with Username and Password</strong>
+                        <s:form action="Login.action" theme="simple" 
method="POST">
+                        <div class="errors">
+                            <s:actionerror />
+                            <s:fielderror />
+                        </div>
+                        <table cellpadding="0" cellspacing="10" border="0">
+                            <tr><td>Username</td><td><s:textfield 
name="username" label="Login name" cssClass="text-box-normal" /></td></tr>
+                            <tr><td>Password</td><td><s:password 
name="password" label="Password" cssClass="text-box-normal" /></td></tr>
+                            <tr><td></td><td><s:submit value="Login" 
align="left" cssClass="button" /></td></tr>
+                        </table>
+                        </s:form>
+                    </td>
+                    <td><img src="images/line-sep.png" height="150" width="2" 
/></td>
+                    <td valign="top">
+                        <strong>login with your Information Card</strong>
+                        <div>
+                        <a href="/OpenIdInfoCardLogin.action" title="Login 
with your Information Card"><img src="images/infocard_114x80.png" align="left" 
style="margin-right:10px;" border="0" /></a>
+                        You can only login with a personal information card 
that you have already registered. 
+                        If you have not registered a personal information card 
please first login with your username and password and
+                        register a card. 
+                        </div>
+                    </td>
+                </tr>
+            </table>
+            <div>
+                <strong>Don't have a Login?</strong><br/><br/>
+                Signing up is easy.
+                <a href="ShowUserRegistration.action">Signing Up</a>
+            </div>
+        </td>
+    </tr>
+</table>
+
+<!-- Include footer -->
+<s:include value="footer.jsp" />
+
+</body>
+
+</html>
\ No newline at end of file

Modified: 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidlogin.jsp
==============================================================================
--- 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidlogin.jsp
  (original)
+++ 
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/openidlogin.jsp
  Thu Dec 13 03:28:12 2007
@@ -27,23 +27,35 @@
                <br>
                <table cellpadding="0" cellspacing="10" border="0"
                        class="login-header">
+                       
                        <tr>
-                               <td valign="top" width="30%"><strong>Login with 
you
-                               OpenID url</strong> <s:form 
action="OpenIdSubmit.action" theme="simple"
+                               <td valign="top" width="40%"><strong>Login with 
you
+                               OpenID url</strong> <s:form 
action="OpenIdSubmit.action?returnUrl=https://localhost:12443/OpenIdCallback.action";
 theme="simple"
                                        method="POST">
                                        <div class="errors"><s:actionerror /> 
<s:fielderror /></div>
-                                       <table cellpadding="0" cellspacing="10" 
border="0">
+                                       <table cellpadding="0" cellspacing="2" 
border="0">
+                               
                                                <tr>
-                                                       <td 
valign="top">OpenID</td>
-                                                       <td><s:textfield 
name="openIdUrl" label="openIdUrl"
+                                                       <td 
valign="top">OpenID:</td>
+                                                       <td 
valign="top"><s:textfield name="openIdUrl" label="openIdUrl"
                                                                
cssClass="text-box-normal" /></td>
                                                </tr>
                                                <tr>
                                                        <td 
valign="top"><s:submit value="Login" align="left"
                                                                
cssClass="button" /></td>
+                                                       <td/>
                                                </tr>
+                                                                               
        
                                        </table>
                                </s:form></td>
+                       
+                       <td><img src="images/line-sep.png" height="150" 
width="5" /></td>
+                       <td valign="top"><strong>Login with your OpenID 
Information Card</strong><br/>
+                                               <div><a 
href="https://localhost:12443/OpenIdInfoCardLogin.action";
+                                                       title="Login with your 
OpenID Information Card"><img
+                                                       
src="images/openid_infocard.png" align="left"
+                                                       style="margin-right: 
10px;" border="0" /></a></div>
+                                               </td>                           
                        </tr>
 
                </table>

_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev

Reply via email to