Author: prabath
Date: Tue Dec 11 03:07:14 2007
New Revision: 10954
Log:
OpenID related UI changes
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/userregistration.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
Tue Dec 11 03:07:14 2007
@@ -1,72 +1,110 @@
-<%@ 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</title>
-<link type="text/css" rel="stylesheet" href="css/styles.css" />
-</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>WSO2 Identity Provider</h1></td>
- <td align="right" valign="top"><img
src="images/wso2-identity-content-rounded.jpg" align="top" /></td>
- </tr>
- </table>
-
- <br>
- <h3><font color="#FF0000">IMPORTANT : The identity
provider will be reset periodically.</font></h3>
- <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="/InfoCardLogin.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/>
- Sign up is easy.
- <a href="ShowUserRegistration.action">Sign
Up</a>
- </div>
- </td>
- </tr>
-</table>
-
-<!-- Include footer -->
-<s:include value="footer.jsp" />
-
-</body>
-
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<[EMAIL PROTECTED]
import="org.wso2.solutions.identity.relyingparty.HTMLEncoder"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+<head>
+<title>WSO2 Identity Solution</title>
+<link type="text/css" rel="stylesheet" href="css/styles.css" />
+</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>WSO2 Identity Provider</h1>
+ </td>
+ <td align="right" valign="top"><img
+
src="images/wso2-identity-content-rounded.jpg" align="top" /></td>
+ </tr>
+ </table>
+
+ <br>
+ <h3><font color="#FF0000">IMPORTANT : The identity
+ provider will be reset periodically.</font></h3>
+ <table cellpadding="0" cellspacing="10" border="0"
+ class="login-header">
+ <tr>
+ <td valign="top" width="30%"><strong>Login with
+ Username and Password</strong>
+ <%
+ String openid = (String)
request.getAttribute("openid");
+ if (openid != null) {
+ %>
+ <strong>Your OpenID is:
<%=HTMLEncoder.encode(openid)%></strong>
+ <%
+ }else
+ {
+
+ }
+ %>
+
+ <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>
+ <table>
+ <tr>
+ <td valign="top"><strong>login
with your Information
+ Card</strong>
+ <div><a
href="/InfoCardLogin.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>
+ <tr>
+ <td valign="top"><strong>login
with your OpenID</strong>
+ <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>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ </table>
+ <div><strong>Don't have a Login?</strong><br />
+ <br />
+ Sign up is easy. <a href="ShowUserRegistration.action">Sign
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/userregistration.jsp
==============================================================================
---
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/userregistration.jsp
(original)
+++
branches/solutions/identity/openid-poc/modules/user-ui/src/main/webapp/jsp/userregistration.jsp
Tue Dec 11 03:07:14 2007
@@ -1,64 +1,100 @@
-<%@ 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 Solution</title>
-<link type="text/css" rel="stylesheet" href="css/styles.css" />
-</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>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%">
- <form action="UserRegistrationFormSubmit.action"
method="post">
- <strong>Register with username and
password</strong><br/>
- <!--todo -->
- <div class="errors">
- <s:actionerror />
- <s:fielderror />
- </div>
- <i>All fields are required</i>
- <table cellpadding="0" cellspacing="10" border="0"
class="form-table">
- <tr><td>User name </td><td><font
class="required">*</font><input type="text" name="username"></td></tr>
- <tr><td>Password </td><td><font
class="required">*</font><input type="password" name="password"></td></tr>
-
- <s:iterator value="claims">
- <tr><td><s:property value="displayTag" />
</td><td><font class="required">*</font><input type="text" name="<s:property
value="uri" />"></td></tr>
- </s:iterator>
-
- <tr><td></td><td><input type="submit"
value="Submit" class="button"> <input type="button" value="Cancel"
onClick="javascript:window.location = 'ShowMain.action'"
class="button"></td></tr>
- </table>
- </form>
- </td>
- <td><img width="2" height="150"
src="images/line-sep.png"/></td>
- <td valign="top"><strong>Register with your information
card</strong><br/>
- <a href="/InfoCardUserRegisteration.action" title="Register
with your Information Card"><img src="images/infocard_114x80.png" align="left"
style="margin-right:10px;" border="0" /></a></td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-
-<!-- Include footer -->
-<s:include value="footer.jsp" />
-
-</body>
-
+"http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+<head>
+<title>WSO2 Identity Solution</title>
+<link type="text/css" rel="stylesheet" href="css/styles.css" />
+</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>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%">
+ <form
action="UserRegistrationFormSubmit.action" method="post">
+ <strong>Register with username and
password</strong><br />
+ <!--todo -->
+ <div class="errors"><s:actionerror />
<s:fielderror /></div>
+ <i>All fields are required</i>
+ <table cellpadding="0" cellspacing="10"
border="0"
+ class="form-table">
+ <tr>
+ <td>User name</td>
+ <td><font
class="required">*</font><input type="text"
+ name="username"></td>
+ </tr>
+ <tr>
+ <td>Password</td>
+ <td><font
class="required">*</font><input type="password"
+ name="password"></td>
+ </tr>
+
+ <s:iterator value="claims">
+ <tr>
+ <td><s:property
value="displayTag" /></td>
+ <td><font
class="required">*</font><input type="text"
+
name="<s:property value="uri" />"></td>
+ </tr>
+ </s:iterator>
+
+ <tr>
+ <td></td>
+ <td><input type="submit"
value="Submit" class="button">
+ <input type="button"
value="Cancel"
+
onClick="javascript:window.location = 'ShowMain.action'"
+ class="button"></td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ <td><img width="2" height="150"
src="images/line-sep.png" /></td>
+ <td>
+ <table>
+ <tr>
+ <td
valign="top"><strong>Register with your
+ information card</strong><br />
+ <a
href="/InfoCardUserRegisteration.action"
+ title="Register with
your Information Card"><img
+
src="images/infocard_114x80.png" align="left"
+ style="margin-right:
10px;" border="0" /></a></td>
+ </tr>
+ <tr>
+ <td
valign="top"><br/><br/><strong>Register with WSO2 IS OpenID
Provider</strong><br />
+ <a
href="/OpenIdUserRegistration.action"
+ title="Register with
WSO2 IS OpenID Provider"><img
+
src="images/infocard_114x80.png" align="left"
+ style="margin-right:
10px;" border="0" /></a></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+<!-- Include footer -->
+<s:include value="footer.jsp" />
+
+</body>
+
</html>
\ No newline at end of file
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
