You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/02/19 20:53:08 UTC
svn commit: r509321 [6/7] - in /ofbiz/trunk/applications: content/data/
content/script/org/ofbiz/content/blog/
content/script/org/ofbiz/content/content/
content/script/org/ofbiz/content/data/
content/script/org/ofbiz/content/survey/ content/script/org/...
Modified: ofbiz/trunk/applications/ecommerce/data/DemoBlogUsersData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoBlogUsersData.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoBlogUsersData.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoBlogUsersData.xml Mon Feb 19 11:53:06 2007
@@ -22,22 +22,22 @@
<Party partyId="BLOGUSER_ADMIN" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<Person partyId="BLOGUSER_ADMIN" lastName="Blog" firstName="Admin"/>
<UserLogin userLoginId="blog_admin" partyId="BLOGUSER_ADMIN" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a"/>
- <PartyRole partyId="BLOGUSER_ADMIN" roleTypeId="BLOG_ADMIN"/>
- <ContentRole partyId="BLOGUSER_ADMIN" roleTypeId="BLOG_ADMIN" contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/>
+ <PartyRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN"/>
+ <ContentRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN" contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/>
<UserLoginSecurityGroup userLoginId="blog_admin" groupId="FULLADMIN" fromDate="2004-09-15 00:00:00.000"/>
<Party partyId="BLOGUSER_EDITOR" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<Person partyId="BLOGUSER_EDITOR" lastName="Blog" firstName="Editor"/>
<UserLogin userLoginId="blog_editor" partyId="BLOGUSER_EDITOR" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a"/>
- <PartyRole partyId="BLOGUSER_EDITOR" roleTypeId="BLOG_ADMIN"/>
- <ContentRole partyId="BLOGUSER_EDITOR" roleTypeId="BLOG_ADMIN" contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/>
+ <PartyRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN"/>
+ <ContentRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN" contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/>
<UserLoginSecurityGroup userLoginId="blog_editor" groupId="FULLADMIN" fromDate="2004-09-15 00:00:00.000"/>
<Party partyId="BLOGUSER_USER" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<Person partyId="BLOGUSER_USER" lastName="Blog" firstName="User"/>
<UserLogin userLoginId="blog_user" partyId="BLOGUSER_USER" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" fromDate="2004-09-15 00:00:00.000"/>
- <PartyRole partyId="BLOGUSER_USER" roleTypeId="BLOG_ADMIN"/>
- <PartyRole partyId="BLOGUSER_USER" roleTypeId="BLOG_AUTHOR"/>
+ <PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_ADMIN"/>
+ <PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_AUTHOR"/>
<Party partyId="BLOGUSER_GUEST" partyTypeId="PERSON" createdDate="2004-10-20 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-10-20 09:37:40.989" lastModifiedByUserLogin="admin"/>
<Person partyId="BLOGUSER_GUEST" lastName="Blog" firstName="Guest"/>
@@ -46,9 +46,10 @@
<Party partyId="AUTHOR_BIGAL" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<Person partyId="AUTHOR_BIGAL" lastName="Al" firstName="Big"/>
<UserLogin userLoginId="bigal" partyId="AUTHOR_BIGAL" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a"/>
- <PartyRole partyId="AUTHOR_BIGAL" roleTypeId="BLOG_AUTHOR"/>
- <ContentRole partyId="AUTHOR_BIGAL" roleTypeId="BLOG_AUTHOR" contentId="BLOGROOTBIGAL" fromDate="2004-03-27 09:37:40.989"/>
+ <PartyRole partyId="AUTHOR_BIGAL" roleTypeId="CONTENT_AUTHOR"/>
+ <ContentRole partyId="AUTHOR_BIGAL" roleTypeId="CONTENT_AUTHOR" contentId="BLOGROOTBIGAL" fromDate="2004-03-27 09:37:40.989"/>
<ContentPurpose contentId="BLOGROOTBIGAL" contentPurposeTypeId="ARTICLE"/>
+ <UserLoginSecurityGroup userLoginId="bigal" groupId="CONTENT_USER" fromDate="2004-09-15 00:00:00.000"/>
<!-- Updating BLOGROOTBIGAL with bigal as creator so that he will be found as "owner" for subrecords.
This is used in a screen permission test.
-->
@@ -61,9 +62,10 @@
<Party partyId="AUTHOR_MADMAX" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
<Person partyId="AUTHOR_MADMAX" lastName="Max" firstName="Mad"/>
<UserLogin userLoginId="madmax" partyId="AUTHOR_MADMAX" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a"/>
- <PartyRole partyId="AUTHOR_MADMAX" roleTypeId="BLOG_AUTHOR"/>
- <ContentRole partyId="AUTHOR_MADMAX" roleTypeId="BLOG_AUTHOR" contentId="BLOGROOTMADMAX" fromDate="2004-03-27 09:37:40.989"/>
+ <PartyRole partyId="AUTHOR_MADMAX" roleTypeId="CONTENT_AUTHOR"/>
+ <ContentRole partyId="AUTHOR_MADMAX" roleTypeId="CONTENT_AUTHOR" contentId="BLOGROOTMADMAX" fromDate="2004-03-27 09:37:40.989"/>
<ContentPurpose contentId="BLOGROOTMADMAX" contentPurposeTypeId="ARTICLE"/>
+ <UserLoginSecurityGroup userLoginId="madmax" groupId="CONTENT_USER" fromDate="2004-09-15 00:00:00.000"/>
<!-- Updating biBLOGROOTMADMAXgal with madmax as creator so that he will be found as "owner" for subrecords.
This is used in a screen permission test.
-->
Modified: ofbiz/trunk/applications/ecommerce/data/DemoFactoids.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoFactoids.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoFactoids.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoFactoids.xml Mon Feb 19 11:53:06 2007
@@ -19,49 +19,49 @@
-->
<entity-engine-xml>
- <DataResource dataResourceId="FACT_1" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="FACT_1" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="FACT_1" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
Did you know that widget users live twice as long as their non-widget counterparts?
]]></textData>
</ElectronicText>
- <Content contentId="FACT_1" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_1" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Widget Users Live Longer" description="Studies show that users of Widgets live longer" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="FACT_1" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_1" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Widget Users Live Longer" description="Studies show that users of Widgets live longer" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
<ContentAssoc contentId="FACT_1" contentIdTo="WebStoreFACTOID" contentAssocTypeId="PUBLISH_LINK" fromDate="2004-03-30 07:57:53.141" createdDate="2004-03-30 07:57:53.145" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:53.145" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.151" createdStamp="2004-03-30 07:57:53.151"/>
- <DataResource dataResourceId="FACT_2" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="FACT_2" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="FACT_2" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
Widgets outsell gizmos 2:1
]]></textData>
</ElectronicText>
- <Content contentId="FACT_2" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_2" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Widgets outselling Gizmos" description="Widgets outsell Gizmos 2:1" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="FACT_2" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_2" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Widgets outselling Gizmos" description="Widgets outsell Gizmos 2:1" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
<ContentAssoc contentId="FACT_2" contentIdTo="WebStoreFACTOID" contentAssocTypeId="PUBLISH_LINK" fromDate="2004-03-30 07:57:53.141" createdDate="2004-03-30 07:57:53.145" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:53.145" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.151" createdStamp="2004-03-30 07:57:53.151"/>
- <DataResource dataResourceId="FACT_3" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="FACT_3" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="FACT_3" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
Gizmos are our most popular item.
]]></textData>
</ElectronicText>
- <Content contentId="FACT_3" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_3" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Gizmos most popular" description="Gizmos most popular" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="FACT_3" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_3" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Gizmos most popular" description="Gizmos most popular" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
<ContentAssoc contentId="FACT_3" contentIdTo="WebStoreFACTOID" contentAssocTypeId="PUBLISH_LINK" fromDate="2004-03-30 07:57:53.141" createdDate="2004-03-30 07:57:53.145" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:53.145" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.151" createdStamp="2004-03-30 07:57:53.151"/>
- <DataResource dataResourceId="FACT_4" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="FACT_4" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="FACT_4" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
The resale value of widgets after five years is 46% higher than that of competitors.
]]></textData>
</ElectronicText>
- <Content contentId="FACT_4" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_4" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Widgets hold value" description="Widgets hold value" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="FACT_4" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_4" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Widgets hold value" description="Widgets hold value" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
<ContentAssoc contentId="FACT_4" contentIdTo="WebStoreFACTOID" contentAssocTypeId="PUBLISH_LINK" fromDate="2004-03-30 07:57:53.141" createdDate="2004-03-30 07:57:53.145" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:53.145" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.151" createdStamp="2004-03-30 07:57:53.151"/>
- <DataResource dataResourceId="FACT_5" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="FACT_5" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="FACT_5" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
The use of gizmos has been shown to have no negative effect on personal longetivity.
]]></textData>
</ElectronicText>
- <Content contentId="FACT_5" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_5" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Gizmos are safe" description="Gizmos are safe" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="FACT_5" contentTypeId="DOCUMENT" ownerContentId="WebStoreFACTOID" dataResourceId="FACT_5" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Gizmos are safe" description="Gizmos are safe" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
<ContentAssoc contentId="FACT_5" contentIdTo="WebStoreFACTOID" contentAssocTypeId="PUBLISH_LINK" fromDate="2004-03-30 07:57:53.141" createdDate="2004-03-30 07:57:53.145" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:53.145" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.151" createdStamp="2004-03-30 07:57:53.151"/>
<ContentAssoc contentId="FACT_1" contentIdTo="WebStoreFACTOID" contentAssocTypeId="SUBSITE" fromDate="2004-03-01 12:00:00.000" createdDate="2004-03-01 12:00:00.000" createdByUserLogin="admin"/>
Modified: ofbiz/trunk/applications/ecommerce/data/DemoRelatedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRelatedData.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoRelatedData.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoRelatedData.xml Mon Feb 19 11:53:06 2007
@@ -19,15 +19,15 @@
-->
<entity-engine-xml>
- <DataResource dataResourceId="RELATED_1" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="RELATED_1" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="RELATED_1" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
Al Byers in this marvelous display of technical manual writing has show the way for us all to reach for the stars.
]]></textData>
</ElectronicText>
- <Content contentId="RELATED_1" contentTypeId="DOCUMENT" ownerContentId="ECMC180000" dataResourceId="RELATED_1" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Re:How to operate the Rocket Launcher Widget - Marvelous" description="Re:How to operate the Rocket Launcher Widget - Marvelous" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="RELATED_1" contentTypeId="DOCUMENT" ownerContentId="ECMC180000" dataResourceId="RELATED_1" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Re:How to operate the Rocket Launcher Widget - Marvelous" description="Re:How to operate the Rocket Launcher Widget - Marvelous" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
- <DataResource dataResourceId="RELATED_2" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="RELATED_2" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="RELATED_2" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
This poor attempt at a maintenance document is so flawed that I don't know where to begin.
@@ -36,9 +36,9 @@
even someone that he loves, could be terminated by a reentrant space vehicle.
]]></textData>
</ElectronicText>
- <Content contentId="RELATED_2" contentTypeId="DOCUMENT" ownerContentId="ECMC180000" dataResourceId="RELATED_2" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Re:How to operate the Rocket Launcher Widget - Ridiculous" description="Re:How to operate the Rocket Launcher Widget - Ridiculous" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="RELATED_2" contentTypeId="DOCUMENT" ownerContentId="ECMC180000" dataResourceId="RELATED_2" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Re:How to operate the Rocket Launcher Widget - Ridiculous" description="Re:How to operate the Rocket Launcher Widget - Ridiculous" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
- <DataResource dataResourceId="RELATED_3" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="RELATED_3" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="RELATED_3" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
While truly visionary, one has to ask the question why are the national defense aspects of this futuristic
@@ -47,9 +47,9 @@
There is no reason why every community could not have a battery of these stations - if not in a fixed location, at least on a mobile launcher that could be hooked up to an SUV and towed from one driveway to another on a random schedule.
]]></textData>
</ElectronicText>
- <Content contentId="RELATED_3" contentTypeId="DOCUMENT" ownerContentId="ECMC180001" dataResourceId="RELATED_3" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Re:Future Directions in Rocket Launcher Widgets" description="Re:Future Directions in Rocket Launcher Widgets" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="RELATED_3" contentTypeId="DOCUMENT" ownerContentId="ECMC180001" dataResourceId="RELATED_3" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Re:Future Directions in Rocket Launcher Widgets" description="Re:Future Directions in Rocket Launcher Widgets" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
- <DataResource dataResourceId="RELATED_4" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
+ <DataResource dataResourceId="RELATED_4" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2004-03-30 07:57:39.734" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.734" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:39.734" createdStamp="2004-03-30 07:57:39.734"/>
<ElectronicText dataResourceId="RELATED_4" lastUpdatedStamp="2004-03-30 07:57:39.694" createdStamp="2004-03-30 07:57:39.694">
<textData><![CDATA[
Shame on Al Byers.
@@ -58,7 +58,7 @@
get the idea that there are more important things in life than shooting for the stars.
]]></textData>
</ElectronicText>
- <Content contentId="RELATED_4" contentTypeId="DOCUMENT" ownerContentId="ECMC180001" dataResourceId="RELATED_4" statusId="BLOG_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Re:Future Directions in Rocket Launcher Widgets" description="Re:Future Directions in Rocket Launcher Widgets" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
+ <Content contentId="RELATED_4" contentTypeId="DOCUMENT" ownerContentId="ECMC180001" dataResourceId="RELATED_4" statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_BRONZE" contentName="Re:Future Directions in Rocket Launcher Widgets" description="Re:Future Directions in Rocket Launcher Widgets" createdDate="2004-03-30 07:57:39.671" createdByUserLogin="admin" lastModifiedDate="2004-03-30 07:57:39.671" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-30 07:57:53.174" createdStamp="2004-03-30 07:57:39.671"/>
<ContentAssoc contentId="RELATED_1" contentIdTo="ECMC180000" contentAssocTypeId="RELATED_CONTENT" fromDate="2004-03-01 12:00:00.000" createdDate="2004-03-01 12:00:00.000" createdByUserLogin="admin"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentaddprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentaddprep.bsh?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentaddprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentaddprep.bsh Mon Feb 19 11:53:06 2007
@@ -84,14 +84,14 @@
singleWrapper.putInContext("forumId", contentIdTo);
forumContent = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentIdTo));
-statusId = "BLOG_PUBLISHED";
+statusId = "CTNT_PUBLISHED";
if (forumContent != null) {
statusId = forumContent.getString("statusId");
if (UtilValidate.isEmpty(statusId)) {
statusId = page.get("statusId");
}
if (UtilValidate.isEmpty(statusId)) {
- statusId = "BLOG_PUBLISHED";
+ statusId = "CTNT_PUBLISHED";
}
}
singleWrapper.putInContext("statusId", statusId);
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/respondpermandprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/respondpermandprep.bsh?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/respondpermandprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/respondpermandprep.bsh Mon Feb 19 11:53:06 2007
@@ -64,7 +64,7 @@
contentToValue = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentIdTo));
contentToPurposeList = contentToValue.getRelatedCache("ContentPurpose");
-currentValue = delegator.makeValue("Content", UtilMisc.toMap("contentTypeId", "DOCUMENT", "statusId", "BLOG_PUBLISHED", "privilegeEnumId", "_00_"));
+currentValue = delegator.makeValue("Content", UtilMisc.toMap("contentTypeId", "DOCUMENT", "statusId", "CTNT_PUBLISHED", "privilegeEnumId", "_00_"));
if (contentToPurposeList.contains("RESPONSE")) {
ownerContentId = contentToValue.get("ownerContentId");
@@ -116,7 +116,7 @@
pubContentValue = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", pubPt));
if (pubContentValue != null) {
mapIn.put("currentContent", pubContentValue);
- mapIn.put("statusId", "BLOG_PUBLISHED");
+ mapIn.put("statusId", "CTNT_PUBLISHED");
}
//org.ofbiz.base.util.Debug.logInfo("in permprep(2), mapIn:" + mapIn, null);
result = dispatcher.runSync("checkContentPermission", mapIn);
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Feb 19 11:53:06 2007
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
@@ -1222,9 +1222,9 @@
<response name="success" type="view" value="MainBlog"/>
</request-map>
- <request-map uri="ViewBlog">
+ <request-map uri="ViewArticle">
<security https="false" auth="false"/>
- <response name="success" type="view" value="ViewBlog"/>
+ <response name="success" type="view" value="ViewArticle"/>
</request-map>
<request-map uri="ViewBlogRss">
@@ -1244,9 +1244,13 @@
<response name="success" type="view" value="LatestResponses"/>
</request-map>
- <request-map uri="EditBlog">
- <security https="false" auth="true"/>
- <response name="success" type="view" value="EditBlog"/>
+ <request-map uri="NewArticle">
+ <security auth="true"/>
+ <response name="success" type="view" value="NewArticle"/>
+ </request-map>
+ <request-map uri="EditArticle">
+ <security auth="true"/>
+ <response name="success" type="view" value="EditArticle"/>
</request-map>
<request-map uri="EditBlogImage">
@@ -1264,9 +1268,9 @@
<response name="success" type="view" value="RespondBlog"/>
</request-map>
- <request-map uri="persistBlogAll">
+ <request-map uri="createBlogArticle">
<security https="false" auth="true"/>
- <event type="service" path="" invoke="persistBlogAll"/>
+ <event type="service" invoke="postBlogEntry"/>
<response name="success" type="view" value="EditBlog"/>
<response name="error" type="view" value="EditBlog"/>
</request-map>
@@ -1291,10 +1295,16 @@
<response name="success" type="view" value="EditBlog"/>
<response name="error" type="view" value="EditBlog"/>
</request-map>
-
- <request-map uri="persistBlogResponse">
+
+ <request-map uri="createBlogResponse">
<security https="false" auth="true"/>
- <event type="service" path="" invoke="persistContentAndAssoc"/>
+ <event type="service" invoke="createTextContent"/>
+ <response name="success" type="view" value="ViewResponse"/>
+ <response name="error" type="view" value="ViewResponse"/>
+ </request-map>
+ <request-map uri="updateBlogResponse">
+ <security https="false" auth="true"/>
+ <event type="service" invoke="updateTextContent"/>
<response name="success" type="view" value="ViewResponse"/>
<response name="error" type="view" value="ViewResponse"/>
</request-map>
@@ -1611,8 +1621,9 @@
<!-- Blog Views -->
<view-map name="MainBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#MainBlog"/>
- <view-map name="ViewBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#ViewBlog"/>
- <view-map name="EditBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlog"/>
+ <view-map name="ViewArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#ViewArticle"/>
+ <view-map name="NewArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#NewArticle"/>
+ <view-map name="EditArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditArticle"/>
<view-map name="ViewResponse" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#ViewResponse"/>
<view-map name="RespondBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#RespondBlog"/>
<view-map name="EditBlogText" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogText"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl Mon Feb 19 11:53:06 2007
@@ -89,7 +89,7 @@
</td>
<td> </td>
<td width="60%" align="left"
- <textarea class="textAreaBox" class="inputBox" name="mainData" cols="60" rows="24">${textData?if_exists}</textarea>
+ <textarea class="textAreaBox" class="inputBox" name="textData" cols="60" rows="24">${textData?if_exists}</textarea>
</td>
<td width="10%" align="right">
<span class="treeHeader"> </span>
@@ -108,7 +108,7 @@
<td width="60%" align="left">
<div class="inputBox">Existing file name: <#if imageContent?has_content && imageContent.drObjectInfo?has_content>${imageContent.drObjectInfo}</#if></div>
<br/>
- <input type="file" class="inputBox" name="imageData" size="25"/>
+ <input type="file" class="inputBox" name="uploadedFile" size="25"/>
<#--
Force: <input type="checkbox" value="true" name="forceElectronicText"/>
-->
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl Mon Feb 19 11:53:06 2007
@@ -24,7 +24,7 @@
<div class="screenlet-body">
<#list blogs as blog>
<div class="browsecategorytext" style="margin-left: 10px">
- - <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
+ - <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
</div>
</#list>
</div>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml Mon Feb 19 11:53:06 2007
@@ -506,7 +506,7 @@
<ignored />
</field>
<field name="statusId" >
- <hidden value="BLOG_PUBLISHED"/>
+ <hidden value="CTNT_PUBLISHED"/>
</field>
<field name="contentAssocTypeId" >
<hidden value="RESPONSE"/>
@@ -563,7 +563,7 @@
<ignored />
</field>
<field name="statusId" >
- <hidden value="BLOG_PUBLISHED"/>
+ <hidden value="CTNT_PUBLISHED"/>
</field>
<field name="contentAssocTypeId" >
<hidden value="RESPONSE"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/bloglib.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/bloglib.ftl?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/bloglib.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/bloglib.ftl Mon Feb 19 11:53:06 2007
@@ -36,7 +36,7 @@
viewIndex=viewIdx
viewSize=viewSz
contentAssocTypeId="PUBLISH_LINK"
- pickWhen="purposes.contains(\"ARTICLE\") && \"BLOG_PUBLISHED\".equals(content.get(\"statusId\"))"
+ pickWhen="purposes.contains(\"ARTICLE\") && \"CTNT_PUBLISHED\".equals(content.get(\"statusId\"))"
returnAfterPickWhen="purposes.contains(\"ARTICLE\")"
followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"never follow\")"
>
@@ -102,19 +102,19 @@
<#if pageTargOp?has_content>
<#assign targOp=pageTargOp/>
</#if>
-<@checkPermission mode="equals" entityOperation="_CREATE" subContentId=contentDept statusId="BLOG_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx>
+<@checkPermission mode="equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx>
<tr><td align="right">
<a class="tabButton" style="height:14pt;" href="<@o...@ofbizUrl>" >${uiLabelMap.ProductNewArticle}</a>
</td></tr>
</...@checkPermission>
-<@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentDept statusId="BLOG_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx>
+<@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx>
<tr><td class="tabletext" align="right">
${uiLabelMap.EcommerceLoggedToPost}
</td></tr>
</...@checkPermission>
</table>
<#--
-<@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentIdx statusId="BLOG_PUBLISHED" targetOperation="HAS_USER_ROLE" contentPurposeList="ARTICLE">
+<@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentIdx statusId="CTNT_PUBLISHED" targetOperation="HAS_USER_ROLE" contentPurposeList="ARTICLE">
${permissionErrorMsg?if_exists}
</...@checkPermission>
-->
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/mostrecent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/mostrecent.ftl?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/mostrecent.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/mostrecent.ftl Mon Feb 19 11:53:06 2007
@@ -43,11 +43,11 @@
</td>
<td class="tabletext">
<b>${uiLabelMap.CommonSubmitted}:</b>
- <input type="radio" name="statusId_o_${row}" value="BLOG_SUBMITTED" checked/>
+ <input type="radio" name="statusId_o_${row}" value="CTNT_IN_PROGRESS" checked/>
</td>
<td class="tabletext">
<b>${uiLabelMap.CommonPublish}:</b>
- <input type="radio" name="statusId_o_${row}" value="BLOG_PUBLISHED"/>
+ <input type="radio" name="statusId_o_${row}" value="CTNT_PUBLISHED"/>
</td>
</tr>
<input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml Mon Feb 19 11:53:06 2007
@@ -38,7 +38,7 @@
<property name="entityOperation">_VIEW</property>
<property name="targetOperation">CONTENT_VIEW</property>
<property name="contentPurposeTypeId">RESPONSE</property>
- <property name="statusId">BLOG_PUBLISHED</property>
+ <property name="statusId">CTNT_PUBLISHED</property>
<property name="permissionType">complex</property>
<page-action name="/includes/currentvalprep.bsh"/>
<page-action name="/includes/permprep.bsh"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css Mon Feb 19 11:53:06 2007
@@ -78,9 +78,27 @@
text-align: center;
}
+/*
.rightjustify {
+float: right;
padding-left: 5px;
display: inline;
+vertical-align: top;
+text-align: right;
+width: 100%;
+height: 100%;
+}
+*/
+.rightjustify {
+display: inline;
+vertical-align: text-top;
+float: right;
+}
+
+.leftjustify {
+display: inline;
+vertical-align: text-top;
+float: left;
}
.blogheader {
@@ -102,11 +120,16 @@
background: #fffeee;
}
-.blogtitle {
+.blogtitle, A.blogtitle {
+color: white;
font-weight: bold;
text-align: left;
text-decoration: none;
display: inline;
+}
+
+A.blogtitle:hover {
+text-decoration: underline;
}
.blogtitleboxed {
Modified: ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml Mon Feb 19 11:53:06 2007
@@ -196,7 +196,7 @@
<set field="targetOperation" value="CONTENT_UPDATE"/>
<set field="contentTypeId" value="DOCUMENT"/>
<set field="contentPurposeTypeId" value="ARTICLE"/>
- <set field="statusId" value="BLOG_PUBLISHED"/>
+ <set field="statusId" value="CTNT_PUBLISHED"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/nodetrailprep.bsh"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/permprep.bsh"/>
@@ -244,7 +244,7 @@
<set field="entityOperation" value="_VIEW"/>
<set field="targetOperation" value="CONTENT_VIEW"/>
<set field="contentPurposeTypeId" value="RESPONSE"/>
- <set field="statusId" value="BLOG_PUBLISHED"/>
+ <set field="statusId" value="CTNT_PUBLISHED"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/permprep.bsh"/>
@@ -293,7 +293,7 @@
<set field="requiredRoles" value="BLOG_AUTHOR|BLOG_EDITOR|BLOG_ADMIN|BLOG_PUBLISHER"/>
<set field="contentPurposeTypeId" value="RESPONSE"/>
<set field="contentAssocTypeId" value="RESPONSE"/>
- <set field="statusId" value="BLOG_PUBLISHED"/>
+ <set field="statusId" value="CTNT_PUBLISHED"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/htmlareaprep.bsh"/>
@@ -334,7 +334,7 @@
<set field="targetOperation" value="CONTENT_UPDATE"/>
<set field="requiredRoles" value="BLOG_AUTHOR|BLOG_EDITOR|BLOG_ADMIN|BLOG_PUBLISHER"/>
<set field="contentPurposeTypeId" value="ARTICLE"/>
- <set field="statusId" value="BLOG_PUBLISHED"/>
+ <set field="statusId" value="CTNT_PUBLISHED"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/permprep.bsh"/>
@@ -381,7 +381,7 @@
<set field="requiredRoles" value="OWNER|BLOG_AUTHOR|BLOG_EDITOR|BLOG_ADMIN|BLOG_PUBLISHER"/>
<set field="contentPurposeTypeId" value="ARTICLE"/>
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
- <set field="statusId" value="BLOG_PUBLISHED"/>
+ <set field="statusId" value="CTNT_PUBLISHED"/>
<set field="mainMenuDefFile" value="/AgepsMenus.xml"/>
<set field="mainMenuName" value="main"/>
@@ -434,7 +434,7 @@
<set field="requiredRoles" value="OWNER|BLOG_AUTHOR|BLOG_EDITOR|BLOG_ADMIN|BLOG_PUBLISHER"/>
<set field="contentPurposeTypeId" value="ARTICLE"/>
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
- <set field="statusId" value="BLOG_PUBLISHED"/>
+ <set field="statusId" value="CTNT_PUBLISHED"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/permprep.bsh"/>
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml Mon Feb 19 11:53:06 2007
@@ -77,7 +77,7 @@
</field>
</form>
- <form name="AddBlogResponse" target="persistBlogResponse" title="" type="single" default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <form name="AddBlogResponse" target="createBlogResponse" title="" type="single" default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-entity entity-name="ContentAssocDataResourceViewTo" default-field-type="hidden" map-name="rsp"/>
<field name="contentName" title="Short title" entry-name="contentName" map-name="rsp">
<text size="40"/>
@@ -85,7 +85,19 @@
<field name="description" title="Description (250 chars max)" map-name="rsp">
<textarea cols="40" rows="6"/>
</field>
- <field name="contentId" entry-name="contentId" map-name="rsp">
+ <field name="textData" title="Response" map-name="rsp" widget-style="inputBox dojo-ResizableTextArea">
+ <textarea cols="60" rows="12"/>
+ </field>
+ <field name="statusId">
+ <radio no-current-selected-key="CTNT_INITIAL_DRAFT">
+ <option key="CTNT_PUBLISHED" description="POST"/>
+ <option key="CTNT_INITIAL_DRAFT" description="PREVIEW"/>
+ </radio>
+ </field>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ <field name="blogContentId" entry-name="blogContentId" map-name="rsp">
<hidden/>
</field>
<field name="articleContentId" entry-name="articleContentId" map-name="rsp">
@@ -94,40 +106,26 @@
<field name="ownerContentId" entry-name="ownerContentId" map-name="rsp">
<hidden/>
</field>
- <field name="caContentId" entry-name="caContentId" map-name="rsp">
+ <field name="contentIdFrom" entry-name="contentIdFrom" map-name="rsp">
<hidden/>
</field>
- <!--
- <field name="contentContentId" entry-name="caContentIdTo" map-name="rsp">
- <hidden/>
- </field>
- -->
<field name="contentTypeId" entry-name="contentTypeId" map-name="rsp">
<hidden/>
</field>
- <field name="drDataResourceTypeId" entry-name="drDataResourceTypeId" map-name="rsp">
+ <field name="contentAssocTypeId" entry-name="contentAssocTypeId" map-name="rsp">
<hidden/>
</field>
- <field name="caContentAssocTypeId" entry-name="caContentAssocTypeId" map-name="rsp">
+ <field name="dataResourceTypeId" entry-name="dataResourceTypeId" map-name="rsp">
<hidden/>
</field>
- <field name="textData" title="Response" map-name="rsp">
- <textarea cols="60" rows="12"/>
- </field>
- <field name="statusId">
- <radio no-current-selected-key="BLOG_DRAFT">
- <option key="BLOG_PUBLISHED" description="POST"/>
- <option key="BLOG_DRAFT" description="PREVIEW"/>
- </radio>
- </field>
- <field name="submitButton" title="Submit" widget-style="smallSubmit">
- <submit button-type="button"/>
+ <field name="contentPurposeTypeId" entry-name="contentPurposeTypeId" map-name="rsp">
+ <hidden/>
</field>
- <field name="deactivateExisting">
- <hidden value="false"/>
+ <field name="contentOperationId" entry-name="contentOperationId" map-name="rsp">
+ <hidden/>
</field>
- <field name="contentPurposeString">
- <hidden value="RESPONSE"/>
+ <field name="partyId" entry-name="partyId" map-name="userLogin">
+ <hidden/>
</field>
<sort-order>
<sort-field name="contentName"/>
@@ -138,7 +136,7 @@
</sort-order>
</form>
- <form name="EditBlogResponse" target="persistBlogResponse" title="" type="single" default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <form name="EditBlogResponse" target="updateBlogResponse" title="" type="single" default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-entity entity-name="Content" default-field-type="hidden" map-name="content"/>
<auto-fields-entity entity-name="DataResource" default-field-type="hidden" map-name="dataResource"/>
<field name="contentName" title="Short title" entry-name="contentName" map-name="rsp">
@@ -153,23 +151,29 @@
<field name="articleContentId" entry-name="articleContentId" map-name="rsp">
<hidden/>
</field>
- <field name="textData" title="Response" map-name="electronicText">
+ <field name="textData" title="Response" map-name="electronicText" widget-style="inputBox dojo-ResizableTextArea">
<textarea cols="60" rows="12"/>
</field>
<field name="statusId">
- <radio no-current-selected-key="BLOG_DRAFT">
- <option key="BLOG_PUBLISHED" description="POST"/>
- <option key="BLOG_DRAFT" description="PREVIEW"/>
+ <radio no-current-selected-key="CTNT_INITIAL_DRAFT">
+ <option key="CTNT_PUBLISHED" description="POST"/>
+ <option key="CTNT_INITIAL_DRAFT" description="PREVIEW"/>
</radio>
</field>
<field name="submitButton" title="Submit" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
- <field name="deactivateExisting">
- <hidden value="true"/>
+ <field name="blogContentId" entry-name="blogContentId" map-name="rsp">
+ <hidden/>
</field>
- <field name="contentPurposeString">
- <hidden value="RESPONSE"/>
+ <field name="contentPurposeTypeId" entry-name="contentPurposeTypeId" map-name="rsp">
+ <hidden/>
+ </field>
+ <field name="contentOperationId" entry-name="contentOperationId" map-name="rsp">
+ <hidden/>
+ </field>
+ <field name="partyId" entry-name="partyId" map-name="userLogin">
+ <hidden/>
</field>
<sort-order>
<sort-field name="contentId"/>
@@ -181,198 +185,109 @@
</sort-order>
</form>
- <form name="EditBlogAll" target="persistBlogAll" title="" type="upload" default-title-style="treeHeader" skip-end="true" default-tooltip-style="tabletext" default-widget-style="inputBox">
- <field name="contentIdStart" map-name="view">
- <hidden/>
- </field>
- <field name="caContentId" map-name="view">
- <hidden/>
- </field>
- <field name="caContentIdTo" map-name="view">
- <hidden/>
- </field>
- <field name="caContentAssocTypeId" map-name="view">
- <hidden/>
- </field>
- <field name="caFromDate" map-name="view">
- <hidden/>
- </field>
- <field name="caThruDate" map-name="view">
- <hidden/>
- </field>
- <field name="caContentAssocPredicateId" map-name="view">
- <hidden/>
- </field>
- <field name="caDataSourceId" map-name="view">
- <hidden/>
- </field>
- <field name="caSequenceNum" map-name="view">
- <hidden/>
- </field>
- <field name="caMapKey" map-name="view">
- <hidden/>
- </field>
- <field name="caUpperCoordinate" map-name="view">
- <hidden/>
- </field>
- <field name="caLeftCoordinate" map-name="view">
- <hidden/>
- </field>
- <field name="caCreatedDate" map-name="view">
- <hidden/>
- </field>
- <field name="caCreatedByUserLogin" map-name="view">
- <hidden/>
- </field>
- <field name="caLastModifiedDate" map-name="view">
- <hidden/>
- </field>
- <field name="caLastModifiedByUserLogin" map-name="view">
- <hidden/>
- </field>
- <field name="contentTypeId" map-name="view">
- <hidden/>
- </field>
- <field name="ownerContentId" map-name="view">
- <hidden/>
- </field>
- <field name="instanceOfContentId" map-name="view">
- <hidden/>
- </field>
- <field name="dataResourceId" map-name="view">
- <hidden/>
- </field>
- <field name="templateDataResourceId" map-name="view">
- <hidden/>
- </field>
- <field name="dataSourceId" map-name="view">
- <hidden/>
- </field>
- <field name="privilegeEnumId" map-name="view">
- <hidden/>
- </field>
- <field name="serviceName" map-name="view">
- <hidden/>
- </field>
- <field name="localeString" map-name="view">
- <hidden/>
- </field>
- <field name="mimeTypeId" map-name="view">
- <hidden/>
- </field>
- <field name="characterSetId" map-name="view">
- <hidden/>
- </field>
- <field name="childLeafCount" map-name="view">
- <hidden/>
- </field>
- <field name="childBranchCount" map-name="view">
- <hidden/>
- </field>
- <field name="createdDate" map-name="view">
- <hidden/>
- </field>
- <field name="createdByUserLogin" map-name="view">
- <hidden/>
- </field>
- <field name="lastModifiedDate" map-name="view">
- <hidden/>
- </field>
- <field name="lastModifiedByUserLogin" map-name="view">
- <hidden/>
- </field>
- <field name="drDataResourceId" map-name="view">
- <hidden/>
- </field>
- <field name="drDataResourceTypeId" map-name="view">
- <hidden/>
- </field>
- <field name="drDataTemplateTypeId" map-name="view">
- <hidden/>
- </field>
- <field name="drDataCategoryId" map-name="view">
- <hidden/>
- </field>
- <field name="drDataSourceId" map-name="view">
- <hidden/>
- </field>
- <field name="drStatusId" map-name="view">
- <hidden/>
- </field>
- <field name="drDataResourceName" map-name="view">
- <hidden/>
- </field>
- <field name="drLocaleString" map-name="view">
- <hidden/>
+ <form name="CreateArticle" target="createBlogArticle" title="" type="upload" default-title-style="treeHeader" skip-end="true" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <field name="contentName" title="Short title">
+ <text size="40"/>
</field>
- <field name="drMimeTypeId" map-name="view">
- <hidden/>
+ <field name="description" title="Slightly longer title (250 chars max)">
+ <textarea cols="40" rows="2"/>
</field>
- <field name="drCharacterSetId" map-name="view">
- <hidden/>
+ <field name="summaryData" title="Summary" widget-style="inputBox dojo-ResizableTextArea">
+ <textarea cols="60" rows="4"/>
</field>
- <field name="drObjectInfo" map-name="view">
- <hidden/>
+ <field name="textData" title="Article" widget-style="inputBox dojo-ResizableTextArea">
+ <textarea cols="60" rows="12"/>
</field>
- <field name="drRelatedDetailId" map-name="view">
- <hidden/>
+ <field name="uploadedFile" title="Image">
+ <file size="25"/>
</field>
- <field name="drIsPublic" map-name="view">
- <hidden/>
+ <field name="dataResourceId" title="Template">
+ <drop-down allow-empty="true">
+ <option key="BLOG_TPL_TOPLEFT" description="Top Left"/>
+ <option key="BLOG_TPL_TOPCENTER" description="Top Center"/>
+ </drop-down>
+ </field>
+ <field name="statusId" title="Status">
+ <drop-down no-current-selected-key="CTNT_INITIAL_DRAFT">
+ <option key="CTNT_PUBLISHED" description="Publish"/>
+ <option key="CTNT_INITIAL_DRAFT" description="Preview"/>
+ </drop-down>
</field>
- <field name="drCreatedDate" map-name="view">
- <hidden/>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit">
+ <submit button-type="button"/>
</field>
- <field name="drCreatedByUserLogin" map-name="view">
- <hidden/>
+ <field name="contentPurposeString">
+ <hidden value="ARTICLE"/>
</field>
- <field name="drLastModifiedDate" map-name="view">
- <hidden/>
+ <field name="contentAssocTypeId">
+ <hidden value="PUBLISH_LINK"/>
</field>
- <field name="drLastModifiedByUserLogin" map-name="view">
+ <field name="blogContentId" entry-name="blogContentId">
<hidden/>
</field>
- <field name="deactivateExisting" map-name="view">
+ <field name="contentIdFrom" entry-name="blogContentId">
<hidden/>
</field>
- <field name="contentPurposeString" map-name="view">
- <hidden/>
+ <sort-order>
+ <sort-field name="contentName"/>
+ <sort-field name="description"/>
+ <sort-field name="summaryData"/>
+ <sort-field name="textData"/>
+ <sort-field name="uploadedFile"/>
+ <sort-field name="dataResourceId"/>
+ <sort-field name="statusId"/>
+ <sort-field name="submitButton"/>
+ </sort-order>
+ </form>
+
+ <form name="EditArticle" target="updateBlogArticle" title="" type="upload" default-title-style="treeHeader" skip-end="true" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <field name="contentId" entry-name="articleContentId" title="Blog ID" use-when="contentId!=null||contentId==""">
+ <display/>
</field>
- <field name="contentName" title="Short title" map-name="view">
+ <field name="contentName" title="Short title" map-name="content">
<text size="40"/>
</field>
- <field name="description" title="Slightly longer title (250 chars max)" map-name="view">
+ <field name="description" title="Slightly longer title (250 chars max)" map-name="content">
<textarea cols="40" rows="2"/>
</field>
- <field name="contentId" title="Blog ID" map-name="parameters" use-when="contentId!=null">
- <display/>
- </field>
- <field name="summaryData" title="Summary" entry-name="textData" map-name="summaryText">
+ <field name="summaryData" title="Summary" map-name="summaryText" entry-name="textData" widget-style="inputBox dojo-ResizableTextArea">
<textarea cols="60" rows="4"/>
</field>
- <!--
- <field name="textData" title="Article" map-name="electronicText">
+ <field name="textData" title="Article" map-name="mainText" widget-style="inputBox dojo-ResizableTextArea">
<textarea cols="60" rows="12"/>
</field>
- -->
- <field name="statusId">
- <radio no-current-selected-key="BLOG_DRAFT">
- <option key="BLOG_PUBLISHED" description="POST"/>
- <option key="BLOG_DRAFT" description="PREVIEW"/>
- </radio>
+ <field name="uploadedFile" title="Image">
+ <file size="25"/>
</field>
- <field name="deactivateExisting">
- <hidden value="false"/>
+ <field name="dataResourceId" title="Template" map-name="content">
+ <drop-down allow-empty="true">
+ <option key="BLOG_TPL_TOPLEFT" description="Top Left"/>
+ <option key="BLOG_TPL_TOPCENTER" description="Top Center"/>
+ </drop-down>
+ </field>
+ <field name="statusId" title="Status" map-name="content">
+ <drop-down no-current-selected-key="CTNT_INITIAL_DRAFT">
+ <option key="CTNT_PUBLISHED" description="Publish"/>
+ <option key="CTNT_INITIAL_DRAFT" description="Preview"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit">
+ <submit button-type="button"/>
</field>
<field name="contentPurposeString">
<hidden value="ARTICLE"/>
</field>
+ <field name="blogContentId" entry-name="blogContentId">
+ <hidden/>
+ </field>
<sort-order>
<sort-field name="contentId"/>
<sort-field name="contentName"/>
<sort-field name="description"/>
<sort-field name="summaryData"/>
<sort-field name="textData"/>
+ <sort-field name="uploadedFile"/>
+ <sort-field name="dataResourceId"/>
<sort-field name="statusId"/>
<sort-field name="submitButton"/>
</sort-order>
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml Mon Feb 19 11:53:06 2007
@@ -22,7 +22,7 @@
<menu name="view_edit" default-title-style="tabButton" default-selected-style="tabButtonSelected" default-menu-item-name="all" orientation="horizontal" menu-width="100%" default-tooltip-style="tabletext" default-widget-style="tabButton" menu-container-style="blogmenuwrapper" title="" type="simple">
<menu-item name="view" title="View">
<!--<link text="View" target="ViewBlog?articleContentId=${blog.contentId}&ownerContentId=${blog.ownerContentId}" style="tabButton" />-->
- <link text="View" target="ViewBlog?articleContentId=${blog.contentId}&caContentId=${blog.contentIdStart}&caContentIdTo=${blog.caContentIdTo}&contentId=${blog.contentId}&caContentAssocTypeId=${blog.caContentAssocTypeId}&caFromDate=${blog.caFromDate}&drDataResourceId=${blog.dataResourceId}" style="buttontext" url-mode="inter-app"/>
+ <link text="View" target="ViewArticle?articleContentId=${blog.contentId}&blogContentId=${blog.contentIdStart}" style="buttontext" url-mode="inter-app"/>
</menu-item>
<menu-item name="edit" title="Edit">
<condition>
@@ -31,7 +31,7 @@
<if-entity-permission entity-id="${blog.contentId}" entity-name="Content" target-operation="CONTENT_UPDATE"/>
</or>
</condition>
- <link text="Edit" target="EditBlog?caContentId=${blog.contentIdStart}&caContentIdTo=${blog.caContentIdTo}&contentId=${blog.contentId}&caContentAssocTypeId=${blog.caContentAssocTypeId}&caFromDate=${blog.caFromDate}&drDataResourceId=${blog.dataResourceId}" style="buttontext" url-mode="inter-app"/>
+ <link text="Edit" target="EditArticle?articleContentId=${blog.contentId}&blogContentId=${blog.contentIdStart}" style="buttontext" url-mode="inter-app"/>
</menu-item>
</menu>
</menus>