[pal-cvs 2418] [150] updated login form.

svnno****@sourc***** svnno****@sourc*****
2007年 5月 18日 (金) 23:25:08 JST


Revision: 150
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=150
Author:   shinsuke
Date:     2007-05-18 23:25:08 +0900 (Fri, 18 May 2007)

Log Message:
-----------
updated login form.

Modified Paths:
--------------
    pal-portal/trunk/build.properties
    pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp

Added Paths:
-----------
    pal-portal/trunk/portal/files/src/webapp/css/
    pal-portal/trunk/portal/files/src/webapp/css/login.css
    pal-portal/trunk/portal/files/src/webapp/images/
    pal-portal/trunk/portal/files/src/webapp/images/login_logo.gif
    pal-portal/trunk/portal/patches/components/portal/
    pal-portal/trunk/portal/patches/components/portal/src/
    pal-portal/trunk/portal/patches/components/portal/src/java/
    pal-portal/trunk/portal/patches/components/portal/src/java/org/
    pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/
    pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/
    pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/
    pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java
    pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/
    pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties
    pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties
    pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties
    pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml


-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties	2007-05-18 07:39:12 UTC (rev 149)
+++ pal-portal/trunk/build.properties	2007-05-18 14:25:08 UTC (rev 150)
@@ -159,6 +159,10 @@
 -Dportal.psml.name="${portal.psml.name}" \
 
 portal.patch.files=\
+components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java,\
+components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties,\
+components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\
+components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties,\
 components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java,\
 components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java,\
 components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java,\
@@ -168,6 +172,7 @@
 layout-portlets/src/webapp/WEB-INF/portlet.xml,\
 src/webapp/WEB-INF/assembly/jetspeed-services.xml,\
 src/webapp/WEB-INF/assembly/portal-url-generation.xml,\
+src/webapp/WEB-INF/assembly/pipelines.xml,\
 src/webapp/WEB-INF/templates/login/html/login.jsp,\
 src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm,\
 src/webapp/decorations/portlet/decorator.vm,\

Added: pal-portal/trunk/portal/files/src/webapp/css/login.css
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/css/login.css	2007-05-18 07:39:12 UTC (rev 149)
+++ pal-portal/trunk/portal/files/src/webapp/css/login.css	2007-05-18 14:25:08 UTC (rev 150)
@@ -0,0 +1,149 @@
+body {
+    margin:0px;
+    padding:0px;
+    background-color:#ffffff;
+}
+#main {
+    width:300px;
+    position:absolute;
+    top:20%;
+    left:50%;
+    margin-top:-50px;
+    margin-left:-330px;
+    border: 2px solid #999999;
+    text-align:center;
+}
+.title {
+    position:relative;
+    top:-10px;
+    text-align:center;
+    font-size:medium;
+    background-color:#ffffff;
+    margin:0px;
+    padding:5px 10px;
+    display:inline;
+
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+}
+form {
+    margin:0px;
+    padding:5px;
+    text-align:left;
+}
+.data {
+    height:30px;
+}
+.label {
+    padding:2px;
+    margin:0px;
+    width:80px;
+    text-align:right;
+    float:left;
+
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+}
+.input {
+    padding:2px;
+    margin:0px;
+    text-align:left;
+}
+.input input {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+}
+.action {
+    padding:0px;
+    margin:0px;
+    width:290px;
+    text-align:center;
+    clear:both;
+}
+.action input {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+}
+.forgetpassword {
+    padding:0px;
+    margin:20px 0px;
+    width:290px;
+    text-align:center;
+    clear:both;
+}
+.forgetpassword a {
+    text-decoration: none;
+}
+.errormessage {
+    padding:0px;
+    margin:10px 0px;
+    width:290px;
+    text-align:center;
+    clear:both;
+    font-weight:bold;
+    color:red;
+}
+
+#description {
+    width:300px;
+    position:absolute;
+    top:20%;
+    left:50%;
+    margin-top:-50px;
+    margin-left:10px;
+    border: 2px solid #999999;
+    text-align:center;
+}
+.signuptitle {
+    padding:0px;
+    margin:20px 0px 0px 0px;
+    width:290px;
+    text-align:center;
+    clear:both;
+    font-weight: bold;
+    font-size: 12px;
+}
+.signupdesc {
+    padding:0px;
+    margin:20px 0px 0px 0px;
+    width:290px;
+    text-align:center;
+    clear:both;
+}
+.signup {
+    padding:0px;
+    margin:20px 0px 20px 0px;
+    width:290px;
+    text-align:right;
+    clear:both;
+}
+.signup a {
+    text-decoration: none;
+}
+
+#header {
+    width:100%;
+    border-bottom: 1px solid #999999;
+    height:33px;
+}
+#header .logo {
+    float:left;
+}
+#header .home {
+    float:right;
+    margin: 10px;
+}
+#header .home a {
+    text-decoration: none;
+}
+
+#footer {
+    width:100%;
+    top:80%;
+    position:absolute;
+    text-align:center;
+}
+.copyright {
+    display:inline;
+}
+


