9:20 a.m.
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>