gatein SVN: r1362 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-01-19 02:06:40 -0500 (Tue, 19 Jan 2010)
New Revision: 1362
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
set the request character encoding before accessing any parameters so that the parameters are encoded properly.
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-01-19 06:37:45 UTC (rev 1361)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-01-19 07:06:40 UTC (rev 1362)
@@ -113,6 +113,22 @@
response_ = res;
response_.setBufferSize(1024 * 100);
setSessionId(req.getSession().getId());
+
+
+ //The encoding needs to be set before reading any of the parameters since the parameters's encoding
+ //is set at the first acces.
+
+ //TODO use the encoding from the locale-config.xml file
+ response_.setContentType("text/html; charset=UTF-8");
+ try
+ {
+ request_.setCharacterEncoding("UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ log.error("Encoding not supported", e);
+ }
+
ajaxRequest_ = "true".equals(req.getParameter("ajaxRequest"));
String cache = req.getParameter(CACHE_LEVEL);
if (cache != null)
@@ -145,17 +161,6 @@
accessPath = PRIVATE_ACCESS;
}
- //TODO use the encoding from the locale-config.xml file
- response_.setContentType("text/html; charset=UTF-8");
- try
- {
- request_.setCharacterEncoding("UTF-8");
- }
- catch (UnsupportedEncodingException e)
- {
- log.error("Encoding not supported", e);
- }
-
urlBuilder = new PortalURLBuilder(requestURI_);
}
14 years, 11 months
gatein SVN: r1361 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-01-19 01:37:45 -0500 (Tue, 19 Jan 2010)
New Revision: 1361
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
Log:
GTNPORTAL-418: Fix bug in IE
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-01-19 06:14:54 UTC (rev 1360)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-01-19 06:37:45 UTC (rev 1361)
@@ -291,8 +291,8 @@
<%} %>
<div class="EDITION-BLOCK EDITION-PORTLET" style="display: none;">
- <div style="position: relative;">
- <div style="position: absolute; top: -86px;z-index:999;">
+ <div style="position: relative; z-index: 999;">
+ <div style="position: absolute; top: -86px;">
<div class="NewLayer"><span></span></div>
<div class="CONTROL-PORTLET CONTROL-BLOCK" style="position: absolute; top: -6px;">
<%/*Begin InfoBar*/%>
14 years, 11 months
gatein SVN: r1360 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-01-19 01:14:54 -0500 (Tue, 19 Jan 2010)
New Revision: 1360
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
Log:
GTNPORTAL-418: Make DashboardWorkspace appear in middle of UIDashboard
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2010-01-19 05:35:44 UTC (rev 1359)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2010-01-19 06:14:54 UTC (rev 1360)
@@ -290,7 +290,6 @@
colsContainer.style.width = "100%" ;
eXo.webui.UIDashboard.initHeight(windowId) ;
- eXo.webui.UIDashboard.initPopup(windowId);
setTimeout("eXo.webui.UIDashboard.initDragDrop('" + windowId + "'," + canEdit + ");", 300) ;
};
@@ -385,13 +384,12 @@
}
};
- UIDashboard.prototype.initPopup = function(windowId) {
- var uiWindow = document.getElementById(windowId);
- var uiDashboardCont = eXo.core.DOMUtil.findFirstDescendantByClass(uiWindow, "div", "UIDashboardContainer");
- var popup = eXo.core.DOMUtil.findPreviousElementByTagName(uiDashboardCont, "div");
+ UIDashboard.prototype.initPopup = function(popup) {
+ if(typeof(popup) == "string") popup = document.getElementById(popup);
if(!popup || popup.style.display == "none") return;
- var deltaY = Math.ceil((uiWindow.offsetHeight - popup.offsetHeight) / 2);
- popup.style.top = eXo.core.Browser.findPosY(uiWindow) + deltaY + "px";
+ var uiDashboard = eXo.core.DOMUtil.findAncestorByClass(popup, "UIDashboard");
+ var deltaY = Math.ceil((uiDashboard.offsetHeight - popup.offsetHeight) / 2);
+ popup.style.top = eXo.core.Browser.findPosY(uiDashboard) + deltaY + "px";
};
UIDashboard.prototype.createTarget = function(width, height) {
14 years, 11 months
gatein SVN: r1359 - portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-01-19 00:35:44 -0500 (Tue, 19 Jan 2010)
New Revision: 1359
Modified:
portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
Log:
GTNPORTAL-418: Make DashboardWorkspace appear in middle of UIDashboard
Modified: portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
===================================================================
--- portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2010-01-19 04:49:07 UTC (rev 1358)
+++ portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2010-01-19 05:35:44 UTC (rev 1359)
@@ -1,6 +1,11 @@
<%
def uiDashboard = uicomponent.getAncestorOfType(org.exoplatform.dashboard.webui.component.UIDashboard.class);
if(!uiDashboard.canEdit()) return;
+
+ def uiPopup = uicomponent.getAncestorOfType(org.exoplatform.webui.core.UIPopupWindow.class);
+ def rcontext = _ctx.getRequestContext();
+ rcontext.getJavascriptManager().addJavascript("eXo.webui.UIDashboard.initPopup('"+uiPopup.getId()+"');");
+
%>
<div class="$uicomponent.id" id="UIDashboardSelectContainer" style="display: <%= uiDashboard.isShowSelectPopup()? "block" : "none"; %>;">
<div class="DashboardItemContainer ItemContainer">
14 years, 11 months
gatein SVN: r1358 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/pom/config and 6 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-01-18 23:49:07 -0500 (Mon, 18 Jan 2010)
New Revision: 1358
Added:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDataException.java
Removed:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDateException.java
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/StorageException.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
portal/trunk/webui/core/pom.xml
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/bean/UIDataFeed.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIRepeater.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIVirtualList.java
Log:
GTNPORTAL-273 Improve the code and add unit test for Data Storage services
Copied: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDataException.java (from rev 1352, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDateException.java)
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDataException.java (rev 0)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDataException.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -0,0 +1,48 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+
+ * Copyright 2009, 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.portal.config;
+
+
+public class NoSuchDataException extends StorageException
+{
+ public NoSuchDataException()
+ {
+ }
+
+ public NoSuchDataException(String message)
+ {
+ super(message);
+ }
+
+ public NoSuchDataException(Throwable cause) {
+ super(cause);
+ }
+
+ public NoSuchDataException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+}
Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDateException.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDateException.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NoSuchDateException.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -1,43 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, 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.portal.config;
-
-
-public class NoSuchDateException extends StorageException
-{
- public NoSuchDateException()
- {
- }
-
- public NoSuchDateException(String message)
- {
- super(message);
- }
-
- public NoSuchDateException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
-}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/StorageException.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/StorageException.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/StorageException.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -15,8 +15,14 @@
super(message);
}
+ public StorageException(Throwable cause)
+ {
+ super(cause);
+ }
+
public StorageException(String message, Throwable cause)
{
super(message, cause);
}
+
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -25,7 +25,7 @@
import org.exoplatform.commons.chromattic.SynchronizationListener;
import org.exoplatform.commons.chromattic.SynchronizationStatus;
import org.exoplatform.portal.application.PortletPreferences;
-import org.exoplatform.portal.config.NoSuchDateException;
+import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.portal.pom.data.Mapper;
import org.gatein.mop.api.Model;
import org.gatein.mop.api.content.Customization;
@@ -203,7 +203,7 @@
{
Customization<?> customization = getModel().findCustomizationById(id);
if (customization == null) {
- throw new NoSuchDateException("Can not find " + id);
+ throw new NoSuchDataException("Can not find " + id);
}
return customization;
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -19,7 +19,7 @@
package org.exoplatform.portal.pom.config.tasks;
-import org.exoplatform.portal.config.NoSuchDateException;
+import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.portal.pom.config.POMTask;
import org.exoplatform.portal.pom.config.cache.DataAccessMode;
import org.exoplatform.portal.pom.config.cache.CacheableDataTask;
@@ -112,7 +112,7 @@
Site srcSite = workspace.getSite(siteType, ownerId);
if (srcSite == null)
{
- throw new NoSuchDateException("Could not clone page " + name + "from non existing site of type "
+ throw new NoSuchDataException("Could not clone page " + name + "from non existing site of type "
+ ownerType + " with id " + ownerId);
}
else
@@ -125,7 +125,7 @@
//
if (srcPage == null)
{
- throw new NoSuchDateException("Could not clone non existing page " + name + " from site of type "
+ throw new NoSuchDataException("Could not clone non existing page " + name + " from site of type "
+ ownerType + " with id " + ownerId);
}
@@ -267,7 +267,7 @@
Site site = workspace.getSite(siteType, ownerId);
if (site == null)
{
- throw new NoSuchDateException("Could not remove page " + name + "of non existing site of type "
+ throw new NoSuchDataException("Could not remove page " + name + "of non existing site of type "
+ ownerType + " with id " + ownerId);
}
else
@@ -277,7 +277,7 @@
org.gatein.mop.api.workspace.Page page = pages.getChild(name);
if (page == null)
{
- throw new NoSuchDateException("Could not remove non existing page " + name + " of site of type "
+ throw new NoSuchDataException("Could not remove non existing page " + name + " of site of type "
+ ownerType + " with id " + ownerId);
}
page.destroy();
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PortalConfigTask.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -20,7 +20,7 @@
package org.exoplatform.portal.pom.config.tasks;
import org.exoplatform.portal.application.PortletPreferences;
-import org.exoplatform.portal.config.NoSuchDateException;
+import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.portal.pom.config.cache.DataAccessMode;
import org.exoplatform.portal.pom.config.cache.CacheableDataTask;
import org.exoplatform.portal.pom.data.Mapper;
@@ -80,7 +80,7 @@
Site site = workspace.getSite(type, key.getId());
if (site == null)
{
- throw new NoSuchDateException("Could not remove non existing portal " + key.getId());
+ throw new NoSuchDataException("Could not remove non existing portal " + key.getId());
}
else
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PreferencesTask.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -19,7 +19,7 @@
package org.exoplatform.portal.pom.config.tasks;
-import org.exoplatform.portal.config.NoSuchDateException;
+import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMTask;
import org.exoplatform.portal.pom.config.cache.CacheableDataTask;
@@ -50,7 +50,7 @@
{
Customization<S> customization = (Customization<S>)session.findCustomizationById(storageId);
if (customization == null) {
- throw new NoSuchDateException("Can not find " + storageId);
+ throw new NoSuchDataException("Can not find " + storageId);
}
return customization.getContentId();
}
@@ -136,7 +136,7 @@
Customization<S> customization = (Customization<S>)session.findCustomizationById(storageId);
if (customization == null) {
- throw new NoSuchDateException("Can not find " + storageId);
+ throw new NoSuchDataException("Can not find " + storageId);
}
if (prefs != null)
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -19,7 +19,7 @@
package org.exoplatform.portal.pom.data;
-import org.exoplatform.portal.config.NoSuchDateException;
+import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.ApplicationType;
@@ -398,7 +398,7 @@
private List<ComponentData> loadChildren(UIContainer src)
{
- if (src == null) throw new NoSuchDateException("Can not load children");
+ if (src == null) throw new NoSuchDataException("Can not load children");
ArrayList<ComponentData> children = new ArrayList<ComponentData>(src.size());
for (UIComponent component : src)
{
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -134,7 +134,7 @@
storage_.remove(portal);
fail("was expecting a NoSuchDataException");
}
- catch (NoSuchDateException e)
+ catch (NoSuchDataException e)
{
}
Modified: portal/trunk/webui/core/pom.xml
===================================================================
--- portal/trunk/webui/core/pom.xml 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/webui/core/pom.xml 2010-01-19 04:49:07 UTC (rev 1358)
@@ -38,6 +38,11 @@
<version>3.0.0-CR01-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.portal</artifactId>
+ <version>3.0.0-CR01-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
</dependency>
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/bean/UIDataFeed.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/bean/UIDataFeed.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/bean/UIDataFeed.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -20,7 +20,7 @@
package org.exoplatform.webui.bean;
import org.exoplatform.commons.utils.PageList;
-import org.exoplatform.portal.config.NoSuchDateException;
+import org.exoplatform.portal.config.NoSuchDataException;
/**
* Created by The eXo Platform SAS Author : liem.nguyen ncliam(a)gmail.com Jun 26,
@@ -33,10 +33,10 @@
/***
* Load data of next page. Throws DataMissingException when page's data is cannot load
- * @throws NoSuchDateException
+ * @throws NoSuchDataException
* @throws Exception
*/
- public void feedNext() throws NoSuchDateException, Exception;
+ public void feedNext() throws NoSuchDataException, Exception;
public boolean hasNext();
}
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIRepeater.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIRepeater.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIRepeater.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -20,7 +20,7 @@
package org.exoplatform.webui.core;
import org.exoplatform.commons.utils.PageList;
-import org.exoplatform.portal.config.NoSuchDateException;
+import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.util.ReflectionUtil;
import org.exoplatform.webui.bean.UIDataFeed;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -106,7 +106,7 @@
return method.invoke(bean, ReflectionUtil.EMPTY_ARGS);
}
- public void feedNext() throws NoSuchDateException, Exception
+ public void feedNext() throws NoSuchDataException, Exception
{
int page = datasource.getCurrentPage();
page++;
@@ -123,10 +123,10 @@
if (obj == null) throw new Exception("Data Row is Null");
}
}
- catch (Throwable e)
+ catch (Exception e)
{
datasource.getPage(page--);
- throw new NoSuchDateException(e);
+ throw new NoSuchDataException(e);
}
}
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIVirtualList.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIVirtualList.java 2010-01-19 04:29:07 UTC (rev 1357)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIVirtualList.java 2010-01-19 04:49:07 UTC (rev 1358)
@@ -20,7 +20,7 @@
package org.exoplatform.webui.core;
import org.exoplatform.commons.utils.PageList;
-import org.exoplatform.portal.config.NoSuchDateException;
+import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.bean.UIDataFeed;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -80,7 +80,7 @@
{
dataFeed.feedNext();
}
- catch (NoSuchDateException e)
+ catch (NoSuchDataException e)
{
// Update parent of virtual list to refresh
event.getRequestContext().addUIComponentToUpdateByAjax(virtualList.getParent());
14 years, 11 months
gatein SVN: r1357 - in portal/trunk: web/eXoResources/src/main/webapp/javascript/eXo/webui and 1 other directory.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-01-18 23:29:07 -0500 (Mon, 18 Jan 2010)
New Revision: 1357
Modified:
portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
Log:
GTNPORTAL-418: IE: Still action on DashboardWorkspace when switch view mode
Modified: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java
===================================================================
--- portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java 2010-01-19 03:46:32 UTC (rev 1356)
+++ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboard.java 2010-01-19 04:29:07 UTC (rev 1357)
@@ -53,7 +53,7 @@
public UIDashboard() throws Exception
{
- UIPopupWindow popup = addChild(UIPopupWindow.class, null, GADGET_POPUP_ID);
+ UIPopupWindow popup = addChild(UIPopupWindow.class, null, GADGET_POPUP_ID + "-" + hashCode());
popup.setUIComponent(createUIComponent(UIDashboardSelectContainer.class, null, null));
addChild(UIDashboardContainer.class, null, null).setColumns(3);
}
@@ -82,7 +82,7 @@
public void setShowSelectPopup(final boolean value)
{
this.isShowSelectPopup = value;
- ((UIPopupWindow)getChildById(GADGET_POPUP_ID)).setShow(value);
+ getChild(UIPopupWindow.class).setShow(value);
}
public String getAggregatorId()
@@ -118,7 +118,7 @@
boolean isShow = Boolean.parseBoolean(pcontext.getRequestParameter("isShow"));
uiDashboard.setShowSelectPopup(isShow);
String windowId = uiDashboard.getChild(UIDashboardContainer.class).getWindowId();
- event.getRequestContext().addUIComponentToUpdateByAjax(uiDashboard.getChildById(GADGET_POPUP_ID));
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiDashboard.getChild(UIPopupWindow.class));
if (isShow)
{
event.getRequestContext().getJavascriptManager().addCustomizedOnLoadScript(
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2010-01-19 03:46:32 UTC (rev 1356)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2010-01-19 04:29:07 UTC (rev 1357)
@@ -275,10 +275,9 @@
portletFragment.style.overflow = "hidden" ;
if(eXo.core.Browser.isIE6()) gadgetContainer.style.width = "99.5%";
- var selectPopup = DOMUtil.findDescendantById(uiDashboard, "UIAddGadgetPopup");
+ var selectPopup = DOMUtil.findPreviousElementByTagName(uiContainer, "div");
var closeButton = DOMUtil.findFirstDescendantByClass(selectPopup, "div", "CloseButton");
closeButton.onclick = eXo.webui.UIDashboard.showHideSelectContainer;
- var uiSelect = DOMUtil.findFirstDescendantByClass(selectPopup, "div", "UIDashboardSelectContainer");
var colsContainer = DOMUtil.findFirstChildByClass(gadgetContainer, "div", "UIColumns");
var columns = DOMUtil.findChildrenByClass(colsContainer, "div", "UIColumn");
@@ -291,6 +290,7 @@
colsContainer.style.width = "100%" ;
eXo.webui.UIDashboard.initHeight(windowId) ;
+ eXo.webui.UIDashboard.initPopup(windowId);
setTimeout("eXo.webui.UIDashboard.initDragDrop('" + windowId + "'," + canEdit + ");", 300) ;
};
@@ -385,6 +385,15 @@
}
};
+ UIDashboard.prototype.initPopup = function(windowId) {
+ var uiWindow = document.getElementById(windowId);
+ var uiDashboardCont = eXo.core.DOMUtil.findFirstDescendantByClass(uiWindow, "div", "UIDashboardContainer");
+ var popup = eXo.core.DOMUtil.findPreviousElementByTagName(uiDashboardCont, "div");
+ if(!popup || popup.style.display == "none") return;
+ var deltaY = Math.ceil((uiWindow.offsetHeight - popup.offsetHeight) / 2);
+ popup.style.top = eXo.core.Browser.findPosY(uiWindow) + deltaY + "px";
+ };
+
UIDashboard.prototype.createTarget = function(width, height) {
var uiTarget = document.createElement("div");
uiTarget.id = "UITarget";
@@ -408,8 +417,8 @@
var comp = eXo.core.Browser.getEventSource(event);
var uiDashboardPortlet = DOMUtil.findAncestorByClass(comp, "UIDashboard");
var portletFragment = DOMUtil.findAncestorByClass(uiDashboardPortlet, "PORTLET-FRAGMENT");
- var uiSelectPopup = DOMUtil.findDescendantById(uiDashboardPortlet, "UIAddGadgetPopup");
var uiContainer = DOMUtil.findFirstDescendantByClass(uiDashboardPortlet, "div", "UIDashboardContainer");
+ var uiSelectPopup = DOMUtil.findPreviousElementByTagName(uiContainer, "div");
var addButton = DOMUtil.findFirstDescendantByClass(uiContainer, "div", "ContainerControlBarL");
var params;
14 years, 11 months
gatein SVN: r1356 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-01-18 22:46:32 -0500 (Mon, 18 Jan 2010)
New Revision: 1356
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
Log:
updated Book_Info
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2010-01-19 03:37:44 UTC (rev 1355)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2010-01-19 03:46:32 UTC (rev 1356)
@@ -9,7 +9,7 @@
<productname>Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
<edition>1</edition>
- <pubsnumber>1.1</pubsnumber>
+ <pubsnumber>1.5</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
14 years, 11 months
gatein SVN: r1355 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-01-18 22:37:44 -0500 (Mon, 18 Jan 2010)
New Revision: 1355
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml
Log:
Fixed broken revhistory
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml 2010-01-19 03:35:15 UTC (rev 1354)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml 2010-01-19 03:37:44 UTC (rev 1355)
@@ -21,7 +21,6 @@
</simplelist>
</revdescription>
</revision>
- <revhistory>
<revision>
<revnumber>1.1</revnumber>
<date>Mon Dec 07 2009</date>
14 years, 11 months
gatein SVN: r1354 - in portal/trunk/docs/user-guide/en/modules: language and 1 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-01-18 22:35:15 -0500 (Mon, 18 Jan 2010)
New Revision: 1354
Modified:
portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml
portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml
portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml
portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml
Log:
Finalised first pass of copy edit
Modified: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml 2010-01-19 03:33:08 UTC (rev 1353)
+++ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml 2010-01-19 03:35:15 UTC (rev 1354)
@@ -46,7 +46,7 @@
</step>
<step>
<para>
- Click the <emphasis role="bold">Auto Import</emphasis> button!images/Auto1.png! at upper right corner on the action bar. A pop up will be shown:
+ Click the <emphasis role="bold">Auto Import</emphasis> button at upper right corner on the action bar. A pop up will be shown:
</para>
<mediaobject>
<imageobject>
Modified: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2010-01-19 03:33:08 UTC (rev 1353)
+++ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2010-01-19 03:35:15 UTC (rev 1354)
@@ -137,7 +137,7 @@
<procedure>
<step>
<para>
- Click the edit icon!images/EditIcon1.png! on the title bar of a category that you want to edit.
+ Click the edit icon on the title bar of a category that you want to edit.
</para>
</step>
<step>
@@ -161,7 +161,7 @@
<procedure>
<step>
<para>
- Click the trash can icon!images/DeleteIcon.png! on the Title bar of the category that you want to delete.
+ Click the trash can icon on the Title bar of the category that you want to delete.
</para>
</step>
<step>
@@ -180,7 +180,7 @@
<procedure>
<step>
<para>
- Click the "add" icon!images/AddIcon.png! on the title bar of a category to which you want to add portlets. An interface will appear in the right pane as you can see below:
+ Click the "add" icon on the title bar of a category to which you want to add portlets. An interface will appear in the right pane as you can see below:
</para>
<mediaobject>
<imageobject>
@@ -232,7 +232,7 @@
<procedure>
<step>
<para>
- Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Page Navigations</emphasis> -> select <emphasis role="bold">Administration</emphasis> --> <emphasis role="bold">Application Registry</emphasis>
+ Go to <emphasis role="bold">Group</emphasis> in the Toolbar, highlight <emphasis role="bold">Administration</emphasis> and then click on <emphasis role="bold">Application Registry</emphasis>.
</para>
<mediaobject>
<imageobject>
@@ -276,7 +276,7 @@
<procedure>
<step>
<para>
- On the navigation bar, go to the <emphasis role="bold">Administration</emphasis>-> <emphasis role="bold">Application Registry</emphasis> page-> <emphasis role="bold">Portlet</emphasis> item . A form to view all portlets will appear:
+ Go to <emphasis role="bold">Group</emphasis> in the Toolbar, highlight <emphasis role="bold">Administration</emphasis> and then click <emphasis role="bold">Application Registry</emphasis>. On the <emphasis role="bold">Application Registry</emphasis> page, click the <emphasis role="bold">Portlet</emphasis> item. A form to view all portlets will appear:
</para>
<mediaobject>
<imageobject>
@@ -316,7 +316,7 @@
You can follow these steps to add a gadget to the gadget list :
</para>
<para>
- 1. Go to the <emphasis role="bold">Administration</emphasis> --> <emphasis role="bold">Application Registry</emphasis> and click on <emphasis role="bold">Gadget</emphasis> :
+ Go to <emphasis role="bold">Group</emphasis> in the Toolbar, highlight <emphasis role="bold">Administration</emphasis> and then click <emphasis role="bold">Application Registry</emphasis>. On the <emphasis role="bold">Application Registry</emphasis> page, click the <emphasis role="bold">Gadget</emphasis> item
</para>
<mediaobject>
<imageobject>
@@ -454,7 +454,7 @@
<title>Edit a Gadget</title>
<step>
<para>
- Click the edit icon!images/EditGadget.png! . It will display a dialog:
+ Click the edit icon. This will display a dialog:
</para>
<mediaobject>
<imageobject>
@@ -492,7 +492,7 @@
<title>Delete a Gadget</title>
<step>
<para>
- Click the trash can icon!images/DeleteGadget.png! on the row of the gadget that you want to delete. It will display an alert message :
+ Click the trash can icon on the row of the gadget that you want to delete. this will prompt an alert message :
</para>
<mediaobject>
<imageobject>
Modified: portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml 2010-01-19 03:33:08 UTC (rev 1353)
+++ portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml 2010-01-19 03:35:15 UTC (rev 1354)
@@ -80,10 +80,10 @@
Click <emphasis role="bold">Save</emphasis> and <emphasis role="bold">Finish</emphasis>!images/FinishIcon.png! icon to take affect.
</para>
</step>
- </procedure> -->
+ </procedure>
<para>
For Portal 2.6
- </para>
+ </para> -->
<para>
You easily change the interface language of the current Portal by following guides:
</para>
@@ -147,10 +147,10 @@
Click the <emphasis role="bold">Apply</emphasis> button and wait for few seconds to take affect.
</para>
</step>
- </procedure> -->
+ </procedure>
<para>
For Portal 2.6
- </para>
+ </para> -->
<para>
You can set the interface language for yourself by doing the following:
</para>
Modified: portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml 2010-01-19 03:33:08 UTC (rev 1353)
+++ portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml 2010-01-19 03:35:15 UTC (rev 1354)
@@ -26,7 +26,7 @@
--><title>Multi-Language Navigation Nodes</title>
<warning>
<para>
- The <emphasis role="bold">Add New Portal</emphasis> button mentioned in this section does not appear under the <emphasis role="bold">Site</emphasis> navigation in GateIn 3.0 Beta 3, even when logged in as the Administrator.
+ The <emphasis role="bold">Create Page Wizard</emphasis> mentioned in this section does not appear to allow editing of existing pages in GateIn 3.0 Beta 3, even when logged in as the Administrator. Therefore these instructions may be incomplete or incorrect.
</para>
</warning>
@@ -83,7 +83,7 @@
<procedure>
<step>
<para>
- Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Basic</emphasis> --> <emphasis role="bold">Create Page Wizard</emphasis>
+ Go to <emphasis role="bold">Group</emphasis> and click on <emphasis role="bold">Add New Page</emphasis>. This will activate the <emphasis role="bold">Create Page Wizard</emphasis>.
</para>
</step>
<step>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2010-01-19 03:33:08 UTC (rev 1353)
+++ portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2010-01-19 03:35:15 UTC (rev 1354)
@@ -24,6 +24,11 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--><title>Change Portal Skins</title>
+<warning>
+<para>
+The <emphasis role="bold">Administration</emphasis> menu entry reported to be under the <emphasis role="bold">GateIn Start</emphasis> button does not exist in GateIn 3.0 Beta 3. Therefore some of the instructions in this section may be incomplete or inaccurate.
+</para>
+</warning>
<para>
Skins are graphic styles that display an attractive user interface. Each skin has its own characteristics with different backgrounds, icons, and other visual elements. In order to be user-friendly and flexible, users are allowed to change the skin they use on the portal without having edit rights.
</para>
@@ -37,7 +42,7 @@
<procedure>
<step>
<para>
- Go to <emphasis role="bold">GateIn Start</emphasis> and click on <emphasis role="bold">Change Skin</emphasis>.
+ Go to <emphasis role="bold">&PRODUCT; Start</emphasis> and click on <emphasis role="bold">Change Skin</emphasis>.
</para>
</step>
<step>
@@ -94,11 +99,6 @@
</listitem>
</varlistentry>
</variablelist>
- <warning>
- <para>
- The <emphasis role="bold">Administration</emphasis> item referred to in the above procedure is not present in GateIn 3.0 Beta 3
- </para>
- </warning>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-01-19 03:33:08 UTC (rev 1353)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-01-19 03:35:15 UTC (rev 1354)
@@ -31,7 +31,7 @@
</para>
</warning>
<para>
- If you are allowed to access GateIn Start in the User Workspace, you can take all actions related to a node such as : add a new node, edit, copy, cut, delete and clone node.
+ If you are allowed to access &PRODUCT; in the User Workspace, you can take all actions related to a node such as : add a new node, edit, copy, cut, delete and clone node.
</para>
<section id="sect-User_Guide-Manage_Navigation_Nodes-Add_a_new_node">
<title>Add a new node</title>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2010-01-19 03:33:08 UTC (rev 1353)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2010-01-19 03:35:15 UTC (rev 1354)
@@ -210,7 +210,7 @@
<procedure>
<step>
<para>
- Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Manage Pages</emphasis>
+ Go to <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Administration</emphasis> and then click on <emphasis role="bold">Page Management</emphasis>.
</para>
</step>
<step>
@@ -300,7 +300,7 @@
<procedure>
<step>
<para>
- Go to <emphasis role="bold">GateIn Admin</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Manage Pages</emphasis>. You will be presented with a list of all existing pages.
+ Go to <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Administration</emphasis> and then click on <emphasis role="bold">Page Management</emphasis>. You will be presented with a list of all existing pages.
</para>
</step>
<step>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2010-01-19 03:33:08 UTC (rev 1353)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2010-01-19 03:35:15 UTC (rev 1354)
@@ -71,7 +71,7 @@
<term>New portals</term>
<listitem>
<para>
- On the Toolbar select <emphasis role="bold">Site</emphasis> then click on the <emphasis role="bold">Add New Portal</emphasis> button, select the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Access Permission Setting</emphasis> sub tab.
+ On the Toolbar select <emphasis role="bold">Site Editor</emphasis> then click on the <emphasis role="bold">Add New Portal</emphasis> button, select the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Access Permission Setting</emphasis> sub tab.
</para>
<warning>
<para>
14 years, 11 months
gatein SVN: r1353 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide: en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-01-18 22:33:08 -0500 (Mon, 18 Jan 2010)
New Revision: 1353
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Feedback.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Preface.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/publican.cfg
Log:
Finalised first pass of copy edit
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml 2010-01-19 02:21:38 UTC (rev 1352)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml 2010-01-19 03:33:08 UTC (rev 1353)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
+%BOOK_ENTITIES;
]>
<authorgroup>
<author>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2010-01-19 02:21:38 UTC (rev 1352)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Book_Info.xml 2010-01-19 03:33:08 UTC (rev 1353)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
+%BOOK_ENTITIES;
]>
<bookinfo id="book-User_Guide-User_Guide">
<title>User Guide</title>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Feedback.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Feedback.xml 2010-01-19 02:21:38 UTC (rev 1352)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Feedback.xml 2010-01-19 03:33:08 UTC (rev 1353)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-We_Need_Feedback">
<title>We Need Feedback!</title>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Preface.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Preface.xml 2010-01-19 02:21:38 UTC (rev 1352)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Preface.xml 2010-01-19 03:33:08 UTC (rev 1353)
@@ -1,10 +1,13 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
+%BOOK_ENTITIES;
]>
<preface id="pref-User_Guide-Preface">
<title>Preface</title>
<xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</xi:fallback>
</xi:include>
</preface>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml 2010-01-19 02:21:38 UTC (rev 1352)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Revision_History.xml 2010-01-19 03:33:08 UTC (rev 1353)
@@ -1,11 +1,28 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
+%BOOK_ENTITIES;
]>
<appendix id="appe-User_Guide-Revision_History">
<title>Revision History</title>
<simpara>
<revhistory>
<revision>
+ <revnumber>1.5</revnumber>
+ <date>Tue Jan 19 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Finalised first pass of copy edit.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revhistory>
+ <revision>
<revnumber>1.1</revnumber>
<date>Mon Dec 07 2009</date>
<author>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.xml 2010-01-19 02:21:38 UTC (rev 1352)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.xml 2010-01-19 03:33:08 UTC (rev 1353)
@@ -1,5 +1,9 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
+%BOOK_ENTITIES;
+<!ENTITY % BOOK_ENTITIES SYSTEM "Enterprise_Portal_Platform_User_Guide.ent">
+%BOOK_ENTITIES;
]>
<book>
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/publican.cfg
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/publican.cfg 2010-01-19 02:21:38 UTC (rev 1352)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/publican.cfg 2010-01-19 03:33:08 UTC (rev 1353)
@@ -4,7 +4,7 @@
xml_lang: en-US
type: Book
brand: RedHat
-chunk_section_depth: 1
+#chunk_section_depth: 1
chunk_first: 1
debug:1
14 years, 11 months