[jboss-svn-commits] JBL Code SVN: r19655 - in labs/jbosslabs/qa/portal-extensions: jbosswiki/forge-wiki/src/web/views and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Apr 20 11:27:22 EDT 2008
Author: szimano
Date: 2008-04-20 11:27:21 -0400 (Sun, 20 Apr 2008)
New Revision: 19655
Modified:
labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css
labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
svn merge -r 19648:19654 https://svn.labs.jboss.com/labs/jbosslabs/trunk/portal-extensions .
Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2008-04-20 15:22:51 UTC (rev 19654)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2008-04-20 15:27:21 UTC (rev 19655)
@@ -209,6 +209,23 @@
</preferences>
</instance>
</deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>FreezoneResourcesPageInstance</instance-id>
+ <portlet-ref>FreezonePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>projectId</name>
+ <value>default</value>
+ </preference>
+ <preference>
+ <name>page</name>
+ <value>resources_new.html</value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
<!-- <deployment>
<if-exists>overwrite</if-exists>
<instance>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2008-04-20 15:22:51 UTC (rev 19654)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2008-04-20 15:27:21 UTC (rev 19655)
@@ -20,7 +20,8 @@
<meta name='gwt:property' content='tagMeWebsite/wiki/#{wikiCommon.pageName}=true' />
</c:if>
</head>
-<body class="wiki-body">
+<body>
+ <div id="wiki-body" class="wiki-body">
<f:loadBundle basename="Messages" var="msg"/>
<h:panelGroup rendered="#{wikiCommon.userLoggedIn}" id="tagMeWiki" />
@@ -57,5 +58,6 @@
<ui:insert name="content" />
</a4j:page>
</f:view>
+ </div>
</body>
</html>
\ No newline at end of file
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2008-04-20 15:22:51 UTC (rev 19654)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2008-04-20 15:27:21 UTC (rev 19655)
@@ -1,5 +1,9 @@
/* Styles that are unique to the wiki pages */
+.wiki-body {
+ padding: 10px;
+}
+
.wikiContent {
margin: 0px;
padding: 0px;
Modified: labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2008-04-20 15:22:51 UTC (rev 19654)
+++ labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2008-04-20 15:27:21 UTC (rev 19655)
@@ -120,11 +120,35 @@
</portal>
</deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <parent-ref>default</parent-ref>
+ <page>
+ <page-name>download</page-name>
+ <properties>
+ <!-- Set the emptyRenderer for this page -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
+
+ <window>
+ <window-name>FreezoneDownloadWindow</window-name>
+ <instance-ref>
+ FreezoneDownloadPageInstance
+ </instance-ref>
+ <region>triple</region>
+ <height>0</height>
+ </window>
+ </page>
+ </deployment>
+
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
- <page-name>download</page-name>
+ <page-name>resources</page-name>
<properties>
<!-- Set the emptyRenderer for this page -->
<property>
@@ -134,9 +158,9 @@
</properties>
<window>
- <window-name>FreezoneDownloadWindow</window-name>
+ <window-name>FreezoneResourcesWindow</window-name>
<instance-ref>
- FreezoneDownloadPageInstance
+ FreezoneResourcesPageInstance
</instance-ref>
<region>triple</region>
<height>0</height>
@@ -350,6 +374,13 @@
<parent-ref>default</parent-ref>
<page>
<page-name>labswiki</page-name>
+ <properties>
+ <!-- Set the emptyRenderer for this page -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
<window>
<window-name>WikiPortletWindow</window-name>
<instance-ref>WikiPortletInstance</instance-ref>
More information about the jboss-svn-commits
mailing list