[OFBiz] SVN: r7648 - in trunk/applications/content: webapp/content/content widget widget/content
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Sun May 21 01:09:46 CDT 2006
Author: hansbak
Date: 2006-05-21 01:09:25 -0500 (Sun, 21 May 2006)
New Revision: 7648
Modified:
trunk/applications/content/webapp/content/content/ContentForms.xml
trunk/applications/content/widget/CommonScreens.xml
trunk/applications/content/widget/ContentMenus.xml
trunk/applications/content/widget/content/ContentScreens.xml
Log:
make the lower level content menus buttons etc work....
Modified: trunk/applications/content/webapp/content/content/ContentForms.xml
===================================================================
--- trunk/applications/content/webapp/content/content/ContentForms.xml 2006-05-21 04:33:10 UTC (rev 7647)
+++ trunk/applications/content/webapp/content/content/ContentForms.xml 2006-05-21 06:09:25 UTC (rev 7648)
@@ -113,9 +113,8 @@
</field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
- <entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/>
- <entity-order-by field-name="sequenceId"/>
+ <entity-options description="${description}" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS "/>
</entity-options>
</drop-down>
</field>
@@ -167,16 +166,15 @@
</field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+ <entity-options description="${description}" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS "/>
+ </entity-options>
</drop-down>
</field>
<field name="createdByUserLogin" position="1"><display/></field>
<field name="createdDate" position="2"><display/></field>
<field name="lastModifiedByUserLogin" position="1"><display/></field>
<field name="lastModifiedDate" position="2"><display/></field>
- <field name="findContent" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Find" target="FindContent"/>
- </field>
</form>
Modified: trunk/applications/content/widget/CommonScreens.xml
===================================================================
--- trunk/applications/content/widget/CommonScreens.xml 2006-05-21 04:33:10 UTC (rev 7647)
+++ trunk/applications/content/widget/CommonScreens.xml 2006-05-21 06:09:25 UTC (rev 7648)
@@ -69,6 +69,20 @@
<decorator-screen name="mainContentDecorator">
<decorator-section name="body">
<include-menu name="content" location="component://content/widget/ContentMenus.xml"/>
+ <container>
+ <include-menu name="contentSub" location="component://content/widget/ContentMenus.xml"/>
+ </container>
+ <section>
+ <condition>
+ <not><if-empty field-name="currentValue.contentId"/></not>
+ </condition>
+ <widgets>
+ <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.contentName},${currentValue.description} [${currentValue.contentId}] ${uiLabelMap.${extraFunctionName}}"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head1" text="${uiLabelMap.${titleProperty}}"/>
+ </fail-widgets>
+ </section>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
Modified: trunk/applications/content/widget/ContentMenus.xml
===================================================================
--- trunk/applications/content/widget/ContentMenus.xml 2006-05-21 04:33:10 UTC (rev 7647)
+++ trunk/applications/content/widget/ContentMenus.xml 2006-05-21 06:09:25 UTC (rev 7648)
@@ -53,48 +53,34 @@
default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
default-permission-entity-action="_ADMIN"
default-associated-content-id="${userLogin.userLoginId}"
- selected-menuitem-context-field-name="currentMenuItemName"
+ selected-menuitem-context-field-name="tabButtonItem"
title="" type="simple">
- <menu-item name="NewContent" title="Create New" widget-style="buttontext" >
+ <menu-item name="content" title="Content" >
<condition>
- <if-empty field-name="content.contentId"/>
+ <not><if-empty field-name="currentValue.contentId"/></not>
</condition>
- <link target="EditContent?contentId=${contentId}"/>
+ <link target="EditContent?contentId=${parameters.contentId}"/>
</menu-item>
-
- <menu-item name="EditContent" title="Content" >
- <condition>
- <not><if-empty field-name="content.contentId"/></not>
- </condition>
- <link target="EditContent?contentId=${contentId}"/>
- </menu-item>
- <menu-item name="AddContent" title="Content" >
+ <menu-item name="association" title="Association" >
<condition>
- <not><if-empty field-name="content.contentId"/></not>
+ <not><if-empty field-name="currentValue.contentId"/></not>
</condition>
- <link target="AddContent"/>
+ <link target="EditContentAssoc?contentId=${parameters.contentId}"/>
</menu-item>
- <menu-item name="contentassoc" title="Association" >
- <condition>
- <not><if-empty field-name="content.contentId"/></not>
- </condition>
- <link target="EditContentAssoc?contentId=${contentId}"/>
- </menu-item>
-
<menu-item name="role" title="Role" >
<condition>
- <not><if-empty field-name="content.contentId"/></not>
+ <not><if-empty field-name="currentValue.contentId"/></not>
</condition>
- <link target="EditContentRole?contentId=${contentId}"/>
+ <link target="EditContentRole?contentId=${parameters.contentId}"/>
</menu-item>
<menu-item name="purpose" title="Purpose" >
<condition>
<not>
- <if-empty field-name="content.contentId" />
+ <if-empty field-name="currentValue.contentId" />
</not>
</condition>
<link target="EditContentPurpose?contentId=${contentId}"/>
@@ -102,18 +88,37 @@
<menu-item name="attribute" title="Attribute" >
<condition>
- <not><if-empty field-name="content.contentId"/></not>
+ <not><if-empty field-name="currentValue.contentId"/></not>
</condition>
<link target="EditContentAttribute?contentId=${contentId}"/>
</menu-item>
- <menu-item name="metadata" title="Metadata" >
+ <menu-item name="metaData" title="Metadata" >
<condition>
- <not><if-empty field-name="content.contentId"/></not>
+ <not><if-empty field-name="currentValue.contentId"/></not>
</condition>
<link target="EditContentMetaData?contentId=${contentId}"/>
</menu-item>
</menu>
-
+ <menu name="contentSub" default-title-style="buttontext"
+ default-selected-style="tabButtonSelected"
+ default-menu-item-name="content"
+ orientation="horizontal"
+ menu-width="100%"
+ default-tooltip-style="tabletext" default-widget-style="buttontext"
+ default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
+ default-permission-entity-action="_ADMIN"
+ default-associated-content-id="${userLogin.userLoginId}"
+ selected-menuitem-context-field-name="currentMenuItemName"
+ title="" type="simple">
+
+ <menu-item name="NewContent" title="${uiLabelMap.CommonCreateNew}">
+ <condition>
+ <not><if-empty field-name="currentValue.contentId"/></not>
+ </condition>
+ <link target="AddContent"/>
+ </menu-item>
+ </menu>
+
</menus>
Modified: trunk/applications/content/widget/content/ContentScreens.xml
===================================================================
--- trunk/applications/content/widget/content/ContentScreens.xml 2006-05-21 04:33:10 UTC (rev 7647)
+++ trunk/applications/content/widget/content/ContentScreens.xml 2006-05-21 06:09:25 UTC (rev 7648)
@@ -32,8 +32,9 @@
<set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
- <decorator-screen name="commonContentDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <container><link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
<label style="head1" text="${uiLabelMap.PageTitleFindContent}"></label>
<include-form name="FindContent" location="component://content/webapp/content/content/ContentForms.xml"/>
<label style="head1" text="Content List"></label>
@@ -49,17 +50,15 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="Content Edit Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentContentMenuItemName" value="EditContent" to-scope="user"/>
- <set field="contentId" from-field="parameters.contentId" />
+ <set field="tabButtonItem" value="content"/>
<entity-one entity-name="Content" value-name="currentValue">
- <field-map field-name="contentId" env-name="contentId"/>
+ <field-map field-name="contentId" env-name="parameters.contentId"/>
</entity-one>
</actions>
<widgets>
- <decorator-screen name="commonContentDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditContent" location="component://content/webapp/content/content/ContentForms.xml"/>
</decorator-section>
@@ -74,13 +73,12 @@
</condition>
<actions>
<set field="headerItem" value="Content"/>
- <script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="CMS Content Edit Page"/>
- <set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentContentMenuItemName" value="AddContent" to-scope="user"/>
+ <set field="titleProperty" value="PageTitleAddContent"/>
+ <set field="tabButtonItem" value="content"/>
</actions>
<widgets>
- <decorator-screen name="commonContentDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="AddContent" location="component://content/webapp/content/content/ContentForms.xml"/>
</decorator-section>
@@ -94,24 +92,24 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="Content Edit Page"/>
- <set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentContentMenuItemName" value="contentassoc" to-scope="user"/>
-
+ <set field="titleProperty" value="PageTitleAssociations"/>
+ <set field="extraFunctionName" value="'From'"/>
+ <set field="tabButtonItem" value="association"/>
<set field="contentId" from-field="parameters.contentId" />
-
<set field="contentIdTo" from-field="parameters.contentIdTo" />
-
<set field="contentAssocTypeId" from-field="parameters.contentAssocTypeId" default-value="${defaultContentAssocTypeId}"/>
<set field="contentAssocTypeId" from-field="contentAssocTypeId" to-scope="user"/>
-
<set field="fromDate" from-field="parameters.fromDate" />
+ <entity-one entity-name="Content" value-name="currentValue">
+ <field-map field-name="contentId" env-name="parameters.contentId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="commonContentDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentAssocFrom" location="component://content/webapp/content/content/ContentForms.xml"/>
+ <label style="head1" text="List associations 'to'"></label>
<include-form name="ListContentAssocTo" location="component://content/webapp/content/content/ContentForms.xml"/>
<section>
<condition>
@@ -123,6 +121,7 @@
</and>
</condition>
<widgets>
+ <label style="head1" text="Add an association"></label>
<include-form name="EditContentAssoc" location="component://content/webapp/content/content/ContentForms.xml"/>
</widgets>
</section>
@@ -136,6 +135,7 @@
</or>
</condition>
<widgets>
+ <label style="head1" text="Add an association"></label>
<include-form name="AddContentAssoc" location="component://content/webapp/content/content/ContentForms.xml"/>
</widgets>
</section>
@@ -154,15 +154,19 @@
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="Content Edit Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentContentMenuItemName" value="role" to-scope="user"/>
+ <set field="tabButtonItem" value="role"/>
<set field="contentId" from-field="parameters.contentId" />
<set field="contentRoleTarget" value=""/>
+ <entity-one entity-name="Content" value-name="currentValue">
+ <field-map field-name="contentId" env-name="parameters.contentId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="commonContentDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentRole" location="component://content/webapp/content/content/ContentForms.xml"/>
+ <label style="head1" text="Add a Role"></label>
<include-form name="AddContentRole" location="component://content/webapp/content/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -179,14 +183,17 @@
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="Content Edit Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentContentMenuItemName" value="purpose" to-scope="user"/>
-
+ <set field="tabButtonItem" value="purpose"/>
<set field="contentId" from-field="parameters.contentId" />
+ <entity-one entity-name="Content" value-name="currentValue">
+ <field-map field-name="contentId" env-name="parameters.contentId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="commonContentDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentPurpose" location="component://content/webapp/content/content/ContentForms.xml"/>
+ <label style="head1" text="Add a purpose"></label>
<include-form name="AddContentPurpose" location="component://content/webapp/content/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -203,14 +210,17 @@
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="Content Edit Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentContentMenuItemName" value="attribute" to-scope="user"/>
-
+ <set field="tabButtonItem" value="attribute"/>
<set field="contentId" from-field="parameters.contentId" />
+ <entity-one entity-name="Content" value-name="currentValue">
+ <field-map field-name="contentId" env-name="parameters.contentId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="commonContentDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentAttribute" location="component://content/webapp/content/content/ContentForms.xml"/>
+ <label style="head1" text="Add an attribute"></label>
<include-form name="AddContentAttribute" location="component://content/webapp/content/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -228,13 +238,17 @@
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="Content Edit Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentContentMenuItemName" value="metadata" to-scope="user"/>
+ <set field="tabButtonItem" value="metaData"/>
<set field="contentId" from-field="parameters.contentId" />
+ <entity-one entity-name="Content" value-name="currentValue">
+ <field-map field-name="contentId" env-name="parameters.contentId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="commonContentDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentMetaData" location="component://content/webapp/content/content/ContentForms.xml"/>
+ <label style="head1" text="Add a metadata"></label>
<include-form name="AddContentMetaData" location="component://content/webapp/content/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -255,7 +269,7 @@
<set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
- <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-screen name="LookupDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="lookupContent" location="component://content/webapp/content/content/ContentForms.xml"/>
<include-form name="listLookupContent" location="component://content/webapp/content/content/ContentForms.xml"/>
More information about the Svn
mailing list