JBoss Portal SVN: r8325 - branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-18 12:34:41 -0400 (Tue, 18 Sep 2007)
New Revision: 8325
Modified:
branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java
branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java
branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowActionEvent.java
branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java
branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowNavigationEvent.java
branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowRenderEvent.java
Log:
update api javadoc for node events.
Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java 2007-09-18 15:46:53 UTC (rev 8324)
+++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java 2007-09-18 16:34:41 UTC (rev 8325)
@@ -25,7 +25,7 @@
import org.jboss.portal.api.node.PortalNode;
/**
- * This event is fired whenever a page is rendered.
+ * This event is raised whenever a page is rendered.
*
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java 2007-09-18 15:46:53 UTC (rev 8324)
+++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java 2007-09-18 16:34:41 UTC (rev 8325)
@@ -31,11 +31,17 @@
public interface PortalNodeEventListener
{
/**
- * Dispatch an event to the listener.
+ * <p>Dispatch an event to the listener. If the listener does not care about replacing the current event with a new
+ * one then it should return the event returned by the <code>PortalNodeEventContext</code> provided such as:</p>
*
+ * <p><code>return context.dispatch()</code></p>
+ *
+ * <p>Otherwise it can return a new event to replace the current one. Only events of type <code>WindowNavigationEvent</code>
+ * or <code>WindowActionEvent;</code> will have an effect.</p>
+ *
* @param context the context in which the event is triggered
* @param event the fired event
- * @return an possible new events that will replace the current event or null to keep the same event
+ * @return an event
*/
PortalNodeEvent onEvent(PortalNodeEventContext context, PortalNodeEvent event);
}
Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowActionEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowActionEvent.java 2007-09-18 15:46:53 UTC (rev 8324)
+++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowActionEvent.java 2007-09-18 16:34:41 UTC (rev 8325)
@@ -27,6 +27,8 @@
import java.util.Map;
/**
+ * This event is raised when the portal invokes an action on a window.
+ *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java 2007-09-18 15:46:53 UTC (rev 8324)
+++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java 2007-09-18 16:34:41 UTC (rev 8325)
@@ -26,7 +26,11 @@
import org.jboss.portal.WindowState;
import org.jboss.portal.api.node.PortalNode;
-/** @author <a href="mailto:julien@jboss.org">Julien Viet</a> */
+/**
+ * Base class for window events.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ */
public abstract class WindowEvent extends PortalNodeEvent
{
Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowNavigationEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowNavigationEvent.java 2007-09-18 15:46:53 UTC (rev 8324)
+++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowNavigationEvent.java 2007-09-18 16:34:41 UTC (rev 8325)
@@ -27,6 +27,8 @@
import java.util.Map;
/**
+ * This event happens when the portal udpates the navigational state of a window.
+ *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowRenderEvent.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowRenderEvent.java 2007-09-18 15:46:53 UTC (rev 8324)
+++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowRenderEvent.java 2007-09-18 16:34:41 UTC (rev 8325)
@@ -27,6 +27,8 @@
import java.util.Map;
/**
+ * This event occurs when the portal renders a window.
+ *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
18 years, 7 months
JBoss Portal SVN: r8324 - branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-09-18 11:46:53 -0400 (Tue, 18 Sep 2007)
New Revision: 8324
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
Log:
JBPORTAL-1522 : Selected tab doesn't display properly in nightly version of WebKit
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-09-18 15:28:25 UTC (rev 8323)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-09-18 15:46:53 UTC (rev 8324)
@@ -274,12 +274,12 @@
font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: bold;
color: #8a8a8a;
- line-height: 22px;
padding: 5px 15px 3px 15px; /*background-image: url(../images/tab_left.gif);*/
background-repeat: no-repeat;
background-position: top left;
width: 110px;
white-space: nowrap;
+ line-height:22px;
}
ul#tabsHeader a:hover {
@@ -303,6 +303,7 @@
color: #000; /* background-image: url(../images/tab_left_current.gif); */
background-repeat: no-repeat;
background-position: top left;
+ line-height: 22px;
}
/* Begin Submenu selectors */
@@ -321,12 +322,10 @@
ul#tabsHeader ul a {
text-decoration: none;
-
font: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
-
}
ul#tabsHeader ul a:hover {
18 years, 7 months
JBoss Portal SVN: r8323 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/core/model/instance/command/action and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-18 11:28:25 -0400 (Tue, 18 Sep 2007)
New Revision: 8323
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java
Log:
JBPORTAL-1604: remove the necessity to set window state and mode on the event
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2007-09-18 15:12:03 UTC (rev 8322)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2007-09-18 15:28:25 UTC (rev 8323)
@@ -36,7 +36,6 @@
import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.invocation.response.RenderResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.common.FixMe;
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
@@ -89,28 +88,14 @@
}
}
- public static ControllerResponse createActionResponse(String instanceId, ActionContext actionContext, PortletInvocationResponse response)
+ public static ControllerResponse createActionResponse(String instanceId, PortletInvocationResponse response)
{
if (response instanceof org.jboss.portal.portlet.invocation.response.RenderResponse)
{
RenderResponse renderResult = (RenderResponse)response;
//
- Mode mode = renderResult.getMode();
- if (mode == null)
- {
- mode = actionContext.getMode();
- }
-
- //
- WindowState windowState = renderResult.getWindowState();
- if (windowState == null)
- {
- windowState = actionContext.getWindowState();
- }
-
- //
- return new PortletInstanceActionResponse(instanceId, windowState, mode, renderResult.getNavigationalState());
+ return new PortletInstanceActionResponse(instanceId, null, null, renderResult.getNavigationalState());
}
else
{
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java 2007-09-18 15:12:03 UTC (rev 8322)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java 2007-09-18 15:28:25 UTC (rev 8323)
@@ -34,7 +34,6 @@
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.PortletParameters;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.Mode;
@@ -103,7 +102,7 @@
PortletInvocationResponse response = instance.invoke(action);
//
- return ControllerResponseFactory.createActionResponse(instanceId, (ActionContext)action.getContext(), response);
+ return ControllerResponseFactory.createActionResponse(instanceId, response);
}
catch (PortletInvokerException e)
{
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java 2007-09-18 15:12:03 UTC (rev 8322)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java 2007-09-18 15:28:25 UTC (rev 8323)
@@ -41,7 +41,6 @@
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
/**
@@ -79,6 +78,8 @@
throws IllegalArgumentException
{
super(windowId, mode, windowState);
+
+ //
this.navigationalState = navigationalState;
this.interactionState = interactionState;
this.formParameters = formParameters;
@@ -145,6 +146,20 @@
{
try
{
+ Mode mode = this.mode;
+ if (mode == null)
+ {
+ mode = Mode.VIEW;
+ }
+
+ //
+ WindowState windowState = this.windowState;
+ if (windowState == null)
+ {
+ windowState = WindowState.NORMAL;
+ }
+
+ //
PortletInvocation invocation = PortletInvocationFactory.createAction(
context,
mode,
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java 2007-09-18 15:12:03 UTC (rev 8322)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java 2007-09-18 15:28:25 UTC (rev 8323)
@@ -86,7 +86,6 @@
{
// We can redirect
newEvent = new WindowActionEvent(windowB);
- newEvent.setMode(wae.getMode());
newEvent.setWindowState(WindowState.MAXIMIZED);
newEvent.setParameters(wae.getParameters());
}
18 years, 7 months
JBoss Portal SVN: r8322 - in branches/JBoss_Portal_Branch_2_6: build/ide/intellij/idea60/modules/core and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-18 11:12:03 -0400 (Tue, 18 Sep 2007)
New Revision: 8322
Modified:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/api/api.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java
Log:
JBPORTAL-1604: Window state required but has no effect
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/api/api.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/api/api.iml 2007-09-18 15:03:42 UTC (rev 8321)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/api/api.iml 2007-09-18 15:12:03 UTC (rev 8322)
@@ -10,6 +10,15 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library" exported="">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-09-18 15:03:42 UTC (rev 8321)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-09-18 15:12:03 UTC (rev 8322)
@@ -357,15 +357,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar!/" />
</CLASSES>
<JAVADOC />
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2007-09-18 15:03:42 UTC (rev 8321)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2007-09-18 15:12:03 UTC (rev 8322)
@@ -33,9 +33,13 @@
import org.jboss.portal.core.model.instance.command.response.PortletInstanceActionResponse;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.invocation.response.RenderResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.common.FixMe;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -56,12 +60,28 @@
}
}
- public static ControllerResponse createActionResponse(PortalObjectId targetId, PortletInvocationResponse response)
+ public static ControllerResponse createActionResponse(PortalObjectId targetId, ActionContext actionContext, PortletInvocationResponse response)
{
if (response instanceof RenderResponse)
{
RenderResponse renderResult = (RenderResponse)response;
- return new PortletWindowActionResponse(targetId, renderResult.getWindowState(), renderResult.getMode(), renderResult.getNavigationalState());
+
+ //
+ Mode mode = renderResult.getMode();
+ if (mode == null)
+ {
+ mode = actionContext.getMode();
+ }
+
+ //
+ WindowState windowState = renderResult.getWindowState();
+ if (windowState == null)
+ {
+ windowState = actionContext.getWindowState();
+ }
+
+ //
+ return new PortletWindowActionResponse(targetId, windowState, mode, renderResult.getNavigationalState());
}
else
{
@@ -69,12 +89,28 @@
}
}
- public static ControllerResponse createActionResponse(String instanceId, PortletInvocationResponse response)
+ public static ControllerResponse createActionResponse(String instanceId, ActionContext actionContext, PortletInvocationResponse response)
{
if (response instanceof org.jboss.portal.portlet.invocation.response.RenderResponse)
{
RenderResponse renderResult = (RenderResponse)response;
- return new PortletInstanceActionResponse(instanceId, renderResult.getWindowState(), renderResult.getMode(), renderResult.getNavigationalState());
+
+ //
+ Mode mode = renderResult.getMode();
+ if (mode == null)
+ {
+ mode = actionContext.getMode();
+ }
+
+ //
+ WindowState windowState = renderResult.getWindowState();
+ if (windowState == null)
+ {
+ windowState = actionContext.getWindowState();
+ }
+
+ //
+ return new PortletInstanceActionResponse(instanceId, windowState, mode, renderResult.getNavigationalState());
}
else
{
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java 2007-09-18 15:03:42 UTC (rev 8321)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java 2007-09-18 15:12:03 UTC (rev 8322)
@@ -34,6 +34,7 @@
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.PortletParameters;
import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.Mode;
@@ -102,7 +103,7 @@
PortletInvocationResponse response = instance.invoke(action);
//
- return ControllerResponseFactory.createActionResponse(instanceId, response);
+ return ControllerResponseFactory.createActionResponse(instanceId, (ActionContext)action.getContext(), response);
}
catch (PortletInvokerException e)
{
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java 2007-09-18 15:03:42 UTC (rev 8321)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java 2007-09-18 15:12:03 UTC (rev 8322)
@@ -39,7 +39,9 @@
import org.jboss.portal.portlet.PortletParameters;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
/**
@@ -157,7 +159,7 @@
PortletInvocationResponse response = instance.invoke(invocation);
//
- return ControllerResponseFactory.createActionResponse(targetId, response);
+ return ControllerResponseFactory.createActionResponse(targetId, (ActionContext)invocation.getContext(), response);
}
catch (PortletInvokerException e)
{
18 years, 7 months
JBoss Portal SVN: r8321 - trunk/core/src/bin/portal-core-war/layouts/1column.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-18 11:03:42 -0400 (Tue, 18 Sep 2007)
New Revision: 8321
Modified:
trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp
Log:
oups
Modified: trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-09-18 15:02:48 UTC (rev 8320)
+++ trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-09-18 15:03:42 UTC (rev 8321)
@@ -57,23 +57,3 @@
</body>
</html>
-onC' -->
- <p:region regionName='right' regionID='right'/>
- </td>
- </tr>
- </table>
- <hr class="cleaner"/>
- </div>
- </div>
- </div>
-</div>
-
-<!-- TODO: Fix the auto jump in this tag -->
-<div id="footer-container" class="portal-copyright">Powered by
-<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
-</div>
-
-<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
-
-</body>
-</html>
18 years, 7 months
JBoss Portal SVN: r8320 - branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-18 11:02:48 -0400 (Tue, 18 Sep 2007)
New Revision: 8320
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
Log:
oups (2) ohloh++
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-09-18 14:55:38 UTC (rev 8319)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-09-18 15:02:48 UTC (rev 8320)
@@ -57,23 +57,3 @@
</body>
</html>
-onC' -->
- <p:region regionName='right' regionID='right'/>
- </td>
- </tr>
- </table>
- <hr class="cleaner"/>
- </div>
- </div>
- </div>
-</div>
-
-<!-- TODO: Fix the auto jump in this tag -->
-<div id="footer-container" class="portal-copyright">Powered by
-<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
-</div>
-
-<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
-
-</body>
-</html>
18 years, 7 months
JBoss Portal SVN: r8319 - trunk/core-admin/src/bin/portal-admin-war.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-18 10:55:38 -0400 (Tue, 18 Sep 2007)
New Revision: 8319
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
Log:
-JBPORTAL-1539: Steps in wizard are misaligned...
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 14:19:59 UTC (rev 8318)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 14:55:38 UTC (rev 8319)
@@ -401,9 +401,14 @@
/* Change dashed line to solid. */
.admin-ui hr {
- border-top-style: solid;
+ border-top-style: solid;
}
+.admin-ui form {
+ padding:0;
+ margin:0;
+}
+
.admin-ui .wizardStepBox {
display: inline;
float: left;
18 years, 7 months
JBoss Portal SVN: r8318 - in trunk/core/src: bin/portal-core-war/layouts/1column and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-18 10:19:59 -0400 (Tue, 18 Sep 2007)
New Revision: 8318
Added:
trunk/core/src/bin/portal-core-war/layouts/1column/
trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp
Removed:
trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp
trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp
Modified:
trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
Log:
- Added 1column layout
- Admin main page is now using the 1column layout
Copied: trunk/core/src/bin/portal-core-war/layouts/1column (from rev 8316, branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column)
Deleted: trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-09-18 14:07:45 UTC (rev 8316)
+++ trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-09-18 14:19:59 UTC (rev 8318)
@@ -1,79 +0,0 @@
-<%@ page import="org.jboss.portal.server.PortalConstants" %>
-<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title><%= PortalConstants.VERSION.toString() %></title>
- <meta http-equiv="Content-Type" content="text/html;"/>
- <!-- to correct the unsightly Flash of Unstyled Content. -->
- <script type="text/javascript"></script>
- <!-- inject the theme, default to the Renaissance theme if nothing is selected for the portal or the page -->
- <p:theme themeName="renaissance"/>
- <!-- insert header content that was possibly set by portlets on the page -->
- <p:headerContent/>
-</head>
-
-<body id="body">
-<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<div id="portal-container">
- <div id="sizer">
- <div id="expander">
- <div id="logoName"></div>
- <table border="0" cellpadding="0" cellspacing="0" id="header-container">
- <tr>
- <td align="center" valign="top" id="header">
-
- <!-- Utility controls -->
- <p:region regionName='dashboardnav' regionID='dashboardnav'/>
-
- <!-- navigation tabs and such -->
- <p:region regionName='navigation' regionID='navigation'/>
- <div id="spacer"></div>
- </td>
- </tr>
- </table>
- <div id="content-container">
- <table width="100%">
- <tr>
- <td valign="top">
- <!-- insert the content of the 'center' region of the page, and assign the css selector id 'regionB' -->
- <p:region regionName='center' regionID='center'/>
- </td>
- </tr>
- </table>
- <hr class="cleaner"/>
- </div>
- </div>
- </div>
-</div>
-
-<!-- TODO: Fix the auto jump in this tag -->
-<div id="footer-container" class="portal-copyright">Powered by
-<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
-</div>
-
-<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
-
-</body>
-</html>
-onC' -->
- <p:region regionName='right' regionID='right'/>
- </td>
- </tr>
- </table>
- <hr class="cleaner"/>
- </div>
- </div>
- </div>
-</div>
-
-<!-- TODO: Fix the auto jump in this tag -->
-<div id="footer-container" class="portal-copyright">Powered by
-<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
-</div>
-
-<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
-
-</body>
-</html>
Copied: trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp (from rev 8316, branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp)
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp (rev 0)
+++ trunk/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-09-18 14:19:59 UTC (rev 8318)
@@ -0,0 +1,79 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title><%= PortalConstants.VERSION.toString() %></title>
+ <meta http-equiv="Content-Type" content="text/html;"/>
+ <!-- to correct the unsightly Flash of Unstyled Content. -->
+ <script type="text/javascript"></script>
+ <!-- inject the theme, default to the Renaissance theme if nothing is selected for the portal or the page -->
+ <p:theme themeName="renaissance"/>
+ <!-- insert header content that was possibly set by portlets on the page -->
+ <p:headerContent/>
+</head>
+
+<body id="body">
+<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
+<div id="portal-container">
+ <div id="sizer">
+ <div id="expander">
+ <div id="logoName"></div>
+ <table border="0" cellpadding="0" cellspacing="0" id="header-container">
+ <tr>
+ <td align="center" valign="top" id="header">
+
+ <!-- Utility controls -->
+ <p:region regionName='dashboardnav' regionID='dashboardnav'/>
+
+ <!-- navigation tabs and such -->
+ <p:region regionName='navigation' regionID='navigation'/>
+ <div id="spacer"></div>
+ </td>
+ </tr>
+ </table>
+ <div id="content-container">
+ <table width="100%">
+ <tr>
+ <td valign="top">
+ <!-- insert the content of the 'center' region of the page, and assign the css selector id 'regionB' -->
+ <p:region regionName='center' regionID='center'/>
+ </td>
+ </tr>
+ </table>
+ <hr class="cleaner"/>
+ </div>
+ </div>
+ </div>
+</div>
+
+<!-- TODO: Fix the auto jump in this tag -->
+<div id="footer-container" class="portal-copyright">Powered by
+<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
+</div>
+
+<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
+
+</body>
+</html>
+onC' -->
+ <p:region regionName='right' regionID='right'/>
+ </td>
+ </tr>
+ </table>
+ <hr class="cleaner"/>
+ </div>
+ </div>
+ </div>
+</div>
+
+<!-- TODO: Fix the auto jump in this tag -->
+<div id="footer-container" class="portal-copyright">Powered by
+<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
+</div>
+
+<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
+
+</body>
+</html>
Deleted: trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp 2007-09-18 14:11:21 UTC (rev 8317)
+++ trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp 2007-09-18 14:19:59 UTC (rev 8318)
@@ -1,50 +0,0 @@
-<%@ page import="org.jboss.portal.server.PortalConstants" %>
-<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title><%= PortalConstants.VERSION.toString() %></title>
- <meta http-equiv="Content-Type" content="text/html;"/>
- <!-- to correct the unsightly Flash of Unstyled Content. -->
- <script type="text/javascript"></script>
- <!-- use the renaissance theme if nothing else was defined for the portal or the page -->
- <p:theme themeName="renaissance"/>
- <!-- inject header content that was generated by the portlets on the requested page -->
- <p:headerContent/>
-</head>
-
-<body id="body">
-<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<div id="portal-container">
- <div id="sizer">
- <div id="expander">
- <div id="logoName"></div>
- <table border="0" cellpadding="0" cellspacing="0" id="header-container">
- <tr>
- <td align="center" valign="top" id="header">
- <p:region regionName='dashboardnav' regionID='dashboardnav'/>
-
- <p:region regionName='navigation' regionID='navigation'/>
- <div id="spacer"></div>
- </td>
- </tr>
- </table>
- <div id="content-container">
- <!-- Note: this construct assumes that the 'maximizedRegion' layout strategy was chosen for the layout, page or portal -->
- <!-- the 'maximizedRegion' strategy assigns the maximized portlet to the 'maximized' region -->
- <p:region regionName='maximized' regionID='regionMaximized'/>
- <hr class="cleaner"/>
-
- <div id="footer-container" class="portal-copyright">Powered by
- <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br>
- <span id="ThemeBy"></span>
- </div>
- </div>
-
- </div>
- </div>
-</div>
-<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
-</body>
-</html>
Modified: trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-09-18 14:11:21 UTC (rev 8317)
+++ trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-09-18 14:19:59 UTC (rev 8318)
@@ -340,7 +340,19 @@
<instance-ref>AdminPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
</window>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>1column</value>
+ </property>
+ </properties>
</page>
<page>
<page-name>Members</page-name>
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2007-09-18 14:11:21 UTC (rev 8317)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2007-09-18 14:19:59 UTC (rev 8318)
@@ -53,11 +53,19 @@
<layout>
<name>3columns</name>
<uri>/layouts/3columns/index.jsp</uri>
- <uri state="maximized">/layouts/3columns/maximized.jsp</uri>
+ <uri state="maximized">/layouts/generic/maximized.jsp</uri>
<regions>
<region name="left"/>
<region name="center"/>
<region name="right"/>
</regions>
</layout>
+ <layout>
+ <name>1column</name>
+ <uri>/layouts/1column/index.jsp</uri>
+ <uri state="maximized">/layouts/generic/maximized.jsp</uri>
+ <regions>
+ <region name="center"/>
+ </regions>
+ </layout>
</layouts>
18 years, 7 months
JBoss Portal SVN: r8317 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-18 10:11:21 -0400 (Tue, 18 Sep 2007)
New Revision: 8317
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
Log:
oups
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2007-09-18 14:07:45 UTC (rev 8316)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2007-09-18 14:11:21 UTC (rev 8317)
@@ -65,9 +65,7 @@
<uri>/layouts/1column/index.jsp</uri>
<uri state="maximized">/layouts/generic/maximized.jsp</uri>
<regions>
- <region name="left"/>
<region name="center"/>
- <region name="right"/>
</regions>
</layout>
</layouts>
18 years, 7 months
JBoss Portal SVN: r8316 - in branches/JBoss_Portal_Branch_2_6/core/src: bin/portal-core-war/layouts/1column and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-18 10:07:45 -0400 (Tue, 18 Sep 2007)
New Revision: 8316
Added:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
Removed:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
Log:
- Added 1column layout
- Admin main page is now using the 1column layout
Added: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-09-18 14:07:45 UTC (rev 8316)
@@ -0,0 +1,79 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title><%= PortalConstants.VERSION.toString() %></title>
+ <meta http-equiv="Content-Type" content="text/html;"/>
+ <!-- to correct the unsightly Flash of Unstyled Content. -->
+ <script type="text/javascript"></script>
+ <!-- inject the theme, default to the Renaissance theme if nothing is selected for the portal or the page -->
+ <p:theme themeName="renaissance"/>
+ <!-- insert header content that was possibly set by portlets on the page -->
+ <p:headerContent/>
+</head>
+
+<body id="body">
+<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
+<div id="portal-container">
+ <div id="sizer">
+ <div id="expander">
+ <div id="logoName"></div>
+ <table border="0" cellpadding="0" cellspacing="0" id="header-container">
+ <tr>
+ <td align="center" valign="top" id="header">
+
+ <!-- Utility controls -->
+ <p:region regionName='dashboardnav' regionID='dashboardnav'/>
+
+ <!-- navigation tabs and such -->
+ <p:region regionName='navigation' regionID='navigation'/>
+ <div id="spacer"></div>
+ </td>
+ </tr>
+ </table>
+ <div id="content-container">
+ <table width="100%">
+ <tr>
+ <td valign="top">
+ <!-- insert the content of the 'center' region of the page, and assign the css selector id 'regionB' -->
+ <p:region regionName='center' regionID='center'/>
+ </td>
+ </tr>
+ </table>
+ <hr class="cleaner"/>
+ </div>
+ </div>
+ </div>
+</div>
+
+<!-- TODO: Fix the auto jump in this tag -->
+<div id="footer-container" class="portal-copyright">Powered by
+<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
+</div>
+
+<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
+
+</body>
+</html>
+onC' -->
+ <p:region regionName='right' regionID='right'/>
+ </td>
+ </tr>
+ </table>
+ <hr class="cleaner"/>
+ </div>
+ </div>
+ </div>
+</div>
+
+<!-- TODO: Fix the auto jump in this tag -->
+<div id="footer-container" class="portal-copyright">Powered by
+<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
+</div>
+
+<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
+
+</body>
+</html>
Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
___________________________________________________________________
Name: svn:executable
+ *
Deleted: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp 2007-09-18 14:00:18 UTC (rev 8315)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp 2007-09-18 14:07:45 UTC (rev 8316)
@@ -1,50 +0,0 @@
-<%@ page import="org.jboss.portal.server.PortalConstants" %>
-<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title><%= PortalConstants.VERSION.toString() %></title>
- <meta http-equiv="Content-Type" content="text/html;"/>
- <!-- to correct the unsightly Flash of Unstyled Content. -->
- <script type="text/javascript"></script>
- <!-- use the renaissance theme if nothing else was defined for the portal or the page -->
- <p:theme themeName="renaissance"/>
- <!-- inject header content that was generated by the portlets on the requested page -->
- <p:headerContent/>
-</head>
-
-<body id="body">
-<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<div id="portal-container">
- <div id="sizer">
- <div id="expander">
- <div id="logoName"></div>
- <table border="0" cellpadding="0" cellspacing="0" id="header-container">
- <tr>
- <td align="center" valign="top" id="header">
- <p:region regionName='dashboardnav' regionID='dashboardnav'/>
-
- <p:region regionName='navigation' regionID='navigation'/>
- <div id="spacer"></div>
- </td>
- </tr>
- </table>
- <div id="content-container">
- <!-- Note: this construct assumes that the 'maximizedRegion' layout strategy was chosen for the layout, page or portal -->
- <!-- the 'maximizedRegion' strategy assigns the maximized portlet to the 'maximized' region -->
- <p:region regionName='maximized' regionID='regionMaximized'/>
- <hr class="cleaner"/>
-
- <div id="footer-container" class="portal-copyright">Powered by
- <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br>
- <span id="ThemeBy"></span>
- </div>
- </div>
-
- </div>
- </div>
-</div>
-<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
-</body>
-</html>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-09-18 14:00:18 UTC (rev 8315)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-09-18 14:07:45 UTC (rev 8316)
@@ -340,7 +340,19 @@
<instance-ref>AdminPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
</window>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>1column</value>
+ </property>
+ </properties>
</page>
<page>
<page-name>Members</page-name>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2007-09-18 14:00:18 UTC (rev 8315)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2007-09-18 14:07:45 UTC (rev 8316)
@@ -53,11 +53,21 @@
<layout>
<name>3columns</name>
<uri>/layouts/3columns/index.jsp</uri>
- <uri state="maximized">/layouts/3columns/maximized.jsp</uri>
+ <uri state="maximized">/layouts/generic/maximized.jsp</uri>
<regions>
<region name="left"/>
<region name="center"/>
<region name="right"/>
</regions>
</layout>
+ <layout>
+ <name>1column</name>
+ <uri>/layouts/1column/index.jsp</uri>
+ <uri state="maximized">/layouts/generic/maximized.jsp</uri>
+ <regions>
+ <region name="left"/>
+ <region name="center"/>
+ <region name="right"/>
+ </regions>
+ </layout>
</layouts>
18 years, 7 months