Property changes on: pal-portal/trunk/portal/files/src/webapp/css/login.css
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/files/src/webapp/images/login_logo.gif
===================================================================
(Binary files differ)


Property changes on: pal-portal/trunk/portal/files/src/webapp/images/login_logo.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java	2007-05-18 07:39:12 UTC (rev 149)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java	2007-05-18 14:25:08 UTC (rev 150)
@@ -0,0 +1,26 @@
+Index: components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java	(リビジョン 539124)
++++ components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java	(作業コピー)
+@@ -37,13 +37,14 @@
+             HttpServletResponse response) throws IOException, ServletException
+     {
+         HttpSession session = request.getSession();
+-        String destination = (String) session
+-                .getAttribute(LoginConstants.DESTINATION);
+-        if (destination == null)
+-            destination = request.getContextPath() + "/";
+-        else
+-            session.removeAttribute(LoginConstants.DESTINATION);
+-
++        //        String destination = (String) session
++        //                .getAttribute(LoginConstants.DESTINATION);
++        //        if (destination == null)
++        //            destination = request.getContextPath() + "/";
++        //        else
++        //            session.removeAttribute(LoginConstants.DESTINATION);
++        String destination = request.getContextPath() + "/login/proxy";
++        
+         Integer retryCount = (Integer) session
+                 .getAttribute(LoginConstants.RETRYCOUNT);
+         if (retryCount == null)


Property changes on: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties	2007-05-18 07:39:12 UTC (rev 149)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties	2007-05-18 14:25:08 UTC (rev 150)
@@ -0,0 +1,22 @@
+Index: components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties	(リビジョン 539124)
++++ components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties	(作業コピー)
+@@ -18,4 +18,15 @@
+ 
+ login.button=Login
+ username.label=Username: 
+-password.label=Password: 
+\ ファイルの末尾に改行がありません
++password.label=Password: 
++
++login.page.title=Login
++login.forget.your.password=Forget your password?
++login.to.portal=Login to Portal
++login.signup.title=Don't have a Portal ID?
++login.signup.description=Signing up is easy.
++login.signup.link=Sign Up
++login.copyright=Copyright (C) 2007 PAL Portal. All rights reserved.
++login.invalid.id.or.password=Invalid ID or password.
++login.home.link=Home
++


Property changes on: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties	2007-05-18 07:39:12 UTC (rev 149)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties	2007-05-18 14:25:08 UTC (rev 150)
@@ -0,0 +1,22 @@
+Index: components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties	(リビジョン 539124)
++++ components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties	(作業コピー)
+@@ -18,4 +18,15 @@
+ 
+ login.button=Login
+ username.label=Username: 
+-password.label=Password: 
+\ ファイルの末尾に改行がありません
++password.label=Password: 
++
++login.page.title=Login
++login.forget.your.password=Forget your password?
++login.to.portal=Login to Portal
++login.signup.title=Don't have a Portal ID?
++login.signup.description=Signing up is easy.
++login.signup.link=Sign Up
++login.copyright=Copyright (C) 2007 PAL Portal. All rights reserved.
++login.invalid.id.or.password=Invalid ID or password.
++login.home.link=Home
++


Property changes on: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties
===================================================================
--- pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties	2007-05-18 07:39:12 UTC (rev 149)
+++ pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties	2007-05-18 14:25:08 UTC (rev 150)
@@ -0,0 +1,22 @@
+Index: components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties
+===================================================================
+--- components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties	(リビジョン 539124)
++++ components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties	(作業コピー)
+@@ -18,4 +18,14 @@
+ 
+ login.button=\u30ed\u30b0\u30a4\u30f3
+ username.label=\u30e6\u30fc\u30b6\u30fc\u540d: 
+-password.label=\u30d1\u30b9\u30ef\u30fc\u30c9: 
+\ ファイルの末尾に改行がありません
++password.label=\u30d1\u30b9\u30ef\u30fc\u30c9: 
++
++login.page.title=\u30ed\u30b0\u30a4\u30f3
++login.forget.your.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u65b9
++login.to.portal=\u30dd\u30fc\u30bf\u30eb\u3078\u30ed\u30b0\u30a4\u30f3
++login.signup.title=\u30dd\u30fc\u30bf\u30eb ID \u3092\u4f5c\u308a\u307e\u305b\u3093\u304b?
++login.signup.description=\u7c21\u5358\u306b\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7\u3067\u304d\u307e\u3059\u3002
++login.signup.link=\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7
++login.copyright=Copyright (C) 2007 PAL Portal. All rights reserved.
++login.invalid.id.or.password=ID \u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
++login.home.link=\u30db\u30fc\u30e0
+\ ファイルの末尾に改行がありません


Property changes on: pal-portal/trunk/portal/patches/components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml	2007-05-18 07:39:12 UTC (rev 149)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml	2007-05-18 14:25:08 UTC (rev 150)
@@ -0,0 +1,12 @@
+Index: src/webapp/WEB-INF/assembly/pipelines.xml
+===================================================================
+--- src/webapp/WEB-INF/assembly/pipelines.xml	(リビジョン 539124)
++++ src/webapp/WEB-INF/assembly/pipelines.xml	(作業コピー)
+@@ -301,6 +301,7 @@
+     <list>
+       <ref bean="capabilityValve"/>
+       <ref bean="localizationValve"/>
++      <ref bean="loginValidationValve"/>
+       <ref bean="loginViewValve"/>
+     </list>
+     </constructor-arg>


Property changes on: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp	2007-05-18 07:39:12 UTC (rev 149)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp	2007-05-18 14:25:08 UTC (rev 150)
@@ -1,10 +1,12 @@
 Index: src/webapp/WEB-INF/templates/login/html/login.jsp
 ===================================================================
---- src/webapp/WEB-INF/templates/login/html/login.jsp	(リビジョン 519203)
+--- src/webapp/WEB-INF/templates/login/html/login.jsp	(リビジョン 539124)
 +++ src/webapp/WEB-INF/templates/login/html/login.jsp	(作業コピー)
-@@ -19,13 +19,92 @@
+@@ -17,15 +17,57 @@
+ <%@ page language="java" import="org.apache.jetspeed.login.LoginConstants" session="true" %>
+ <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
  <fmt:setBundle basename="org.apache.jetspeed.login.resources.LoginViewResources" />
- 
+-
  <html>
 -<body onLoad='document.forms["login"].submit();'>
 -<form id='login' method='POST' action='<%= response.encodeURL("j_security_check") %>'>
@@ -15,91 +17,55 @@
 -</noscript>
 -</form>
 +<head>
-+<title><fmt:message key="login.button"/></title>
-+<style>
-+body {
-+    margin:0px;
-+    padding:0px;
-+    background-color:#ffffff;
-+}
-+#main {
-+    width:300px;
-+    position:absolute;
-+    top:40%;
-+    left:50%;
-+    margin-top:-50px;
-+    margin-left:-150px;
-+    border: 2px solid #999999;
-+    text-align:center;
-+}
-+.title {
-+    position:relative;
-+    top:-10px;
-+    text-align:center;
-+    font-size:medium;
-+    background-color:#ffffff;
-+    margin:0px;
-+    padding:5px 10px;
-+    display:inline;
-+
-+    font-family: Arial, Helvetica, sans-serif;
-+    font-size: 11px;
-+}
-+form {
-+    margin:0px;
-+    padding:5px;
-+    text-align:left;
-+}
-+.data {
-+    height:30px;
-+}
-+.label {
-+    padding:2px;
-+    margin:0px;
-+    width:120px;
-+    text-align:right;
-+    float:left;
-+
-+    font-family: Arial, Helvetica, sans-serif;
-+    font-size: 11px;
-+}
-+.input {
-+    padding:2px;
-+    margin:0px;
-+    text-align:left;
-+}
-+.input input {
-+    font-family: Arial, Helvetica, sans-serif;
-+    font-size: 11px;
-+}
-+.action {
-+    padding:0px;
-+    margin:0px;
-+    width:290px;
-+    text-align:center;
-+    clear:both;
-+}
-+.action input {
-+    font-family: Arial, Helvetica, sans-serif;
-+    font-size: 11px;
-+}
-+</style>
++<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/css/login.css"/>
++<link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"/>
++<title><fmt:message key="login.page.title"/></title>
 +</head>
 +<body>
