gatein SVN: r570 - portal/trunk/packaging.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-11 07:40:30 -0500 (Wed, 11 Nov 2009)
New Revision: 570
Modified:
portal/trunk/packaging/
Log:
add profiles.xml to ignore list
Property changes on: portal/trunk/packaging
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
profiles.xml
15 years, 2 months
gatein SVN: r569 - portal/trunk/component/web/src/main/java/org/exoplatform/web/login.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-11 06:53:10 -0500 (Wed, 11 Nov 2009)
New Revision: 569
Modified:
portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
Log:
GTNPORTAL-126: First login without 'Remember me' option fails
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2009-11-11 11:22:01 UTC (rev 568)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2009-11-11 11:53:10 UTC (rev 569)
@@ -74,14 +74,16 @@
cookie.setPath(req.getContextPath());
cookie.setMaxAge(0);
resp.addCookie(cookie);
- // This allows the customer to define another login page without changing the portal
+ // This allows the customer to define another login page without
+ // changing the portal
context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp);
return;
}
}
else
{
- // This allows the customer to define another login page without changing the portal
+ // This allows the customer to define another login page without
+ // changing the portal
context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp);
return;
}
@@ -95,8 +97,12 @@
{
if (InitiateLoginServlet.COOKIE_NAME.equals(cookie.getName()))
{
- token = cookie.getValue();
- break;
+ String rememberme = req.getParameter(COOKIE_NAME);
+ if (rememberme != null)
+ {
+ token = cookie.getValue();
+ break;
+ }
}
}
if (token == null)
15 years, 2 months
gatein SVN: r568 - in portal/trunk/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directories.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-11 06:22:01 -0500 (Wed, 11 Nov 2009)
New Revision: 568
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl
Log:
GTNPORTAL-229 Unknown error when add gadget into categories to be able used in Dashboard in specical case
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2009-11-11 10:18:27 UTC (rev 567)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2009-11-11 11:22:01 UTC (rev 568)
@@ -3,6 +3,8 @@
import org.exoplatform.application.registry.Application;
import org.exoplatform.application.registry.ApplicationCategory;
import org.exoplatform.application.registry.ApplicationRegistryService;
+import org.exoplatform.applicationregistry.webui.Util;
+import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
@@ -25,7 +27,7 @@
*/
@ComponentConfig(template = "system:/groovy/webui/form/UIForm.gtmpl", lifecycle = UIFormLifecycle.class, events = {
@EventConfig(listeners = UICategorySelector.SaveActionListener.class),
- @EventConfig(listeners = UICategorySelector.CloseActionListener.class, phase = Phase.DECODE)})
+ @EventConfig(listeners = UICategorySelector.CancelActionListener.class, phase = Phase.DECODE)})
public class UICategorySelector extends UIForm
{
private List<ApplicationCategory> categories;
@@ -36,17 +38,39 @@
private final static String[] TABLE_COLUMNS = {"choose", "categoryName"};
- public UICategorySelector() throws Exception
+ public UICategorySelector()
{
+ }
+
+ @Override
+ public boolean isRendered()
+ {
ApplicationRegistryService appRegService = getApplicationComponent(ApplicationRegistryService.class);
- categories = appRegService.getApplicationCategories();
+ List<ApplicationCategory> categories;
+ try
+ {
+ categories = appRegService.getApplicationCategories();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
categories = categories != null ? categories : new ArrayList<ApplicationCategory>();
+ if (categories.isEmpty())
+ return false;
+ return super.isRendered();
}
- public void setup(Application app) throws Exception
+ /**
+ * @see Refresh each render time
+ */
+ @Override
+ public void processRender(WebuiRequestContext context) throws Exception
{
setChildren(null);
- this.application = app;
+ ApplicationRegistryService appRegService = getApplicationComponent(ApplicationRegistryService.class);
+ List<ApplicationCategory> categories = appRegService.getApplicationCategories(new Util.CategoryComparator());
+ categories = categories != null ? categories : new ArrayList<ApplicationCategory>();
UIFormTableInputSet uiTableInputSet = createUIComponent(UIFormTableInputSet.class, null, null);
uiTableInputSet.setName(getClass().getSimpleName());
@@ -57,28 +81,34 @@
UIFormInputSet uiInputSet;
UIFormCheckBoxInput<Boolean> checkBoxInput;
UIFormInputInfo uiInfo;
-
- ApplicationRegistryService appRegService = getApplicationComponent(ApplicationRegistryService.class);
for (ApplicationCategory category : categories)
{
uiInputSet = new UIFormInputSet(category.getName());
- boolean defaultValue = appRegService.getApplication(category.getName(), app.getApplicationName()) != null;
+ boolean defaultValue = false;
+ if (application != null)
+ {
+ String definitionName = application.getDisplayName().replace(' ', '_');
+ defaultValue =
+ appRegService.getApplication(category.getName(), definitionName) != null;
+ }
checkBoxInput = new UIFormCheckBoxInput<Boolean>("category_" + category.getName(), null, defaultValue);
uiInfo = new UIFormInputInfo("categoryName", null, category.getDisplayName());
uiInputSet.addChild(checkBoxInput);
uiInputSet.addChild(uiInfo);
uiTableInputSet.addChild(uiInputSet);
}
+
+ super.processRender(context);
}
public String[] getActions()
{
return ACTIONS;
- }
+ }
- public List<ApplicationCategory> getCategories()
+ public void setApplication(Application app)
{
- return this.categories;
+ this.application = app;
}
public Application getApplication()
@@ -91,11 +121,12 @@
public void execute(Event<UICategorySelector> event) throws Exception
{
UICategorySelector selector = event.getSource();
- List<ApplicationCategory> categories = selector.getCategories();
- UIFormCheckBoxInput<Boolean> chkInput;
ApplicationRegistryService appRegService = selector.getApplicationComponent(ApplicationRegistryService.class);
+ List<ApplicationCategory> categories = appRegService.getApplicationCategories();
+ categories = categories != null ? categories : new ArrayList<ApplicationCategory>();
+ UIFormCheckBoxInput<Boolean> chkInput;
for (ApplicationCategory category : categories)
- {
+ {
chkInput = selector.getUIInput("category_" + category.getName());
if (chkInput != null && chkInput.isChecked())
{
@@ -115,11 +146,12 @@
newApp.setType(app.getType());
newApp.setDescription(app.getDescription());
newApp.setAccessPermissions(app.getAccessPermissions());
+ newApp.setContentId(app.getContentId());
return newApp;
}
}
- static public class CloseActionListener extends EventListener<UICategorySelector>
+ static public class CancelActionListener extends EventListener<UICategorySelector>
{
public void execute(Event<UICategorySelector> event) throws Exception
{
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java 2009-11-11 10:18:27 UTC (rev 567)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java 2009-11-11 11:22:01 UTC (rev 568)
@@ -99,7 +99,8 @@
for (ApplicationCategory category : allCategories)
{
- if (appRegService.getApplication(category.getName(), gadget_.getName()) != null)
+ String definitionName = gadget_.getTitle().replace(' ', '_');
+ if (appRegService.getApplication(category.getName(), definitionName) != null)
{
nameList.add(category.getDisplayName());
}
@@ -217,6 +218,15 @@
public void execute(Event<UIGadgetInfo> event) throws Exception
{
UIGadgetInfo gadgetInfo = event.getSource();
+
+ ApplicationRegistryService appRegService = gadgetInfo.getApplicationComponent(ApplicationRegistryService.class);
+ List<ApplicationCategory> categories = appRegService.getApplicationCategories();
+ if (categories == null || categories.isEmpty()) {
+ UIApplication uiApp = event.getRequestContext().getUIApplication();
+ uiApp.addMessage(new ApplicationMessage("UICategorySelector.msg.NoCategory", null));
+ return;
+ }
+
Gadget gadget = gadgetInfo.getGadget();
UICategorySelector selector = gadgetInfo.getChild(UICategorySelector.class);
@@ -224,13 +234,14 @@
app.setApplicationName(gadget.getName());
app.setType(ApplicationType.GADGET);
app.setDisplayName(gadget.getTitle());
+ app.setContentId(gadget.getName());
String description =
(gadget.getDescription() == null || gadget.getDescription().length() < 1) ? gadget.getName() : gadget
.getDescription();
app.setDescription(description);
app.setAccessPermissions(new ArrayList<String>());
- selector.setup(app);
+ selector.setApplication(app);
selector.setRendered(true);
event.getRequestContext().addUIComponentToUpdateByAjax(event.getSource());
}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2009-11-11 10:18:27 UTC (rev 567)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2009-11-11 11:22:01 UTC (rev 568)
@@ -131,6 +131,7 @@
UICategorySelector.header.categoryName=Category's name
UICategorySelector.action.Save=Save
UICategorySelector.action.Cancel=Cancel
+UICategorySelector.msg.NoCategory=There is no any category
## org.exoplatform.applicationregistry.webui.component.UIAddGadget
UIAddGadget.action.Add=Add
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2009-11-11 10:18:27 UTC (rev 567)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2009-11-11 11:22:01 UTC (rev 568)
@@ -64,11 +64,7 @@
<a href="#" onclick="<%= uicomponent.event("ShowCategories") %>" style="color:red;text-decoration:underline;">
<%=_ctx.appRes("UIGadgetInfo.label.categories.clickHere")%>
</a>
- <% } else { %>
- <div>
- <% uicomponent.renderChildren() %>
- </div>
- <%}%>
+ <% } %>
<%}%>
</td>
@@ -77,4 +73,9 @@
</div>
</div>
+ <div>
+ <% if (categoryNames.equals("") && selectorRender) {
+ uicomponent.renderChildren();
+ } %>
+ </div>
</div>
\ No newline at end of file
15 years, 2 months
gatein SVN: r566 - portal/trunk/web/portal/src/main/webapp/login/jsp.
by do-not-reply＠jboss.org
Author: truong.le
Date: 2009-11-11 04:06:37 -0500 (Wed, 11 Nov 2009)
New Revision: 566
Modified:
portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
Log:
GTNPORTAL-59: Cyryllic symbols don't show
Modified: portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
===================================================================
--- portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2009-11-11 08:54:04 UTC (rev 565)
+++ portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2009-11-11 09:06:37 UTC (rev 566)
@@ -26,7 +26,6 @@
<%@ page import="java.util.ResourceBundle"%>
<%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%>
<%@ page language="java" %>
-<%@ page contentType="text/html; charset=utf-8" %>
<%
String contextPath = request.getContextPath() ;
@@ -43,12 +42,15 @@
cookie.setPath(request.getContextPath());
cookie.setMaxAge(0);
response.addCookie(cookie);
+
+ response.setCharacterEncoding("UTF-8");
+
%>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Login</title>
<link rel="shortcut icon" type="image/x-icon" href="<%=contextPath%>/favicon.ico" />
@@ -65,7 +67,7 @@
<%
if(username.length() > 0 || password.length() > 0) {
%>
- <font color="red"><%=res.getString("UILoginForm.label.SigninFail")%></font><%}%>
+ <font color="red"><%=res.getString("UILoginForm.label.SigninFail")%></font><%}%>
<form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;">
<input type="hidden" name="uri" value="<%=session.getAttribute("initialURI") %>"/>
<table>
15 years, 2 months
gatein SVN: r565 - portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-11-11 03:54:04 -0500 (Wed, 11 Nov 2009)
New Revision: 565
Added:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java
Removed:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java
Log:
rename wsrp test to be homogeneous with other tests
Copied: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java (from rev 558, portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java)
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java (rev 0)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java 2009-11-11 08:54:04 UTC (rev 565)
@@ -0,0 +1,88 @@
+/**
+ * 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.
+ */
+
+package org.exoplatform.portal.config;
+
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.portal.config.model.Application;
+import org.exoplatform.portal.config.model.Page;
+import org.exoplatform.portal.config.model.TransientApplicationState;
+import org.exoplatform.portal.pom.config.POMSession;
+import org.exoplatform.portal.pom.config.POMSessionManager;
+import org.exoplatform.portal.pom.spi.wsrp.WSRP;
+import org.exoplatform.test.BasicTestCase;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestWSRP extends BasicTestCase
+{
+
+ /** . */
+ private DataStorage storage_;
+
+ /** . */
+ private POMSessionManager mgr;
+
+ /** . */
+ private POMSession session;
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ if (storage_ != null)
+ {
+ return;
+ }
+ PortalContainer container = PortalContainer.getInstance();
+ storage_ = (DataStorage)container.getComponentInstanceOfType(DataStorage.class);
+ mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
+ session = mgr.openSession();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ mgr.closeSession(false);
+ }
+
+ public void testBilto() throws Exception
+ {
+ WSRP wsrp = new WSRP();
+ String id = "portlet id";
+ wsrp.setPortletId(id);
+ TransientApplicationState<WSRP> state = new TransientApplicationState<WSRP>("test", wsrp);
+ Application<WSRP> wsrpApplication = Application.createWSRPApplication();
+ wsrpApplication.setState(state);
+
+ Page container = new Page();
+ String pageId = "portal::test::wsrp_page";
+ container.setPageId(pageId);
+ container.getChildren().add(wsrpApplication);
+
+ storage_.create(container);
+
+ container = storage_.getPage(pageId);
+ wsrpApplication = (Application<WSRP>)container.getChildren().get(0);
+
+ wsrp = storage_.load(wsrpApplication.getState());
+ assertNotNull(wsrp);
+ assertEquals(id, wsrp.getPortletId());
+ }
+}
Deleted: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java 2009-11-11 08:51:22 UTC (rev 564)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java 2009-11-11 08:54:04 UTC (rev 565)
@@ -1,88 +0,0 @@
-/**
- * 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.
- */
-
-package org.exoplatform.portal.config;
-
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.portal.config.model.Application;
-import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.TransientApplicationState;
-import org.exoplatform.portal.pom.config.POMSession;
-import org.exoplatform.portal.pom.config.POMSessionManager;
-import org.exoplatform.portal.pom.spi.wsrp.WSRP;
-import org.exoplatform.test.BasicTestCase;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class WSRPTest extends BasicTestCase
-{
-
- /** . */
- private DataStorage storage_;
-
- /** . */
- private POMSessionManager mgr;
-
- /** . */
- private POMSession session;
-
- public void setUp() throws Exception
- {
- super.setUp();
- if (storage_ != null)
- {
- return;
- }
- PortalContainer container = PortalContainer.getInstance();
- storage_ = (DataStorage)container.getComponentInstanceOfType(DataStorage.class);
- mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
- session = mgr.openSession();
- }
-
- protected void tearDown() throws Exception
- {
- mgr.closeSession(false);
- }
-
- public void testBilto() throws Exception
- {
- WSRP wsrp = new WSRP();
- String id = "portlet id";
- wsrp.setPortletId(id);
- TransientApplicationState<WSRP> state = new TransientApplicationState<WSRP>("test", wsrp);
- Application<WSRP> wsrpApplication = Application.createWSRPApplication();
- wsrpApplication.setState(state);
-
- Page container = new Page();
- String pageId = "portal::test::wsrp_page";
- container.setPageId(pageId);
- container.getChildren().add(wsrpApplication);
-
- storage_.create(container);
-
- container = storage_.getPage(pageId);
- wsrpApplication = (Application<WSRP>)container.getChildren().get(0);
-
- wsrp = storage_.load(wsrpApplication.getState());
- assertNotNull(wsrp);
- assertEquals(id, wsrp.getPortletId());
- }
-}
15 years, 2 months
gatein SVN: r564 - portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2009-11-11 03:51:22 -0500 (Wed, 11 Nov 2009)
New Revision: 564
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl
Log:
GTNPORTAL-150: Rename Organize to Categories, move Portlet and Gadget to the right.
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl 2009-11-11 08:15:37 UTC (rev 563)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl 2009-11-11 08:51:22 UTC (rev 564)
@@ -16,7 +16,7 @@
<div class="RightToolbar">
<div class="MiddleToolbar">
- <div class="ManagementIconContainer">
+ <div class="ManagementIconContainer ClearFix">
<%
cssClass = "ItemButton";
if(uicomponent.getChild(0).isRendered()) cssClass = "ItemButton SelectItemButton";
@@ -25,25 +25,25 @@
<div class="LablelIcon OrganizeIcon"><span></span></div>
<a href="javascript:void(0);" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.organize")%></a>
</div>
- <div class="HorizontalSeparator"><span></span></div>
<%
cssClass = "ItemButton";
+ if(uicomponent.getChild(2).isRendered()) cssClass = "ItemButton SelectItemButton";
+ %>
+ <div onclick="<%=uicomponent.event("ViewChild", "UIGadgetManagement")%>" class="$cssClass" style="float: <%= isLT? "right" : "left" %>">
+ <div class="LablelIcon GadgetIcon"><span></span></div>
+ <a href="javascript:void(0)" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.gadget")%></a>
+ </div>
+ <div class="HorizontalSeparator" style="float: <%= isLT? "right" : "left" %>"><span></span></div>
+ <%
+ cssClass = "ItemButton";
if(uicomponent.getChild(1).isRendered()) cssClass = "ItemButton SelectItemButton";
%>
- <div onclick="<%=uicomponent.event("ViewChild", "UIPortletManagement")%>" class="$cssClass">
+ <div onclick="<%=uicomponent.event("ViewChild", "UIPortletManagement")%>" class="$cssClass" style="float: <%= isLT? "right" : "left" %>">
<div class="LablelIcon PorletIcon"><span></span></div>
<a href="javascript:void(0);" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.portlet")%></a>
</div>
- <div class="HorizontalSeparator"><span></span></div>
- <%
- cssClass = "ItemButton";
- if(uicomponent.getChild(2).isRendered()) cssClass = "ItemButton SelectItemButton";
- %>
- <div onclick="<%=uicomponent.event("ViewChild", "UIGadgetManagement")%>" class="$cssClass">
- <div class="LablelIcon GadgetIcon"><span></span></div>
- <a href="javascript:void(0)" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.gadget")%></a>
- </div>
- <div class="ClearLeft"><span></span></div>
+ <div class="HorizontalSeparator" style="float: <%= isLT? "right" : "left" %>"><span></span></div>
+
</div>
</div>
15 years, 2 months
gatein SVN: r563 - portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2009-11-11 03:15:37 -0500 (Wed, 11 Nov 2009)
New Revision: 563
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
Log:
GTNPORTAL-89: Some improvements when add new tab in Dashboard page
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2009-11-11 08:12:34 UTC (rev 562)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2009-11-11 08:15:37 UTC (rev 563)
@@ -78,7 +78,7 @@
}
.UITabPaneDashboard .UIHorizontalTabs {
- padding: 5px 0 8px;
+ padding: 1px 0 5px;
}
.UITabPaneDashboard .UIHorizontalTabs .TabsContainer {
@@ -86,7 +86,7 @@
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle {
- padding: 4px 2px 0 0;
+ margin: 4px 2px 0 0;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab,
15 years, 2 months
gatein SVN: r562 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tam_nguyen
Date: 2009-11-11 03:12:34 -0500 (Wed, 11 Nov 2009)
New Revision: 562
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
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_fr.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
GTNPORTAL-154 A dubious behavior to User in the portlet setting form
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2009-11-11 08:10:11 UTC (rev 561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2009-11-11 08:12:34 UTC (rev 562)
@@ -528,7 +528,7 @@
</label>
<action>
<Close>الغاء</Close>
- <Save>#{word.save}</Save>
+ <Save>Save And Close</Save>
</action>
<tab>
<label>
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 2009-11-11 08:10:11 UTC (rev 561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-11 08:12:34 UTC (rev 562)
@@ -295,7 +295,7 @@
UIPortletForm.label.description=Description :
UIPortletForm.label.template=Template
UIPortletForm.action.Close=Cancel
-UIPortletForm.action.Save=#{word.save}
+UIPortletForm.action.Save=Save And Close
UIPortletForm.tab.label.PortletPref=Preferences
UIPortletForm.tab.label.PortletSetting=Portlet Setting
UIPortletForm.tab.label.Renderer=Renderer
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-11 08:10:11 UTC (rev 561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-11 08:12:34 UTC (rev 562)
@@ -281,7 +281,7 @@
UIPortletForm.label.description=Description :
UIPortletForm.label.template=#{word.template}
UIPortletForm.action.Close=Annuler
-UIPortletForm.action.Save=#{word.save}
+UIPortletForm.action.Save=Save And Close
UIPortletForm.tab.label.PortletPref=Preferences
UIPortletForm.tab.label.PortletSetting=Configuration de la portlet
UIPortletForm.tab.label.Renderer=Renderer
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-11 08:10:11 UTC (rev 561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-11 08:12:34 UTC (rev 562)
@@ -276,7 +276,7 @@
UIPortletForm.label.description=Описание:
UIPortletForm.label.template=Шаблон
UIPortletForm.action.Close=Отменить
-UIPortletForm.action.Save=#{word.save}
+UIPortletForm.action.Save=Save And Close
UIPortletForm.tab.label.PortletPref=Настройки
UIPortletForm.tab.label.PortletSetting=Параметры портлета
UIPortletForm.tab.label.Renderer=Отрисовщик
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-11 08:10:11 UTC (rev 561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-11 08:12:34 UTC (rev 562)
@@ -276,7 +276,7 @@
UIPortletForm.label.description=Опис :
UIPortletForm.label.template=Шаблон
UIPortletForm.action.Close=Скасувати
-UIPortletForm.action.Save=#{word.save}
+UIPortletForm.action.Save=Save And Close
UIPortletForm.tab.label.PortletPref=Налаштування
UIPortletForm.tab.label.PortletSetting=Встановлення портлету
UIPortletForm.tab.label.Renderer=Відтворювач
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 2009-11-11 08:10:11 UTC (rev 561)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-11 08:12:34 UTC (rev 562)
@@ -276,7 +276,7 @@
UIPortletForm.label.description=Mô tả :
UIPortletForm.label.template=Portlet mẫu:
UIPortletForm.action.Close=Từ bỏ
-UIPortletForm.action.Save=#{word.save}
+UIPortletForm.action.Save=Save And Close
UIPortletForm.tab.label.PortletPref=Tùy chỉnh
UIPortletForm.tab.label.PortletSetting=Cấu hình Portlet
UIPortletForm.tab.label.Renderer=Biểu hiện
15 years, 2 months
gatein SVN: r561 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-11 03:10:11 -0500 (Wed, 11 Nov 2009)
New Revision: 561
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipManagement.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java
Log:
GTNPORTAL-221: Unknown error when delete membership in special case
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipManagement.java 2009-11-11 07:45:34 UTC (rev 560)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipManagement.java 2009-11-11 08:10:11 UTC (rev 561)
@@ -27,11 +27,8 @@
import java.io.Writer;
/**
- * Created by The eXo Platform SARL
- * Author : chungnv
- * nguyenchung136(a)yahoo.com
- * Jun 23, 2006
- * 10:07:15 AM
+ * Created by The eXo Platform SARL Author : chungnv nguyenchung136(a)yahoo.com
+ * Jun 23, 2006 10:07:15 AM
*/
@ComponentConfig()
public class UIMembershipManagement extends UIContainer
@@ -43,7 +40,8 @@
addChild(UIMembershipTypeForm.class, null, null);
}
- public UIGroupMembershipForm getGroupMembershipForm()
+ /** Returns currently selected GroupMembershipForm under the Group tab * */
+ private UIGroupMembershipForm getGroupMembershipForm()
{
UIOrganizationPortlet uiParent = getParent();
UIGroupManagement groupManagement = uiParent.getChild(UIGroupManagement.class);
@@ -55,12 +53,20 @@
public void addOptions(MembershipType option)
{
- getGroupMembershipForm().addOptionMembershipType(option);
+ UIGroupMembershipForm membershipFormUnderGroupTab = getGroupMembershipForm();
+ if (membershipFormUnderGroupTab != null)
+ {
+ membershipFormUnderGroupTab.addOptionMembershipType(option);
+ }
}
public void deleteOptions(MembershipType option)
{
- getGroupMembershipForm().removeOptionMembershipType(option);
+ UIGroupMembershipForm membershipFormUnderGroupTab = getGroupMembershipForm();
+ if (membershipFormUnderGroupTab != null)
+ {
+ membershipFormUnderGroupTab.removeOptionMembershipType(option);
+ }
}
@SuppressWarnings("unused")
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java 2009-11-11 07:45:34 UTC (rev 560)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java 2009-11-11 08:10:11 UTC (rev 561)
@@ -101,6 +101,9 @@
return;
}
service.getMembershipTypeHandler().createMembershipType(mt, true);
+
+ // Update the list of membership under GroupManagment if any
+ uiMembershipManagement.addOptions(mt);
}
uiMembershipManagement.getChild(UIListMembershipType.class).loadData();
15 years, 2 months
gatein SVN: r560 - in portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin: webui/component/UITabSystem/UITabs and 1 other directory.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2009-11-11 02:45:34 -0500 (Wed, 11 Nov 2009)
New Revision: 560
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabs/Stylesheet.css
Log:
GTNPORTAL-89: Some improvements when add new tab in Dashboard page
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2009-11-11 07:42:29 UTC (rev 559)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2009-11-11 07:45:34 UTC (rev 560)
@@ -17,7 +17,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-<<<<<<< .mine
.UIWindow .UIDashboardPortlet {
margin: 0px;
}
@@ -36,7 +35,6 @@
.UIDashboard {
height: 100%;
- background: url('background/BgRepeat.gif') repeat-y left bottom;
}
.UIDashboard .DashboardContainer {
@@ -65,31 +63,32 @@
}
.UITabPaneDashboard .LtTabDashboard {
- background: url('background/NavUser.gif') no-repeat left top;
+ background: #ffcf01 url('background/NavUser.gif') no-repeat left top;
padding-left: 3px;
- height: 32px;
}
.UITabPaneDashboard .RtTabDashboard {
- background: url('background/NavUser.gif') no-repeat right top;
+ background: #ffcf01 url('background/NavUser.gif') no-repeat right top;
padding-right: 3px;
- height: 32px;
}
.UITabPaneDashboard .CtTabDashboard {
- height: 32px;
- background: url('background/NavUser.gif') repeat-x center bottom;
+ background: #ffcf01 url('background/NavUser.gif') repeat-x center -32px;
padding: 0px 6px;
}
.UITabPaneDashboard .UIHorizontalTabs {
- padding-top: 10px;
+ padding: 5px 0 8px;
}
.UITabPaneDashboard .UIHorizontalTabs .TabsContainer {
- height: 25px;
+ height: auto;
}
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle {
+ padding: 4px 2px 0 0;
+}
+
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab,
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab {
padding: 0px;
@@ -111,6 +110,7 @@
width: 34px; height: 22px;
float: left;
cursor: pointer;
+ margin-top: 4px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab {
@@ -366,8 +366,9 @@
.UIDashboardContainer .GadgetContainer {
overflow: auto;
- min-height: 400px;
- _height: 400px;
+ height: 100%;
+ min-height: 400px;
+ _height: 400px;
}
/**html .UIDashboardContainer .GadgetContainer {
@@ -514,30 +515,30 @@
#UIAddGadgetPopup .PopupTitle {
margin-left: 22px;
}
-/*----------------------UIDashboardMask-------------------*/
+/*----------------------Maximized-------------------*/
-.UIDashboardMask .UIGadget {
+.Maximized .UIGadget {
padding: 5px;
margin: 0px;
}
-.UIDashboardMask .UIGadget .GadgetControl {
+.Maximized .UIGadget .GadgetControl {
float: none;
padding: 0px;
height: auto; width: auto;
}
-.UIDashboardMask .UIGadget .GadgetControl .LeftControlBar {
+.Maximized .UIGadget .GadgetControl .LeftControlBar {
background: none;
padding: 0px;
}
-.UIDashboardMask .UIGadget .GadgetControl .RightControlBar {
+.Maximized .UIGadget .GadgetControl .RightControlBar {
background: none;
padding: 0px;
}
-.UIDashboardMask .UIGadget .GadgetControl .CenterControlBar {
+.Maximized .UIGadget .GadgetControl .CenterControlBar {
background: url('background/BgTitleGadget.gif') repeat-x left top;
height: 23px;
line-height: 23px;
@@ -546,31 +547,31 @@
border-top: none;
}
-.UIDashboardMask .UIGadget .GadgetControl .GadgetDragHandleArea {
+.Maximized .UIGadget .GadgetControl .GadgetDragHandleArea {
display: none;
}
-.UIDashboardMask .UIGadget .TLGadget {
+.Maximized .UIGadget .TLGadget {
display: none;
}
-.UIDashboardMask .UIGadget .MLGadget {
+.Maximized .UIGadget .MLGadget {
background: #f2f2f3;
border: 1px solid #c3c3c3;
border-top: none;
padding: 3px;
}
-.UIDashboardMask .UIGadget .MRGadget {
+.Maximized .UIGadget .MRGadget {
background: white;
padding: 0 0 1px;
}
-.UIDashboardMask .UIGadget .BLGadget {
+.Maximized .UIGadget .BLGadget {
display: none;
}
-.UIDashboardMask .GadgetTitle {
+.Maximized .GadgetTitle {
float: left; /* orientation=lt */
float: right; /* orientation=rt */
padding: 0px 5px;
@@ -581,6 +582,6 @@
white-space: nowrap;
}
-.UIDashboardMask iframe {
+.Maximized iframe {
width: 100%;
}
\ No newline at end of file
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabs/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabs/Stylesheet.css 2009-11-11 07:42:29 UTC (rev 559)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITabSystem/UITabs/Stylesheet.css 2009-11-11 07:45:34 UTC (rev 560)
@@ -308,8 +308,8 @@
/***************************** GrayTabStyle ************************/
.UIHorizontalTabs .GrayTabStyle {
- margin: 4px 2px 0 0; /* orientation=lt */
- margin: 4px 0 0 2px; /* orientation=rt */
+ margin-right: 2px; /* orientation=lt */
+ margin-left: 2px; /* orientation=rt */
}
.UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab {
15 years, 2 months