svn commit: r1160233 [2/4] - in /ofbiz/trunk/applications: commonext/widget/ofbizsetup/ content/webapp/content/WEB-INF
Locked
svn commit: r1160233 [2/4] - in /ofbiz/trunk/applications: commonext/widget/ofbizsetup/ content/webapp/content/WEB-INF
 
|
Modified: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml Mon Aug 22 12:14:25 2011 @@ -33,9 +33,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentTypePanel" title="${uiLabelMap.PageTitleEditContentType}" collapsible="true"> - <include-form name="AddContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -53,9 +53,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentTypeAttrPanel" title="${uiLabelMap.PageTitleEditContentAttribute}" collapsible="true"> - <include-form name="AddContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentTypeAttr" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentTypeAttr" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -73,9 +73,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentAssocTypePanel" title="${uiLabelMap.PageTitleEditContentAssoc}" collapsible="true"> - <include-form name="AddContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentAssocType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentAssocType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -93,9 +93,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentPurposeTypePanel" title="${uiLabelMap.PageTitleEditContentPurpose}" collapsible="true"> - <include-form name="AddContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentPurposeType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentPurposeType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -113,9 +113,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentAssocPredicatePanel" title="${uiLabelMap.PageTitleEditContentAssocPredicate}" collapsible="true"> - <include-form name="AddContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentAssocPredicate" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentAssocPredicate" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -133,9 +133,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentPurposeOperationPanel" title="${uiLabelMap.PageTitleEditContentPurposeOperation}" collapsible="true"> - <include-form name="AddContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentPurposeOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentPurposeOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -175,9 +175,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentOperationPanel" title="${uiLabelMap.PageTitleEditContentOperation}" collapsible="true"> - <include-form name="AddContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Mon Aug 22 12:14:25 2011 @@ -33,9 +33,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceTypePanel" title="${uiLabelMap.PageTitleEditDataResourceType}" collapsible="true"> - <include-form name="AddDataResourceType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddDataResourceType" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateDataResourceType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateDataResourceType" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -54,9 +54,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceCharacterSetPanel" title="${uiLabelMap.PageTitleEditDataResourceCharacterSet}" collapsible="true"> - <include-form name="AddCharacterSet" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddCharacterSet" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateCharacterSet" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateCharacterSet" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -75,9 +75,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceTypeAttrPanel" title="${uiLabelMap.PageTitleEditDataResourceTypeAttr}" collapsible="true"> - <include-form name="AddDataResourceTypeAttr" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddDataResourceTypeAttr" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateDataResourceTypeAttr" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateDataResourceTypeAttr" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -96,9 +96,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="FileExtensionPanel" title="${uiLabelMap.PageTitleEditDataResourceFileExtension}" collapsible="true"> - <include-form name="AddFileExtension" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddFileExtension" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateFileExtension" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateFileExtension" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -117,9 +117,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="MetaDataPredicatePanel" title="${uiLabelMap.PageTitleEditDataResourceMetaDataPredicate}" collapsible="true"> - <include-form name="AddMetaDataPredicate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddMetaDataPredicate" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateMetaDataPredicate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateMetaDataPredicate" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -138,9 +138,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceMimeTypePanel" title="${uiLabelMap.PageTitleEditDataResourceMimeType}" collapsible="true"> - <include-form name="AddMimeType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddMimeType" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateMimeType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateMimeType" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -159,9 +159,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="MimeTypeHtmlTemplatePanel" title="${uiLabelMap.PageTitleEditDataResourceMimeTypeHtmlTemplate}" collapsible="true"> - <include-form name="CreateMimeTypeHtmlTemplate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="CreateMimeTypeHtmlTemplate" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateMimeTypeHtmlTemplate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateMimeTypeHtmlTemplate" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -181,9 +181,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceCategoryPanel" title="${uiLabelMap.PageTitleEditDataResourceCategory}" collapsible="true"> - <include-form name="AddDataCategory" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddDataCategory" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateDataCategory" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateDataCategory" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Copied: ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml (from r1160226, ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml?p2=ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml&p1=ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml&r1=1160226&r2=1160233&rev=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml (original) +++ ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml Mon Aug 22 12:14:25 2011 @@ -1,279 +0,0 @@ -<?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. ---> - -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <!-- DataResourceType forms --> - <form name="AddDataResourceType" target="addDataResourceType" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createDataResourceType"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateDataResourceType" list-name="contentList" target="updateDataResourceType" title="" type="list" paginate-target="EditDataResourceType" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="DataResourceType" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateDataResourceType"/> - <field name="dataResourceTypeId" widget-style="tabletext"> - <display/> - </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceType"> - <parameter param-name="dataResourceTypeId"/> - </hyperlink> - </field> - </form> - - <!-- DataResourceTypeAttr forms --> - <form name="AddDataResourceTypeAttr" target="addDataResourceTypeAttr" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createDataResourceTypeAttr"/> - <field entity-name="DataResource" name="dataResourceTypeId"> - <drop-down allow-empty="false"> - <entity-options description="${description}" - entity-name="DataResourceType" key-field-name="dataResourceTypeId"/> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateDataResourceTypeAttr" list-name="contentList" target="updateDataResourceTypeAttr" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditDataResourceTypeAttr"> - <actions> - <entity-condition entity-name="DataResourceTypeAttr" use-cache="false"/> - </actions> - <auto-fields-service service-name="createDataResourceTypeAttr"/> - <field name="dataResourceTypeId"> - <display/> - </field> - <field name="attrName" title="${uiLabelMap.ContentAttributeName}"> - <display/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceTypeAttr"> - <parameter param-name="dataResourceTypeId"/> - <parameter param-name="attrName"/> - </hyperlink> - </field> - </form> - - <!-- CharacterSet forms --> - <form name="AddCharacterSet" target="addCharacterSet" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createCharacterSet"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateCharacterSet" list-name="contentList" target="updateCharacterSet" title="" type="list" paginate-target="EditCharacterSet" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="CharacterSet" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateCharacterSet"/> - <field name="characterSetId" widget-style="tabletext"> - <display/> - </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCharacterSet"> - <parameter param-name="characterSetId"/> - </hyperlink> - </field> - </form> - - <!-- DataCategory forms --> - <form name="AddDataCategory" target="addDataCategory" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createDataCategory"/> - <field name="parentCategoryId"> - <drop-down allow-empty="true"> - <entity-options entity-name="DataCategory" description="${categoryName}" key-field-name="dataCategoryId"></entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateDataCategory" list-name="dataCategoryList" target="updateDataCategory" title="" type="list" paginate-target="EditDataCategory" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="DataCategory" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateDataCategory"/> - <field name="dataCategoryId" widget-style="tabletext"> - <display/> - </field> - <field name="parentCategoryId"> - <drop-down allow-empty="true"> - <list-options list-name="dataCategoryList" - key-name="dataCategoryId" description="${categoryName}" - /> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataCategory"> - <parameter param-name="dataCategoryId"/> - </hyperlink> - </field> - </form> - - <!-- FileExtension forms --> - <form name="AddFileExtension" target="addFileExtension" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createFileExtension"/> - <field name="mimeTypeId" title="${uiLabelMap.CommonEmptyHeader}"> - <drop-down allow-empty="false"> - <entity-options description="${description}" - entity-name="MimeType" key-field-name="mimeTypeId"/> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateFileExtension" list-name="contentList" target="updateFileExtension" title="" type="list" paginate-target="EditFileExtension" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="FileExtension" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateFileExtension"/> - <field name="fileExtensionId" widget-style="tabletext"> - <display/> - </field> - <field name="mimeTypeId" title="${uiLabelMap.CommonEmptyHeader}"> - <drop-down allow-empty="false"> - <entity-options description="${description}" - entity-name="MimeType" key-field-name="mimeTypeId"/> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeFileExtension"> - <parameter param-name="fileExtensionId"/> - </hyperlink> - </field> - </form> - - <!-- MetaDataPredicate forms --> - <form name="AddMetaDataPredicate" target="addMetaDataPredicate" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createMetaDataPredicate"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateMetaDataPredicate" list-name="contentList" target="updateMetaDataPredicate" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditMetaDataPredicate"> - <actions> - <entity-condition entity-name="MetaDataPredicate" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateMetaDataPredicate"/> - <field name="metaDataPredicateId" widget-style="tabletext"> - <display/> - </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMetaDataPredicate"> - <parameter param-name="metaDataPredicateId"/> - </hyperlink> - </field> - </form> - - <!-- MimeType forms --> - <form name="AddMimeType" target="addMimeType" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createMimeType"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateMimeType" list-name="contentList" target="updateMimeType" title="" type="list" paginate-target="EditMimeType" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="MimeType" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateMimeType"/> - <field name="mimeTypeId" widget-style="tabletext"> - <display/> - </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeType"> - <parameter param-name="mimeTypeId"/> - </hyperlink> - </field> - </form> - - <!-- MimeTypeHtmlTemplate Froms --> - <form name="CreateMimeTypeHtmlTemplate" target="createMimeTypeHtmlTemplate" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createMimeTypeHtmlTemplate"/> - <field name="mimeTypeId" widget-style="tabletext"> - <drop-down allow-empty="false"> - <entity-options entity-name="MimeType" description="${description}" key-field-name="mimeTypeId"/> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - - <form name="UpdateMimeTypeHtmlTemplate" target="updateMimeTypeHtmlTemplate" title="" type="list" list-name="contentList" paginate-target="EditMimeTypeHtmlTemplate" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="MimeTypeHtmlTemplate" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateMimeTypeHtmlTemplate"/> - <field name="mimeTypeId" widget-style="tabletext"> - <hyperlink target-type="intra-app" target="editMimeType" description="${mimeTypeId}"> - <parameter param-name="mimeTypeId"/> - </hyperlink> - </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeTypeHtmlTemplate"> - <parameter param-name="mimeTypeId"/> - <parameter param-name="dataResourceId"/> - <parameter param-name="fromDate"/> - </hyperlink> - </field> - </form> -</forms> Copied: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml (from r1160221, ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml?p2=ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml&p1=ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml&r1=1160221&r2=1160233&rev=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original) +++ ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml Mon Aug 22 12:14:25 2011 @@ -1,476 +0,0 @@ -<?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. ---> - -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <!-- LayoutFind forms --> - <form name="findLayout" default-entity-name="Content" target="FindLayout" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <!--<auto-fields-entity entity-name="Content" default-field-type="find"/>--> - <field name="contentTypeId"> - <hidden value="DOCUMENT"/> - </field> - <field name="contentId"> - <text-find/> - </field> - <field name="contentName"> - <text-find/> - </field> - <field name="description"> - <text-find/> - </field> - <field name="createdByUserLogin"> - <lookup target-form-name="LookupPerson"/> - </field> - <field name="createdDate"> - <date-find/> - </field> - <field name="lastModifiedByUserLogin"> - <lookup target-form-name="LookupParty"/> - </field> - <field name="lastModifiedDate"> - <date-find/> - </field> - <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - - <!-- LayoutEdit forms --> - <form name="EditLayout" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutSubContent" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" > - <display/> - </field> - <field name="contentIdTo" > - <hidden value="TEMPLATE_MASTER"/> - </field> - <field name="drDataResourceTypeId" > - <display/> - </field> - <field name="drMimeTypeId" > - <display/> - </field> - <field name="contentName" > - <display/> - </field> - <field name="description" > - <display/> - </field> - <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> - <display /> - </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="EditLayoutTemplate?mode=add&contentIdTo=TEMPLATE_MASTER"/> - </field> - --> - </form> - <form name="AddLayout" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="createLayoutSubContent" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" > - <text/> - </field> - <field name="drDataResourceTypeId" > - <drop-down no-current-selected-key="LOCAL_FILE"> - <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/> - <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/> - <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/> - <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/> - </drop-down> - </field> - <field name="drMimeTypeId" > - <drop-down no-current-selected-key="text/html"> - <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> - <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> - </drop-down> - </field> - <field name="drDataResourceTypeId" > - <drop-down no-current-selected-key="LOCAL_FILE"> - <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/> - <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/> - <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/> - <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/> - </drop-down> - </field> - <field name="drMimeTypeId" > - <drop-down no-current-selected-key="text/html"> - <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> - <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> - </drop-down> - </field> - <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> - <text /> - </field> - <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"> - <textarea rows="24" cols="80"/> - </field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - - <form name="listFindLayout" default-entity-name="ContentDataResourceView" title="" type="list" list-name="listIt" target="" paginate-target="FindLayout" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <set field="requestParameters.contentTypeId" value="DOCUMENT"/> - <service service-name="performFind" result-map="result" result-map-list="listIt"> - <field-map field-name="inputFields" from-field="parameters"/> - <field-map field-name="entityName" value="ContentDataResourceView"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> - </service> - </actions> - <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${contentId}" target="EditLayout"> - <parameter param-name="contentId"/> - <parameter param-name="drDataResourceId"/> - </hyperlink> - </field> - <field name="dummy" title="${uiLabelMap.ContentClip}" widget-style="buttontext" map-name="dummy"> - <hyperlink also-hidden="false" description="${contentId}" target="clipFindLayout"> - <parameter param-name="contentId"/> - <parameter param-name="drDataResourceId"/> - <parameter param-name="viewSize"/> - <parameter param-name="viewIndex"/> - <parameter param-name="entityName"/> - </hyperlink> - </field> - <field name="contentName"><display/></field> - <field name="description"><display/></field> - <field name="drObjectInfo"><display/></field> - <!-- - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout"> - <parameter param-name="contentId"/> - <parameter param-name="contentIdTo"/> - <parameter param-name="contentAssocTypeId"/> - <parameter param-name="fromDate"/> - </hyperlink> - </field> - --> - </form> - - <form name="listListLayout" default-entity-name="ContentAssocDataResourceViewFrom" list-name="layoutList" target="" title="" type="list" paginate-target="FindLayout" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="contentId" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${contentId}" target="EditLayout"> - <parameter param-name="contentId"/> - <parameter param-name="drDataResourceId"/> - </hyperlink> - </field> - <field name="contentName"><display/></field> - <field name="description"><display/></field> - <field name="drObjectInfo"><display/></field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout"> - <parameter param-name="contentId"/> - <parameter param-name="contentIdTo" from-field="caContentIdTo"/> - <parameter param-name="contentAssocTypeId" from-field="caContentAssocTypeId"/> - <parameter param-name="fromDate" from-field="caFromDate"/> - </hyperlink> - </field> - </form> - - <form name="LayoutSubContentMaster" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" position="1" > - </field> - <field name="contentTypeIdDisplay" title="${uiLabelMap.ContentType}" position="2" map-name="dummy"> - <display description="DOCUMENT"/> - </field> - <field name="contentIdToDisplay" title="${uiLabelMap.ContentParent}" position="3" map-name="dummy"> - <display description="${contentIdTo}"/> - </field> - <field name="mapKeyDisplay" title="${uiLabelMap.ContentMapKey}" position="4" map-name="dummy"> - <display description="${mapKey}"/> - </field> - <field name="contentTypeId" > - <hidden value="DOCUMENT"/> - </field> - <field name="drDataResourceId" title="${uiLabelMap.FormFieldTitle_dataResourceId}" > - <display/> - </field> - <field name="contentName"> - <text/> - </field> - <field name="description"> - <text/> - </field> - <field name="contentIdTo" > - <hidden value="${contentIdTo}"/> - </field> - <field name="mapKey" > - <hidden value="${mapKey}"/> - </field> - </form> - - <form name="EditLayoutHtml" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutHtml" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="currentValue==null" target="createLayoutHtml"/> - <field name="drDataResourceTypeId" > - <display description="ELECTRONIC_TEXT"/> - </field> - <field name="drMimeTypeId" > - <display description="text/plain"/> - </field> - <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"> - <textarea rows="24" cols="80"/> - </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> - </form> - - <form name="EditLayoutText" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutText" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="currentValue==null" target="createLayoutText"/> - <field name="drDataResourceTypeId" > - <display description="ELECTRONIC_TEXT"/> - </field> - <field name="drMimeTypeId" > - <display description="text/plain"/> - </field> - <field name="textData" title="${uiLabelMap.ContentText}" > - <textarea rows="24" cols="80"/> - </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> - </form> - - <form name="EditLayoutImage" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutImage" title="" type="upload" - header-row-style="header-row" default-table-style="basic-table"> - <field name="drDataResourceTypeId" > - <display description="IMAGE_OBJECT"/> - </field> - <field name="drMimeTypeId" > - <drop-down> - <option key="image/gif" description="${uiLabelMap.ContentGIF}"/> - <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/> - <option key="image/png" description="${uiLabelMap.ContentPNG}"/> - <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/> - </drop-down> - </field> - <field name="drObjectInfo" title="${uiLabelMap.FormFieldTitle_imageFileName}"> - <display description="${currentValue.drObjectInfo}"/> - </field> - <field name="imageData" entity-name="ImageDataResource" map-name="dummy"> - <file /> - </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> - </form> - <form name="AddLayoutImage" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="createLayoutImage" title="" type="upload" - header-row-style="header-row" default-table-style="basic-table"> - <field name="drDataResourceTypeId" > - <hidden value="IMAGE_OBJECT"/> - </field> - <field name="drDataResourceTypeIdDisplay" title="${uiLabelMap.FormFieldTitle_drDataResourceTypeId}"> - <display description="IMAGE_OBJECT"/> - </field> - <field name="drMimeTypeId" > - <drop-down> - <option key="image/gif" description="${uiLabelMap.ContentGIF}"/> - <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/> - <option key="image/png" description="${uiLabelMap.ContentPNG}"/> - <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/> - </drop-down> - </field> - <field name="drObjectInfo" title="${uiLabelMap.FormFieldTitle_imageFileName}"> - <display description="${currentValue.drObjectInfo}"/> - </field> - <field name="imageData" entity-name="ImageDataResource"> - <file /> - </field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - - <form name="EditLayoutUrl" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutUrl" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="currentValue==null" target="createLayoutUrl"/> - <field name="drDataResourceTypeId" > - <display description="URL_RESOURCE"/> - </field> - <field name="drMimeTypeId" > - <display description="text/plain"/> - </field> - <field name="drObjectInfo" title="${uiLabelMap.ContentUrl}"> - <text /> - </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> - </form> - <form name="ListRelatedLayouts" default-entity-name="ContentDataResourceView" list-name="entityList" target="" title="" type="list" paginate-target="FindLayout" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${contentId}" target="EditLayout"> - <parameter param-name="contentId"/> - <parameter param-name="drDataResourceId"/> - </hyperlink> - </field> - <field name="contentName"><display/></field> - <field name="description"><display/></field> - <field name="drObjectInfo"><display/></field> - </form> - - <form name="EditLayoutSubContent" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutSubContent" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="currentValue==null" target="createLayoutSubContent"/> - <field name="contentIdToDisplay" title="${uiLabelMap.ContentParent}"> - <ignored/> - </field> - <field name="mapKeyDisplay" > - <ignored/> - </field> - - <field name="contentId" position="1" > - <display/> - </field> - <field name="contentIdTo" > - <text default-value="${parameters.contentIdTo}"/> - </field> - <field name="mapKey" > - <text default-value="${parameters.mapKey}"/> - </field> - <field name="drDataResourceTypeId" > - <drop-down no-current-selected-key="ELECTRONIC_TEXT"> - <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/> - <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/> - <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/> - <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/> - </drop-down> - </field> - <field name="drDataTemplateTypeId" > - <drop-down no-current-selected-key="NONE"> - <entity-options description="${description}" - entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/> - </drop-down> - </field> - <field name="drMimeTypeId"> - <drop-down no-current-selected-key="text/html"> - <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> - <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> - </drop-down> - </field> - <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> - <text /> - </field> - <field name="textData" id-name="textData" title="${uiLabelMap.FormFieldTitle_textDataTitle}"> - <textarea rows="24" cols="80" default-value="${context.textData}"/> - </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> - </form> -<!-- - <field name="paste" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" - use-when="!"${contentIdTo}".equals("TEMPLATE_MASTER")" > - <hyperlink target-type="plain" - target="javascript:call_fieldlookup2(document.AddLayoutSubContent.drDataResourceId, 'ClipBoardContent')" - description="${uiLabelMap.ContentPaste}"/> - </field> - <field name="paste" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" - use-when=""${contentIdTo}".equals("TEMPLATE_MASTER")" > - <hyperlink target-type="plain" - target="javascript:call_fieldlookup2(document.AddLayoutSubContent.drDataResourceId, 'LookupListLayout')" - description="${uiLabelMap.ContentPaste}"/> - </field> ---> -</forms> Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Mon Aug 22 12:14:25 2011 @@ -44,10 +44,10 @@ under the License. </container> </decorator-section> <decorator-section name="search-options"> - <include-form name="findLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="findLayout" location="component://content/widget/layout/LayoutForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listFindLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="listFindLayout" location="component://content/widget/layout/LayoutForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -79,7 +79,7 @@ under the License. <parameter param-name="contentIdTo" value="TEMPLATE_MASTER"/> </link> </container> - <include-form name="listListLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="listListLayout" location="component://content/widget/layout/LayoutForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -100,7 +100,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditLayout}"> - <include-form name="EditLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayout" location="component://content/widget/layout/LayoutForms.xml"/> <link target="cloneLayout" text="${uiLabelMap.ContentCloneLayout}" style="buttontext"> <parameter param-name="contentId" from-field="currentValue.contentId"/> </link> @@ -127,7 +127,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditLayoutSubContent}"> - <include-form name="EditLayoutSubContent" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutSubContent" location="component://content/widget/layout/LayoutForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -148,7 +148,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <!-- - <include-form name="EditLayoutText" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutText" location="component://content/widget/layout/LayoutForms.xml"/> --> </decorator-section> </decorator-screen> @@ -169,7 +169,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <!-- - <include-form name="EditLayoutHtml" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutHtml" location="component://content/widget/layout/LayoutForms.xml"/> --> </decorator-section> </decorator-screen> @@ -190,7 +190,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <!-- - <include-form name="EditLayoutUrl" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutUrl" location="component://content/widget/layout/LayoutForms.xml"/> --> </decorator-section> </decorator-screen> @@ -211,7 +211,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <!-- - <include-form name="EditLayoutImage" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutImage" location="component://content/widget/layout/LayoutForms.xml"/> --> </decorator-section> </decorator-screen> @@ -230,7 +230,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditLayout}"> - <include-form name="AddLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="AddLayout" location="component://content/widget/layout/LayoutForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Copied: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml (from r1160221, ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml?p2=ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml&p1=ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml&r1=1160221&r2=1160233&rev=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original) +++ ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml Mon Aug 22 12:14:25 2011 @@ -1,328 +0,0 @@ -<?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. ---> - -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - - <form name="FindSurvey" default-map-name="survey" target="FindSurvey" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="Survey" default-field-type="find"/> - - <field name="isAnonymous"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - <field name="allowMultiple"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - <field name="allowUpdate"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - <field name="acroFormContentId"> - <lookup target-form-name="LookupContent"/> - </field> - - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="ListFindSurvey" target="" title="" list-name="listIt" type="list" paginate-target="FindSurvey" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map field-name="inputFields" from-field="parameters"/> - <field-map field-name="entityName" value="Survey"/> - <field-map field-name="orderBy" from-field="parameters.sortField"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> - </service> - </actions> - <auto-fields-entity entity-name="Survey" default-field-type="display"/> - <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}" widget-style="buttontext" sort-field="true"> - <hyperlink description="${surveyId}" target="EditSurvey" also-hidden="false"> - <parameter param-name="surveyId"/> - </hyperlink> - </field> - <on-event-update-area event-type="paginate" area-id="search-results" area-target="ListFindSurveySearchResults"/> - </form> - <form name="EditSurvey" type="single" target="updateSurvey" title="" default-map-name="survey" - header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="survey==null" target="createSurvey"/> - - <auto-fields-service service-name="updateSurvey"/> - - <field use-when="survey!=null" name="surveyId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> - <field use-when="survey==null&&surveyId!=null" name="surveyId" tooltip="${uiLabelMap.CommonCannotBeFound}: [${surveyId}]" widget-style="tabletext"><display description="" also-hidden="false"/></field> - <field use-when="survey==null&&surveyId==null" name="surveyId"><ignored/></field> - - <field name="isAnonymous"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - <field name="allowMultiple"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - <field name="allowUpdate"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - - <field name="acroFormContentId" use-when="survey!=null"> - <lookup target-form-name="LookupContent"/> - </field> - <field name="acroFormContentId" use-when="survey==null"><ignored/></field> - - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="BuildSurveyFromPdf" type="single" target="buildSurveyFromPdf" title="" default-map-name="survey" - header-row-style="header-row" default-table-style="basic-table"> - <field name="surveyId" map-name="survey"><hidden/></field> - <field name="contentId" map-name="empty" title="${uiLabelMap.ContentPDF}"> - <lookup target-form-name="LookupContent"/> - </field> - <field name="submitButton" title="${uiLabelMap.ContentSurveyGenerateQuestions}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="BuildSurveyResponseFromPdf" type="single" target="buildSurveyResponseFromPdf" title="" default-map-name="survey" - header-row-style="header-row" default-table-style="basic-table"> - <field name="surveyId" map-name="parameters"><hidden/></field> - <field name="surveyResponseId" map-name="surveyResponse"><hidden/></field> - <field name="pdfFileNameIn" map-name="empty"><text/></field> - - <field name="contentId" map-name="empty" title="${uiLabelMap.ContentPDF}"> - <lookup target-form-name="LookupContent"/> - </field> - <field name="submitButton" title="${uiLabelMap.ContentSurveyBuildRespondeFromPDF}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <!-- SurveyMultiResp & SurveyMultiRespColumn --> - <form name="EditSurveyMultiResp" type="single" target="updateSurveyMultiResp" title="" default-map-name="surveyMultiResp" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="updateSurveyMultiResp" default-field-type="edit"/> - - <field name="surveyId"><hidden/></field> - <field name="surveyMultiRespId" widget-style="tabletext"><display/></field> - - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="ListSurveyMultiRespColumns" type="list" target="updateSurveyMultiRespColumn" title="" list-name="surveyMultiRespColumnList" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="SurveyMultiRespColumn"> - <condition-list combine="and"> - <condition-expr field-name="surveyId" from-field="surveyMultiResp.surveyId"/> - <condition-expr field-name="surveyMultiRespId" from-field="surveyMultiResp.surveyMultiRespId"/> - </condition-list> - <order-by field-name="sequenceNum"/> - </entity-condition> - </actions> - - <auto-fields-service service-name="updateSurveyMultiRespColumn" default-field-type="edit"/> - - <field name="surveyId"><hidden/></field> - <field name="surveyMultiRespId" widget-style="tabletext"><display/></field> - <field name="surveyMultiRespColId" widget-style="tabletext"><display/></field> - - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="AddSurveyMultiRespColumn" type="single" target="createSurveyMultiRespColumn" title="" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createSurveyMultiRespColumn" default-field-type="edit"/> - - <field name="surveyId" map-name="surveyMultiResp"><hidden/></field> - <field name="surveyMultiRespId" map-name="surveyMultiResp"><hidden/></field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="AddSurveyMultiResp" type="single" target="createSurveyMultiResp" title="" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createSurveyMultiResp" default-field-type="edit"/> - - <field name="surveyId" map-name="survey"><hidden/></field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <!-- SurveyPage --> - <form name="ListSurveyPages" type="list" target="updateSurveyPage" title="" list-name="surveyPageList" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="SurveyPage"> - <condition-expr field-name="surveyId" from-field="surveyId"/> - <order-by field-name="sequenceNum"/> - </entity-condition> - </actions> - - <auto-fields-service service-name="updateSurveyPage" default-field-type="edit"/> - - <field name="surveyId"><hidden/></field> - <field name="surveyPageSeqId" widget-style="tabletext"><display/></field> - - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="AddSurveyPage" type="single" target="createSurveyPage" title="" default-map-name="surveyPage" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createSurveyPage" default-field-type="edit"/> - - <field name="surveyId"><hidden/></field> - - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <!-- UNUSED FORM - <form name="ListSurveyQuestions" type="list" target="updateSurveyQuestion" title="" list-name="surveyQuestionList" list-entry-name="surveyQuestion" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <auto-fields-service service-name="updateSurveyQuestion" map-name="surveyQuestion"/> - - <field name="surveyId"><hidden/></field> - <field name="surveyQuestionSeqId" title="${uiLabelMap.ContentSurveyQuestionNumber}"><display/></field> - <field name="surveyQuestionTypeId"> - <drop-down allow-empty="false"> - <entity-options entity-name="SurveyQuestionType" description="${description}"/> - </drop-down> - </field> - - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - --> - - <form name="CreateSurveyQuestion" type="single" target="createSurveyQuestion" title="" default-map-name="surveyQuestion" - header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="surveyQuestion!=null" target="updateSurveyQuestion"/> - <auto-fields-service service-name="createSurveyQuestion"/> - - <field use-when="surveyQuestion!=null" name="surveyQuestionId"><hidden/></field> - <field name="surveyId"><hidden value="${surveyId}"/></field> - <field name="surveyQuestionSeqId"><ignored/></field> - <field name="surveyQuestionCategoryId"> - <drop-down allow-empty="false"> - <entity-options entity-name="SurveyQuestionCategory" description="${description}"/> - </drop-down> - </field> - <field name="surveyQuestionTypeId"> - <drop-down allow-empty="false"> - <entity-options entity-name="SurveyQuestionType" description="${description}"/> - </drop-down> - </field> - - <field use-when="surveyQuestion!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="CreateSurveyQuestionCategory" type="single" target="createSurveyQuestionCategory" title="" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createSurveyQuestionCategory"/> - <field name="surveyId"><hidden value="${surveyId}"/></field> - <field name="parentCategoryId"> - <drop-down allow-empty="true"> - <entity-options entity-name="SurveyQuestionCategory" description="${description} [${surveyQuestionCategoryId}]" key-field-name="surveyQuestionCategoryId"> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="CreateSurveyQuestionOption" type="single" target="createSurveyQuestionOption" title="" default-map-name="surveyQuestionOption" - header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="surveyQuestionOption!=null" target="updateSurveyQuestionOption"/> - <auto-fields-service service-name="createSurveyQuestionOption"/> - - <field name="surveyId"><hidden value="${surveyId}"/></field> - <field name="surveyQuestionId"><hidden value="${surveyQuestionId}"/></field> - <field use-when="surveyQuestionOption!=null" name="surveyOptionSeqId"><hidden/></field> - - <field name="amountBaseUomId"> - <drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}"> - <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom"> - <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="durationUomId"> - <drop-down allow-empty="true"> - <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})"> - <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - - <field use-when="surveyQuestionOption!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field use-when="surveyQuestionOption==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="FindSurveyResponse" target="FindSurveyResponse" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="SurveyResponse" default-field-type="find"/> - - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="ListFindSurveyResponse" list-name="listIt" title="" type="list" paginate-target="FindSurveyResponse" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <service service-name="performFind" result-map="result" result-map-list="listIt"> - <field-map field-name="inputFields" from-field="parameters"/> - <field-map field-name="entityName" value="SurveyResponse"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> - </service> - </actions> - <auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/> - <field name="surveyResponseId" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${surveyResponseId}" target="EditSurveyResponse"> - <parameter param-name="surveyResponseId"/> - </hyperlink> - </field> - </form> - - <form name="lookupSurvey" target="LookupSurvey" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="Survey" default-field-type="find"/> - <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}"><text-find/></field> - <field name="isAnonymous"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - <field name="allowMultiple"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - <field name="allowUpdate"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="listLookupSurvey" list-name="listIt" title="" type="list" paginate-target="LookupSurvey" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <service service-name="performFind" result-map="result" result-map-list="listIt"> - <field-map field-name="inputFields" from-field="parameters"/> - <field-map field-name="entityName" value="Survey"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> - </service> - </actions> - <auto-fields-entity entity-name="Survey" default-field-type="display"/> - <field name="surveyId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${surveyId}" target="javascript:set_value('${surveyId}')"/> - </field> - </form> - - <form name="lookupSurveyResponse" target="LookupSurveyResponse" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="SurveyResponse" default-field-type="find"/> - - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="listLookupSurveyResponse" list-name="listIt" title="" type="list" paginate-target="LookupSurveyResponse" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <service service-name="performFind" result-map="result" result-map-list="listIt"> - <field-map field-name="inputFields" from-field="parameters"/> - <field-map field-name="entityName" value="SurveyResponse"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> - </service> - </actions> - <auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/> - <field name="surveyResponseId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${surveyResponseId}" target="javascript:set_value('${surveyResponseId}')"/> - </field> - </form> -</forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |