|
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Tue Apr 7 08:27:15 2009 @@ -144,7 +144,7 @@ <set field="titleProperty" value="PageTitleEditInvoice"/> <set field="tabButtonItem" value="editInvoice"/> <set field="invoiceId" from-field="parameters.invoiceId"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <entity-one entity-name="Invoice" value-field="invoice"/> <entity-one entity-name="InvoiceType" value-field="invoiceType"> <field-map field-name="invoiceTypeId" from-field="invoice.invoiceTypeId"/> @@ -482,8 +482,8 @@ <set field="tabButtonItem" value="listInvoiceItems"/> <set field="invoiceId" from-field="parameters.invoiceId"/> <set field="invoiceItemSeqd" from-field="parameters.invoiceItemSeqId"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> - <entity-one entity-name="Invoice" value-field="invoice" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> + <entity-one entity-name="Invoice" value-field="invoice"/> <entity-one entity-name="InvoiceItem" value-field="invoiceItem"/> <entity-and entity-name="InvoiceItem" list="invoiceItems"> <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Tue Apr 7 08:27:15 2009 @@ -37,10 +37,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="lookupPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="listPayment" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -63,10 +63,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="lookupInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="listInvoice" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -87,10 +87,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="lookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="listLookupFixedAsset" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -142,10 +142,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="lookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="listLookupGlAccount" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -192,10 +192,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupAgreementItem" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="lookupAgreementItem" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listAgreementItems" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml" /> + <include-form name="listAgreementItems" location="component://accounting/webapp/accounting/lookup/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Tue Apr 7 08:27:15 2009 @@ -60,7 +60,7 @@ <set field="headerItem" value="payments"/> <set field="tabButtonItem" value="editPayment"/> <set field="paymentId" from-field="parameters.paymentId"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -111,7 +111,7 @@ <entity-one entity-name="Payment" value-field="payment"> <field-map field-name="paymentId" from-field="parameters.paymentId"/> </entity-one> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> <widgets> <decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -439,7 +439,7 @@ <section> <actions> <!-- pass in paymentId to print one check, otherwise use multi form input --> - <set field="paymentId" from-field="parameters.paymentId" /> + <set field="paymentId" from-field="parameters.paymentId"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy"/> Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Tue Apr 7 08:27:15 2009 @@ -66,7 +66,7 @@ <label style="h1">${uiLabelMap.AccountingAgreements}</label> <section> <widgets> - <include-menu name="ApMainAgreementMenu" location="component://accounting/widget/ap/Menus.xml" /> + <include-menu name="ApMainAgreementMenu" location="component://accounting/widget/ap/Menus.xml"/> </widgets> </section> </container> @@ -74,7 +74,7 @@ <label style="h1">${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}</label> <section> <widgets> - <include-menu name="ApMainVendorMenu" location="component://accounting/widget/ap/Menus.xml" /> + <include-menu name="ApMainVendorMenu" location="component://accounting/widget/ap/Menus.xml"/> </widgets> </section> </container> @@ -84,7 +84,7 @@ <label style="h1">${uiLabelMap.AccountingReports}</label> <section> <widgets> - <include-menu name="ApMainReportMenu" location="component://accounting/widget/ap/Menus.xml" /> + <include-menu name="ApMainReportMenu" location="component://accounting/widget/ap/Menus.xml"/> </widgets> </section> </container> @@ -97,7 +97,7 @@ <iterate-section list="paymentTypes" entry="paymentType"> <section> <widgets> - <include-menu name="ApMainPaymentTypeMenu" location="component://accounting/widget/ap/Menus.xml" /> + <include-menu name="ApMainPaymentTypeMenu" location="component://accounting/widget/ap/Menus.xml"/> </widgets> </section> </iterate-section> @@ -106,7 +106,7 @@ <iterate-section list="paymentMethodTypes" entry="paymentMethodType"> <section> <widgets> - <include-menu name="ApMainPaymentMethodTypeMenu" location="component://accounting/widget/ap/Menus.xml" /> + <include-menu name="ApMainPaymentMethodTypeMenu" location="component://accounting/widget/ap/Menus.xml"/> </widgets> </section> </iterate-section> @@ -117,7 +117,7 @@ <iterate-section list="paymentStatus" entry="paymentsStatus"> <section> <widgets> - <include-menu name="ApMainPaymentStatusMenu" location="component://accounting/widget/ap/Menus.xml" /> + <include-menu name="ApMainPaymentStatusMenu" location="component://accounting/widget/ap/Menus.xml"/> </widgets> </section> </iterate-section> @@ -134,7 +134,7 @@ <iterate-section list="invoiceTypes" entry="invoiceType"> <section> <widgets> - <include-menu name="ApMainInvoiceTypeMenu" location="component://accounting/widget/ap/Menus.xml" /> + <include-menu name="ApMainInvoiceTypeMenu" location="component://accounting/widget/ap/Menus.xml"/> </widgets> </section> </iterate-section> @@ -143,7 +143,7 @@ <iterate-section list="invoiceStatus" entry="invoicesStatus"> <section> <widgets> - <include-menu name="ApMainInvoiceStatusMenu" location="component://accounting/widget/ap/Menus.xml" /> + <include-menu name="ApMainInvoiceStatusMenu" location="component://accounting/widget/ap/Menus.xml"/> </widgets> </section> </iterate-section> Modified: ofbiz/trunk/applications/content/data/CompDocData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/CompDocData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/CompDocData.xml (original) +++ ofbiz/trunk/applications/content/data/CompDocData.xml Tue Apr 7 08:27:15 2009 @@ -36,49 +36,49 @@ <UserLoginSecurityGroup groupId="COMPDOCADMIN" userLoginId="approver" fromDate="2006-01-01 12:00:00.0"/> - <DataResource dataResourceId="DR1103b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile" /> - <DataResource dataResourceId="DR1105b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/mswordtest2.doc" mimeTypeId="application/msword" dataResourceName="2nd Quarter Review" /> + <DataResource dataResourceId="DR1103b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile"/> + <DataResource dataResourceId="DR1105b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/mswordtest2.doc" mimeTypeId="application/msword" dataResourceName="2nd Quarter Review"/> - <DataResource dataResourceId="DR1103a" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile" /> - <DataResource dataResourceId="DR1105a" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/mswordtest2.doc" mimeTypeId="application/msword" dataResourceName="2nd Quarter Review" /> + <DataResource dataResourceId="DR1103a" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile"/> + <DataResource dataResourceId="DR1105a" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/mswordtest2.doc" mimeTypeId="application/msword" dataResourceName="2nd Quarter Review"/> - <DataResource dataResourceId="DR1101" mimeTypeId="application/pdf" dataResourceName="Letter of inquiry" /> - <DataResource dataResourceId="DR1102" mimeTypeId="application/pdf" dataResourceName="POA Contract" /> - <DataResource dataResourceId="DR1103" mimeTypeId="application/pdf" dataResourceName="Personal Profile" /> - <DataResource dataResourceId="DR1104" mimeTypeId="application/pdf" dataResourceName="1st Quarter Review" /> - <DataResource dataResourceId="DR1105" mimeTypeId="application/pdf" dataResourceName="2nd Quarter Review" /> - <DataResource dataResourceId="DR1106" mimeTypeId="application/pdf" dataResourceName="3rd Quarter Review" /> - <DataResource dataResourceId="DR1107" mimeTypeId="application/pdf" dataResourceName="4th Quarter Review" /> - <DataResource dataResourceId="DR1108" mimeTypeId="application/pdf" dataResourceName="Phase I Budget" /> - <DataResource dataResourceId="DR1109" mimeTypeId="application/pdf" dataResourceName="Phase II Budget" /> - <DataResource dataResourceId="DR1110" mimeTypeId="application/pdf" dataResourceName="IJK 4988" /> - <DataResource dataResourceId="DR1111" mimeTypeId="application/pdf" dataResourceName="ABC 123" /> - <DataResource dataResourceId="DR1112" mimeTypeId="application/pdf" dataResourceName="Yearly Review" /> - <DataResource dataResourceId="DR1113" mimeTypeId="application/pdf" dataResourceName="Miscellaneous Notes" /> - <DataResource dataResourceId="DR1114" mimeTypeId="application/pdf" dataResourceName="Disclosure Agreement" /> - <DataResource dataResourceId="DR1115" mimeTypeId="application/pdf" dataResourceName="Performance Review" /> - <DataResource dataResourceId="DR1116" mimeTypeId="application/pdf" dataResourceName="Other Upload" /> + <DataResource dataResourceId="DR1101" mimeTypeId="application/pdf" dataResourceName="Letter of inquiry"/> + <DataResource dataResourceId="DR1102" mimeTypeId="application/pdf" dataResourceName="POA Contract"/> + <DataResource dataResourceId="DR1103" mimeTypeId="application/pdf" dataResourceName="Personal Profile"/> + <DataResource dataResourceId="DR1104" mimeTypeId="application/pdf" dataResourceName="1st Quarter Review"/> + <DataResource dataResourceId="DR1105" mimeTypeId="application/pdf" dataResourceName="2nd Quarter Review"/> + <DataResource dataResourceId="DR1106" mimeTypeId="application/pdf" dataResourceName="3rd Quarter Review"/> + <DataResource dataResourceId="DR1107" mimeTypeId="application/pdf" dataResourceName="4th Quarter Review"/> + <DataResource dataResourceId="DR1108" mimeTypeId="application/pdf" dataResourceName="Phase I Budget"/> + <DataResource dataResourceId="DR1109" mimeTypeId="application/pdf" dataResourceName="Phase II Budget"/> + <DataResource dataResourceId="DR1110" mimeTypeId="application/pdf" dataResourceName="IJK 4988"/> + <DataResource dataResourceId="DR1111" mimeTypeId="application/pdf" dataResourceName="ABC 123"/> + <DataResource dataResourceId="DR1112" mimeTypeId="application/pdf" dataResourceName="Yearly Review"/> + <DataResource dataResourceId="DR1113" mimeTypeId="application/pdf" dataResourceName="Miscellaneous Notes"/> + <DataResource dataResourceId="DR1114" mimeTypeId="application/pdf" dataResourceName="Disclosure Agreement"/> + <DataResource dataResourceId="DR1115" mimeTypeId="application/pdf" dataResourceName="Performance Review"/> + <DataResource dataResourceId="DR1116" mimeTypeId="application/pdf" dataResourceName="Other Upload"/> <!-- A CDT (Composite Document Template) that can be used independently, or as part of CD0001 defined below --> - <Content contentId="CDT1201" contentTypeId="COMPDOC_TEMPLATE" contentName="Demo Template Root (CDT) 1201" ownerContentId="" /> + <Content contentId="CDT1201" contentTypeId="COMPDOC_TEMPLATE" contentName="Demo Template Root (CDT) 1201" ownerContentId=""/> - <Content contentId="CDT1101" dataResourceId="DR1101" contentTypeId="TEMPLATE" contentName="Letter of inquiry" /> - <Content contentId="CDT1102" dataResourceId="DR1102" contentTypeId="TEMPLATE" contentName="POA Contract" /> - <Content contentId="CDT1103" dataResourceId="DR1103" contentTypeId="TEMPLATE" contentName="Personal Profile" /> - <Content contentId="CDT1104" dataResourceId="DR1104" contentTypeId="TEMPLATE" contentName="1st Quarter Review" /> - <Content contentId="CDT1105" dataResourceId="DR1105" contentTypeId="TEMPLATE" contentName="2nd Quarter Review" /> - <Content contentId="CDT1106" dataResourceId="DR1106" contentTypeId="TEMPLATE" contentName="3rd Quarter Review" /> - <Content contentId="CDT1107" dataResourceId="DR1107" contentTypeId="TEMPLATE" contentName="4th Quarter Review" /> - <Content contentId="CDT1108" dataResourceId="DR1108" contentTypeId="TEMPLATE" contentName="Phase I Budget" /> - <Content contentId="CDT1109" dataResourceId="DR1109" contentTypeId="TEMPLATE" contentName="Phase II Budget" /> - <Content contentId="CDT1110" dataResourceId="DR1110" contentTypeId="TEMPLATE" contentName="IJK 4988" /> - <Content contentId="CDT1111" dataResourceId="DR1111" contentTypeId="TEMPLATE" contentName="ABC 123" /> - <Content contentId="CDT1112" dataResourceId="DR1112" contentTypeId="TEMPLATE" contentName="Yearly Review" /> - <Content contentId="CDT1113" dataResourceId="DR1113" contentTypeId="TEMPLATE" contentName="Miscellaneous Notes" /> - <Content contentId="CDT1114" dataResourceId="DR1114" contentTypeId="TEMPLATE" contentName="Disclosure Agreement" /> - <Content contentId="CDT1115" dataResourceId="DR1115" contentTypeId="TEMPLATE" contentName="Performance Review" /> - <Content contentId="CDT1116" dataResourceId="DR1116" contentTypeId="TEMPLATE" contentName="Other Upload" /> + <Content contentId="CDT1101" dataResourceId="DR1101" contentTypeId="TEMPLATE" contentName="Letter of inquiry"/> + <Content contentId="CDT1102" dataResourceId="DR1102" contentTypeId="TEMPLATE" contentName="POA Contract"/> + <Content contentId="CDT1103" dataResourceId="DR1103" contentTypeId="TEMPLATE" contentName="Personal Profile"/> + <Content contentId="CDT1104" dataResourceId="DR1104" contentTypeId="TEMPLATE" contentName="1st Quarter Review"/> + <Content contentId="CDT1105" dataResourceId="DR1105" contentTypeId="TEMPLATE" contentName="2nd Quarter Review"/> + <Content contentId="CDT1106" dataResourceId="DR1106" contentTypeId="TEMPLATE" contentName="3rd Quarter Review"/> + <Content contentId="CDT1107" dataResourceId="DR1107" contentTypeId="TEMPLATE" contentName="4th Quarter Review"/> + <Content contentId="CDT1108" dataResourceId="DR1108" contentTypeId="TEMPLATE" contentName="Phase I Budget"/> + <Content contentId="CDT1109" dataResourceId="DR1109" contentTypeId="TEMPLATE" contentName="Phase II Budget"/> + <Content contentId="CDT1110" dataResourceId="DR1110" contentTypeId="TEMPLATE" contentName="IJK 4988"/> + <Content contentId="CDT1111" dataResourceId="DR1111" contentTypeId="TEMPLATE" contentName="ABC 123"/> + <Content contentId="CDT1112" dataResourceId="DR1112" contentTypeId="TEMPLATE" contentName="Yearly Review"/> + <Content contentId="CDT1113" dataResourceId="DR1113" contentTypeId="TEMPLATE" contentName="Miscellaneous Notes"/> + <Content contentId="CDT1114" dataResourceId="DR1114" contentTypeId="TEMPLATE" contentName="Disclosure Agreement"/> + <Content contentId="CDT1115" dataResourceId="DR1115" contentTypeId="TEMPLATE" contentName="Performance Review"/> + <Content contentId="CDT1116" dataResourceId="DR1116" contentTypeId="TEMPLATE" contentName="Other Upload"/> <ContentAssoc contentIdTo="CDT1201" contentId="CDT1101" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01" sequenceNum="0010"/> <ContentAssoc contentIdTo="CDT1201" contentId="CDT1102" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01" sequenceNum="0020"/> @@ -98,9 +98,9 @@ <ContentAssoc contentIdTo="CDT1201" contentId="CDT1116" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01" sequenceNum="0160"/> <!-- sample instances CDT CDT1201 --> - <Content contentId="CDI1201" instanceOfContentId="CDT1201" contentTypeId="COMPDOC_INSTANCE" contentName="Demo Instance Root (CDI) 1201" ownerContentId="" /> + <Content contentId="CDI1201" instanceOfContentId="CDT1201" contentTypeId="COMPDOC_INSTANCE" contentName="Demo Instance Root (CDI) 1201" ownerContentId=""/> <Content contentId="CDI1103" instanceOfContentId="CDT1103" dataResourceId="DR1103b" contentTypeId="DOCUMENT" contentName="Personal Profile" ownerContentId=""/> - <Content contentId="CDI1105" instanceOfContentId="CDT1105" dataResourceId="DR1105b" contentTypeId="DOCUMENT" contentName="2nd Quarter Review" ownerContentId="" /> + <Content contentId="CDI1105" instanceOfContentId="CDT1105" dataResourceId="DR1105b" contentTypeId="DOCUMENT" contentName="2nd Quarter Review" ownerContentId=""/> <ContentAssoc contentIdTo="CDT1201" contentId="CDI1201" contentAssocTypeId="INSTANCE" fromDate="2006-01-12 01:01:01" sequenceNum="0020"/> <ContentAssoc contentIdTo="CDI1201" contentId="CDI1103" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01" sequenceNum="00130"/> @@ -148,24 +148,24 @@ <!-- sample approval entries for CDT CD0001 --> - <ContentApproval contentApprovalId="CA0101" contentId="CDT1201" contentRevisionSeqId="000002" partyId="admin" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0102" contentId="CDT1201" contentRevisionSeqId="000002" partyId="approver" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0103" contentId="CDT1201" contentRevisionSeqId="000002" roleTypeId="APPROVER" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0104" contentId="CDT1201" contentRevisionSeqId="000002" roleTypeId="REVIEWER" approvalStatusId="CNTAP_READY" /> - - <ContentApproval contentApprovalId="CA0111" contentId="CDT1201" contentRevisionSeqId="000004" partyId="admin" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0112" contentId="CDT1201" contentRevisionSeqId="000004" partyId="approver" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0113" contentId="CDT1201" contentRevisionSeqId="000004" roleTypeId="APPROVER" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0114" contentId="CDT1201" contentRevisionSeqId="000004" roleTypeId="REVIEWER" approvalStatusId="CNTAP_READY" /> - - <ContentApproval contentApprovalId="CA0121" contentId="CDT1201" contentRevisionSeqId="000013" partyId="admin" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0122" contentId="CDT1201" contentRevisionSeqId="000013" partyId="approver" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0123" contentId="CDT1201" contentRevisionSeqId="000013" roleTypeId="APPROVER" approvalStatusId="CNTAP_READY" /> - <ContentApproval contentApprovalId="CA0124" contentId="CDT1201" contentRevisionSeqId="000013" roleTypeId="REVIEWER" approvalStatusId="CNTAP_READY" /> - - <ContentApproval contentApprovalId="CA0221" contentId="CDI1201" contentRevisionSeqId="000010" partyId="admin" sequenceNum="10" approvalStatusId="CNTAP_APPROVED" /> - <ContentApproval contentApprovalId="CA0122" contentId="CDI1201" contentRevisionSeqId="000010" partyId="approver" sequenceNum="20" approvalStatusId="CNTAP_APPROVED" /> - <ContentApproval contentApprovalId="CA0123" contentId="CDI1201" contentRevisionSeqId="000010" roleTypeId="APPROVER" sequenceNum="30" approvalStatusId="CNTAP_SOFT_REJ" /> - <ContentApproval contentApprovalId="CA0124" contentId="CDI1201" contentRevisionSeqId="000010" roleTypeId="REVIEWER" sequenceNum="40" approvalStatusId="CNTAP_READY" /> + <ContentApproval contentApprovalId="CA0101" contentId="CDT1201" contentRevisionSeqId="000002" partyId="admin" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0102" contentId="CDT1201" contentRevisionSeqId="000002" partyId="approver" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0103" contentId="CDT1201" contentRevisionSeqId="000002" roleTypeId="APPROVER" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0104" contentId="CDT1201" contentRevisionSeqId="000002" roleTypeId="REVIEWER" approvalStatusId="CNTAP_READY"/> + + <ContentApproval contentApprovalId="CA0111" contentId="CDT1201" contentRevisionSeqId="000004" partyId="admin" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0112" contentId="CDT1201" contentRevisionSeqId="000004" partyId="approver" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0113" contentId="CDT1201" contentRevisionSeqId="000004" roleTypeId="APPROVER" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0114" contentId="CDT1201" contentRevisionSeqId="000004" roleTypeId="REVIEWER" approvalStatusId="CNTAP_READY"/> + + <ContentApproval contentApprovalId="CA0121" contentId="CDT1201" contentRevisionSeqId="000013" partyId="admin" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0122" contentId="CDT1201" contentRevisionSeqId="000013" partyId="approver" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0123" contentId="CDT1201" contentRevisionSeqId="000013" roleTypeId="APPROVER" approvalStatusId="CNTAP_READY"/> + <ContentApproval contentApprovalId="CA0124" contentId="CDT1201" contentRevisionSeqId="000013" roleTypeId="REVIEWER" approvalStatusId="CNTAP_READY"/> + + <ContentApproval contentApprovalId="CA0221" contentId="CDI1201" contentRevisionSeqId="000010" partyId="admin" sequenceNum="10" approvalStatusId="CNTAP_APPROVED"/> + <ContentApproval contentApprovalId="CA0122" contentId="CDI1201" contentRevisionSeqId="000010" partyId="approver" sequenceNum="20" approvalStatusId="CNTAP_APPROVED"/> + <ContentApproval contentApprovalId="CA0123" contentId="CDI1201" contentRevisionSeqId="000010" roleTypeId="APPROVER" sequenceNum="30" approvalStatusId="CNTAP_SOFT_REJ"/> + <ContentApproval contentApprovalId="CA0124" contentId="CDI1201" contentRevisionSeqId="000010" roleTypeId="REVIEWER" sequenceNum="40" approvalStatusId="CNTAP_READY"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original) +++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Tue Apr 7 08:27:15 2009 @@ -258,6 +258,6 @@ </ElectronicText> <Content contentId="STDWRAP001" contentTypeId="DOCUMENT" dataResourceId="STDWRAP001" contentName="Standard SubContent Wrapper" description="Standard SubContent Wrapper"/> - <WebSite webSiteId="CONTENT_SITE" siteName="Content Manager" visualThemeSetId="BACKOFFICE" /> + <WebSite webSiteId="CONTENT_SITE" siteName="Content Manager" visualThemeSetId="BACKOFFICE"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/content/data/DemoBlogMiscData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/DemoBlogMiscData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/DemoBlogMiscData.xml (original) +++ ofbiz/trunk/applications/content/data/DemoBlogMiscData.xml Tue Apr 7 08:27:15 2009 @@ -19,16 +19,16 @@ --> <entity-engine-xml> - <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_ADMIN" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_" /> - <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_" /> - <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_CREATE" roleTypeId="_NA_" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_" /> + <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_ADMIN" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/> + <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/> + <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_CREATE" roleTypeId="_NA_" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/> - <DataResource dataResourceId="BLOG_TPL_TOPLEFT" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Float left" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#FloatLeft" /> - <DataResource dataResourceId="BLOG_TPL_TOPCENTER" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Top centered" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#TopCenter" /> + <DataResource dataResourceId="BLOG_TPL_TOPLEFT" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Float left" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#FloatLeft"/> + <DataResource dataResourceId="BLOG_TPL_TOPCENTER" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Top centered" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#TopCenter"/> - <DataResource dataResourceId="ECOM_BLANK" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Plain Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonEmptyDecorator" /> - <DataResource dataResourceId="ECOM_LEFT" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftDecorator" /> - <DataResource dataResourceId="ECOM_RIGHT" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonRightDecorator" /> - <DataResource dataResourceId="ECOM_LEFTRIGHT" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left/Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftRightDecorator" /> + <DataResource dataResourceId="ECOM_BLANK" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Plain Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonEmptyDecorator"/> + <DataResource dataResourceId="ECOM_LEFT" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftDecorator"/> + <DataResource dataResourceId="ECOM_RIGHT" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonRightDecorator"/> + <DataResource dataResourceId="ECOM_LEFTRIGHT" dataResourceTypeId="CONTEXT_FILE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left/Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftRightDecorator"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/content/data/DemoBlogPubPtData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/DemoBlogPubPtData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/DemoBlogPubPtData.xml (original) +++ ofbiz/trunk/applications/content/data/DemoBlogPubPtData.xml Tue Apr 7 08:27:15 2009 @@ -29,7 +29,7 @@ createdByUserLogin="admin" lastModifiedByUserLogin="admin" createdDate="2007-01-22 17:32:31.285" - lastModifiedDate="2007-01-22 17:32:31.291" /> + lastModifiedDate="2007-01-22 17:32:31.291"/> <ContentAssoc contentId="BLOGROOT" @@ -39,7 +39,7 @@ createdByUserLogin="admin" lastModifiedByUserLogin="admin" createdDate="2007-01-22 17:32:33.988" - lastModifiedDate="2007-01-22 17:32:33.988" /> + lastModifiedDate="2007-01-22 17:32:33.988"/> <Content contentId="BLOGROOTMADMAX" contentTypeId="WEB_SITE_PUB_PT" ownerContentId="BLOGROOT" @@ -50,7 +50,7 @@ createdByUserLogin="admin" lastModifiedByUserLogin="admin" createdDate="2007-01-22 17:32:31.285" - lastModifiedDate="2007-01-22 17:32:31.291" /> + lastModifiedDate="2007-01-22 17:32:31.291"/> <ContentAssoc @@ -61,5 +61,5 @@ createdByUserLogin="admin" lastModifiedByUserLogin="admin" createdDate="2007-01-22 17:32:33.988" - lastModifiedDate="2007-01-22 17:32:33.988" /> + lastModifiedDate="2007-01-22 17:32:33.988"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/content/data/DemoBlogUsersData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/DemoBlogUsersData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/DemoBlogUsersData.xml (original) +++ ofbiz/trunk/applications/content/data/DemoBlogUsersData.xml Tue Apr 7 08:27:15 2009 @@ -76,7 +76,7 @@ createdByUserLogin="bigal" lastModifiedByUserLogin="bigal" createdDate="2004-10-16 17:32:31.285" - lastModifiedDate="2004-10-16 17:32:31.291" /> + lastModifiedDate="2004-10-16 17:32:31.291"/> <Party partyId="AUTHOR_MADMAX" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/> <Person partyId="AUTHOR_MADMAX" lastName="Max" firstName="Mad"/> @@ -92,7 +92,7 @@ createdByUserLogin="madmax" lastModifiedByUserLogin="madmax" createdDate="2004-10-16 17:32:31.285" - lastModifiedDate="2004-10-16 17:32:31.291" /> + lastModifiedDate="2004-10-16 17:32:31.291"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/content/data/TemplateData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/TemplateData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/TemplateData.xml (original) +++ ofbiz/trunk/applications/content/data/TemplateData.xml Tue Apr 7 08:27:15 2009 @@ -195,7 +195,7 @@ > <#assign drDataResourceId=content.dataResourceId?if_exists/> </@traverseSubContentCache> - <img src="<@ofbizUrl>/img?imgId=${drDataResourceId?if_exists}</@ofbizUrl>" /> + <img src="<@ofbizUrl>/img?imgId=${drDataResourceId?if_exists}</@ofbizUrl>"/> </td> </tr> </table> @@ -338,7 +338,7 @@ does not know where to find nextprev.ftl. Looks like Configuration.setDirectoryForTemplateLoading could be used, but I don't want to worry about passing a request object down to this level, at this time. -<#include "nextprev.ftl" /> +<#include "nextprev.ftl"/> --> <#assign outputIndex = 0/> @@ -363,14 +363,14 @@ <#assign lowIndex = 0/> </#if> <#assign lowPlusOne = lowIndex + 1/> -<#assign prevStr = "" /> +<#assign prevStr = ""/> <#if highIndex?exists > <#assign highIndex = highIndex?number/> <#else> <#assign highIndex = 0/> </#if> <#assign hiIndex = highIndex -1 /> -<#assign nextStr = "" /> +<#assign nextStr = ""/> <tr><td> <table border="0" width="100%"> <tr><td> @@ -447,7 +447,7 @@ <textData><