[ofbiz-framework] branch trunk updated (d56e397 -> e6d77fd)
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
holivier pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from d56e397 Improved: Upgrade Gradle to V6.5.1 (OFBIZ-11946) new 302bc0e Documented: migration to help system using asciidoc files (OFBIZ-11587) new 37c075b Documented: migration to help system using asciidoc files (OFBIZ-11587) new 19d5435 fixed: duplicate webtools include help from developer-manual to user-manual for help link work new e6d77fd Documented: Help system using asciidoc files (OFBIZ-11693) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../accounting/data/AccountingHelpData.xml | 29 ---------- applications/accounting/data/HELP_ACCOUNTING.xml | 30 ----------- applications/commonext/data/CommonExtHelpData.xml | 34 ------------ applications/content/data/ContentHelpData.xml | 62 ---------------------- applications/content/data/PartyHelpData.xml | 29 ---------- applications/content/data/WebtoolsHelpData.xml | 29 ---------- .../content/data/helpdata/HELP_CONTENT.xml | 32 ----------- .../content/data/helpdata/HELP_CONTENT_IT.xml | 28 ---------- applications/content/data/helpdata/HELP_ROOT.xml | 36 ------------- .../content/data/helpdata/HELP_ROOT_FR.xml | 39 -------------- .../content/data/helpdata/HELP_ROOT_IT.xml | 31 ----------- .../content/data/helpdata/HELP_ROOT_NL.xml | 37 ------------- applications/humanres/data/HELP_HR.xml | 28 ---------- applications/humanres/data/HumanResHelpData.xml | 28 ---------- applications/manufacturing/data/Help_MFG.xml | 33 ------------ .../data/ManufacturingHelpData_EN.xml | 30 ----------- applications/marketing/data/HELP_MARKETING.xml | 38 ------------- applications/marketing/data/HELP_SFA.xml | 35 ------------ applications/marketing/data/MarketingHelpData.xml | 37 ------------- applications/order/data/HELP_ORDERMGR.xml | 27 ---------- applications/order/data/OrderHelpData.xml | 28 ---------- applications/party/data/HELP_PARTY.xml | 33 ------------ applications/product/data/HELP_PRODUCT.xml | 30 ----------- applications/product/data/ProductHelpData.xml | 25 --------- build.gradle | 4 +- docs/asciidoc/user-manual.adoc | 7 +++ framework/resources/templates/HELP.xml | 29 ---------- framework/resources/templates/document.xml | 35 ------------ framework/webtools/data/HELP_WEBTOOLS.xml | 24 --------- themes/bluelight/template/Header.ftl | 10 +--- themes/flatgrey/template/Header.ftl | 10 +--- .../rainbowstone/template/includes/TopAppBar.ftl | 8 +-- themes/tomahawk/template/AppBarClose.ftl | 10 +--- 33 files changed, 12 insertions(+), 913 deletions(-) delete mode 100644 applications/accounting/data/AccountingHelpData.xml delete mode 100644 applications/accounting/data/HELP_ACCOUNTING.xml delete mode 100644 applications/commonext/data/CommonExtHelpData.xml delete mode 100644 applications/content/data/ContentHelpData.xml delete mode 100644 applications/content/data/PartyHelpData.xml delete mode 100644 applications/content/data/WebtoolsHelpData.xml delete mode 100644 applications/content/data/helpdata/HELP_CONTENT.xml delete mode 100644 applications/content/data/helpdata/HELP_CONTENT_IT.xml delete mode 100644 applications/content/data/helpdata/HELP_ROOT.xml delete mode 100644 applications/content/data/helpdata/HELP_ROOT_FR.xml delete mode 100644 applications/content/data/helpdata/HELP_ROOT_IT.xml delete mode 100644 applications/content/data/helpdata/HELP_ROOT_NL.xml delete mode 100644 applications/humanres/data/HELP_HR.xml delete mode 100644 applications/humanres/data/HumanResHelpData.xml delete mode 100644 applications/manufacturing/data/Help_MFG.xml delete mode 100644 applications/manufacturing/data/ManufacturingHelpData_EN.xml delete mode 100644 applications/marketing/data/HELP_MARKETING.xml delete mode 100644 applications/marketing/data/HELP_SFA.xml delete mode 100644 applications/marketing/data/MarketingHelpData.xml delete mode 100644 applications/order/data/HELP_ORDERMGR.xml delete mode 100644 applications/order/data/OrderHelpData.xml delete mode 100644 applications/party/data/HELP_PARTY.xml delete mode 100644 applications/product/data/HELP_PRODUCT.xml delete mode 100644 applications/product/data/ProductHelpData.xml delete mode 100644 framework/resources/templates/HELP.xml delete mode 100644 framework/resources/templates/document.xml delete mode 100644 framework/webtools/data/HELP_WEBTOOLS.xml |
|
|
This is an automated email from the ASF dual-hosted git repository.
holivier pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 302bc0eb154203682aee53d1d4bf2bfa5be1599c Author: holivier <[hidden email]> AuthorDate: Mon Oct 26 17:10:58 2020 +0100 Documented: migration to help system using asciidoc files (OFBIZ-11587) Remove all related help docbook files --- .../accounting/data/AccountingHelpData.xml | 29 ---------- applications/accounting/data/HELP_ACCOUNTING.xml | 30 ----------- applications/commonext/data/CommonExtHelpData.xml | 34 ------------ applications/content/data/ContentHelpData.xml | 62 ---------------------- applications/content/data/PartyHelpData.xml | 29 ---------- applications/content/data/WebtoolsHelpData.xml | 29 ---------- .../content/data/helpdata/HELP_CONTENT.xml | 32 ----------- .../content/data/helpdata/HELP_CONTENT_IT.xml | 28 ---------- applications/content/data/helpdata/HELP_ROOT.xml | 36 ------------- .../content/data/helpdata/HELP_ROOT_FR.xml | 39 -------------- .../content/data/helpdata/HELP_ROOT_IT.xml | 31 ----------- .../content/data/helpdata/HELP_ROOT_NL.xml | 37 ------------- applications/humanres/data/HELP_HR.xml | 28 ---------- applications/humanres/data/HumanResHelpData.xml | 28 ---------- applications/manufacturing/data/Help_MFG.xml | 33 ------------ .../data/ManufacturingHelpData_EN.xml | 30 ----------- applications/marketing/data/HELP_MARKETING.xml | 38 ------------- applications/marketing/data/HELP_SFA.xml | 35 ------------ applications/marketing/data/MarketingHelpData.xml | 37 ------------- applications/order/data/HELP_ORDERMGR.xml | 27 ---------- applications/order/data/OrderHelpData.xml | 28 ---------- applications/party/data/HELP_PARTY.xml | 33 ------------ applications/product/data/HELP_PRODUCT.xml | 30 ----------- applications/product/data/ProductHelpData.xml | 25 --------- framework/webtools/data/HELP_WEBTOOLS.xml | 24 --------- 25 files changed, 812 deletions(-) diff --git a/applications/accounting/data/AccountingHelpData.xml b/applications/accounting/data/AccountingHelpData.xml deleted file mode 100644 index 8928b1f..0000000 --- a/applications/accounting/data/AccountingHelpData.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - <DataResource dataResourceId="HELP_ACCOUNTING" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/accounting/data/HELP_ACCOUNTING.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" - dataResourceName="Accounting Overview" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_ACCOUNTING" contentTypeId="DOCUMENT" contentName="Accounting" templateDataResourceId="HELP_TEMPL" - dataResourceId="HELP_ACCOUNTING" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ACCOUNTING" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> - - -</entity-engine-xml> diff --git a/applications/accounting/data/HELP_ACCOUNTING.xml b/applications/accounting/data/HELP_ACCOUNTING.xml deleted file mode 100644 index e5703b7..0000000 --- a/applications/accounting/data/HELP_ACCOUNTING.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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>Accounting help screen redirection</title> - <para>Accounting Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_accounting">OFBiz user documentation site / accounting</link> - </para> -</section> - diff --git a/applications/commonext/data/CommonExtHelpData.xml b/applications/commonext/data/CommonExtHelpData.xml deleted file mode 100644 index a535de5..0000000 --- a/applications/commonext/data/CommonExtHelpData.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - - <!-- setup application help --> - <DataResource dataResourceId="HELP_SETUP" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_SETUP.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz Setup Overview" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_SETUP" contentTypeId="DOCUMENT" localeString="en" contentName="OFBiz Setup" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_SETUP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SETUP" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="000"/> - - <DataResource dataResourceId="DOCUMENTATION_SYSTEM" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Documentation system" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="DOCUMENTATION_SYSTEM" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="DOCUMENTATION_SYSTEM" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Documentation system" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SETUP" contentIdTo="DOCUMENTATION_SYSTEM" contentAssocTypeId="TREE_CHILD" fromDate="2009-09-09 01:01:01" sequenceNum="010" mapKey="DOCUMENTATION_SYSTEM"/> - - <DataResource dataResourceId="DOCUMENTAT_SYSTEM_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Orga. techn. de la documentation" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="DOCUMENTAT_SYSTEM_FR" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="DOCUMENTAT_SYSTEM_FR" localeString="fr" statusId="CTNT_IN_PROGRESS" contentName="Orga. techn. de la documentation" mimeTypeId="text/html"/> - <ContentAssoc contentId="DOCUMENTATION_SYSTEM" contentIdTo="DOCUMENTAT_SYSTEM_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> -</entity-engine-xml> diff --git a/applications/content/data/ContentHelpData.xml b/applications/content/data/ContentHelpData.xml deleted file mode 100644 index a2030e3..0000000 --- a/applications/content/data/ContentHelpData.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - - <!-- content help data --> - <Content contentId="HELP_MYPORTAL"/><!-- portlets are in most components --> - <Content contentId="HELP_ROOT"/><!-- should be in the first application loaded --> - <PortletCategory portletCategoryId="REPORT" description="Reports"/> - <DataResource dataResourceId="HELP_TEMPL"/><!-- further defined in the content application --> - - <Content contentId="DOCUMENTS" contentTypeId="DOCUMENT" contentName="Documents"/> - - <!-- system document root used in content -> navigate --> - <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT"/> - <ContentAssoc contentId="TREE_ROOT" contentIdTo="DOCUMENTS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/> - - <!-- show help on the system document root --> - <ContentAssoc contentId="TREE_ROOT" contentIdTo="HELP_ROOT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/> - <DataResource dataResourceId="HELP_ROOT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_ROOT" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Help system root" mimeTypeId="text/html"/> - <DataResource dataResourceId="HELP_ROOT_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" /> - - <!-- how to create alternative locales --> - <DataResource dataResourceId="HELP_ROOT_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_ROOT_NL" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_NL" localeString="nl" statusId="CTNT_IN_PROGRESS" contentName="Help system root in dutch" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> - - <DataResource dataResourceId="HELP_ROOT_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_ROOT_FR" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_FR" localeString="fr" statusId="CTNT_IN_PROGRESS" contentName="Help system root in french" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> - - <DataResource dataResourceId="HELP_ROOT_IT" localeString="it" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_IT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Radice Guida on-line" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_ROOT_IT" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_IT" localeString="it" statusId="CTNT_IN_PROGRESS" contentName="Help system root in Italian" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_IT" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> - - <!-- Content specific --> - <DataResource dataResourceId="HELP_CONTENT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Content Manager" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_CONTENT" contentTypeId="DOCUMENT" contentName="Content Manager" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_CONTENT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_CONTENT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="050"/> - - <DataResource dataResourceId="HELP_CONTENT_IT" localeString="it" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT_IT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Guida sul gestore di contentui (CMS)" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_CONTENT_IT" contentTypeId="DOCUMENT" contentName="Guida gestore contenuti" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_CONTENT_IT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_CONTENT" contentIdTo="HELP_CONTENT_IT" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> - -</entity-engine-xml> \ No newline at end of file diff --git a/applications/content/data/PartyHelpData.xml b/applications/content/data/PartyHelpData.xml deleted file mode 100644 index d0bccca..0000000 --- a/applications/content/data/PartyHelpData.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - <!-- party help data --> - <DataResource dataResourceId="HELP_PARTY" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/party/data/HELP_PARTY.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" - dataResourceName="Party Overview" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_PARTY" contentTypeId="DOCUMENT" contentName="Party Manager" templateDataResourceId="HELP_TEMPL" - dataResourceId="HELP_PARTY" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_PARTY" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> - -</entity-engine-xml> \ No newline at end of file diff --git a/applications/content/data/WebtoolsHelpData.xml b/applications/content/data/WebtoolsHelpData.xml deleted file mode 100644 index d688aab..0000000 --- a/applications/content/data/WebtoolsHelpData.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - - <!-- webtools help data --> - <DataResource dataResourceId="HELP_WEBTOOLS" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="framework/webtools/data/HELP_WEBTOOLS.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" - dataResourceName="Webtools Overview" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_WEBTOOLS" contentTypeId="DOCUMENT" contentName="Framework Webtools" templateDataResourceId="HELP_TEMPL" - dataResourceId="HELP_WEBTOOLS" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_WEBTOOLS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> - </entity-engine-xml> \ No newline at end of file diff --git a/applications/content/data/helpdata/HELP_CONTENT.xml b/applications/content/data/helpdata/HELP_CONTENT.xml deleted file mode 100644 index 20132d7..0000000 --- a/applications/content/data/helpdata/HELP_CONTENT.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<!--from https://cwiki.apache.org/confluence/display/OFBENDUSER/Content+Management+Overview--> - -<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>Content Management Overview</title> - <para>Content Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_content_management_overview">OFBiz user documentation site / Content Management Overview</link> - </para> -</section> - diff --git a/applications/content/data/helpdata/HELP_CONTENT_IT.xml b/applications/content/data/helpdata/HELP_CONTENT_IT.xml deleted file mode 100644 index ddf2837..0000000 --- a/applications/content/data/helpdata/HELP_CONTENT_IT.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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>Panoramica sul gestore di contenuti</title> - <para>Il gestore di contenuti e documenti (CMS/DMS) e' utilizzato per archiviare i dati e per richiamarli in contesti multipli.</para> -</section> - diff --git a/applications/content/data/helpdata/HELP_ROOT.xml b/applications/content/data/helpdata/HELP_ROOT.xml deleted file mode 100644 index 7998289..0000000 --- a/applications/content/data/helpdata/HELP_ROOT.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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>Welcome to the Apache OFBiz help system</title> - <section> - <para>If you arrived at this page without selecting the index, - then a specific help page was not yet available</para> - </section> - <section> - <para> - This system will provide you context sensitive help throughout the - system. - </para> - </section> -</section> - diff --git a/applications/content/data/helpdata/HELP_ROOT_FR.xml b/applications/content/data/helpdata/HELP_ROOT_FR.xml deleted file mode 100644 index e48d48b..0000000 --- a/applications/content/data/helpdata/HELP_ROOT_FR.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!-- - 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>Bienvenue dans l'aide Apache OFBiz</title> - <section> - <para>Si vous �tes arriv�s sur cette page sans s�lectionner la page d'index, - c'est qu'il n'y a pas de page d'aide sp�cifique pour cette cat�gorie. - </para> - </section> - <section> - <para> - Cette fen�tre permet d'avoir une aide sur les diff�rents composants de l'application Apache OFBiz. - </para> - <para> - L'aide est en cours de traduction. Toutes les contributions sont les bienvenues ! - </para> - </section> -</section> - diff --git a/applications/content/data/helpdata/HELP_ROOT_IT.xml b/applications/content/data/helpdata/HELP_ROOT_IT.xml deleted file mode 100644 index c046030..0000000 --- a/applications/content/data/helpdata/HELP_ROOT_IT.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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>Benvenuto nel sistema di guida in linea di Apache OFBiz</title> - <section> - <para>Se sei arrivato a questa pagina senza aver selezionato l'indice, - significa che non e' ancora disponibile una guida specifica per questa - sezione</para> - </section> -</section> - diff --git a/applications/content/data/helpdata/HELP_ROOT_NL.xml b/applications/content/data/helpdata/HELP_ROOT_NL.xml deleted file mode 100644 index 4100e65..0000000 --- a/applications/content/data/helpdata/HELP_ROOT_NL.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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>Welkom in het Apache OFBiz help systeem.</title> - <section> - <para> - Als je op deze pagina beland zonder de index geselecteerd te - hebben,wordt veroorzaakt doordat de specifieke help pagina nog niet - beschikbaar is. - </para> - </section> - <section> - <para> - Dit help systeem geeft je scherm afhankelijke informatie. - </para> - </section> -</section> diff --git a/applications/humanres/data/HELP_HR.xml b/applications/humanres/data/HELP_HR.xml deleted file mode 100644 index 62bab7c..0000000 --- a/applications/humanres/data/HELP_HR.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<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>Human Resources Help redirection</title> - <para>Human Resource Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_human_resources">OFBiz user documentation site / Human Resources</link> - </para> -</section> diff --git a/applications/humanres/data/HumanResHelpData.xml b/applications/humanres/data/HumanResHelpData.xml deleted file mode 100644 index 084aade..0000000 --- a/applications/humanres/data/HumanResHelpData.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - <DataResource dataResourceId="HELP_HR" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/humanres/data/HELP_HR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" - dataResourceName="Human Resources Overview" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_HR" contentTypeId="DOCUMENT" contentName="Human Resources" templateDataResourceId="HELP_TEMPL" - dataResourceId="HELP_HR" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_HR" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000"/> - -</entity-engine-xml> diff --git a/applications/manufacturing/data/Help_MFG.xml b/applications/manufacturing/data/Help_MFG.xml deleted file mode 100644 index 324eac8..0000000 --- a/applications/manufacturing/data/Help_MFG.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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>Manufacturing Help redirection</title> - <para> - Manufacturing is the application to assist in manufacturing processes. - </para> - <para>Manufacturing Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_manufacturing">OFBiz user documentation site / Manufacturing</link> - </para> -</section> \ No newline at end of file diff --git a/applications/manufacturing/data/ManufacturingHelpData_EN.xml b/applications/manufacturing/data/ManufacturingHelpData_EN.xml deleted file mode 100644 index 84f90ee..0000000 --- a/applications/manufacturing/data/ManufacturingHelpData_EN.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<entity-engine-xml> - <!-- This is the mapping for the help screens in locale EN --> - <DataResource dataResourceId="HELP_MFG" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/Help_MFG.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" - dataResourceName="OFBiz:MFG Overview" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_MFG" contentTypeId="DOCUMENT" contentName="Manufacturing" templateDataResourceId="HELP_TEMPL" - dataResourceId="HELP_MFG" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_MFG" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - -</entity-engine-xml> diff --git a/applications/marketing/data/HELP_MARKETING.xml b/applications/marketing/data/HELP_MARKETING.xml deleted file mode 100644 index 55005ca..0000000 --- a/applications/marketing/data/HELP_MARKETING.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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>Marketing Help redirection</title> - <para> - The overall purpose of the Marketing application is the support to select - leads from parties obtained from a certain source or marketing - segment to convert to opportunities by contacting these parties via a - contact-list related to a marketing campaign. - (contact-list generation support not yet implemented) - </para> - <para>Marketing Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_marketing">OFBiz user documentation site / Marketing</link> - </para> - -</section> - diff --git a/applications/marketing/data/HELP_SFA.xml b/applications/marketing/data/HELP_SFA.xml deleted file mode 100644 index 4384e2a..0000000 --- a/applications/marketing/data/HELP_SFA.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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>SFA Help redirection</title> - <section> - <para> - The main purpose of the SFA application is to support the process of creating orders for leads. - </para> - <para>SFA Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_sfa">OFBiz user documentation site / SFA</link> - </para> - </section> -</section> - diff --git a/applications/marketing/data/MarketingHelpData.xml b/applications/marketing/data/MarketingHelpData.xml deleted file mode 100644 index 24306fa..0000000 --- a/applications/marketing/data/MarketingHelpData.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - <!-- chapter Marketing--> - <DataResource dataResourceId="HELP_MARKETING" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/marketing/data/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" 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"/> - - <!-- Chapter SFA --> - <DataResource dataResourceId="HELP_SFA" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/marketing/data/HELP_SFA.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" - dataResourceName="SFA Overview" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_SFA" contentTypeId="DOCUMENT" contentName="SFA(Sales force Autm.)" templateDataResourceId="HELP_TEMPL" - dataResourceId="HELP_SFA" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SFA" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> - -</entity-engine-xml> diff --git a/applications/order/data/HELP_ORDERMGR.xml b/applications/order/data/HELP_ORDERMGR.xml deleted file mode 100644 index 42fe21e..0000000 --- a/applications/order/data/HELP_ORDERMGR.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to you under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the - License. ---> -<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>Order Help redirection</title> - <para> - The order manager allows you to enter and maintain orders, quotes, requests and report on them. - </para> - <para>Order Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_order">OFBiz user documentation site / Order</link> - </para> -</section> diff --git a/applications/order/data/OrderHelpData.xml b/applications/order/data/OrderHelpData.xml deleted file mode 100644 index 9ac802a..0000000 --- a/applications/order/data/OrderHelpData.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - <DataResource dataResourceId="HELP_ORDERMGR" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/order/data/HELP_ORDERMGR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" - dataResourceName="Order" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_ORDERMGR" contentTypeId="DOCUMENT" contentName="Order Manager" templateDataResourceId="HELP_TEMPL" - dataResourceId="HELP_ORDERMGR" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ORDERMGR" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> - -</entity-engine-xml> diff --git a/applications/party/data/HELP_PARTY.xml b/applications/party/data/HELP_PARTY.xml deleted file mode 100644 index f25af71..0000000 --- a/applications/party/data/HELP_PARTY.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<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 Party Manager Help redirection</title> - <para> - The Party Manager application is used to manage the parties, i.e any legal entity your company has to deal with. - </para> - <para>Party Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_party">OFBiz user documentation site / Party</link> - </para> -</section> - diff --git a/applications/product/data/HELP_PRODUCT.xml b/applications/product/data/HELP_PRODUCT.xml deleted file mode 100644 index f4d59c5..0000000 --- a/applications/product/data/HELP_PRODUCT.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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 Catalog help redirection</title> - <para>Catalog Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_catalog">OFBiz user documentation site / Catalog</link> - </para> -</section> - diff --git a/applications/product/data/ProductHelpData.xml b/applications/product/data/ProductHelpData.xml deleted file mode 100644 index ccc43e1..0000000 --- a/applications/product/data/ProductHelpData.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - <DataResource dataResourceId="HELP_PRODUCT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/product/data/helpdata/HELP_PRODUCT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system Product" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="HELP_PRODUCT" contentTypeId="DOCUMENT" localeString="en" contentName="Catalog Manager" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_PRODUCT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_PRODUCT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="020"/> - -</entity-engine-xml> diff --git a/framework/webtools/data/HELP_WEBTOOLS.xml b/framework/webtools/data/HELP_WEBTOOLS.xml deleted file mode 100644 index 98a74aa..0000000 --- a/framework/webtools/data/HELP_WEBTOOLS.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<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 Webtools Help redirection.</title> - <para>Webtools Help has been migrated to a new system, you can access it by using - <link xl:href="https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/developer-manual.html#_web_tools">OFBiz Developer documentation site / Webtools</link> - </para> -</section> \ No newline at end of file |
|
|
In reply to this post by holivier
This is an automated email from the ASF dual-hosted git repository.
holivier pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 37c075b1f5d5e73e46cd2f15d24926416fd3abbe Author: holivier <[hidden email]> AuthorDate: Mon Oct 26 17:12:52 2020 +0100 Documented: migration to help system using asciidoc files (OFBIZ-11587) remove in plugin creation gradle task, files related to docbook help --- build.gradle | 4 +--- framework/resources/templates/HELP.xml | 29 ------------------------- framework/resources/templates/document.xml | 35 ------------------------------ 3 files changed, 1 insertion(+), 67 deletions(-) diff --git a/build.gradle b/build.gradle index 3013b75..2c1edbc 100644 --- a/build.gradle +++ b/build.gradle @@ -722,7 +722,7 @@ task createPlugin(group: ofbizPlugin, description: 'create a new plugin componen def templateDir = "${rootDir}/framework/resources/templates" def pluginDir = "${pluginsDir}/${pluginId}" - ['config', 'data/helpdata', 'dtd', 'documents', 'entitydef', 'lib', 'patches/test', 'patches/qa', + ['config', 'dtd', 'entitydef', 'lib', 'patches/test', 'patches/qa', 'patches/production', 'groovyScripts', 'minilang', 'servicedef', 'src/main/java', 'src/test/java', 'testdef', 'widget', "webapp/${webappName}/error", "webapp/${webappName}/WEB-INF"].each { mkdir pluginDir+'/'+it @@ -734,10 +734,8 @@ task createPlugin(group: ofbizPlugin, description: 'create a new plugin componen [tempName:'SecurityPermissionSeedData.xml', newName:"${pluginResourceName}SecurityPermissionSeedData.xml", location:'data'], [tempName:'SecurityGroupDemoData.xml', newName:"${pluginResourceName}SecurityGroupDemoData.xml", location:'data'], [tempName:'DemoData.xml', newName:"${pluginResourceName}DemoData.xml", location:'data'], - [tempName:'HELP.xml', newName:"HELP_${pluginResourceName}.xml", location:'data/helpdata'], [tempName:'HELP.adoc', newName:'HELP.adoc', location:''], [tempName:'README.adoc', newName:'README.adoc', location:''], - [tempName:'document.xml', newName:"${pluginResourceName}.xml", location:'documents'], [tempName:'entitymodel.xml', newName:'entitymodel.xml', location:'entitydef'], [tempName:'services.xml', newName:'services.xml', location:'servicedef'], [tempName:'Tests.xml', newName:"${pluginResourceName}Tests.xml", location:'testdef'], diff --git a/framework/resources/templates/HELP.xml b/framework/resources/templates/HELP.xml deleted file mode 100644 index 4b0d5f7..0000000 --- a/framework/resources/templates/HELP.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<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>@component-resource-name@ Overview</title> - <para>The @component-resource-name@ Help file template.</para> -</section> - diff --git a/framework/resources/templates/document.xml b/framework/resources/templates/document.xml deleted file mode 100644 index 63ec73c..0000000 --- a/framework/resources/templates/document.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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 ../../../applications/content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - - <title><anchor xml:id="@component-resource-name@"/>The @component-resource-name@ Component</title> - <section> - <title>Introduction</title> - <para> - </para> - </section> - <xi:include href="../data/helpdata/HELP_@component-resource-name@.xml" /> - -</chapter> |
|
|
In reply to this post by holivier
This is an automated email from the ASF dual-hosted git repository.
holivier pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 19d5435c978e3092265dd1e8e2c69a6a6d4e55b6 Author: holivier <[hidden email]> AuthorDate: Mon Oct 26 17:15:07 2020 +0100 fixed: duplicate webtools include help from developer-manual to user-manual for help link work when there will be a general glossary, duplication will not be necessary --- docs/asciidoc/user-manual.adoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/asciidoc/user-manual.adoc b/docs/asciidoc/user-manual.adoc index c77a6140..bc7481a 100644 --- a/docs/asciidoc/user-manual.adoc +++ b/docs/asciidoc/user-manual.adoc @@ -172,6 +172,13 @@ include::../../applications/party/src/docs/asciidoc/party.adoc[leveloffset=+2] include::../../applications/product/src/docs/asciidoc/product.adoc[leveloffset=+2] +//// +webtools help should be remove when global glossary exist, and contain a link to developer-manual#webtools +//// +=== Web tools +The Webtools application is the UI-gateway to all the framework functions. + +include::../../framework/webtools/src/docs/asciidoc/_include/webtools-main.adoc[leveloffset=+3] // Plugins Business Applications include::../../plugins/docs/asciidoc/plugins-user-manual.adoc[leveloffset=+1] \ No newline at end of file |
|
|
In reply to this post by holivier
This is an automated email from the ASF dual-hosted git repository.
holivier pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit e6d77fdaa31dc5361184594c04bfdbf930926cd5 Author: holivier <[hidden email]> AuthorDate: Mon Oct 26 17:33:05 2020 +0100 Documented: Help system using asciidoc files (OFBIZ-11693) now OFBiz uses only help link to asciidoc user-manual (no more using docbook files) --- themes/bluelight/template/Header.ftl | 10 +--------- themes/flatgrey/template/Header.ftl | 10 +--------- themes/rainbowstone/template/includes/TopAppBar.ftl | 8 +------- themes/tomahawk/template/AppBarClose.ftl | 10 +--------- 4 files changed, 4 insertions(+), 34 deletions(-) diff --git a/themes/bluelight/template/Header.ftl b/themes/bluelight/template/Header.ftl index 9460fed..6ff5e16 100644 --- a/themes/bluelight/template/Header.ftl +++ b/themes/bluelight/template/Header.ftl @@ -195,15 +195,7 @@ under the License. <#else> <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> </#if> - <#if helpAnchor??> - <li><a class="help-link alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}#${helpAnchor}" target="help" title="${uiLabelMap.CommonHelp}"></a></li> - <#else> - <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??--> - <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??> - <#include "component://common-theme/template/includes/HelpLink.ftl" /> - <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('<@ofbizUrl>showHelp?helpTopic=${helpTopic}&portalPageId=${(parameters.portalPageId!)?html}</@ofbizUrl>','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> - </#if> - </#if> + <li><a class="help-link alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}<#if helpAnchor??>#${helpAnchor}</#if>" target="help" title="${uiLabelMap.CommonHelp}"></a></li> <#if userLogin??> <#if "Y" == (userPreferences.COMPACT_HEADER)?default("N")> <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()"> </a> diff --git a/themes/flatgrey/template/Header.ftl b/themes/flatgrey/template/Header.ftl index 97e20f0..a24bbe3 100644 --- a/themes/flatgrey/template/Header.ftl +++ b/themes/flatgrey/template/Header.ftl @@ -157,15 +157,7 @@ under the License. <#else> <li>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> </#if> - <#if helpAnchor??> - <li><a class="alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}#${helpAnchor}" target="help">${uiLabelMap.CommonHelp}</a></li> - <#else> - <#---if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??--> - <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??> - <#include "component://common-theme/template/includes/HelpLink.ftl" /> - <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup1('<@ofbizUrl>showHelp?helpTopic=${helpTopic}&portalPageId=${(parameters.portalPageId!)?html}</@ofbizUrl>','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> - </#if> - </#if> + <li><a class="alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}<#if helpAnchor??>#${helpAnchor}</#if>" target="help">${uiLabelMap.CommonHelp}</a></li> </ul> </li> </ul> diff --git a/themes/rainbowstone/template/includes/TopAppBar.ftl b/themes/rainbowstone/template/includes/TopAppBar.ftl index a6936dd..318c0fa 100644 --- a/themes/rainbowstone/template/includes/TopAppBar.ftl +++ b/themes/rainbowstone/template/includes/TopAppBar.ftl @@ -237,13 +237,7 @@ under the License. </div> <div id="main-nav-bar-right"> <div id="company-logo"></div> - <#if helpAnchor??> - <a class="dark-color" title="${uiLabelMap.CommonHelp}" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}#${helpAnchor}" target="help">${uiLabelMap.CommonHelp}<img class="appbar-btn-img" id="help-btn" src="/rainbowstone/images/help.svg" alt="Help"></a> - <#else> - <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> - <a class="dark-color" title="${uiLabelMap.CommonHelp}" href="javascript:lookup_popup1('<@ofbizUrl>showHelp?helpTopic=${helpTopic}&portalPageId=${(parameters.portalPageId!)?html}</@ofbizUrl>','help' ,500,500);"><img class="appbar-btn-img" id="help-btn" src="/rainbowstone/images/help.svg" alt="Help"></a> - </#if> - </#if> + <a class="dark-color" title="${uiLabelMap.CommonHelp}" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}<#if helpAnchor??>#${helpAnchor}</#if>" target="help">${uiLabelMap.CommonHelp}<img class="appbar-btn-img" id="help-btn" src="/rainbowstone/images/help.svg" alt="Help"></a> <#include "component://rainbowstone/template/includes/Avatar.ftl"/> </div> diff --git a/themes/tomahawk/template/AppBarClose.ftl b/themes/tomahawk/template/AppBarClose.ftl index 0467bad..a3c0a64 100644 --- a/themes/tomahawk/template/AppBarClose.ftl +++ b/themes/tomahawk/template/AppBarClose.ftl @@ -72,15 +72,7 @@ under the License. </#if> </#if> <#if userLogin??> - <#if helpAnchor??> - <li><a class="help-link alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}#${helpAnchor}" target="help" title="${uiLabelMap.CommonHelp}"></a></li> - <#else> - <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??--> - <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??> - <#include "component://common-theme/template/includes/HelpLink.ftl" /> - <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('<@ofbizUrl>showHelp?helpTopic=${helpTopic}&portalPageId=${(parameters.portalPageId!)?html}</@ofbizUrl>','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> - </#if> - </#if> + <li><a class="help-link alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}<#if helpAnchor??>#${helpAnchor}</#if>" target="help" title="${uiLabelMap.CommonHelp}"></a></li> <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li> <li><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li> <#else> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |