svn commit: r812336 - in /ofbiz/trunk: applications/commonext/data/ applications/commonext/documen
Locked
svn commit: r812336 - in /ofbiz/trunk: applications/commonext/data/ applications/commonext/documen
 
|
Author: hansbak
Date: Tue Sep 8 03:58:39 2009 New Revision: 812336 URL: http://svn.apache.org/viewvc?rev=812336&view=rev Log: corrections in top level documents and added placeholders for marketing component Added: ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml (with props) ofbiz/trunk/applications/marketing/data/helpdata/ ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml (with props) ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml (with props) ofbiz/trunk/applications/marketing/documents/ ofbiz/trunk/applications/marketing/documents/Marketing.xml (with props) Modified: ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml ofbiz/trunk/applications/marketing/ofbiz-component.xml ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Modified: ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml?rev=812336&r1=812335&r2=812336&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml (original) +++ ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml Tue Sep 8 03:58:39 2009 @@ -31,8 +31,8 @@ <DataResource dataResourceId="APACHE_OFBIZ_TECH" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/documents/ApacheOfbizTechnical.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="APACHE_OFBIZ_T_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_TECH" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBiz Technical Guide in one page HTML" mimeTypeId="text/html"/> <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_T_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/> - <DataResource dataResourceId="APACHE_OFBIZ_USER" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/documents/ApacheOfbizTechnical.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz User document" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="APACHE_OFBIZ_U_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_TECH" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBizUser Guide in one page HTML" mimeTypeId="text/html"/> + <DataResource dataResourceId="APACHE_OFBIZ_USER" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/documents/ApacheOfbizUser.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz User document" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="APACHE_OFBIZ_U_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_USER" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBizUser Guide in one page HTML" mimeTypeId="text/html"/> <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_U_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/> </entity-engine-xml> Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml?rev=812336&r1=812335&r2=812336&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml (original) +++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml Tue Sep 8 03:58:39 2009 @@ -68,6 +68,7 @@ <xi:include href="../../../applications/accounting/documents/Accounting.xml"/> <xi:include href="../../../applications/product/documents/Product.xml"/> <xi:include href="../../../applications/content/documents/Content.xml"/> + <xi:include href="../../../applications/marketing/documents/Marketing.xml"/> <xi:include href="../../../specialpurpose/myportal/documents/MyPortal.xml"/> <appendix> Added: ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml?rev=812336&view=auto ============================================================================== --- ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml (added) +++ ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml Tue Sep 8 03:58:39 2009 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<entity-engine-xml> + <!-- chapter --> + <DataResource dataResourceId="HELP_MARKETING" localeString="en" dataResourceTypeId="OFBIZ_FILE" + objectInfo="applications/marketing/data/helpdata/HELP_MARKETING.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + dataResourceName="Marketing Overview" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="HELP_MARKETING" contentTypeId="DOCUMENT" contentName="Marketing Overview" templateDataResourceId="HELP_TEMPL" + dataResourceId="HELP_MARKETING" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/> + <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_MARKETING" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> + + <!-- marketing help --> + <DataResource dataResourceId="MARKETING_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" + objectInfo="applications/marketing/data/helpdata/HELP_MARKETING_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MARKETING Main Help" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="MARKETING_main" contentTypeId="DOCUMENT" contentName="MARKETING Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="MARKETING_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/> + <ContentAssoc contentId="HELP_MARKETING" contentIdTo="MARKETING_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> + + <!-- sfa help --> + <DataResource dataResourceId="SFA_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" + objectInfo="applications/marketing/data/helpdata/HELP_SFA_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Main Help" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="SFA_main" contentTypeId="DOCUMENT" contentName="SFA Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/> + <ContentAssoc contentId="HELP_MARKETING" contentIdTo="SFA_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> +</entity-engine-xml> Propchange: ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml?rev=812336&view=auto ============================================================================== --- ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml (added) +++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml Tue Sep 8 03:58:39 2009 @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" + xmlns:xl="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The Marketing Main help screen.</title> + <para>Introduction</para> +</section> + Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml?rev=812336&view=auto ============================================================================== --- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml (added) +++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml Tue Sep 8 03:58:39 2009 @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" + xmlns:xl="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The SFA (Sales force Automation) Main help screen.</title> + <para>Introduction</para> +</section> + Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/applications/marketing/documents/Marketing.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/documents/Marketing.xml?rev=812336&view=auto ============================================================================== --- ofbiz/trunk/applications/marketing/documents/Marketing.xml (added) +++ ofbiz/trunk/applications/marketing/documents/Marketing.xml Tue Sep 8 03:58:39 2009 @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The Marketing Component.</title> + <section> + <title>Introduction</title> + <para> + Please find here a general introduction to the marketing component (to be continued) + </para> + </section> + <xi:include href="../data/helpdata/HELP_MARKETING_main.xml" /> + <xi:include href="../data/helpdata/HELP_SFA_main.xml" /> +</chapter> Propchange: ofbiz/trunk/applications/marketing/documents/Marketing.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/documents/Marketing.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/marketing/documents/Marketing.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/marketing/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/ofbiz-component.xml?rev=812336&r1=812335&r2=812336&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/ofbiz-component.xml (original) +++ ofbiz/trunk/applications/marketing/ofbiz-component.xml Tue Sep 8 03:58:39 2009 @@ -28,6 +28,7 @@ <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=812336&r1=812335&r2=812336&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Tue Sep 8 03:58:39 2009 @@ -25,6 +25,9 @@ <#if (helpTopic?length > 20)> <#assign helpTopic = helpTopic?substring(0,20)> </#if> +${helpTopic}<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files +${helpTopic} +--> <#assign helpContent = delegator.findByAnd("Content", {"contentId" : helpTopic})> <#if !helpContent?has_content> <#assign helpContent = delegator.findByAnd("Content", {"contentId" : webSiteId})> @@ -33,9 +36,6 @@ <#assign helpTopic = "navigateHelp"/> </#if> </#if> -<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files -${helpTopic} ---> <#if helpUrlsMap["Prefix"] != "Prefix"> <#assign helpUrlPrefix = helpUrlsMap["Prefix"] /> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |