Author: buscob
Date: Sat Oct 24 20:20:18 2009
New Revision: 829443
URL: http://svn.apache.org/viewvc?rev=829443&view=rev
Log:
Part of OFBIZ-3067 - Menus and form widget files location
Ecommerce, Webtools and hhfacility components
Moved forms from webapp to widget folder
Removed empty folders
Added:
ofbiz/trunk/framework/webtools/widget/LogForms.xml
- copied unchanged from r829437,
ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml
ofbiz/trunk/framework/webtools/widget/ServiceForms.xml
- copied unchanged from r829437,
ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml
ofbiz/trunk/framework/webtools/widget/tempExprForms.xml
- copied unchanged from r829437,
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml
- copied unchanged from r829437,
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/ContentForms.xml
ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml
- copied unchanged from r829437,
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
Removed:
ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml
ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/ContentForms.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/
Modified:
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml
ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=829443&r1=829442&r2=829443&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sat Oct 24 20:20:18
2009
@@ -76,13 +76,13 @@
<decorator-screen name="log-decorator">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.WebtoolsDebuggingLevelFormDescription}">
- <include-form name="LevelSwitch"
location="component://webtools/webapp/webtools/log/LogForms.xml"/>
+ <include-form name="LevelSwitch"
location="component://webtools/widget/LogForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.WebtoolsAddLoggerFormDescription}">
- <include-form name="AddLogger"
location="component://webtools/webapp/webtools/log/LogForms.xml"/>
+ <include-form name="AddLogger"
location="component://webtools/widget/LogForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.WebtoolsLoggerListFormDescription}">
- <include-form name="LoggerList"
location="component://webtools/webapp/webtools/log/LogForms.xml"/>
+ <include-form name="LoggerList"
location="component://webtools/widget/LogForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=829443&r1=829442&r2=829443&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Sat Oct 24
20:20:18 2009
@@ -60,10 +60,10 @@
<widgets>
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="FindJobs"
location="component://webtools/webapp/webtools/service/ServiceForms.xml"/>
+ <include-form name="FindJobs"
location="component://webtools/widget/ServiceForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListJobs"
location="component://webtools/webapp/webtools/service/ServiceForms.xml"/>
+ <include-form name="ListJobs"
location="component://webtools/widget/ServiceForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -104,7 +104,7 @@
<decorator-screen name="CommonServiceDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.WebtoolsStep1ServiceAndRecurrenceInfo}">
- <include-form name="scheduleJob"
location="component://webtools/webapp/webtools/service/ServiceForms.xml"/>
+ <include-form name="scheduleJob"
location="component://webtools/widget/ServiceForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -123,7 +123,7 @@
<decorator-screen name="CommonServiceDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleRunService}">
- <include-form name="runService"
location="component://webtools/webapp/webtools/service/ServiceForms.xml"/>
+ <include-form name="runService"
location="component://webtools/widget/ServiceForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=829443&r1=829442&r2=829443&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Sat Oct 24
20:20:18 2009
@@ -69,10 +69,10 @@
</section>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="FindTemporalExpression"
location="component://webtools/webapp/webtools/tempexpr/tempExprForms.xml"/>
+ <include-form name="FindTemporalExpression"
location="component://webtools/widget/tempExprForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListTemporalExpressions"
location="component://webtools/webapp/webtools/tempexpr/tempExprForms.xml"/>
+ <include-form name="ListTemporalExpressions"
location="component://webtools/widget/tempExprForms.xml"/>
</decorator-section>
</decorator-screen>
</decorator-section>
@@ -104,7 +104,7 @@
<not><if-empty
field="childExpressionList"/></not>
</condition>
<widgets>
- <include-form name="ListChildExpressions"
location="component://webtools/webapp/webtools/tempexpr/tempExprForms.xml"/>
+ <include-form name="ListChildExpressions"
location="component://webtools/widget/tempExprForms.xml"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml?rev=829443&r1=829442&r2=829443&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml Sat Oct 24
20:20:18 2009
@@ -116,7 +116,7 @@
<set field="titleProperty" value="PageTitleShoppingCart"/>
<set field="headerItem" value="ContentMenu"/>
- <set field="formDefFile"
value="component://ecommerce/webapp/ecommerce/content/ContentForms.xml"/>
+ <set field="formDefFile"
value="component://ecommerce/widget/ContentForms.xml"/>
<set field="entityName" value=""/>
<set field="permission" value="CONTENTMGR"/>
<set field="permissionType" value="simple"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml?rev=829443&r1=829442&r2=829443&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml Sat Oct 24
20:20:18 2009
@@ -37,4 +37,704 @@
</field>
<field name="addButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
+ <form name="EditCombo" target="uploadContentAndImage" title=""
type="upload"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="imageData" >
+ <file />
+ </field>
+ <field name="dataResourceId" >
+ <drop-down allow-empty="false"
no-current-selected-key="TEMPLATE_TEXT_ONLY">
+ <option key="TEMPLATE_TEXT_ONLY"
description="${uiLabelMap.EcommerceTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED"
description="${uiLabelMap.EcommerceImageCenteredAbove}"/>
+ <option key="TEMPLATE_IMAGE_LEFT"
description="${uiLabelMap.EcommerceImageLeft}"/>
+ </drop-down>
+ </field>
+ <field name="ftlContentId" position="1">
+ <display description="${ftlContentId}"/>
+ </field>
+ <field name="contentIdTo" position="2">
+ <display description="${contentIdTo}"/>
+ </field>
+ <field name="ownerContentId" >
+ <hidden value="${contentIdTo}"/>
+ </field>
+ <field name="contentName">
+ <text/>
+ </field>
+ <field name="description">
+ <text size="60"/>
+ </field>
+ <field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
+ use-when=""${summaryDataResourceTypeId}".length()>0"
+ id-name="summaryData">
+ <textarea rows="8" cols="80"/>
+ </field>
+
+ <field name="textData" title="${uiLabelMap.ProductText}"
id-name="textData"><textarea rows="20" cols="60"/></field>
+ <field name="privilegeEnumId" >
+ <drop-down allow-empty="false"
no-current-selected-key="SUBSCRIBE_BRONZE">
+ <option key="SUBSCRIBE_BRONZE"
description="${uiLabelMap.EcommerceBronze}"/>
+ <option key="SUBSCRIBE_SILVER"
description="${uiLabelMap.EcommerceSilver}"/>
+ <option key="SUBSCRIBE_GOLD"
description="${uiLabelMap.EcommerceGold}"/>
+ </drop-down>
+ </field>
+ <field name="section" >
+ <drop-down no-current-selected-key="${targetSection}"
allow-empty="true">
+ <list-options list-name="sectionList" key-name="contentId"
description="${description}"/>
+ </drop-down>
+ </field>
+ <field name="topic" position="1">
+ <drop-down no-current-selected-key="${targetTopic}"
allow-empty="true">
+ <entity-options entity-name="Content"
key-field-name="contentId" description="${description}">
+ <entity-constraint name="contentTypeId" value="TOPIC"/>
+ <entity-order-by field-name="contentId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <!--
+ <field name="newTopicId" position="2">
+ <text size="12"/>
+ </field>
+ <field name="newTopicDescription" title="Description" position="3">
+ <text size="24"/>
+ </field>
+ <field name="createTopic" title="${uiLabelMap.CommonEmptyHeader}"
position="4">
+ <hyperlink also-hidden="false" target="createTopic${pageName}"
description="Create Topic">
+ <parameter param-name="mode" value="restore"/>
+ </hyperlink>
+ </field>
+ -->
+ <field name="submitButton" title="${uiLabelMap.CommonUpload}"
widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ <field name="ftlContentId" >
+ <hidden />
+ </field>
+ <field name="sumContentId" >
+ <hidden />
+ </field>
+ <field name="txtContentId" >
+ <hidden />
+ </field>
+ <field name="imgContentId" >
+ <hidden />
+ </field>
+ <field name="ftlDataResourceId" >
+ <hidden />
+ </field>
+ <field name="sumDataResourceId" >
+ <hidden />
+ </field>
+ <field name="txtDataResourceId" >
+ <hidden />
+ </field>
+ <field name="imgDataResourceId" >
+ <hidden />
+ </field>
+ <field name="statusId" >
+ <hidden />
+ </field>
+ <field name="contentPurposeString" >
+ <hidden value="${contentPurposeTypeId}"/>
+ </field>
+ <field name="targetOperationString" >
+ <hidden value="${targetOperation}"/>
+ </field>
+ <field name="nodeTrailCsv" >
+ <hidden value="${nodeTrailCsv}"/>
+ </field>
+ </form>
+ <form name="ViewComboResponse" target="" title="" type="single"
extends="EditCombo"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="summaryData" >
+ <ignored/>
+ </field>
+ <field name="dataResourceId" >
+ <display />
+ </field>
+ <field name="ftlContentId" position="1">
+ <display description="${ftlContentId}"/>
+ </field>
+ <field name="contentIdTo" position="2">
+ <display description="${contentIdTo}"/>
+ </field>
+ <field name="contentName">
+ <display/>
+ </field>
+ <field name="description">
+ <display/>
+ </field>
+ <field name="textData" title="${uiLabelMap.ContentText}"
id-name="textData"><display/></field>
+ <field name="privilegeEnumId" >
+ <display/>
+ </field>
+
+ </form>
+
+ <form name="findContent"
default-entity-name="ContentAssocDataResourceViewFrom" target="FindContent"
title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="caContentIdTo"
title="${uiLabelMap.ContentPublishToContent}"><text-find/></field>
+ <field name="caMapKey"><text-find/></field>
+ <field name="caContentAssocTypeId"
title="${uiLabelMap.FormFieldTitle_contentAssocTypeId}" ><text-find/></field>
+ <field name="caFromDate" title="${uiLabelMap.CommonFromDate}"
><date-find/></field>
+ <field name="contentId"><text-find/></field>
+ <field name="dataResourceId"><text-find/></field>
+ <field name="contentName"><text-find/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
+<!--
+ <field name="createLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
+ <hyperlink also-hidden="false" description="Create New"
target="AddContent"/>
+ </field>
+-->
+
+ </form>
+
+ <form name="listFindContent" type="list" target=""
+ default-title-style="tableheadtext" default-widget-style="inputBox"
default-tooltip-style="tabletext"
+ paginate-target="/FindContent">
+ <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
+ <hyperlink also-hidden="false"
description="${uiLabelMap.CommonEdit}" target="EditContent">
+ <parameter param-name="contentId"/>
+ <parameter param-name="drDataResourceId"/>
+ </hyperlink>
+<!--
+ <hyperlink also-hidden="false"
description="${uiLabelMap.CommonEdit}" target="EditContent">
+ <parameter param-name="caContentIdTo"/>
+ <parameter param-name="caFromDate"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="drDataResourceId"/>
+ <parameter param-name="caContentId"/>
+ <parameter param-name="contentIdStart"/>
+ <parameter param-name="caContentAssocTypeId"/>
+ </hyperlink>
+-->
+ </field>
+<!--
+ <field name="caContentIdTo" title="Publish-to content"
><display/></field>
+ <field name="caMapKey" title="Map Key" ><display/></field>
+ <field name="caFromDate" title="From Date" ><display/></field>
+-->
+ <field name="contentId"><display/></field>
+ <field name="dataResourceId"><display/></field>
+ <field name="contentName"><display/></field>
+ </form>
+
+ <form name="EditContent" target="uploadContentAndImage" title=""
type="upload"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="imageData" >
+ <file />
+ </field>
+ <field name="dataResourceId" >
+ <drop-down allow-empty="false"
no-current-selected-key="TEMPLATE_TEXT_ONLY">
+ <option key="TEMPLATE_TEXT_ONLY"
description="${uiLabelMap.EcommerceTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED"
description="${uiLabelMap.EcommerceImageCenteredAbove}"/>
+ <option key="TEMPLATE_IMAGE_LEFT"
description="${uiLabelMap.EcommerceImageLeft}"/>
+ </drop-down>
+ </field>
+ <field name="ftlContentId" position="1">
+ <display description="${ftlContentId}"/>
+ </field>
+ <field name="contentIdTo" position="2">
+ <display description="${contentIdTo}"/>
+ </field>
+ <field name="ownerContentId" >
+ <hidden value="${contentIdTo}"/>
+ </field>
+ <field name="contentName">
+ <text/>
+ </field>
+ <field name="description">
+ <text size="60"/>
+ </field>
+ <field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
+ use-when=""${summaryDataResourceTypeId}".length()>0"
+ id-name="summaryData">
+ <textarea rows="8" cols="80"/>
+ </field>
+
+ <field name="textData" title="${uiLabelMap.ContentText}"
id-name="textData"><textarea rows="20" cols="60"/></field>
+ <field name="statusId" >
+ <drop-down allow-empty="false"
no-current-selected-key="SUBSCRIBE_BRONZE">
+ <list-options list-name="statusList" key-name="statusId"
description="${description}"/>
+ </drop-down>
+ </field>
+ <field name="privilegeEnumId" >
+ <drop-down allow-empty="false"
no-current-selected-key="SUBSCRIBE_BRONZE">
+ <list-options list-name="privilegeList" key-name="enumId"
description="${description}"/>
+ </drop-down>
+ </field>
+ <field name="section" >
+ <drop-down no-current-selected-key="${targetSection}"
allow-empty="true">
+ <list-options list-name="sectionList" key-name="contentId"
description="${description}"/>
+ </drop-down>
+ </field>
+ <field name="topic" position="1">
+ <drop-down no-current-selected-key="${targetTopic}"
allow-empty="true">
+ <list-options list-name="topicList" key-name="contentId"
description="${description}"/>
+ </drop-down>
+ </field>
+ <!--
+ <field name="newTopicId" position="2">
+ <text size="12"/>
+ </field>
+ <field name="newTopicDescription" title="Description" position="3">
+ <text size="24"/>
+ </field>
+ <field name="createTopic" title="${uiLabelMap.CommonEmptyHeader}"
position="4">
+ <hyperlink also-hidden="false" target="createTopic${pageName}"
description="Create Topic">
+ <parameter param-name="mode" value="restore"/>
+ </hyperlink>
+ </field>
+ -->
+ <field name="submitButton" title="${uiLabelMap.CommonUpload}"
widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ <field name="ftlContentId" >
+ <hidden />
+ </field>
+ <field name="sumContentId" >
+ <hidden />
+ </field>
+ <field name="txtContentId" >
+ <hidden />
+ </field>
+ <field name="imgContentId" >
+ <hidden />
+ </field>
+ <field name="ftlDataResourceId" >
+ <hidden />
+ </field>
+ <field name="sumDataResourceId" >
+ <hidden />
+ </field>
+ <field name="txtDataResourceId" >
+ <hidden />
+ </field>
+ <field name="imgDataResourceId" >
+ <hidden />
+ </field>
+ <field name="statusId" >
+ <hidden />
+ </field>
+ <field name="contentPurposeString" >
+ <hidden value="${contentPurposeTypeId}"/>
+ </field>
+ <field name="targetOperationString" >
+ <hidden value="${targetOperation}"/>
+ </field>
+ <field name="nodeTrailCsv" >
+ <hidden value="${nodeTrailCsv}"/>
+ </field>
+ </form>
+
+ <form name="EditContentInfo" target="updateContent" title="" type="single"
default-map-name="currentValue"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <auto-fields-entity entity-name="Content"/>
+ <field name="contentId"><display/></field>
+ <field name="contentTypeId">
+ <drop-down allow-empty="false">
+ <entity-options description="${description}"
entity-name="ContentType" key-field-name="contentTypeId"/>
+ </drop-down>
+ </field>
+ <field name="dataResourceId">
+ <drop-down allow-empty="false"
no-current-selected-key="TEMPLATE_TEXT_ONLY">
+ <option key="TEMPLATE_TEXT_ONLY"
description="${uiLabelMap.EcommerceTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED"
description="${uiLabelMap.EcommerceImageCenteredAbove}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED_FILE"
description="${uiLabelMap.EcommerceImageCenteredAboveFile}"/>
+ <option key="TEMPLATE_IMAGE_LEFT"
description="${uiLabelMap.EcommerceImageLeft}"/>
+ <option key="TEMPLATE_COMPOSITE"
description="${uiLabelMap.EcommerceNestedContent}"/>
+ </drop-down>
+ </field>
+ <field name="ownerContentId"><lookup
target-form-name="LookupContent"/></field>
+ <field name="mimeTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${mimeTypeId} - ${description}"
entity-name="MimeType" key-field-name="mimeTypeId">
+ <entity-order-by field-name="mimeTypeId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="characterSetId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="CharacterSet" key-field-name="characterSetId"/>
+ </drop-down>
+ </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="CONTENT_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </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="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="createLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" position="1">
+ <hyperlink also-hidden="false"
description="${uiLabelMap.CommonCreateNew}" target="AddContent"/>
+ </field>
+ <field name="findContent" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" position="2">
+ <hyperlink also-hidden="false"
description="${uiLabelMap.CommonFind}" target="FindContent"/>
+ </field>
+ <field name="nodeTrailCsv" map-name="dummy">
+ <hidden value="${nodeTrailCsv}"/>
+ </field>
+ </form>
+
+ <form name="DataResourceMaster" target="createDataResource" title=""
type="single" default-map-name="currentValue"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <auto-fields-entity entity-name="DataResource"
default-field-type="edit"/>
+ <field name="dataResourceId"></field>
+ <field name="dataResourceTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+ </drop-down>
+ </field>
+ <field name="dataTemplateTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+ </drop-down>
+ </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="CONTENT_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="dataCategoryId">
+ <drop-down allow-empty="true">
+ <list-options list-name="dataCategoryList"
key-name="dataCategoryId" description="${categoryName}"/>
+ </drop-down>
+ </field>
+ <field name="mimeTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${mimeTypeId} - ${description}"
entity-name="MimeType" key-field-name="mimeTypeId">
+ <entity-order-by field-name="mimeTypeId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="characterSetId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="CharacterSet" key-field-name="characterSetId"/>
+ </drop-down>
+ </field>
+ <field name="createdDate"><display/></field>
+ <field name="lastModifiedDate"><display/></field>
+ <field name="createdByUserLogin"><display/></field>
+ <field name="lastModifiedByUserLogin"><display/></field>
+ </form>
+ <form name="EditDataResourceText" target="updateDataResourceText" title=""
type="single" extends="DataResourceMaster"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="dataResourceId"><display/></field>
+ <field name="dataResourceTypeId"><hidden
value="ELECTRONIC_TEXT"/></field>
+ <field name="dataResourceTypeIdDisplay"
title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId" >
+ <display description="ELECTRONIC_TEXT" also-hidden="false"/>
+ </field>
+ <field name="textData" title="${uiLabelMap.ContentText}"
id-name="textData"><textarea rows="20" cols="120"/> </field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ImageUpload" target="uploadImage" title="" type="upload"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="dataResourceId" >
+ <display description="${currentValue.dataResourceId}"/>
+ </field>
+ <field name="objectInfo" title="${uiLabelMap.EcommerceImageFileName}">
+ <display description="${currentValue.objectInfo}"/>
+ </field>
+ <field name="imageData" entity-name="ImageDataResource">
+ <file />
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpload}"
widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+ <form name="AddContent" target="uploadArticleAndImage" title=""
type="upload"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="imageData" >
+ <file />
+ </field>
+ <field name="dataResourceId" >
+ <drop-down allow-empty="false"
no-current-selected-key="TEMPLATE_TEXT_ONLY">
+ <option key="TEMPLATE_TEXT_ONLY"
description="${uiLabelMap.EcommerceTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED"
description="${uiLabelMap.EcommerceImageCenteredAbove}"/>
+ <option key="TEMPLATE_IMAGE_LEFT"
description="${uiLabelMap.EcommerceImageLeft}"/>
+ </drop-down>
+ </field>
+ <field name="contentId" position="1">
+ <ignored />
+ </field>
+ <field name="contentName" title="${uiLabelMap.EcommerceShortSubject}">
+ <text/>
+ </field>
+ <field name="description" title="${uiLabelMap.EcommerceLongSubject}">
+ <text size="60"/>
+ </field>
+ <field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
+ use-when=""${summaryDataResourceTypeId}".length()>0"
+ id-name="summaryData">
+ <textarea rows="8" cols="80"/>
+ </field>
+
+ <field name="textData" title="${uiLabelMap.ContentText}"
id-name="textData"><textarea rows="20" cols="80"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpload}"
widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ <field name="statusId" >
+ <hidden value="${statusId}"/>
+ </field>
+ <field name="publishOperation" >
+ <hidden value="${publishOperation}"/>
+ </field>
+ <field name="contentAssocTypeId" >
+ <hidden value="${contentAssocTypeId}"/>
+ </field>
+ <field name="contentPurposeString">
+ <hidden value="${contentPurpose}"/>
+ </field>
+ <field name="targetOperationString" >
+ <hidden value="${targetOperation}"/>
+ </field>
+ <field name="nodeTrailCsv" >
+ <hidden value="${nodeTrailCsv}"/>
+ </field>
+ <field name="contentIdTo" >
+ <hidden value="${contentIdTo}"/>
+ </field>
+ <field name="forumId" >
+ <hidden value="${forumId}"/>
+ </field>
+ <field name="contentTypeId" >
+ <hidden value="${contentTypeId}"/>
+ </field>
+ </form>
+ <form name="AddResponse" target="uploadResponse" title="" type="single"
extends="AddContent"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="contentIdTo" title="${uiLabelMap.EcommerceInResponseTo}">
+ <display description="${contentIdTo}"/>
+ </field>
+ <field name="ownerContentId" >
+ <hidden value="${currentValue.ownerContentId}"/>
+ </field>
+ <field name="dataResourceId" >
+ <hidden value=""/>
+ </field>
+ <field name="privilegeEnumId" >
+ <ignored />
+ </field>
+ <field name="statusId" >
+ <hidden value="CTNT_PUBLISHED"/>
+ </field>
+ <field name="contentAssocTypeId" >
+ <hidden value="RESPONSE"/>
+ </field>
+ <field name="contentName" title="${uiLabelMap.EcommerceShortSubject}"
map-name="replyName">
+ <text/>
+ </field>
+ <field name="description" title="${uiLabelMap.EcommerceLongSubject}"
map-name="replyName">
+ <text size="60"/>
+ </field>
+ <field name="dataResourceTypeId" >
+ <hidden value="ELECTRONIC_TEXT"/>
+ </field>
+ <field name="contentTypeId" >
+ <hidden value="DOCUMENT"/>
+ </field>
+ <field name="contentPurposeString" >
+ <hidden value="${contentPurposeTypeId}"/>
+ </field>
+ <field name="targetOperationString" >
+ <hidden value="${targetOperation}"/>
+ </field>
+ <field name="nodeTrailCsv" >
+ <hidden value="${nodeTrailCsv}"/>
+ </field>
+ <field name="deactivateExisting" >
+ <hidden value="false"/>
+ </field>
+ </form>
+
+ <form name="EditResponse" target="uploadResponse" title="" type="upload"
extends="AddContent"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="contentIdTo" title="${uiLabelMap.EcommerceInResponseTo}">
+ <display description="${contentIdTo}"/>
+ </field>
+ <field name="ownerContentId" >
+ <hidden value="${currentValue.ownerContentId}"/>
+ </field>
+ <field name="summaryData" >
+ <ignored/>
+ </field>
+ <field name="contentId" position="1">
+ <ignored />
+ </field>
+ <field name="imageData" >
+ <ignored />
+ </field>
+ <field name="dataResourceId" >
+ <hidden value="TEMPLATE_TEXT_ONLY"/>
+ </field>
+ <field name="privilegeEnumId" >
+ <ignored />
+ </field>
+ <field name="statusId" >
+ <hidden value="CTNT_PUBLISHED"/>
+ </field>
+ <field name="contentAssocTypeId" >
+ <hidden value="RESPONSE"/>
+ </field>
+
+ </form>
+
+ <form name="EditAddContentMaster" target="" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="dataResourceId" map-name="currentValue">
+ <hidden/>
+ </field>
+ <field name="contentId" position="1" map-name="currentValue"
+ use-when=""${currentValue.contentId}".length()>0" >
+ <display />
+ </field>
+ <field name="ownerContentId"
title="${uiLabelMap.EcommerceOwningDepartment}">
+ <hidden value="${contentIdTo}"/>
+ </field>
+ <field name="contentName" title="${uiLabelMap.CommonTitle}"
map-name="currentValue">
+ <display/>
+ </field>
+ <field name="textData" title="${uiLabelMap.CommonText}"
entry-name="summaryData" id-name="textData"
+ use-when=""${textSource}".length()>0 &&
"${textSource}".equals("summaryData") "
+ ><textarea rows="20" cols="80"/></field>
+ <field name="textData" title="${uiLabelMap.CommonText}"
id-name="textData" entry-name="textData"
+ use-when=""${textSource}".length()>0 &&
"${textSource}".equals("textData") "
+ ><textarea rows="20" cols="80"/></field>
+ <field name="privilegeEnumId" >
+ <hidden/>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpload}"
widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ <field name="statusId" map-name="currentValue">
+ <hidden />
+ </field>
+ <field name="contentAssocTypeId" >
+ <hidden value="${contentAssocTypeId}"/>
+ </field>
+ <field name="contentTypeId" >
+ <hidden value="${contentTypeId}"/>
+ </field>
+ <field name="contentPurposeString" >
+ <hidden value="${contentPurposeTypeId}"/>
+ </field>
+ <field name="targetOperationString" >
+ <hidden value="${targetOperation}"/>
+ </field>
+ <field name="nodeTrailCsv" >
+ <hidden value="${nodeTrailCsv}"/>
+ </field>
+ <field name="contentIdTo" >
+ <hidden value="${contentIdTo}"/>
+ </field>
+ <field name="mapKey" >
+ <hidden value="${mapKey}"/>
+ </field>
+ <field name="dataResourceTypeId" >
+ <hidden value="${dataResourceTypeId}"/>
+ </field>
+<!--
+ <field name="submitContentEdit"
title="${uiLabelMap.CommonEmptyHeader}">
+ <hyperlink also-hidden="false" description="Submit"
target="javascript:document.EditAddContent.action='${persistAction}';
document.EditAddContent.submit()" target-type="plain"/>
+ </field>
+-->
+ <field name="deactivateExisting" >
+ <hidden value="true"/>
+ </field>
+ </form>
+ <form name="EditAddContent" target="persistContent" title="" type="single"
extends="EditAddContentMaster">
+ </form>
+ <form name="EditAddBioContent" target="persistBioContent" title=""
type="single" extends="EditAddContentMaster">
+ </form>
+<!--
+ <form name="AddResponse" target="uploadResponse" title="" type="single"
extends="EditAddContentMaster">
+ </form>
+-->
+
+ <form name="EditAddImageMaster" target="" title="" type="upload"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="inputBox">
+ <field name="dataResourceId" map-name="currentValue">
+ <hidden/>
+ </field>
+ <!--
+ <field name="contentId" position="1" map-name="currentValue"
+ use-when=""${currentValue.contentId}".length()>0" >
+ <display />
+ </field>
+ -->
+ <field name="imageData" >
+ <file />
+ </field>
+ <field name="ownerContentId"
title="${uiLabelMap.EcommerceOwningDepartment}">
+ <hidden value="${contentIdTo}"/>
+ </field>
+ <field name="contentName" title="${uiLabelMap.CommonTitle}"
map-name="currentValue">
+ <hidden/>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpload}"
widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ <field name="statusId" map-name="currentValue">
+ <hidden />
+ </field>
+ <!--
+ <field name="contentAssocTypeId" >
+ <hidden value=""/>
+ </field>
+ <field name="contentTypeId" >
+ <hidden value="${contentTypeId}"/>
+ </field>
+ -->
+ <field name="contentPurposeString" >
+ <hidden value="${contentPurposeTypeId}"/>
+ </field>
+ <field name="targetOperationString" >
+ <hidden value="${targetOperation}"/>
+ </field>
+ <field name="entityOperation" >
+ <hidden value="${entityOperation}"/>
+ </field>
+ <field name="nodeTrailCsv" >
+ <hidden value="${nodeTrailCsv}"/>
+ </field>
+ <field name="contentIdTo" >
+ <hidden value="${contentIdTo}"/>
+ </field>
+ <field name="mapKey" >
+ <hidden value="${mapKey}"/>
+ </field>
+ <field name="dataResourceTypeId" >
+ <hidden value="${dataResourceTypeId}"/>
+ </field>
+ <field name="ftlContentId" >
+ <hidden value="${contentIdTo}"/>
+ </field>
+ <field name="imgContentId" >
+ <hidden />
+ </field>
+ <field name="ftlDataResourceId" >
+ <hidden />
+ </field>
+ <field name="imgDataResourceId" >
+ <hidden />
+ </field>
+ <field name="deactivateExisting" >
+ <hidden value="true"/>
+ </field>
+ </form>
+ <form name="EditAddImage" target="persistImage" title="" type="upload"
extends="EditAddImageMaster">
+ </form>
+ <form name="EditAddBioImage" target="persistBioImage" title=""
type="upload" extends="EditAddImageMaster">
+ </form>
+
</forms>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml?rev=829443&r1=829442&r2=829443&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml Sat Oct 24
20:20:18 2009
@@ -167,7 +167,7 @@
<set field="titleProperty" value="PageTitleAddContent"/>
<set field="headerItem" value="Forum"/>
- <set field="formDefFile"
value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/>
+ <set field="formDefFile"
value="component://content/widget/forum/ForumForms.xml"/>
<set field="singleFormName" value="AddContent"/>
<set field="subMenu" value="/admin/admin_menu.ftl"/>
<set field="entityName" value="Content"/>
@@ -214,7 +214,7 @@
<set field="titleProperty" value="PageTitleEditContent"/>
<set field="headerItem" value="Forum"/>
- <set field="formDefFile"
value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/>
+ <set field="formDefFile"
value="component://content/widget/forum/ForumForms.xml"/>
<set field="singleFormName" value="AddContent"/>
<set field="subMenu" value="/admin/admin_menu.ftl"/>
<set field="entityName" value="Content"/>
@@ -262,7 +262,7 @@
<set field="titleProperty" value="PageTitleForumResponse"/>
<set field="headerItem" value="Forum"/>
- <set field="formDefFile"
value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/>
+ <set field="formDefFile"
value="component://content/widget/forum/ForumForms.xml"/>
<set field="singleFormName" value="ViewComboResponse"/>
<set field="addFormName" value="ViewComboResponse"/>
<set field="editFormName" value="ViewComboResponse"/>
@@ -307,7 +307,7 @@
<set field="titleProperty" value="PageTitleAddResponse"/>
<set field="headerItem" value="Forum"/>
- <set field="formDefFile"
value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/>
+ <set field="formDefFile"
value="component://content/widget/forum/ForumForms.xml"/>
<set field="singleFormName" value="AddResponse"/>
<set field="addFormName" value="EditResponse"/>
<set field="editFormName" value="EditResponse"/>
@@ -357,7 +357,7 @@
<set field="titleProperty"
value="PageTitleEditForumContentInfo"/>
<set field="headerItem" value="Forum"/>
- <set field="formDefFile"
value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/>
+ <set field="formDefFile"
value="component://content/widget/forum/ForumForms.xml"/>
<set field="singleFormName" value="EditContentInfo"/>
<set field="entityName" value="Content"/>
<set field="permission" value="CONTENTMGR"/>
@@ -399,7 +399,7 @@
<set field="titleProperty" value="PageTitleEditAddContent"/>
<set field="headerItem" value="Forum"/>
- <set field="formDefFile"
value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/>
+ <set field="formDefFile"
value="component://content/widget/forum/ForumForms.xml"/>
<set field="singleFormName" value="EditAddContent"/>
<set field="subMenu" value="/admin/admin_menu.ftl"/>
<set field="entityName" value="Content"/>
@@ -452,7 +452,7 @@
<set field="titleProperty" value="PageTitleEditAddImage"/>
<set field="headerItem" value="Forum"/>
- <set field="formDefFile"
value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/>
+ <set field="formDefFile"
value="component://content/widget/forum/ForumForms.xml"/>
<set field="singleFormName" value="EditAddImage"/>
<set field="subMenu" value="/admin/admin_menu.ftl"/>
<set field="entityName" value="Content"/>
Modified:
ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=829443&r1=829442&r2=829443&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
Sat Oct 24 20:20:18 2009
@@ -107,7 +107,7 @@
<container>
<label
style="h1">${uiLabelMap.ProductReceiptPurchaseOrder}</label>
</container>
- <include-form name="POEnter"
location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
+ <include-form name="POEnter"
location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -139,7 +139,7 @@
<container>
<label
style="h1">${uiLabelMap.ProductReceipt}</label>
</container>
- <include-form name="ProductEnter"
location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
+ <include-form name="ProductEnter"
location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/>
<platform-specific><html><html-template
location="component://hhfacility/webapp/hhfacility/setFocusOnField.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
@@ -157,7 +157,7 @@
<widgets>
<decorator-screen name="FacilityDecorator">
<decorator-section name="body">
- <include-form name="ProductQtyEnter"
location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
+ <include-form name="ProductQtyEnter"
location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/>
<platform-specific><html><html-template
location="component://hhfacility/webapp/hhfacility/setFocusOnField.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
@@ -219,7 +219,7 @@
<container>
<label
style="h1">${uiLabelMap.PageTitleFindProductStocktake}</label>
</container>
- <include-form name="FindProductStock"
location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
+ <include-form name="FindProductStock"
location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/>
<platform-specific><html><html-template
location="component://hhfacility/webapp/hhfacility/stocktake.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
@@ -240,8 +240,8 @@
<container>
<label
style="h1">${uiLabelMap.PageTitleProductStocktake}</label>
</container>
- <include-form name="ProductStocktake"
location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
- <include-form name="UpdateProductStocktake"
location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
+ <include-form name="ProductStocktake"
location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/>
+ <include-form name="UpdateProductStocktake"
location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/>
<platform-specific><html><html-template
location="component://hhfacility/webapp/hhfacility/productstocktake.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
@@ -260,7 +260,7 @@
<widgets>
<decorator-screen name="CommonDecorator">
<decorator-section name="body">
- <include-form name="ListFacilities"
location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
+ <include-form name="ListFacilities"
location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
