svn commit: r1160233 [1/4] - in /ofbiz/trunk/applications: commonext/widget/ofbizsetup/ content/webapp/content/WEB-INF
Locked
svn commit: r1160233 [1/4] - in /ofbiz/trunk/applications: commonext/widget/ofbizsetup/ content/webapp/content/WEB-INF
 
|
Author: mor
Date: Mon Aug 22 12:14:25 2011 New Revision: 1160233 URL: http://svn.apache.org/viewvc?rev=1160233&view=rev Log: Moved form widgets from webapp to widget folder. Contribution from Deepak Dixit. Added: ofbiz/trunk/applications/content/widget/LookupForms.xml - copied, changed from r1160221, ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml ofbiz/trunk/applications/content/widget/cms/CMSForms.xml - copied, changed from r1160221, ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml - copied, changed from r1160221, ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml - copied, changed from r1160226, ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml - copied, changed from r1160221, ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml ofbiz/trunk/applications/content/widget/survey/ ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml - copied, changed from r1160221, ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml ofbiz/trunk/applications/content/widget/website/ ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml - copied, changed from r1160221, ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml - copied, changed from r1160221, ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Removed: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml ofbiz/trunk/applications/content/webapp/content/datasetup/ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy ofbiz/trunk/applications/content/widget/LookupScreens.xml ofbiz/trunk/applications/content/widget/SurveyScreens.xml ofbiz/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml (original) +++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Mon Aug 22 12:14:25 2011 @@ -187,7 +187,7 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - <form name="EditWebSite" extends="EditWebSite" extends-resource="component://content/webapp/content/website/WebSiteForms.xml"> + <form name="EditWebSite" extends="EditWebSite" extends-resource="component://content/widget/website/WebSiteForms.xml"> <actions><set field="webSiteId" from-field="webSite.webSiteId"/></actions> <field use-when="webSite==null&&webSiteId==null" name="webSiteId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="WebStore"/></field> <field name="siteName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy Mon Aug 22 12:14:25 2011 @@ -31,11 +31,11 @@ surveyQuestionAndApplList = delegator.fi surveyPageList = delegator.findList("SurveyPage", EntityCondition.makeCondition([surveyId : surveyId]), null, ['sequenceNum'], null, false); surveyMultiRespList = delegator.findList("SurveyMultiResp", EntityCondition.makeCondition([surveyId : surveyId]), null, ['multiRespTitle'], null, false); -HtmlFormWrapper createSurveyQuestionWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestion", request, response); +HtmlFormWrapper createSurveyQuestionWrapper = new HtmlFormWrapper("component://content/widget/survey/SurveyForms.xml", "CreateSurveyQuestion", request, response); createSurveyQuestionWrapper.putInContext("surveyId", surveyId); createSurveyQuestionWrapper.putInContext("surveyQuestion", surveyQuestion); -HtmlFormWrapper createSurveyQuestionCategoryWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestionCategory", request, response); +HtmlFormWrapper createSurveyQuestionCategoryWrapper = new HtmlFormWrapper("component://content/widget/survey/SurveyForms.xml", "CreateSurveyQuestionCategory", request, response); createSurveyQuestionCategoryWrapper.putInContext("surveyId", surveyId); if (surveyQuestion && surveyQuestion.surveyQuestionTypeId && "OPTION".equals(surveyQuestion.surveyQuestionTypeId)) { @@ -43,7 +43,7 @@ if (surveyQuestion && surveyQuestion.sur questionOptions = delegator.findList("SurveyQuestionOption", EntityCondition.makeCondition([surveyQuestionId : surveyQuestionId]), null, ['sequenceNum'], null, false); context.questionOptions = questionOptions; - HtmlFormWrapper createSurveyOptionWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestionOption", request, response); + HtmlFormWrapper createSurveyOptionWrapper = new HtmlFormWrapper("component://content/widget/survey/SurveyForms.xml", "CreateSurveyQuestionOption", request, response); // survey question option optionSeqId = parameters.surveyOptionSeqId; Copied: ofbiz/trunk/applications/content/widget/LookupForms.xml (from r1160221, ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupForms.xml?p2=ofbiz/trunk/applications/content/widget/LookupForms.xml&p1=ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml&r1=1160221&r2=1160233&rev=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/content/widget/LookupForms.xml Mon Aug 22 12:14:25 2011 @@ -1,102 +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="lookupListLayout" default-entity-name="ContentAssocDataResourceViewFrom" list-name="entityList" target="" title="" type="list" - paginate-target="LookupListLayout" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="ContentAssocDataResourceViewFrom" list="entityList" > - <condition-expr field-name="caContentIdTo" value="TEMPLATE_MASTER"/> - </entity-condition> - </actions> - <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${contentId}" target-type="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')"/> - </field> - <field name="contentName"><display/></field> - <field name="description"><display/></field> - <field name="drObjectInfo"><display/></field> - </form> - - <form name="lookupDataResourceContent" default-entity-name="DataResourceContentView" target="LookupSubContent" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="dataResourceId"> - <text-find/> - </field> - <field name="coContentId"> - <text-find/> - </field> - <field name="coContentName"> - <text-find/> - </field> - <field name="coDescription"> - <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> - <field name="contentIdTo"> - <hidden value="${contentIdTo}"/> - </field> - <field name="mapKey"> - <hidden value="${mapKey}"/> - </field> - </form> - - <form name="listLookupDataResourceContent" default-entity-name="DataResourceContentView" list-name="listIt" target="" title="" type="list" - paginate-target="LookupSubContent" 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="DataResourceContentView"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> - </service> - </actions> - <field name="replace" widget-style="buttontext" > - <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.FormFieldTitle_replace} [${dataResourceId}/${coContentId}]" - target="javascript:execRemoteCall('replaceSubContent','${dataResourceId}','${coContentId}', '${contentIdTo}', '${mapKey}')" - /> - </field> - <field name="pasteContent" widget-style="buttontext" > - <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ContentPaste} [${dataResourceId}/${coContentId}]" - target="javascript:execRemoteCall('pasteContent','${dataResourceId}','${coContentId}')"/> - </field> - <field name="dataResourceName" widget-style="buttontext"> - <display/> - </field> - <field name="dataCategoryId" widget-style="buttontext"> - <display/> - </field> - </form> -</forms> Modified: ofbiz/trunk/applications/content/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupScreens.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/LookupScreens.xml Mon Aug 22 12:14:25 2011 @@ -35,7 +35,7 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-results"> - <include-form name="lookupListLayout" location="component://content/webapp/content/lookup/LookupForms.xml"/> + <include-form name="lookupListLayout" location="component://content/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -56,10 +56,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/> + <include-form name="lookupDataResourceContent" location="component://content/widget/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/> + <include-form name="listLookupDataResourceContent" location="component://content/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Mon Aug 22 12:14:25 2011 @@ -40,10 +40,10 @@ under the License. <container style="button-bar"><link text="${uiLabelMap.ContentSurveyCreate}" target="EditSurvey" style="buttontext create"/></container> </decorator-section> <decorator-section name="search-options"> - <include-form name="FindSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="FindSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListFindSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListFindSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -115,13 +115,13 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleCreateSurvey}"> - <include-form name="EditSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="EditSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.PageTitleEditSurvey} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}"> - <include-form name="EditSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> - <include-form name="BuildSurveyFromPdf" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="EditSurvey" location="component://content/widget/survey/SurveyForms.xml"/> + <include-form name="BuildSurveyFromPdf" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </fail-widgets> </section> @@ -152,17 +152,17 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.ContentSurveyEditSurveyMultiResp}"> - <include-form name="EditSurveyMultiResp" location="component://content/webapp/content/survey/SurveyForms.xml"/> - <include-form name="ListSurveyMultiRespColumns" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="EditSurveyMultiResp" location="component://content/widget/survey/SurveyForms.xml"/> + <include-form name="ListSurveyMultiRespColumns" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ContentSurveyAddSurveyMultiRespColumn}"> - <include-form name="AddSurveyMultiRespColumn" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="AddSurveyMultiRespColumn" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </widgets> </section> </iterate-section> <screenlet title="${uiLabelMap.ContentSurveyAddSurveyMultiResp}"> - <include-form name="AddSurveyMultiResp" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="AddSurveyMultiResp" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -188,14 +188,14 @@ under the License. <platform-specific><html><html-template location="component://content/webapp/content/survey/EditSurveyQuestions.ftl"/></html></platform-specific> <!-- This page is a bit of a mess, so will cleanup/modernize later... - <include-form name="ListSurveyQuestions" location="component://content/webapp/content/survey/SurveyForms.xml"/> - <include-form name="CreateSurveyQuestion" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListSurveyQuestions" location="component://content/widget/survey/SurveyForms.xml"/> + <include-form name="CreateSurveyQuestion" location="component://content/widget/survey/SurveyForms.xml"/> --> <screenlet id="SurveyPagePanel" title="${uiLabelMap.PageTitleEditSurveyPages} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}" collapsible="true"> - <include-form name="AddSurveyPage" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="AddSurveyPage" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> - <include-form name="ListSurveyPages" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListSurveyPages" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -225,13 +225,13 @@ under the License. <parameter param-name="surveyId"/> </link> </container> - <include-form name="FindSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="FindSurveyResponse" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ContentSurveyBuildRespondeFromPDF}"> - <include-form name="BuildSurveyResponseFromPdf" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="BuildSurveyResponseFromPdf" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleListSurveyResponse}"> - <include-form name="ListFindSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListFindSurveyResponse" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -295,7 +295,7 @@ under the License. <decorator-section name="body"> <container><label style="h1">${uiLabelMap.PageTitleEditSurveyResponse}, ${uiLabelMap.ContentSurveyResponse}: ${parameters.surveyResponseId}, ${uiLabelMap.ContentSurveySurveyId}: ${surveyId}</label></container> <platform-specific><html><html-template location="component://content/webapp/content/survey/EditSurveyResponse.ftl"/></html></platform-specific> - <include-form name="BuildSurveyResponseFromPdf" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="BuildSurveyResponseFromPdf" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -317,10 +317,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="lookupSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="listLookupSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -341,10 +341,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="lookupSurveyResponse" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="listLookupSurveyResponse" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -361,7 +361,7 @@ under the License. <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> - <include-form name="ListFindSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListFindSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </widgets> </section> </screen> Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Mon Aug 22 12:14:25 2011 @@ -39,7 +39,7 @@ under the License. <container style="button-bar"> <link text="${uiLabelMap.ContentCreateNewWebSite}" target="EditWebSite" style="buttontext create"/> </container> - <include-form name="ListWebSites" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="ListWebSites" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -67,7 +67,7 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleEditWebSite}"> - <include-form name="EditWebSite" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="EditWebSite" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> </widgets> </section> @@ -95,13 +95,13 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleWebSiteContent}"> - <include-form name="ListWebSiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="ListWebSiteContent" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleCreateWebSiteContent}"> - <include-form name="CreateWebSiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="CreateWebSiteContent" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleAutoCreateContentPublishPoints}"> - <include-form name="AutoCreateWebsiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="AutoCreateWebsiteContent" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> </widgets> </section> @@ -128,9 +128,9 @@ under the License. <section> <widgets> <screenlet id="AddWebSiteRolePanel" title="${uiLabelMap.PageTitleCreateWebSiteParties}" collapsible="true"> - <include-form name="CreateWebSiteRole" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="CreateWebSiteRole" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> - <include-form name="UpdateWebSiteRole" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="UpdateWebSiteRole" location="component://content/widget/website/WebSiteForms.xml"/> </widgets> </section> </decorator-section> @@ -346,10 +346,10 @@ under the License. <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="FindWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="FindWebSitePathAlias" location="component://content/widget/website/WebSiteForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="ListWebSitePathAlias" location="component://content/widget/website/WebSiteForms.xml"/> </decorator-section> </decorator-screen> </decorator-section> @@ -363,7 +363,7 @@ under the License. <set field="webSiteId" from-field="parameters.webSiteId"/> </actions> <widgets> - <include-form name="ListWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="ListWebSitePathAlias" location="component://content/widget/website/WebSiteForms.xml"/> </widgets> </section> </screen> @@ -383,7 +383,7 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleWebSiteSEO}"> - <include-form name="CreateWebsiteSEO" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="CreateWebsiteSEO" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> </widgets> </section> @@ -409,10 +409,10 @@ under the License. <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentWebSiteContactListCreate}"> - <include-form location="component://content/webapp/content/website/WebSiteForms.xml" name="CreateWebSiteContactList"/> + <include-form location="component://content/widget/website/WebSiteForms.xml" name="CreateWebSiteContactList"/> </screenlet> <screenlet title="${uiLabelMap.ContentWebSiteContactListView} of webSiteId[${webSiteId}]"> - <include-form location="component://content/webapp/content/website/WebSiteForms.xml" name="ViewWebSiteContactList"/> + <include-form location="component://content/widget/website/WebSiteForms.xml" name="ViewWebSiteContactList"/> </screenlet> </decorator-section> </decorator-screen> Copied: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml (from r1160221, ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSForms.xml?p2=ofbiz/trunk/applications/content/widget/cms/CMSForms.xml&p1=ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml&r1=1160221&r2=1160233&rev=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSForms.xml Mon Aug 22 12:14:25 2011 @@ -1,664 +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="findContent" default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="caContentIdTo"><text-find/></field> - <field name="caMapKey"><text-find/></field> - <field name="caContentAssocTypeId"><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> - </form> - - <form name="listFindContent" type="list" list-name="listIt" target="" paginate-target="/CMSContentFind" view-size="20" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <service service-name="performFind" result-map-list="listIt"> - <field-map field-name="inputFields" from-field="requestParameters"/> - <field-map field-name="entityName" from-field="entityName"/> - <field-map field-name="noConditionFind" value="Y"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> - </service> - </actions> - - <field name="caContentIdTo" title="${uiLabelMap.CommonEmptyHeader}"> - <hyperlink also-hidden="false" description="${caContentIdTo}" target="EditAddContent"> - <parameter param-name="MASTER_contentId" from-field="contentId"/> - <parameter param-name="MASTER_drDataResourceId" from-field="drDataResourceId"/> - <parameter param-name="MASTER_caContentIdTo" from-field="caContentIdTo"/> - <parameter param-name="MASTER_caContentAssocTypeId" from-field="caContentAssocTypeId"/> - <parameter param-name="MASTER_caFromDate" from-field="caFromDate"/> - </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="caMapKey"><display/></field> - <field name="caFromDate" title="${uiLabelMap.CommonFromDate}"><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" - header-row-style="header-row" default-table-style="basic-table"> - <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.ContentTemplateTextOnly}"/> - <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.ContentTemplateImageCentered}"/> - <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.ContentTemplateImageLeft}"/> - </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.ContentBlogSummary}" - use-when=""${summaryDataResourceTypeId}".length()>0" - id-name="summaryData"> - <textarea rows="8" cols="80"/> - </field> - - <field name="textData" 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> - - <!-- ContentPurposeOperation forms --> - <form name="UpdateContentPurposeOperation" list-name="contentList" target="updateContentPurposeOperation" title="" type="list" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation"> - <parameter param-name="contentPurposeTypeId"/> - <parameter param-name="contentOperationId"/> - <parameter param-name="roleTypeId"/> - <parameter param-name="statusId"/> - <parameter param-name="privilegeEnumId"/> - </hyperlink> - </field> - </form> - <form name="AddContentPurposeOperation" target="addContentPurposeOperation" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createContentPurposeOperation"/> - <field name="contentPurposeTypeId"> - <drop-down allow-empty="false"> - <entity-options description="${description}" - entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/> - </drop-down> - </field> - <field name="contentOperationId"> - <drop-down allow-empty="false"> - <entity-options description="${description}" - entity-name="ContentOperation" key-field-name="contentOperationId"/> - </drop-down> - </field> - <field name="roleTypeId"> - <drop-down allow-empty="false"> - <option key="_NA_" description="${uiLabelMap.CommonNA}"/> - <entity-options description="${description}" - entity-name="RoleType" key-field-name="roleTypeId"/> - </drop-down> - </field> - <field name="statusId"> - <drop-down allow-empty="false"> - <option key="_NA_" description="${uiLabelMap.CommonNA}"/> - <entity-options description="${description}" - entity-name="StatusItem" key-field-name="statusId"> - <entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/> - </entity-options> - </drop-down> - </field> - <field name="privilegeEnumId"> - <drop-down allow-empty="false"> - <option key="_NA_" description="${uiLabelMap.CommonNA}"/> - <entity-options description="${description}" - entity-name="Enumeration" key-field-name="enumId"> - <entity-constraint name="enumTypeId" value="SUBSCRIPTION_TYPE"/> - </entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="EditAddContentMaster" target="" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <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="Owning Department" > - <hidden value="${contentIdTo}"/> - </field> - <field name="contentName" map-name="currentValue"> - <display/> - </field> - <field name="textData" entry-name="summaryData" id-name="textData" - use-when=""${textSource}".length()>0 && "${textSource}".equals("summaryData") " - ><textarea rows="20" cols="80"/></field> - <field name="textData" 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="masterContentId" > - <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" header-row-style="header-row" default-table-style="basic-table"> - </form> - <form name="EditAddBioContent" target="persistBioContent" title="" type="single" extends="EditAddContentMaster" header-row-style="header-row" default-table-style="basic-table"> - </form> -<!-- - <form name="AddResponse" target="uploadResponse" title="" type="single" extends="EditAddContentMaster"> - </form> ---> - - <form name="EditAddImageMaster" target="" title="" type="upload" header-row-style="header-row" default-table-style="basic-table"> - <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="Owning Department" > - <hidden value="${contentIdTo}"/> - </field> - <field name="contentName" 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" header-row-style="header-row" default-table-style="basic-table"> - </form> - <form name="EditAddBioImage" target="persistBioImage" title="" type="upload" extends="EditAddImageMaster" header-row-style="header-row" default-table-style="basic-table"> - </form> - - <form name="AdminIndex" target="AdminIndex" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="indexContentIds" position="1"><text size="50"/></field> - <field name="submitButton" title="${uiLabelMap.ContentIndexEnteredIds}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field> - </form> - - <form name="AdminIndexAll" target="indexTree" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" position="1"><text size="50" default-value="WebStoreCONTENT"/></field> - <field name="submitButton" title="${uiLabelMap.ContentIndexAll}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field> - </form> - - <form name="searchQuery" target="AdminSearch" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="queryLine"><text size="60"/></field> - <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="searchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit"> - <parameter param-name="contentId"/> - <parameter param-name="drDataResourceId" from-field="dataResourceId"/> - <parameter param-name="contentIdTo"/> - </hyperlink> - </field> - <field name="contentId"><display/></field> - <field name="dataResourceId"><display/></field> - <field name="contentName"><display/></field> - </form> - - <form name="EditAddContentStuff" target="persistContentStuff" title="" type="upload" default-map-name="currentValue" - header-row-style="header-row" default-table-style="basic-table"> - <field name="contentAssocTitle" title="${uiLabelMap.ContentAssoc}" title-style="h1" map-name="dummy"> - <display description=""/> - </field> - <field name="caContentIdTo" position="1" - use-when=""${caContentIdTo}".length()>0" > - <display /> - </field> - <field name="caContentIdTo" position="1" - use-when=""${caContentIdTo}".length()==0" > - <text /> - </field> - <field name="caMapKey" position="2" - use-when=""${caMapKey}".length()==0" > - <text /> - </field> - <field name="caMapKey" position="2" - use-when=""${caMapKey}".length()>0" > - <display /> - </field> - <field name="caContentAssocTypeId" position="1" - use-when=""${caContentAssocTypeId}".length()>0" > - <display /> - </field> - <field name="caContentAssocTypeId" position="1" - use-when=""${caContentAssocTypeId}".length()==0" > - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="ContentAssocType" key-field-name="contentAssocTypeId"/> - </drop-down> - </field> - <field name="caContentAssocPredicateId" position="1"> - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/> - </drop-down> - </field> - <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" widget-style="buttontext" position="1"><date-time default-value="${nowTimestamp}"/></field> - <field name="caThruDate" title="${uiLabelMap.CommonThruDate}" widget-style="buttontext" position="2"><date-time/></field> - <field name="contentTitle" title="${uiLabelMap.ContentContent}" title-style="h1" map-name="dummy"> - <display description=""/> - </field> - <field name="contentId" position="1" - use-when=""${currentValue.contentId}".length()>0" > - <display /> - </field> - - <field name="contentId" position="1" - use-when=""${currentValue.contentId}".length()==0" > - <text /> - </field> - <field name="templateDataResourceId"> - <lookup target-form-name="LookupDataResource"> - </lookup> - </field> - <field name="contentTypeId" position="1"> - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/> - </drop-down> - </field> - <field name="ownerContentId" position="2"> - <lookup target-form-name="LookupContent"/> - </field> - <field name="contentName" position="1"> - <text/> - </field> - <field name="description" position="2"> - <text size="60"/> - </field> - <field name="mimeTypeId" position="1"> - <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" position="2"> - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/> - </drop-down> - </field> - <field name="localeString" position="3"> - <text/> - </field> - <field name="statusId" position="1"> - <drop-down allow-empty="true" > - <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId"> - <entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/> - <entity-order-by field-name="sequenceId"/> - </entity-options> - </drop-down> - </field> - <field name="privilegeEnumId" position="2"> - <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="dataResourceTitle" title-style="h1" map-name="dummy"> - <display description=""/> - </field> - <field name="dataResourceId"> - <lookup target-form-name="LookupDataResource"> - <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}"> - <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/> - </sub-hyperlink> -<!-- - <sub-hyperlink link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}"> - <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/> - </sub-hyperlink> - <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource" description="${uiLabelMap.ContentGoToDataResource}"> - <parameter param-name="dataResourceId" from-field="currentValue.dataResourceId"/> - </sub-hyperlink> ---> - </lookup> - </field> - <field name="drDataResourceTypeId" position="1"> - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/> - </drop-down> - </field> - <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}" position="2"> - <text/> - </field> - <field name="drDataTemplateTypeId" position="3"> - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/> - </drop-down> - </field> - <field name="drMimeTypeId" position="1"> - <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="drCharacterSetId" position="2"> - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/> - </drop-down> - </field> - <field name="drLocaleString" position="3"> - <text/> - </field> - <field name="drDataSourceId" position="1"> - <text/> - </field> - <field name="drDataCategoryId" position="2"> - <text/> - </field> - <!--<field name="textData" title="Text" id-name="textData" >--> - - <field name="textDataTitle" title-style="h1" map-name="dummy"> - <display description=""/> - </field> - <field name="textData"> - <textarea rows="20" cols="80"/> - </field> - - <field name="imageDataTitle" title-style="h1" map-name="dummy"> - <display description=""/> - </field> - <field name="imageData" > - <file /> - </field> - <field name="contentPurposeString" > - <hidden value="${contentPurposeTypeId}"/> - </field> - <field name="targetOperationString" > - <hidden value="${targetOperation}"/> - </field> - <field name="nodeTrailCsv" > - <hidden value="${nodeTrailCsv}"/> - </field> - <field name="masterContentId" > - <hidden value="${contentIdTo}"/> - </field> - <field name="deactivateExisting" > - <hidden value="true"/> - </field> - <field name="_rowCount" > - <hidden value="1"/> - </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="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.CommonUpload}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - - <field name="MASTER_contentId" ><hidden value="${MASTER_contentId}"/></field> - <field name="MASTER_caContentId" ><hidden value="${MASTER_caContentId}"/></field> - <field name="MASTER_caContentIdTo" ><hidden value="${MASTER_caContentIdTo}"/></field> - <field name="MASTER_caContentAssocTypeId" ><hidden value="${MASTER_caContentAssocTypeId}"/></field> - <field name="MASTER_caFromDate" ><hidden value="${MASTER_caFromDate}"/></field> - <field name="MASTER_drDataResource" ><hidden value="${MASTER_drDataResource}"/></field> - </form> - <form name="EditAddSubContentStuff" target="persistSubContentStuff" title="" type="upload" default-map-name="currentValue" extends="EditAddContentStuff" - header-row-style="header-row" default-table-style="basic-table"> - </form> - - <form name="TestPermission" target="TestPermission" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId"> - <text/> - </field> - <field name="partyId"> - <text/> - </field> - <field name="userLoginId"> - <text/> - </field> - <field name="targetOperationString"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="ContentOperation" key-field-name="contentOperationId"/> - </drop-down> - </field> - <field name="displayFailCond"> - <hidden value="true"/> - </field> - <field name="displayPassCond"> - <hidden value="true"/> - </field> - <!-- - <field name="contentPurposeString"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/> - </drop-down> - </field> - <field name="roleTypeString"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="RoleType" key-field-name="roleTypeId"/> - </drop-down> - </field> - --> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> -</forms> Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Mon Aug 22 12:14:25 2011 @@ -43,10 +43,10 @@ under the License. <container style="button-bar"><link target="EditAddContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container> </decorator-section> <decorator-section name="search-options"> - <include-form name="findContent" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="findContent" location="component://content/widget/cms/CMSForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listFindContent" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="listFindContent" location="component://content/widget/cms/CMSForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -100,7 +100,7 @@ under the License. <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditContent}"> - <include-form name="EditContent" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="EditContent" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -140,7 +140,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSEditPage}"> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/> - <include-form name="EditAddContentStuff" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="EditAddContentStuff" location="component://content/widget/cms/CMSForms.xml"/> <content content-id="${contentId}" enable-edit-name="notfound" edit-request="EditAddSubContent?MASTER_contentId=${MASTER_contentId}&MASTER_caContentIdTo=${MASTER_caContentIdTo}&MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&MASTER_caFromDate=${MASTER_caFromDate}&MASTER_drDataResourceId=${MASTER_drDataResourceId}&caContentIdTo=${caContentIdTo}"/> </screenlet> </decorator-section> @@ -175,7 +175,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSAddSubContent}"> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/> - <include-form name="EditAddSubContentStuff" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="EditAddSubContentStuff" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -200,7 +200,7 @@ under the License. <platform-specific> <html><html-template location="component://content/webapp/content/cms/AdminSearch.ftl"/></html> </platform-specific> - <include-form name="searchList" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="searchList" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -220,8 +220,8 @@ under the License. <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSSearchPage}"> - <include-form name="AdminIndex" location="component://content/webapp/content/cms/CMSForms.xml"/> - <include-form name="AdminIndexAll" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="AdminIndex" location="component://content/widget/cms/CMSForms.xml"/> + <include-form name="AdminIndexAll" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -283,7 +283,7 @@ under the License. <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentTestPermission}"> - <include-form name="TestPermission" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="TestPermission" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Mon Aug 22 12:14:25 2011 @@ -495,7 +495,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListWebSites" paginate-target="ListWebSite" paginate="true" extends="ListWebSites" extends-resource="component://content/webapp/content/website/WebSiteForms.xml"> + <form name="ListWebSites" paginate-target="ListWebSite" paginate="true" extends="ListWebSites" extends-resource="component://content/widget/website/WebSiteForms.xml"> <field name="webSiteContentTypeId"><display-entity entity-name="WebSiteContentType" description="${description}"/></field> <field name="fromDate"><display type="date"/></field> <field name="thruDate"><display type="date"/></field> Copied: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml (from r1160221, ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml?p2=ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml&p1=ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml&r1=1160221&r2=1160233&rev=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml (original) +++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml Mon Aug 22 12:14:25 2011 @@ -1,233 +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"> - <!-- ContentType forms --> - <form name="AddContentType" target="addContentType" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createContentType"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateContentType" list-name="contentList" target="updateContentType" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="ContentType" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateContentType"/> - <field name="contentTypeId" 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="removeContentType"> - <parameter param-name="contentTypeId"/> - </hyperlink> - </field> - </form> - - <!-- ContentTypeAttr forms --> - <form name="AddContentTypeAttr" target="addContentTypeAttr" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createContentTypeAttr"/> - <field entity-name="ContentType" name="contentTypeId"> - <drop-down allow-empty="false"> - <entity-options description="${description}" - entity-name="ContentType" key-field-name="contentTypeId"/> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateContentTypeAttr" list-name="contentList" target="updateContentTypeAttr" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="ContentTypeAttr" use-cache="false"/> - </actions> - <auto-fields-service service-name="createContentTypeAttr"/> - <field name="contentTypeId"> - <display/> - </field> - <field name="attrName"> - <display/> - </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentTypeAttr"> - <parameter param-name="contentTypeId"/> - <parameter param-name="attrName"/> - </hyperlink> - </field> - </form> - - <!-- ContentAssocType forms --> - <form name="AddContentAssocType" target="addContentAssocType" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createContentAssocType"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateContentAssocType" list-name="contentList" target="updateContentAssocType" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="ContentAssocType" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateContentAssocType"/> - <field name="contentAssocTypeId" 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="removeContentAssocType"> - <parameter param-name="contentAssocTypeId"/> - </hyperlink> - </field> - </form> - - <!-- ContentPurposeType forms --> - <form name="AddContentPurposeType" target="addContentPurposeType" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createContentPurposeType"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateContentPurposeType" list-name="contentList" target="updateContentPurposeType" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="ContentPurposeType" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateContentPurposeType"/> - <field name="contentPurposeTypeId" 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="removeContentPurposeType"> - <parameter param-name="contentPurposeTypeId"/> - </hyperlink> - </field> - </form> - - <!-- ContentAssocPredicate forms --> - <form name="AddContentAssocPredicate" target="addContentAssocPredicate" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createContentAssocPredicate"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateContentAssocPredicate" list-name="contentList" target="updateContentAssocPredicate" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="ContentAssocPredicate" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateContentAssocPredicate"/> - <field name="contentAssocPredicateId" 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="removeContentAssocPredicate"> - <parameter param-name="contentAssocPredicateId"/> - </hyperlink> - </field> - </form> - - <!-- ContentOperation forms --> - <form name="AddContentOperation" target="addContentOperation" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createContentOperation"/> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateContentOperation" list-name="contentList" target="updateContentOperation" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-condition entity-name="ContentOperation" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateContentOperation"/> - <field name="contentOperationId" 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="removeContentOperation"> - <parameter param-name="contentOperationId"/> - </hyperlink> - </field> - </form> - <!-- ContentPurposeOperation forms --> - <form name="AddContentPurposeOperation" target="addContentPurposeOperation" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createContentPurposeOperation"/> - <field name="contentPurposeTypeId"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/> - </drop-down> - </field> - <field name="contentOperationId"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="ContentOperation" key-field-name="contentOperationId"/> - </drop-down> - </field> - <field name="roleTypeId"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="RoleType" key-field-name="roleTypeId"/> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> - <form name="UpdateContentPurposeOperation" target="" title="" type="list" list-name="contentList" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <entity-one entity-name="ContentPurposeOperation" use-cache="false"/> - </actions> - <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation"> - <parameter param-name="contentPurposeTypeId"/> - <parameter param-name="contentOperationId"/> - <parameter param-name="roleTypeId"/> - <parameter param-name="statusId"/> - <parameter param-name="privilegeEnumId"/> - </hyperlink> - </field> - </form> -</forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |