gatein SVN: r1522 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-03 09:25:30 -0500 (Wed, 03 Feb 2010)
New Revision: 1522
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
Log:
GTNPORTAL-583: i18n of email subject when sending new password
GTNPORTAL-582: Extract email 'From' from the code when sending new password
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-03 13:45:02 UTC (rev 1521)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-03 14:25:30 UTC (rev 1522)
@@ -925,7 +925,7 @@
UIForgetPassword.msg.user-delete=Your username has been deleted by an administrator.
UIForgetPassword.msg.user-not-exist=This username doesn't exist.
UIForgetPassword.msg.email-not-exist=This email doesn't exist.
-UIForgetPassword.msg.send-mail-success=Please check your email.
+UIForgetPassword.msg.send-mail-success=An email has been sent to you.
UIForgetPassword.msg.send-mail-fail=Can't send mail.
UIForgetPassword.msg.expration=Your link is expired, you have to repeat the activation process.
UIForgetPassword.mail.header=Thank you for contacting our support. You have submitted a request for your user name and password.
@@ -933,6 +933,8 @@
UIForgetPassword.mail.user=The User Name for your account is :
UIForgetPassword.mail.password=The Password for your password is :
UIForgetPassword.mail.link=You can then request a new password for the username, please click on this link :
+UIForgetPassword.mail.subject=Password and username reminder
+UIForgetPassword.mail.from=no-reply(a)gatein.org
UIResetPassword.title=Change password
UIResetPassword.action.Save=Save
UIResetPassword.action.Close=Close
14 years, 10 months
gatein SVN: r1520 - in portal/trunk: component/identity/src/main/java/conf and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-03 08:16:00 -0500 (Wed, 03 Feb 2010)
New Revision: 1520
Added:
portal/trunk/component/identity/src/main/java/conf/configuration.xml
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorService.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorServiceImpl.java
Modified:
portal/trunk/component/identity/pom.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
Log:
GTNPORTAL-583: i18n of email subject when sending new password
GTNPORTAL-582: Extract email 'From' from the code when sending new password
GTNPORTAL-581: "Remind my password" feature when specifying email address doesn't work
GTNPORTAL-310: Change random password 'algorithm' when requesting a new password
Modified: portal/trunk/component/identity/pom.xml
===================================================================
--- portal/trunk/component/identity/pom.xml 2010-02-03 10:29:36 UTC (rev 1519)
+++ portal/trunk/component/identity/pom.xml 2010-02-03 13:16:00 UTC (rev 1520)
@@ -52,7 +52,12 @@
<artifactId>exo.core.component.organization.api</artifactId>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-core</artifactId>
</dependency>
Added: portal/trunk/component/identity/src/main/java/conf/configuration.xml
===================================================================
--- portal/trunk/component/identity/src/main/java/conf/configuration.xml (rev 0)
+++ portal/trunk/component/identity/src/main/java/conf/configuration.xml 2010-02-03 13:16:00 UTC (rev 1520)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
+
+ <component>
+ <key>org.exoplatform.services.organization.PasswordGeneratorService</key>
+ <type>org.exoplatform.services.organization.PasswordGeneratorServiceImpl</type>
+ </component>
+
+</configuration>
\ No newline at end of file
Property changes on: portal/trunk/component/identity/src/main/java/conf/configuration.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorService.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorService.java (rev 0)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorService.java 2010-02-03 13:16:00 UTC (rev 1520)
@@ -0,0 +1,35 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2010, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+
+package org.exoplatform.services.organization;
+
+/**
+ * @author <a href="mailto:theute@redhat.com">Thomas Heute</a>
+ * @version $Revision$
+ */
+public interface PasswordGeneratorService
+{
+
+ public String generatePassword();
+
+}
Property changes on: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorService.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorServiceImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorServiceImpl.java (rev 0)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorServiceImpl.java 2010-02-03 13:16:00 UTC (rev 1520)
@@ -0,0 +1,70 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2010, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+
+package org.exoplatform.services.organization;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
+/**
+ * @author <a href="mailto:theute@redhat.com">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class PasswordGeneratorServiceImpl implements PasswordGeneratorService
+{
+
+ private String passwordCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_][{};:?.-+";
+
+ public String generatePassword()
+ {
+ Logger logger = LoggerFactory.getLogger(PasswordGeneratorServiceImpl.class);
+ int length = 12;
+ StringBuffer buffer = new StringBuffer();
+ char[] characterMap = passwordCharacters.toCharArray();
+ SecureRandom secureRandom;
+ try
+ {
+ secureRandom = SecureRandom.getInstance("SHA1PRNG");
+ }
+ catch (NoSuchAlgorithmException e)
+ {
+ logger.warn("SHA1PRNG algorithm isn't available, falling back to insecure password");
+ return "" + System.currentTimeMillis();
+ }
+
+ for (int i = 0; i <= length; i++)
+ {
+ byte[] bytes = new byte[512];
+ secureRandom.nextBytes(bytes);
+ double number = secureRandom.nextDouble();
+ int b = ((int) (number * characterMap.length));
+ buffer.append(characterMap[b]);
+ }
+
+ return buffer.toString();
+ }
+
+}
Property changes on: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/PasswordGeneratorServiceImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2010-02-03 10:29:36 UTC (rev 1519)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2010-02-03 13:16:00 UTC (rev 1520)
@@ -24,6 +24,7 @@
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.services.mail.MailService;
import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.PasswordGeneratorService;
import org.exoplatform.services.organization.Query;
import org.exoplatform.services.organization.User;
import org.exoplatform.web.application.ApplicationMessage;
@@ -41,7 +42,6 @@
import java.net.URLEncoder;
import java.util.Date;
-import java.util.List;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -78,41 +78,53 @@
String url = portalContext.getRequest().getRequestURL().toString();
MailService mailSrc = uiForm.getApplicationComponent(MailService.class);
OrganizationService orgSrc = uiForm.getApplicationComponent(OrganizationService.class);
+ PasswordGeneratorService passwordGenSrc = uiForm.getApplicationComponent(PasswordGeneratorService.class);
String userName = uiForm.getUIStringInput(Username).getValue();
String email = uiForm.getUIStringInput(Email).getValue();
uiForm.reset();
+
+ User user = null;
+
+ // User provided his username
if (userName != null)
{
- if (orgSrc.getUserHandler().findUserByName(userName) == null)
+ user = orgSrc.getUserHandler().findUserByName(userName);
+ if (user == null)
{
requestContext.getUIApplication().addMessage(
new ApplicationMessage("UIForgetPassword.msg.user-not-exist", null));
return;
}
- email = orgSrc.getUserHandler().findUserByName(userName).getEmail();
}
- //get user
- PageList userPageList = orgSrc.getUserHandler().findUsers(new Query());
- List userList = userPageList.currentPage();
- User user = null;
- for (int i = 0; i < userList.size(); i++)
+
+ // User provided his email address
+ if (user == null && email != null)
{
- User tmpUser = (User)userList.get(i);
- if (tmpUser.getEmail().equals(email))
+ Query query = new Query();
+ // Querying on email won't work. PLIDM-12
+ // Note that querying on email is inefficient as it loops over all users...
+ // query.setEmail(email);
+ PageList<User> users = orgSrc.getUserHandler().findUsers(query);
+ for (User tmpUser : users.currentPage().toArray(new User[]{}))
{
- user = tmpUser;
- break;
+ if (email.equals(tmpUser.getEmail()))
+ {
+ user = tmpUser;
+ break;
+ }
}
+ if (user == null)
+ {
+ requestContext.getUIApplication().addMessage(
+ new ApplicationMessage("UIForgetPassword.msg.email-not-exist", null));
+ return;
+ }
}
- if (user == null)
- {
- requestContext.getUIApplication().addMessage(
- new ApplicationMessage("UIForgetPassword.msg.email-not-exist", null));
- return;
- }
+
+ email = user.getEmail();
+
String portalName = URLEncoder.encode(Util.getUIPortal().getName(), "UTF-8");
- Long now = new Date().getTime();
- user.setPassword(now.toString());
+ user.setPassword(passwordGenSrc.generatePassword());
orgSrc.getUserHandler().saveUser(user, true);
ResourceBundle res = requestContext.getApplicationResourceBundle();
String headerMail = "headermail";
@@ -130,14 +142,18 @@
e.printStackTrace();
}
String host = url.substring(0, url.indexOf(requestContext.getRequestContextPath()));
+ Long now = new Date().getTime();
String activeLink = host + requestContext.getRequestContextPath() + "/public/" + portalName;
activeLink +=
"?portal:componentId=UIPortal&portal:action=RecoveryPasswordAndUsername&datesend=" + now.toString()
+ "&email=" + email;
activeLink = headerMail + activeLink + footerMail;
- try{
- mailSrc.sendMessage("exoservice(a)gmail.com", email, "Remind password and username", activeLink);
- } catch(Exception e){
+ try
+ {
+ mailSrc.sendMessage(res.getString("UIForgetPassword.mail.from"), email, res.getString("UIForgetPassword.mail.subject"), activeLink);
+ }
+ catch(Exception e)
+ {
requestContext.getUIApplication().addMessage(
new ApplicationMessage("UIForgetPassword.msg.send-mail-fail", null));
requestContext.addUIComponentToUpdateByAjax(uilogin);
14 years, 10 months
gatein SVN: r1519 - portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-03 05:29:36 -0500 (Wed, 03 Feb 2010)
New Revision: 1519
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
Log:
GTNPORTAL-500: "Site" and "Group" links for non-privilege people show forbidden buttons (update)
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2010-02-03 10:18:09 UTC (rev 1518)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2010-02-03 10:29:36 UTC (rev 1519)
@@ -6,7 +6,7 @@
uicomponent.loadNavigations();
uicomponent.renderChild(UIVirtualList.class);
- if(uicomponent.loadNavigations().size() > 0){ %>
+ if(uicomponent.getNavigations() != null && uicomponent.getNavigations().size() > 0){ %>
<div class="UIAction">
<table class="ActionContainer">
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2010-02-03 10:18:09 UTC (rev 1518)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2010-02-03 10:29:36 UTC (rev 1519)
@@ -31,7 +31,7 @@
}
%>
<%
- if(uicomponent.getPortalConfigs().size() > 0){
+ if(uicomponent.getPortalConfigs() != null && uicomponent.getPortalConfigs().size() > 0){
%>
<div class="UIAction">
<table class="ActionContainer">
14 years, 10 months
gatein SVN: r1518 - portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-03 05:18:09 -0500 (Wed, 03 Feb 2010)
New Revision: 1518
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
Log:
GTNPORTAL-500: "Site" and "Group" links for non-privilege people show forbidden buttons
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2010-02-03 09:50:19 UTC (rev 1517)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2010-02-03 10:18:09 UTC (rev 1518)
@@ -5,7 +5,8 @@
import org.exoplatform.webui.core.UIPopupWindow;
uicomponent.loadNavigations();
- uicomponent.renderChild(UIVirtualList.class); %>
+ uicomponent.renderChild(UIVirtualList.class);
+ if(uicomponent.loadNavigations().size() > 0){ %>
<div class="UIAction">
<table class="ActionContainer">
@@ -24,6 +25,9 @@
</tr>
</table>
</div>
+ <%
+ }
+ %>
<% uicomponent.renderChild(UIPopupWindow.class); %>
</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2010-02-03 09:50:19 UTC (rev 1517)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2010-02-03 10:18:09 UTC (rev 1518)
@@ -30,7 +30,9 @@
<%
}
%>
-
+ <%
+ if(uicomponent.getPortalConfigs().size() > 0){
+ %>
<div class="UIAction">
<table class="ActionContainer">
<tr>
@@ -48,7 +50,9 @@
</tr>
</table>
</div>
-
+ <%
+ }
+ %>
<%uicomponent.renderChildren();%>
</div>
14 years, 10 months
gatein SVN: r1517 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-03 04:50:19 -0500 (Wed, 03 Feb 2010)
New Revision: 1517
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js
Log:
GTNPORTAL-492 Error displaying MaskLayer when click restore down window
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js 2010-02-03 09:46:24 UTC (rev 1516)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/UIMaskLayer.js 2010-02-03 09:50:19 UTC (rev 1517)
@@ -88,6 +88,7 @@
eXo.core.UIMaskLayer.removeMask(maskLayer) ;
};
+
/**
* Creates and returns the dom element that contains the mask layer, with these parameters
* . the mask layer is a child of blockContainerId
@@ -126,8 +127,8 @@
maskLayer.className = "MaskLayer" ;
maskLayer.id = "MaskLayer" ;
maskLayer.maxZIndex = 4; //3 ;
- maskLayer.style.width = eXo.core.Browser.getBrowserWidth() + "px";
- maskLayer.style.height = eXo.core.Browser.getBrowserHeight() + "px";
+ maskLayer.style.width = Browser.getBrowserWidth() + "px";
+ maskLayer.style.height = Browser.getBrowserHeight() + "px";
maskLayer.style.top = "0px" ;
maskLayer.style.left = "0px" ;
maskLayer.style.zIndex = maskLayer.maxZIndex ;
@@ -165,6 +166,7 @@
}catch(err) {
alert(err) ;
}
+ Browser.addOnResizeCallback(maskLayer.id, eXo.core.UIMaskLayer.resizeMaskLayer);
return maskLayer ;
};
@@ -306,7 +308,9 @@
};
UIMaskLayer.prototype.resizeMaskLayer = function() {
- return ;
-} ;
+ var maskLayer = document.getElementById("MaskLayer");
+ maskLayer.style.width = eXo.core.Browser.getBrowserWidth() + "px";
+ maskLayer.style.height = eXo.core.Browser.getBrowserHeight() + "px";
+};
eXo.core.UIMaskLayer = new UIMaskLayer() ;
14 years, 10 months
gatein SVN: r1516 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-03 04:46:24 -0500 (Wed, 03 Feb 2010)
New Revision: 1516
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
GTNPORTAL-486: Translate Portal Navigation to Vietnamese
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-03 08:51:08 UTC (rev 1515)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-03 09:46:24 UTC (rev 1516)
@@ -1359,6 +1359,7 @@
############################################################################
UINavigationManagement.action.addNode=Add Node
+UINavigationManagement.action.Save=Save
UINavigationManagement.msg.NavigationNotExistAnymore=The navigation could be deleted.
############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-03 08:51:08 UTC (rev 1515)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-03 09:46:24 UTC (rev 1516)
@@ -95,13 +95,13 @@
#org.exoplatform.portal.webui.portal.UIPortalComposer #
#############################################################################
-UIPortalComposer.title.UIPortalComposer=Edit Inline Composer
-UIPortalComposer.action.Abort=Abort
-UIPortalComposer.action.Finish=Finish
-UIPortalComposer.action.ViewProperties=Portal Properties
-UIPortalComposer.action.SwitchMode=Switch View Mode
-UITabPane.title.UIApplicationList=Applications
-UITabPane.title.UIContainerList=Containers
+UIPortalComposer.title.UIPortalComposer=Chỉnh sửa trang
+UIPortalComposer.action.Abort=Thoát
+UIPortalComposer.action.Finish=Hoàn thành
+UIPortalComposer.action.ViewProperties=Xem thuộc tính portal
+UIPortalComposer.action.SwitchMode=Chuyển chế độ xem
+UITabPane.title.UIApplicationList=Các ứng dụng
+UITabPane.title.UIContainerList=Các Container
#############################################################################
#Container config options #
@@ -1296,7 +1296,7 @@
UIPopupWindow.Close=Đóng cửa sổ
UIPopupWindow.title.UIPageNodeForm2=ADD/EDIT PAGE NODE
-UIPopupWindow.title.UINavigationManagement=Navigation Management
+UIPopupWindow.title.UINavigationManagement=Qủan lý Navigation
UIPopupWindow.title.UIPageNavigationForm=Page Navigation Form
############################################################################
@@ -1304,7 +1304,7 @@
############################################################################
UIGroupNavigationManagement.Action.Add=Thêm Navigation
-UIGroupNavigationManagement.Delete.Confirm=Are you sure to delete this navigation?
+UIGroupNavigationManagement.Delete.Confirm=Bạn có muốn xóa navigation này?
UIGroupNavigationManagement.Label.EditNavigation=Sửa Navigation
UIGroupNavigationManagement.Label.EditProperties=Sửa thuộc tính
@@ -1312,6 +1312,14 @@
UIGroupNavigationManagement.Label.Description=Mô tả
############################################################################
+ # org.exoplatform.navigation.webui.component.UIGroupNavigationManagement #
+ ############################################################################
+
+UINavigationManagement.action.addNode=Thêm Node
+UINavigationManagement.action.Save=Lưu
+UINavigationManagement.msg.NavigationNotExistAnymore=Navigation không thể xóa.
+
+ ############################################################################
# org.exoplatform.navigation.webui.component.UIAddGroupNavigation #
############################################################################
14 years, 10 months
gatein SVN: r1515 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-03 03:51:08 -0500 (Wed, 03 Feb 2010)
New Revision: 1515
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
Translate some labels of Dashboard Edit Page to Vietnamese
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-03 08:21:49 UTC (rev 1514)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-03 08:51:08 UTC (rev 1515)
@@ -1244,6 +1244,7 @@
UIDashboardEditForm.label.totalColumns=Number of columns:
UIDashboardEditForm.label.isPrivate=Is Private:
UIDashboardEditForm.label.owner=Owner:
+UIDashboardEditForm.action.Save=Save
UIDashboard.msg.required=The text field is required.
UIDashboard.msg.addGadget=Drag your gadgets here.
UIDashboard.msg.notUrl=The url is invalid. Please enter a correct url of a gadget xml or of an RSS feed.
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-03 08:21:49 UTC (rev 1514)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-03 08:51:08 UTC (rev 1515)
@@ -1212,6 +1212,9 @@
UIDashboardContainer.label.Debug=Debug
UIDashboardContainer.label.Cache=Không lưu Cache
UIDashboardEditForm.label.totalColumns=Số cột
+UIDashboardEditForm.label.isPrivate=Là trang cá nhân:
+UIDashboardEditForm.label.owner=Chủ nhân:
+UIDashboardEditForm.action.Save=Lưu
UIDashboard.msg.required=Trường này không được để trống.
UIDashboard.msg.addGadget=Kéo thả Garget của bạn vào đây.
UIDashboard.msg.notUrl=Nhập URL không hợp lệ! Hãy nhập một URL đúng của Gadget hoặc RSS!
14 years, 10 months
gatein SVN: r1514 - portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-03 03:21:49 -0500 (Wed, 03 Feb 2010)
New Revision: 1514
Added:
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_vi.properties
Log:
Translate some labels of Dashboard to Vietnamese
Added: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_vi.properties
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_vi.properties (rev 0)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_vi.properties 2010-02-03 08:21:49 UTC (rev 1514)
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+UITabPaneDashboard.action.addNewDashboard=Thêm Dashboard
+UITabPaneDashboard.action.switchShowRange=Switch Range
+UITabPaneDashboard.msg.deleteTab=Bạn muốn xóa dashboard này?
+UITabPaneDashboard.msg.cannotDeleteLastTab=Không thể xóa tab cuối cùng.
+UITabPaneDashboard.msg.wrongTabName=Chỉ cho phép chữ cái, chữ số, kí tự '_', kí tự '-' và kí tự cách.
\ No newline at end of file
14 years, 10 months
gatein SVN: r1513 - portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-02-03 03:21:14 -0500 (Wed, 03 Feb 2010)
New Revision: 1513
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
Log:
GTNPORTAL-514;GTNPORTAL-515;GTNPORTAL-517
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2010-02-03 08:19:54 UTC (rev 1512)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2010-02-03 08:21:14 UTC (rev 1513)
@@ -84,15 +84,37 @@
padding-left: 2px; /* orientation=rt */
text-align: left; /* orientation=lt */
text-align: right; /* orientation=rt */
- float: none; /* orientation=lt */
- !float: left; /* orientation=rt */ /* fix for IE7 */
+ float: none;
+ !float: left;/* orientation=rt */
+ _float: none;/* orientation=rt */
}
+
+.UserToolBarSitePortletTDContainer {
+ position: relative;
+}
+
+.UserToolBarGroupPortletTDContainer {
+ position: relative;
+}
+
+.UserToolBarGroupPortletTDContainer {
+ position: relative;
+}
+
+.UserToolBarDashboardPortletTDContainer {
+ position: relative;
+}
+
+.AdminToolBarPortletTDContainer {
+ position: relative;
+}
/****************************/
.UIToolbarContainer .MenuItemContainer {
position: absolute;
- border: 1px solid #9e9fa3;
+ border: 1px solid #9e9fa3;
+ display: none;
}
.UIToolbarContainer .TitleBar {
14 years, 10 months
gatein SVN: r1512 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-03 03:19:54 -0500 (Wed, 03 Feb 2010)
New Revision: 1512
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
Additional features localized for a number of labels of Dashboard
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-03 08:12:15 UTC (rev 1511)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-03 08:19:54 UTC (rev 1512)
@@ -1213,8 +1213,9 @@
UIDashboardContainer.label.Cache=Không lưu Cache
UIDashboardEditForm.label.totalColumns=Số cột
UIDashboard.msg.required=Trường này không được để trống.
-UIDashboard.msg.addGadget=Drag your gadgets here.
+UIDashboard.msg.addGadget=Kéo thả Garget của bạn vào đây.
UIDashboard.msg.notUrl=Nhập URL không hợp lệ! Hãy nhập một URL đúng của Gadget hoặc RSS!
+UIDashboard.msg.ApplicationNotExisted=Ứng dụng không tồn tại hoặc đã bị xóa.
################################################################################
# org.exoplatform.webui.organization.account.UIUserSelector
14 years, 10 months