Author: thomas.heute(a)jboss.com
Date: 2008-05-23 08:48:14 -0400 (Fri, 23 May 2008)
New Revision: 10804
Removed:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/role/
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/user/
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
- removed obsolete stuff
- i18n day ! Make the identity module and login window i18n
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-05-23
06:17:56 UTC (rev 10803)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-05-23
12:48:14 UTC (rev 10804)
@@ -22,14 +22,12 @@
input.login-button {
bottom: 20px;
- width: 60px;
right: 90px
}
input.cancel-button {
bottom: 20px;
right: 10px;
- width: 70px;
}
div.login-container div.login-header {
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-23
06:17:56 UTC (rev 10803)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-23
12:48:14 UTC (rev 10804)
@@ -25,4 +25,14 @@
PAGENAME_default=Home
PAGENAME_Admin=Admin
PAGENAME_Test=Test
-PAGENAME_News=News
\ No newline at end of file
+PAGENAME_News=News
+
+ACCOUNT_DISABLED=Your account is disabled
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=The user doesn't exist or the password is
incorrect
+ACCOUNT_NOTASSIGNEDTOROLE=The user doesn't have the correct role
+
+LOGIN_TITLE=JBoss Portal Login
+LOGIN_USERNAME=Username
+LOGIN_PASSWORD=Password
+LOGIN_CANCEL=Cancel
+LOGIN_SUBMIT=Submit
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-23
06:17:56 UTC (rev 10803)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-23
12:48:14 UTC (rev 10804)
@@ -25,4 +25,14 @@
PAGENAME_default=Accueil
PAGENAME_Admin=Admin
PAGENAME_Test=Test
-PAGENAME_News=Actualit\u00E9s
\ No newline at end of file
+PAGENAME_News=Actualit\u00E9s
+
+ACCOUNT_DISABLED=Votre compte n'est pas actif
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=L'utilisateur n'existe pas ou le mot de
passe est incorrect
+ACCOUNT_NOTASSIGNEDTOROLE=L'utilisateur n'a pas le role requis
+
+LOGIN_TITLE=Connexion JBoss Portal
+LOGIN_USERNAME=Nom d'utilisateur
+LOGIN_PASSWORD=Mot de passe
+LOGIN_CANCEL=Annuler
+LOGIN_SUBMIT=Se connecter
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-23
06:17:56 UTC (rev 10803)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-23
12:48:14 UTC (rev 10804)
@@ -23,9 +23,17 @@
<%@ page pageEncoding="utf-8" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@page import="org.jboss.portal.identity.UserStatus"%>
+<%@page import="org.jboss.portal.common.i18n.ResourceBundleFactory"%>
+<%@page import="java.util.ResourceBundle"%>
+
+<%
+ ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource",
request.getLocale());
+%>
+
<html
xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>Login</title>
+ <title><%= rb.getString("LOGIN_TITLE") %></title>
<style type="text/css">
/* <![CDATA[ */
body {
@@ -53,26 +61,42 @@
<div class="login-container">
+
<div class="login-header">
- <h2>JBoss Portal Login</h2>
+ <h2><%= rb.getString("LOGIN_TITLE") %></h2>
</div>
<div class="login-content">
+
<div class="error-message"
-
style="<%=(request.getAttribute("org.jboss.portal.loginError") != null ?
"" : "display:none")%>;"><%=
- (request.getAttribute("org.jboss.portal.loginError") == null ?
"" : request.getAttribute("org.jboss.portal.loginError"))%>
+
style="<%=(request.getAttribute(!UserStatus.OK.equals("org.jboss.portal.userStatus")
? "" : "display:none"))%>;">
+ <%
+
+ if
(UserStatus.DISABLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+ out.println(rb.getString("ACCOUNT_DISABLED"));
+ }
+ else if
(UserStatus.WRONGPASSWORD.equals(request.getAttribute("org.jboss.portal.userStatus"))
||
UserStatus.UNEXISTING.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+
out.println(rb.getString("ACCOUNT_INEXISTING_OR_WRONG_PASSWORD"));
+ }
+ else if
(UserStatus.NOTASSIGNEDTOROLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
+ {
+ out.println(rb.getString("ACCOUNT_NOTASSIGNEDTOROLE"));
+ }
+ %>
</div>
<form method="post" action="<%=
response.encodeURL("j_security_check") %>" name="loginform"
id="loginForm"
target="_parent">
<div class="form-field">
- <label for="j_username">Username:</label>
+ <label for="j_username"><%=
rb.getString("LOGIN_USERNAME") %>:</label>
<input type="text" name="j_username"
id="j_username" value=""/>
</div>
<div class="form-field bottom-field">
- <label for="j_password">Password:</label>
+ <label for="j_password"><%=
rb.getString("LOGIN_PASSWORD") %>:</label>
<input type="password" name="j_password"
id="j_password" value=""/>
</div>
- <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "display:none")%>;" type="button"
name="cancel" value="Cancel" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
- <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "right:10px")%>;" type="submit"
name="login" value="Login" class="login-button"/>
+ <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "display:none")%>;" type="button"
name="cancel" value="<%= rb.getString("LOGIN_CANCEL")
%>" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
+ <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "right:10px")%>;" type="submit"
name="login" value="<%= rb.getString("LOGIN_SUBMIT")
%>" class="login-button"/>
</form>
</div>
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-05-23
06:17:56 UTC (rev 10803)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-05-23
12:48:14 UTC (rev 10804)
@@ -175,4 +175,7 @@
# Example usage for dynamic values
IDENTITY_DYNAMIC_VALUE_TEST=test label
-IDENTITY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
+IDENTITY_DYNAMIC_VALUE_TEST2=test label2
+
+javax.portlet.title=User profile
+javax.portlet.keywords=management,user
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-05-23
06:17:56 UTC (rev 10803)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-05-23
12:48:14 UTC (rev 10804)
@@ -292,3 +292,5 @@
IDENTITY_XMMP = Identifiant XMMP
IDENTITY_YIM = Identifiant Yahoo
+
+javax.portlet.title=Utilisateur
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-23
06:17:56 UTC (rev 10803)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-23
12:48:14 UTC (rev 10804)
@@ -59,10 +59,7 @@
<supported-locale>fr</supported-locale>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
- <portlet-info>
- <title>User portlet</title>
- <keywords>management,user</keywords>
- </portlet-info>
+ <resource-bundle>conf.bundles.Identity</resource-bundle>
<portlet-preferences>
<preference>
<!-- Use captcha verification -->