++<div id="header">
++  <div class="logo"><img src="<%= request.getContextPath() %>/images/login_logo.gif"/></div>
++  <div class="home">
++    <a href="<%= request.getContextPath() %>/portal"><fmt:message key="login.home.link"/></a>
++  </div>
++</div>
 +<div id="main">
-+  <div class="title"><fmt:message key="login.button"/></div>
++  <div class="title"><fmt:message key="login.to.portal"/></div>
 +  <form id="login" method="POST" action="<%= response.encodeURL("j_security_check") %>">
++<% if(session.getAttribute(LoginConstants.ERRORCODE) != null) {%>
++    <div class="errormessage">
++      <fmt:message key="login.invalid.id.or.password"/>
++    </div>
++<% } %>
 +    <div class="data">
 +      <div class="label"><fmt:message key="username.label"/></div>
-+      <div class="input"><input type="text" name="j_username" size="16" /></div>
++      <div class="input"><input type="text" name="j_username" size="30" /></div>
 +    </div>
 +    <div class="data">
 +      <div class="label"><fmt:message key="password.label"/></div>
-+      <div class="input"><input type="password" name="j_password" size="16"/></div>
++      <div class="input"><input type="password" name="j_password" size="30"/></div>
 +    </div>
 +    <div class="action"><input type="submit" value="<fmt:message key="login.button"/>"/></div>
++    <div class="forgetpassword">
++      <a href="<%= request.getContextPath() %>/portal/forgot.psml"><fmt:message key="login.forget.your.password"/></a>
++    </div>
 +  </form>
 +</div>
++<div id="description">
++  <div class="signuptitle">
++    <fmt:message key="login.signup.title"/>
++  </div>
++  <div class="signupdesc">
++    <fmt:message key="login.signup.description"/>
++  </div>
++  <div class="signup">
++    <a href="<%= request.getContextPath() %>/portal/register.psml"><fmt:message key="login.signup.link"/></a>
++  </div>
++</div>
++<div id="footer">
++  <div class="copyright">
++    <fmt:message key="login.copyright"/>
++  </div>
++</div>
  </body>
  </html>
 +


pal-cvs メーリングリストの案内