svn commit: r1160209 [1/2] - in /ofbiz/trunk/applications: commonext/widget/ofbizsetup/ content/webapp/content/WEB-INF
Locked
svn commit: r1160209 [1/2] - in /ofbiz/trunk/applications: commonext/widget/ofbizsetup/ content/webapp/content/WEB-INF
 
|
Author: mor
Date: Mon Aug 22 11:30:31 2011 New Revision: 1160209 URL: http://svn.apache.org/viewvc?rev=1160209&view=rev Log: Moved form widgets from webapp to widget folder. Contribution from Deepak Dixit. Added: ofbiz/trunk/applications/content/widget/LookupForms.xml (with props) ofbiz/trunk/applications/content/widget/cms/CMSForms.xml (with props) ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml (with props) ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml (with props) ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml (with props) ofbiz/trunk/applications/content/widget/survey/ ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml (with props) ofbiz/trunk/applications/content/widget/website/ ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml (with props) ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (with props) 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=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml (original) +++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Mon Aug 22 11:30:31 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=1160209&r1=1160208&r2=1160209&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 11:30:31 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; Added: ofbiz/trunk/applications/content/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupForms.xml?rev=1160209&view=auto ============================================================================== (empty) Propchange: ofbiz/trunk/applications/content/widget/LookupForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/widget/LookupForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/content/widget/LookupForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/content/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupScreens.xml?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/LookupScreens.xml Mon Aug 22 11:30:31 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=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Mon Aug 22 11:30:31 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=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Mon Aug 22 11:30:31 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> Added: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSForms.xml?rev=1160209&view=auto ============================================================================== (empty) Propchange: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Mon Aug 22 11:30:31 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=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Mon Aug 22 11:30:31 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> Added: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml?rev=1160209&view=auto ============================================================================== (empty) Propchange: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml Mon Aug 22 11:30:31 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=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Mon Aug 22 11:30:31 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> Added: ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml?rev=1160209&view=auto ============================================================================== (empty) Propchange: ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml?rev=1160209&view=auto ============================================================================== (empty) Propchange: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Mon Aug 22 11:30:31 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> Added: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml?rev=1160209&view=auto ============================================================================== (empty) Propchange: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml?rev=1160209&view=auto ============================================================================== (empty) Propchange: ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy Mon Aug 22 11:30:31 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = delegator.findByAnd("InventoryItemDetail", [workEffortId : task.workEffortId]); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskActualComponents", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskActualComponents", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy Mon Aug 22 11:30:31 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = delegator.findByAnd("WorkEffortGoodStandard", [workEffortId : task.workEffortId]); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskComponents", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskComponents", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy Mon Aug 22 11:30:31 2011 @@ -25,14 +25,14 @@ taskCosts = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> costs = EntityUtil.filterByDate(delegator.findByAnd("CostComponent", [workEffortId : task.workEffortId])); - HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); + HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); taskCostsForm.putInContext("taskCosts", costs); taskCosts.add([task : task ,costsForm : taskCostsForm]); } // get the costs directly associated to the production run (e.g. overhead costs) productionRun = delegator.findOne("WorkEffort", [workEffortId: productionRunId], true); costs = EntityUtil.filterByDate(delegator.findByAnd("CostComponent", [workEffortId : productionRunId])); -HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); +HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); taskCostsForm.putInContext("taskCosts", costs); taskCosts.add([task : productionRun ,costsForm : taskCostsForm]); Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Mon Aug 22 11:30:31 2011 @@ -98,7 +98,7 @@ if (productionRunId) { Map routingTaskData = routingTask.getAllFields(); routingTaskData.estimatedSetupMillis = routingTask.getDouble("estimatedSetupMillis"); routingTaskData.estimatedMilliSeconds = routingTask.getDouble("estimatedMilliSeconds"); - HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); + HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); editPrRoutingTaskWrapper.putInContext("routingTaskData", routingTaskData); editPrRoutingTaskWrapper.putInContext("actionForm", "UpdateRoutingTask"); routingTaskData.partyId = userLogin.partyId; @@ -116,14 +116,14 @@ if (productionRunId) { if (templateTask) { delivProducts = EntityUtil.filterByDate(templateTask.getRelatedByAnd("WorkEffortGoodStandard", [workEffortGoodStdTypeId : "PRUNT_PROD_DELIV"])); } - HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); + HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); createRoutingTaskDelivProductForm.putInContext("formData", [productionRunId : productionRunId, workEffortId : routingTaskId]); context.createRoutingTaskDelivProductForm = createRoutingTaskDelivProductForm; context.delivProducts = delivProducts; // Get the list of delivered products, i.e. inventory items prunInventoryProduced = delegator.findByAnd("WorkEffortAndInventoryProduced", [workEffortId : routingTaskId]); context.prunInventoryProduced = prunInventoryProduced; - HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); + HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); prunInventoryProducedForm.putInContext("prunInventoryProduced", prunInventoryProduced); context.prunInventoryProducedForm = prunInventoryProducedForm; } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy?rev=1160209&r1=1160208&r2=1160209&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy Mon Aug 22 11:30:31 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = task.getRelated("WorkEffortFixedAssetAssign"); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskFixedAssets", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskFixedAssets", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |