You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/07/31 20:32:34 UTC
svn commit: r681432 - in /ofbiz/trunk/applications/content:
config/ContentUiLabels.xml data/ForumDemoData.xml widget/CommonScreens.xml
widget/forum/ForumMenus.xml widget/forum/ForumScreens.xml
widget/forum/ForumTrees.xml
Author: adrianc
Date: Thu Jul 31 11:32:33 2008
New Revision: 681432
URL: http://svn.apache.org/viewvc?rev=681432&view=rev
Log:
Some minor UI cleanups/fixups in Content Manager Forum screens.
Modified:
ofbiz/trunk/applications/content/config/ContentUiLabels.xml
ofbiz/trunk/applications/content/data/ForumDemoData.xml
ofbiz/trunk/applications/content/widget/CommonScreens.xml
ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml
ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml
Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=681432&r1=681431&r2=681432&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Thu Jul 31 11:32:33 2008
@@ -1216,7 +1216,7 @@
</property>
<property key="FormFieldTitle_forumGroupDescription">
<value xml:lang="ar">Ùص٠Ù
جÙ
Ùعة اÙÙ
ÙتدÙ</value>
- <value xml:lang="en">Forumgroup Description</value>
+ <value xml:lang="en">Forum Group Description</value>
<value xml:lang="it">Descrizione Gruppo Forum</value>
<value xml:lang="ro">Descriere Grup Forum</value>
<value xml:lang="th">รายละà¹à¸à¸µà¸¢à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value>
@@ -1224,7 +1224,7 @@
</property>
<property key="FormFieldTitle_forumGroupName">
<value xml:lang="ar">إسÙ
Ù
جÙ
Ùعة اÙÙ
ÙتدÙ</value>
- <value xml:lang="en">Forumgroup Name</value>
+ <value xml:lang="en">Forum Group Name</value>
<value xml:lang="it">Nome Gruppo Forum</value>
<value xml:lang="ro">Nume Grup Forum</value>
<value xml:lang="th">à¸à¸·à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value>
@@ -1232,7 +1232,7 @@
</property>
<property key="FormFieldTitle_forumGroups">
<value xml:lang="ar">Ù
جÙ
Ùعات اÙÙ
ÙتدÙ</value>
- <value xml:lang="en">ForumGroups</value>
+ <value xml:lang="en">Forum Groups</value>
<value xml:lang="it">Gruppi Forum</value>
<value xml:lang="ro">Grupuri Forum</value>
<value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value>
@@ -2528,19 +2528,19 @@
<value xml:lang="zh">论åç»å表</value>
</property>
<property key="PageTitleFindForumMessages">
- <value xml:lang="ar">رسائ٠اÙÙ
ÙتدÙ:</value>
- <value xml:lang="en">Messages for forum:</value>
- <value xml:lang="it">Mesasggi per forum:</value>
- <value xml:lang="ro">Mesaj pe forum:</value>
- <value xml:lang="th">à¸à¹à¸à¸à¸§à¸²à¸¡à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸:</value>
+ <value xml:lang="ar">رسائ٠اÙÙ
ÙتدÙ: ${objectName} [${objectId}]</value>
+ <value xml:lang="en">Messages for Forum: ${objectName} [${objectId}]</value>
+ <value xml:lang="it">Mesasggi per forum: ${objectName} [${objectId}]</value>
+ <value xml:lang="ro">Mesaj pe forum: ${objectName} [${objectId}]</value>
+ <value xml:lang="th">à¸à¹à¸à¸à¸§à¸²à¸¡à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸: ${objectName} [${objectId}]</value>
<value xml:lang="zh">ä¿¡æ¯ï¼è®ºå</value>
</property>
<property key="PageTitleFindForums">
- <value xml:lang="ar">ÙائÙ
Ø© اÙÙ
Ùتد٠ÙÙ
جÙ
Ùعة اÙÙ
ÙتدÙ:</value>
- <value xml:lang="en">Forumlist for forumgroup:</value>
- <value xml:lang="it">Lista Forum per gruppo forum:</value>
- <value xml:lang="ro">Lista Forum pe grup forum:</value>
- <value xml:lang="th">รายà¸à¸²à¸£à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸:</value>
+ <value xml:lang="ar">ÙائÙ
Ø© اÙÙ
Ùتد٠ÙÙ
جÙ
Ùعة اÙÙ
ÙتدÙ: ${objectName} [${objectId}]</value>
+ <value xml:lang="en">Forum List for Forum Group: ${objectName} [${objectId}]</value>
+ <value xml:lang="it">Lista Forum per gruppo forum: ${objectName} [${objectId}]</value>
+ <value xml:lang="ro">Lista Forum pe grup forum: ${objectName} [${objectId}]</value>
+ <value xml:lang="th">รายà¸à¸²à¸£à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸: ${objectName} [${objectId}]</value>
<value xml:lang="zh">论åå表ï¼è®ºåç»</value>
</property>
<property key="PageTitleFindLayout">
Modified: ofbiz/trunk/applications/content/data/ForumDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ForumDemoData.xml?rev=681432&r1=681431&r2=681432&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ForumDemoData.xml (original)
+++ ofbiz/trunk/applications/content/data/ForumDemoData.xml Thu Jul 31 11:32:33 2008
@@ -19,7 +19,7 @@
-->
<entity-engine-xml>
<!-- ForumGroups -->
- <Content contentId="WebStoreFORUM" contentTypeId="FORUM_ROOT" contentName="WebStore Forum Root" description="Ecommerce Forums" childBranchCount="3" lastUpdatedStamp="2006-05-03 08:02:52.806" lastUpdatedTxStamp="2006-05-03 08:02:52.248" createdStamp="2006-05-01 13:07:22.886" createdTxStamp="2006-05-01 13:07:22.778"/>
+ <Content contentId="WebStoreFORUM" contentTypeId="FORUM_ROOT" contentName="WebStore Forum Root" description="Ecommerce Forums" childBranchCount="3"/>
<ContentPurpose contentId="WebStoreFORUM" contentPurposeTypeId="ARTICLE"/><!-- do we need this? -->
<ContentPurpose contentId="WebStoreFORUM" contentPurposeTypeId="RESPONSE"/>
<ContentRole contentId="WebStoreFORUM" partyId="BLOG_EDITOR" roleTypeId="CONTENT_EDITOR" fromDate="2004-04-01 12:00:00.000"/>
@@ -29,51 +29,51 @@
<ContentRole contentId="WebStoreFORUM" partyId="BLOG_ADMIN" roleTypeId="CONTENT_ADMIN" fromDate="2004-04-01 12:00:00.000"/>
<!-- forums -->
- <Content contentId="ASK" contentTypeId="WEB_SITE_PUB_PT" ownerContentId="WebStoreFORUM" contentName="Ask the Experts" description="Ask the Experts" childBranchCount="0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin" lastUpdatedStamp="2006-05-02 20:06:50.782" lastUpdatedTxStamp="2006-05-02 20:06:50.646" createdStamp="2006-05-01 13:07:23.198" createdTxStamp="2006-05-01 13:07:22.778"/>
- <ContentAssoc contentIdTo="ASK" contentId="WebStoreFORUM" contentAssocTypeId="SUBSITE" fromDate="2004-03-01 12:00:00.0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin" lastUpdatedStamp="2006-05-01 13:07:23.201" lastUpdatedTxStamp="2006-05-01 13:07:22.778" createdStamp="2006-05-01 13:07:23.201" createdTxStamp="2006-05-01 13:07:22.778"/>
+ <Content contentId="ASK" contentTypeId="WEB_SITE_PUB_PT" ownerContentId="WebStoreFORUM" contentName="Ask the Experts" description="Ask the Experts" childBranchCount="0"/>
+ <ContentAssoc contentIdTo="ASK" contentId="WebStoreFORUM" contentAssocTypeId="SUBSITE" fromDate="2004-03-01 12:00:00.0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin"/>
<ContentAttribute contentId="ASK" attrName="publishOperation" attrValue="HAS_USER_ROLE"/><!-- do we need this? -->
- <Content contentId="GIZMOS" contentTypeId="WEB_SITE_PUB_PT" ownerContentId="WebStoreFORUM" statusId="CTNT_PUBLISHED" contentName="Gizmos" description="Gizmos" childBranchCount="3" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin" lastUpdatedStamp="2006-05-03 08:49:38.728" lastUpdatedTxStamp="2006-05-03 08:49:38.534" createdStamp="2006-05-01 13:07:23.161" createdTxStamp="2006-05-01 13:07:22.778"/>
- <ContentAssoc contentIdTo="GIZMOS" contentId="WebStoreFORUM" contentAssocTypeId="SUBSITE" fromDate="2004-03-01 12:00:00.0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin" lastUpdatedStamp="2006-05-01 13:07:23.166" lastUpdatedTxStamp="2006-05-01 13:07:22.778" createdStamp="2006-05-01 13:07:23.166" createdTxStamp="2006-05-01 13:07:22.778"/>
+ <Content contentId="GIZMOS" contentTypeId="WEB_SITE_PUB_PT" ownerContentId="WebStoreFORUM" statusId="CTNT_PUBLISHED" contentName="Gizmos" description="Gizmos" childBranchCount="3" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin"/>
+ <ContentAssoc contentIdTo="GIZMOS" contentId="WebStoreFORUM" contentAssocTypeId="SUBSITE" fromDate="2004-03-01 12:00:00.0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin"/>
<ContentAttribute contentId="GIZMOS" attrName="publishOperation" attrValue="HAS_USER_ROLE"/>
- <Content contentId="WIDGETS" contentTypeId="WEB_SITE_PUB_PT" ownerContentId="WebStoreFORUM" statusId="CTNT_IN_PROGRESS" contentName="Widgets" description="Widgets" childBranchCount="0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin" lastUpdatedStamp="2006-05-02 20:06:46.214" lastUpdatedTxStamp="2006-05-02 20:06:45.781" createdStamp="2006-05-01 13:07:23.039" createdTxStamp="2006-05-01 13:07:22.778"/>
- <ContentAssoc contentIdTo="WIDGETS" contentId="WebStoreFORUM" contentAssocTypeId="SUBSITE" fromDate="2004-03-01 12:00:00.0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin" lastUpdatedStamp="2006-05-01 13:07:23.126" lastUpdatedTxStamp="2006-05-01 13:07:22.778" createdStamp="2006-05-01 13:07:23.126" createdTxStamp="2006-05-01 13:07:22.778"/>
+ <Content contentId="WIDGETS" contentTypeId="WEB_SITE_PUB_PT" ownerContentId="WebStoreFORUM" statusId="CTNT_IN_PROGRESS" contentName="Widgets" description="Widgets" childBranchCount="0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin"/>
+ <ContentAssoc contentIdTo="WIDGETS" contentId="WebStoreFORUM" contentAssocTypeId="SUBSITE" fromDate="2004-03-01 12:00:00.0" createdDate="2004-03-01 12:00:00.0" createdByUserLogin="admin"/>
<ContentAttribute contentId="WIDGETS" attrName="publishOperation" attrValue="HAS_USER_ROLE"/>
<!-- Threads -->
- <Content contentId="thread10021" contentTypeId="DOCUMENT" ownerContentId="GIZMOS" dataResourceId="TEMPLATE_TEXT_ONLY" statusId="CTNT_PUBLISHED" contentName="This is a Thread" description="Gizmo useless?" childBranchCount="1" createdDate="2006-05-02 13:36:31.937" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:31.937" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-01 08:49:38.78" lastUpdatedTxStamp="2006-05-01 08:49:38.534" createdStamp="2006-05-01 13:36:31.987" createdTxStamp="2006-05-01 13:36:31.904"/>
- <ContentAssoc contentIdTo="thread10021" contentId="GIZMOS" contentAssocTypeId="PUBLISH_LINK" fromDate="2006-05-02 13:36:32.036" createdDate="2006-05-02 13:36:32.055" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.055" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-02 13:36:32.154" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.154" createdTxStamp="2006-05-02 13:36:31.904"/>
+ <Content contentId="thread10021" contentTypeId="DOCUMENT" ownerContentId="GIZMOS" dataResourceId="TEMPLATE_TEXT_ONLY" statusId="CTNT_PUBLISHED" contentName="This is a Thread" description="Gizmo useless?" childBranchCount="2" createdDate="2006-05-02 13:36:31.937" createdByUserLogin="admin"/>
+ <ContentAssoc contentIdTo="thread10021" contentId="GIZMOS" contentAssocTypeId="PUBLISH_LINK" fromDate="2006-05-02 13:36:32.036" createdDate="2006-05-02 13:36:32.055" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.055" lastModifiedByUserLogin="admin"/>
<ContentPurpose contentId="thread10021" contentPurposeTypeId="ARTICLE" lastUpdatedStamp="2006-05-03 11:08:10.788" lastUpdatedTxStamp="2006-05-03 11:08:10.751" createdStamp="2006-05-03 11:08:10.788" createdTxStamp="2006-05-03 11:08:10.751"/>
<!-- Messages -->
- <DataResource dataResourceId="msg10002" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2006-05-02 13:36:32.264" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.264" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-02 13:36:32.266" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.266" createdTxStamp="2006-05-02 13:36:31.904"/>
- <Content contentId="msg10002" contentTypeId="DOCUMENT" ownerContentId="GIZMOS" dataResourceId="msg10002" statusId="CTNT_PUBLISHED" contentName="This is a message" description="Gizmo useless?" childBranchCount="0" createdDate="2006-05-02 13:36:32.417" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.417" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-01 08:05:42.715" lastUpdatedTxStamp="2006-05-01 08:05:42.438" createdStamp="2006-05-01 13:36:32.429" createdTxStamp="2006-05-01 13:36:31.904"/>
- <ContentPurpose contentId="msg10002" contentPurposeTypeId="MAIN_ARTICLE" lastUpdatedStamp="2006-05-03 11:08:11.0" lastUpdatedTxStamp="2006-05-03 11:08:10.914" createdStamp="2006-05-03 11:08:11.0" createdTxStamp="2006-05-03 11:08:10.914"/>
- <ContentAssoc contentIdTo="msg10002" contentId="thread10021" contentAssocTypeId="RESPONSE" fromDate="2006-05-02 13:36:32.495" mapKey="ARTICLE" createdDate="2006-05-02 13:36:32.495" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.495" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-02 13:36:32.537" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.537" createdTxStamp="2006-05-02 13:36:31.904"/>
- <ElectronicText dataResourceId="msg10002" lastUpdatedStamp="2006-05-02 13:36:32.351" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.351" createdTxStamp="2006-05-02 13:36:31.904">
+ <DataResource dataResourceId="msg10002" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2006-05-02 13:36:32.264" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.264" lastModifiedByUserLogin="admin"/>
+ <Content contentId="msg10002" contentTypeId="DOCUMENT" ownerContentId="GIZMOS" dataResourceId="msg10002" statusId="CTNT_PUBLISHED" contentName="This is a message" description="Gizmo useless?" childBranchCount="1" createdDate="2006-05-02 13:36:32.417" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.417" lastModifiedByUserLogin="admin"/>
+ <ContentPurpose contentId="msg10002" contentPurposeTypeId="MAIN_ARTICLE"/>
+ <ContentAssoc contentIdTo="msg10002" contentId="thread10021" contentAssocTypeId="RESPONSE" fromDate="2006-05-02 13:36:32.495" mapKey="ARTICLE" createdDate="2006-05-02 13:36:32.495" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.495" lastModifiedByUserLogin="admin"/>
+ <ElectronicText dataResourceId="msg10002">
<textData><![CDATA[
- It is well known that a Gizmo is no use to everybody. However everybody wants it, why is that?
- Anybody any sensible thoughts on this? A usual I do not know.
+ It is well known that a Gizmo is of no use to anybody. However everybody wants it, why is that?
+ Does anyone have any sensible thoughts on this? As usual I do not know.
]]></textData>
</ElectronicText>
<!-- Responses -->
- <DataResource dataResourceId="msg10002a" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2006-05-02 13:36:32.264" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.264" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-02 13:36:32.266" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.266" createdTxStamp="2006-05-02 13:36:31.904"/>
- <Content contentId="msg10002a" contentTypeId="DOCUMENT" ownerContentId="GIZMOS" dataResourceId="msg10002a" statusId="CTNT_PUBLISHED" contentName="This is a reponse" description="re1:Gizmo useless?" childBranchCount="0" createdDate="2006-05-02 13:36:32.417" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.417" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-03 08:05:42.715" lastUpdatedTxStamp="2006-05-03 08:05:42.438" createdStamp="2006-05-02 13:36:32.429" createdTxStamp="2006-05-02 13:36:31.904"/>
- <ContentAssoc contentIdTo="msg10002a" contentId="thread10021" contentAssocTypeId="RESPONSE" fromDate="2006-05-02 13:36:32.495" mapKey="ARTICLE" createdDate="2006-05-02 13:36:32.495" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.495" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-02 13:36:32.537" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.537" createdTxStamp="2006-05-02 13:36:31.904"/>
- <ContentPurpose contentId="msg10002a" contentPurposeTypeId="RESPONSE" lastUpdatedStamp="2006-05-03 11:08:11.0" lastUpdatedTxStamp="2006-05-03 11:08:10.914" createdStamp="2006-05-03 11:08:11.0" createdTxStamp="2006-05-03 11:08:10.914"/>
- <ElectronicText dataResourceId="msg10002a" lastUpdatedStamp="2006-05-02 13:36:32.351" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.351" createdTxStamp="2006-05-02 13:36:31.904">
+ <DataResource dataResourceId="msg10002a" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2006-05-02 14:36:32.264" createdByUserLogin="admin" lastModifiedDate="2006-05-02 14:36:32.264" lastModifiedByUserLogin="admin"/>
+ <Content contentId="msg10002a" contentTypeId="DOCUMENT" ownerContentId="GIZMOS" dataResourceId="msg10002a" statusId="CTNT_PUBLISHED" contentName="This is a reponse" description="re1:Gizmo useless?" childBranchCount="0" createdDate="2006-05-02 14:36:32.417" createdByUserLogin="admin" lastModifiedDate="2006-05-02 14:36:32.417" lastModifiedByUserLogin="admin"/>
+ <ContentAssoc contentIdTo="msg10002a" contentId="msg10002" contentAssocTypeId="RESPONSE" fromDate="2006-05-02 14:36:32.495" mapKey="ARTICLE" createdDate="2006-05-02 14:36:32.495" createdByUserLogin="admin" lastModifiedDate="2006-05-02 14:36:32.495" lastModifiedByUserLogin="admin"/>
+ <ContentPurpose contentId="msg10002a" contentPurposeTypeId="RESPONSE"/>
+ <ElectronicText dataResourceId="msg10002a">
<textData><![CDATA[
- A very good question and i am really surprised that you ask the question. Do you live? It is wel known that
- people love gizmo's and want to have every day a new one! They showof with them to proove they are better in life
- than other people who have less beautifull gizmo's.
+ A very good question and i am really surprised that you ask the question. Do you live? It is well known that
+ people love gizmos and want to have every day a new one! They show off with them to prove they are better in life
+ than other people who have less beautiful gizmos.
]]></textData>
</ElectronicText>
- <DataResource dataResourceId="msg10002b" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2006-05-02 13:36:32.264" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.264" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-02 13:36:32.266" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.266" createdTxStamp="2006-05-02 13:36:31.904"/>
- <Content contentId="msg10002b" contentTypeId="DOCUMENT" ownerContentId="GIZMOS" dataResourceId="msg10002b" statusId="CTNT_PUBLISHED" contentName="This is a reponse" description="re2:Gizmo useless?" childBranchCount="0" createdDate="2006-05-02 13:36:32.417" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.417" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-03 08:05:42.715" lastUpdatedTxStamp="2006-05-03 08:05:42.438" createdStamp="2006-05-02 13:36:32.429" createdTxStamp="2006-05-02 13:36:31.904"/>
- <ContentAssoc contentIdTo="msg10002b" contentId="thread10021" contentAssocTypeId="RESPONSE" fromDate="2006-05-02 13:36:32.495" mapKey="ARTICLE" createdDate="2006-05-02 13:36:32.495" createdByUserLogin="admin" lastModifiedDate="2006-05-02 13:36:32.495" lastModifiedByUserLogin="admin" lastUpdatedStamp="2006-05-02 13:36:32.537" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.537" createdTxStamp="2006-05-02 13:36:31.904"/>
- <ContentPurpose contentId="msg10002b" contentPurposeTypeId="RESPONSE" lastUpdatedStamp="2006-05-03 11:08:11.0" lastUpdatedTxStamp="2006-05-03 11:08:10.914" createdStamp="2006-05-03 11:08:11.0" createdTxStamp="2006-05-03 11:08:10.914"/>
- <ElectronicText dataResourceId="msg10002b" lastUpdatedStamp="2006-05-02 13:36:32.351" lastUpdatedTxStamp="2006-05-02 13:36:31.904" createdStamp="2006-05-02 13:36:32.351" createdTxStamp="2006-05-02 13:36:31.904">
+ <DataResource dataResourceId="msg10002b" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2006-05-02 15:36:32.264" createdByUserLogin="admin" lastModifiedDate="2006-05-02 15:36:32.264" lastModifiedByUserLogin="admin"/>
+ <Content contentId="msg10002b" contentTypeId="DOCUMENT" ownerContentId="GIZMOS" dataResourceId="msg10002b" statusId="CTNT_PUBLISHED" contentName="This is a reponse" description="re2:Gizmo useless?" childBranchCount="0" createdDate="2006-05-02 15:36:32.417" createdByUserLogin="admin" lastModifiedDate="2006-05-02 15:36:32.417" lastModifiedByUserLogin="admin"/>
+ <ContentAssoc contentIdTo="msg10002b" contentId="thread10021" contentAssocTypeId="RESPONSE" fromDate="2006-05-02 15:36:32.495" mapKey="ARTICLE" createdDate="2006-05-02 15:36:32.495" createdByUserLogin="admin" lastModifiedDate="2006-05-02 15:36:32.495" lastModifiedByUserLogin="admin"/>
+ <ContentPurpose contentId="msg10002b" contentPurposeTypeId="RESPONSE"/>
+ <ElectronicText dataResourceId="msg10002b">
<textData><![CDATA[
Why so many people do not know that people love gizmo's? Probably because they do not have one and do not know how
much pleasure it gives?
Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=681432&r1=681431&r2=681432&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu Jul 31 11:32:33 2008
@@ -114,48 +114,6 @@
</section>
</screen>
- <screen name="commonForumDecorator">
- <section>
- <actions>
- <set field="headerItem" value="Forum"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
- </condition>
- <widgets>
- <section>
- <condition>
- <not><if-empty field-name="tabBar"/></not>
- </condition>
- <widgets>
- <include-menu name="${tabBar}" location="component://content/widget/forum/ForumMenus.xml"/>
- </widgets>
- </section>
- <label style="h1" text="${uiLabelMap.${titleProperty}}"></label>
- <section>
- <condition>
- <not><if-empty field-name="objectId"/></not>
- </condition>
- <widgets>
- <label style="h1" text=""${objectName}" [${objectId}]"></label>
- </widgets>
- </section>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">You do not have permission to view this page. ("CONTENTMGR_VIEW" or "CONTENTMGR_ADMIN" needed)</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="commonDataResourceDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml?rev=681432&r1=681431&r2=681432&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml Thu Jul 31 11:32:33 2008
@@ -27,7 +27,7 @@
</menu>
<menu name="ForumTabBar" default-menu-item-name="Survey" type="simple">
</menu>
- <menu name="ForumMessagesTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
+ <menu name="ForumMessagesTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="forumGroups" title="${uiLabelMap.FormFieldTitle_forumGroups}"><link target="findForumGroups"/></menu-item>
<menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums?forumGroupId=${parameters.forumGroupId}"/></menu-item>
<menu-item name="messageList" title="${uiLabelMap.FormFieldTitle_messageList}"><link target="findForumMessages?forumGroupId=${parameters.forumGroupId}&forumId=${parameters.forumId}"/></menu-item>
Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=681432&r1=681431&r2=681432&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Thu Jul 31 11:32:33 2008
@@ -20,29 +20,32 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
- <screen name="FindForumGroups">
+
+ <screen name="commonForumDecorator">
<section>
<actions>
- <set field="titleProperty" value="PageTitleFindForumGroup"/>
- <set field="headerItem" value="ForumGroups"/>
- <set field="labelTitleProperty" value="PageTitleFindForumGroup"/>
- <entity-and entity-name="Content" list-name="forumGroups">
- <field-map field-name="contentTypeId" value="FORUM_ROOT"/>
- <order-by field-name="contentName"/>
- </entity-and>
+ <set field="headerItem" value="Forum"/>
+ <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="pageTitle" value="${uiLabelMap.${titleProperty}}"/>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
<if-has-permission permission="CONTENTMGR" action="_VIEW"/>
</condition>
<widgets>
- <screenlet id="ForumGroupPanel" title="${uiLabelMap.ForumGroupCreate}" collapsible="true">
- <include-form name="AddForumGroup" location="component://content/widget/forum/ForumForms.xml"/>
- </screenlet>
- <include-form name="ListForumGroups" location="component://content/widget/forum/ForumForms.xml"/>
+ <section>
+ <condition>
+ <not><if-empty field-name="tabBar"/></not>
+ </condition>
+ <widgets>
+ <include-menu name="${tabBar}" location="component://content/widget/forum/ForumMenus.xml"/>
+ </widgets>
+ </section>
+ <container style="h1"><label text="${pageTitle}"/></container>
+ <decorator-section-include name="body"/>
</widgets>
<fail-widgets>
<label style="h3">You do not have permission to view this page. ("CONTENTMGR_VIEW" or "CONTENTMGR_ADMIN" needed)</label>
@@ -53,6 +56,31 @@
</widgets>
</section>
</screen>
+
+ <screen name="FindForumGroups">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindForumGroup"/>
+ <set field="headerItem" value="ForumGroups"/>
+ <set field="labelTitleProperty" value="PageTitleFindForumGroup"/>
+ <entity-and entity-name="Content" list-name="forumGroups">
+ <field-map field-name="contentTypeId" value="FORUM_ROOT"/>
+ <order-by field-name="contentName"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet id="ForumGroupPanel" title="${uiLabelMap.ForumGroupCreate}" collapsible="true">
+ <include-form name="AddForumGroup" location="component://content/widget/forum/ForumForms.xml"/>
+ </screenlet>
+ <include-form name="ListForumGroups" location="component://content/widget/forum/ForumForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="FindForums">
<section>
<actions>
@@ -70,7 +98,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
<decorator-section name="body">
<screenlet id="AddForumToForumGroupPanel" title="${uiLabelMap.ForumAddTo} ${forumGroup.contentName}" collapsible="true">
<include-form name="AddForum" location="component://content/widget/forum/ForumForms.xml"/>
@@ -81,6 +109,7 @@
</widgets>
</section>
</screen>
+
<screen name="ForumGroupRoles">
<section>
<actions>
@@ -98,7 +127,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
<decorator-section name="body">
<screenlet id="ForumGroupRolePanel" title="${uiLabelMap.ForumAddRoleTo} ${forumGroup.contentName} [${forumGroup.contentId}]" collapsible="true">
<include-form name="AddForumGroupRole" location="component://content/widget/forum/ForumForms.xml"/>
@@ -109,6 +138,7 @@
</widgets>
</section>
</screen>
+
<screen name="ForumGroupPurposes">
<section>
<actions>
@@ -126,7 +156,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
<decorator-section name="body">
<screenlet id="ForumGroupPurposePanel" title="${uiLabelMap.ForumAddPurposeTo} ${forumGroup.contentName} [${forumGroup.contentId}]" collapsible="true">
<include-form name="AddForumGroupPurpose" location="component://content/widget/forum/ForumForms.xml"/>
@@ -137,6 +167,7 @@
</widgets>
</section>
</screen>
+
<screen name="FindForumMessages">
<section>
<actions>
@@ -146,7 +177,7 @@
<set field="tabButtonItem" value="messageList"/>
<set field="labelTitleProperty" value="PageTitleFindForumMessages"/>
<entity-one entity-name="Content" value-name="forum">
- <field-map field-name="contentId" env-name="requestParameters.forumId"/>
+ <field-map field-name="contentId" env-name="parameters.forumId"/>
</entity-one>
<set field="objectName" from-field="forum.contentName"/>
<set field="objectId" from-field="forum.contentId"/>
@@ -155,66 +186,40 @@
<field-map field-name="ownerContentId" env-name="parameters.forumId"/>
<order-by field-name="createdDate DESC"/>
</entity-and>
- <set field="parameters.forumMessageIdTo" from-field="requestParameters.forumId"/>
+ <set field="parameters.forumMessageIdTo" from-field="parameters.forumId"/>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
<decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
- </condition>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ForumAddPurposeTo} ${forumGroup.contentName} [${forumGroup.contentId}]"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListForumMessages" location="component://content/widget/forum/ForumForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ForumAddThreadTo} ${forum.description}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddForumMessage" location="component://content/widget/forum/ForumForms.xml"/>
- </widgets>
- </section>
- </container>
+ <include-form name="ListForumMessages" location="component://content/widget/forum/ForumForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.ForumAddThreadTo} ${forum.description}"/>
</container>
- </widgets>
- <fail-widgets>
- <label style="h3">You do not have permission to view this page. ("CONTENTMGR_VIEW" or "CONTENTMGR_ADMIN" needed)</label>
- </fail-widgets>
- </section>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="AddForumMessage" location="component://content/widget/forum/ForumForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+
<screen name="FindForumThreads">
<section>
<actions>
- <set field="contentId" from-field="parameters.forumId" />
- <set field="responseContentId" from-field="parameters.forumId" />
- <set field="threadContentId" from-field="parameters.threadContentId" default-value="${contentId}" />
- <set field="forumId" from-field="parameters.forumId" />
+ <set field="contentId" from-field="parameters.forumId" />
+ <set field="responseContentId" from-field="parameters.forumId" />
+ <set field="threadContentId" from-field="parameters.threadContentId" default-value="${contentId}" />
+ <set field="forumId" from-field="parameters.forumId" />
<entity-one entity-name="Content" value-name="content" use-cache="true">
<field-map field-name="contentId" env-name="contentId"/>
</entity-one>
- <set field="ownerContentId" from-field="content.ownerContentId" default-value="${forumId}" />
- <set field="trail" from-field="threadContentId" />
+ <set field="ownerContentId" from-field="content.ownerContentId" default-value="${forumId}" />
+ <set field="trail" from-field="threadContentId" />
<set field="enableEdit" value="false"/>
<set field="webPutPt" from-field="parameters.forumGroupId"/>
<set field="rsp.contentName" value="${content.contentName}" />
@@ -224,75 +229,57 @@
<set field="tabButtonItem" value="messageThread"/>
<set field="labelTitleProperty" value="PageTitleFindForumMessages"/>
<entity-one entity-name="Content" value-name="forum">
- <field-map field-name="contentId" env-name="requestParameters.forumId"/>
+ <field-map field-name="contentId" env-name="parameters.forumId"/>
</entity-one>
<set field="objectName" from-field="forum.contentName"/>
<set field="objectId" from-field="forum.contentId"/>
<set field="forumNbrMessages" from-field="forum.childBranchCount" default-value="0"/>
<entity-one entity-name="Content" value-name="forumThread">
- <field-map field-name="contentId" env-name="requestParameters.forumThreadId"/>
+ <field-map field-name="contentId" env-name="parameters.forumThreadId"/>
</entity-one>
<entity-one entity-name="Content" value-name="forumMessage">
- <field-map field-name="contentId" env-name="requestParameters.forumMessageId"/>
+ <field-map field-name="contentId" env-name="parameters.forumMessageId"/>
</entity-one>
<entity-one entity-name="ElectronicText" value-name="electronicText">
<field-map field-name="dataResourceId" env-name="forumMessage.dataResourceId"/>
</entity-one>
- <set field="contentId" from-field="requestParameters.forumId"/>
- <set field="trail" from-field="requestParameters.trail"/>
+ <set field="contentId" from-field="parameters.forumId"/>
+ <set field="trail" from-field="parameters.trail" default-value="${contentId}"/>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
<decorator-section name="body">
+ <include-tree name="MessageTree" location="component://content/widget/forum/ForumTrees.xml" />
<section>
<condition>
- <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+ <not><if-empty field-name="parameters.forumThreadId"/></not>
</condition>
<widgets>
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="${uiLabelMap.PageTitleFindForumMessages}"/>
+ <label text="${uiLabelMap.ForumThread} ${parameters.forumThreadId}"/>
</container>
</container>
<container style="screenlet-body">
<section>
<widgets>
- <include-tree name="MessageTree" location="component://content/widget/forum/ForumTrees.xml" />
+ <include-form name="EditForumThread" location="component://content/widget/forum/ForumForms.xml"/>
</widgets>
</section>
</container>
</container>
+ </widgets>
+ </section>
<section>
<condition>
- <not><if-empty field-name="requestParameters.forumThreadId"/></not>
- </condition>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ForumThread} ${requestParameters.forumThreadId}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditForumThread" location="component://content/widget/forum/ForumForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- </widgets>
- </section>
- <section>
- <condition>
- <not><if-empty field-name="requestParameters.forumMessageId"/></not>
+ <not><if-empty field-name="parameters.forumMessageId"/></not>
</condition>
<widgets>
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="${uiLabelMap.ForumMessage} ${requestParameters.forumMessageId}"/>
+ <label text="${uiLabelMap.ForumMessage} ${parameters.forumMessageId}"/>
</container>
</container>
<container style="screenlet-body">
@@ -305,16 +292,12 @@
</container>
</widgets>
</section>
- </widgets>
- <fail-widgets>
- <label style="h3">You do not have permission to view this page. ("CONTENTMGR_VIEW" or "CONTENTMGR_ADMIN" needed)</label>
- </fail-widgets>
- </section>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+
<screen name="EditForumMessage">
<section>
<actions>
@@ -326,7 +309,7 @@
<set field="labelTitleProperty" value="PageTitleFindForumMessages"/>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -362,7 +345,7 @@
</entity-one>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -383,6 +366,7 @@
</widgets>
</section>
</screen>
+
<screen name="AddForumThreadMessage">
<section>
<actions>
@@ -397,7 +381,7 @@
</entity-one>
</actions>
<widgets>
- <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -418,4 +402,5 @@
</widgets>
</section>
</screen>
+
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml?rev=681432&r1=681431&r2=681432&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml Thu Jul 31 11:32:33 2008
@@ -21,37 +21,38 @@
<trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd">
- <tree name="MessageTree" root-node-name="node-root"
- default-render-style="simple" default-wrap-style="responseTreeWrapper">
- <node name="node-root" >
- <entity-one entity-name="Content" use-cache="false" value-name="rsp">
+<!-- <tree name="MessageTree" root-node-name="node-root"
+ default-render-style="expand-collapse" expand-collapse-request="findForumThreads?forumId=${parameters.forumId}"> -->
+ <tree name="MessageTree" root-node-name="node-root" default-render-style="simple">
+ <node name="node-root">
+ <entity-one entity-name="Content" use-cache="false" value-name="rsp">
<field-map field-name="contentId" env-name="parameters.forumId"/>
</entity-one>
<!--include-screen name="responseTreeLine" location="component://content/widget/forum/ForumScreens.xml" /-->
<sub-node node-name="node-body">
<entity-condition entity-name="ContentAssocViewTo" use-cache="false" >
<condition-list combine="and">
- <condition-expr field-name="contentIdStart" operator="equals" env-name="rsp.contentId" />
+ <condition-expr field-name="contentIdStart" operator="equals" env-name="rsp.contentId"/>
<condition-list combine="or">
- <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE" />
- <condition-expr field-name="caContentAssocTypeId" operator="equals" value="PUBLISH_LINK" />
+ <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/>
+ <condition-expr field-name="caContentAssocTypeId" operator="equals" value="PUBLISH_LINK"/>
</condition-list>
<condition-expr field-name="caThruDate" operator="equals" value=""/>
</condition-list>
- <order-by field-name="caFromDate DESC"/>
+ <order-by field-name="createdDate"/>
</entity-condition>
</sub-node>
</node>
<node name="node-body" entry-name="rsp">
- <include-screen name="responseTreeLine" location="${parameters.mainDecoratorLocation}" />
+ <include-screen name="responseTreeLine" location="${parameters.mainDecoratorLocation}"/>
<sub-node node-name="node-body">
- <entity-condition entity-name="ContentAssocViewTo" use-cache="true" >
+ <entity-condition entity-name="ContentAssocViewTo" use-cache="true">
<condition-list combine="and">
- <condition-expr field-name="contentIdStart" operator="equals" env-name="rsp.contentId" />
- <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE" />
+ <condition-expr field-name="contentIdStart" operator="equals" env-name="rsp.contentId"/>
+ <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/>
<condition-expr field-name="caThruDate" operator="equals" value=""/>
</condition-list>
- <order-by field-name="caFromDate DESC"/>
+ <order-by field-name="createdDate"/>
</entity-condition>
</sub-node>
</node>