buildbot exception in on ofbizTrunkFrameworkPlugins

2020-10-26 Thread buildbot
The Buildbot has detected a build exception on builder 
ofbizTrunkFrameworkPlugins while building ofbiz-plugins. Full details are 
available at:
https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1861

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf947_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' 
triggered this build
Build Source Stamp: [branch trunk] 2f6b0f19a3fe320339659580e7b1e1f2dbd6c617
Blamelist: holivier 

BUILD FAILED: exception loadAll upload test-results part 1

Sincerely,
 -The Buildbot





[ofbiz-plugins] branch trunk updated: Documented: remove from plugin cmssite link to document genereted from docbook help files

2020-10-26 Thread 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-plugins.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 2f6b0f1  Documented: remove from plugin cmssite link to document 
genereted from docbook help files
2f6b0f1 is described below

commit 2f6b0f19a3fe320339659580e7b1e1f2dbd6c617
Author: holivier 
AuthorDate: Mon Oct 26 18:45:19 2020 +0100

Documented: remove from plugin cmssite link to document genereted from 
docbook help files
---
 cmssite/data/CmsSiteDemoData.xml   |  22 ---
 cmssite/documents/ApacheOfbiz.xml  |  62 
 cmssite/documents/ApacheOfbizTechnical.xml | 219 -
 cmssite/documents/ApacheOfbizUser.xml  |  64 -
 cmssite/widget/CmssiteScreens.xml  |  18 ---
 5 files changed, 385 deletions(-)

diff --git a/cmssite/data/CmsSiteDemoData.xml b/cmssite/data/CmsSiteDemoData.xml
index 2c2067b..ba6ebde 100644
--- a/cmssite/data/CmsSiteDemoData.xml
+++ b/cmssite/data/CmsSiteDemoData.xml
@@ -114,7 +114,6 @@ under the License.
 Demo Page with screen 
widget and screen decorator
 Demo 
Page with blog using screen decorator
 Demo Page with an xml 
resource formatted with a template ftl resource
-The 
ofbiz public documents
 WebSite 1
 WebSite 2
 
@@ -229,26 +228,5 @@ under the License.
 
 
 
-
-
-
-
-
-/>
-
-
-/>
-
-
-
-/>
-
-
-/>
-
-
-
-
-
 
 
diff --git a/cmssite/documents/ApacheOfbiz.xml 
b/cmssite/documents/ApacheOfbiz.xml
deleted file mode 100644
index f6dbe61..000
--- a/cmssite/documents/ApacheOfbiz.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-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;>
-
-
-Apache OFBiz official documentation.
-
-
-This Book is currently in an experimental stage. It will be 
the start of moving the OFBiz documentation from the current 
-https://cwiki.apache.org/confluence/display/OFBIZ/Home;>OFBiz 
documentation site and the old ofbiz website (Entity documents) to the 
OFBiz content component. 
-The layout is currently open for discussion by the OFBiz 
community. 
-
-
-The advantages of using it within OFBiz are:
-
-No external system required for 
documentation
-The content of the internal help files can 
be used within the documentation
-The documentation always has the same 
version as the system (It is part of it)
-The content is stored in a internationally 
accepted http://docbook.org;>'DocBook' 
format
-The content can be easily presented in the 
selected visual schemas (To be implemented)
-
-
-
-If you want to contribute to this document, you are very 
welcome.
-Several possibilities exist:
-
-Convert existing OFBiz documents on the 
https://cwiki.apache.org/confluence/display/OFBIZ/Documentation;>OFBiz 
documentation site to the http://docbook.org;>docbookformat
-Write new document chapters for an OFBiz 
component
-Write new Help screens which can be 
inserted as sections in the document.
-
-How to contribute? It depends if you have a local OFBiz system 
or not. If you have, check the appendix for an explanation how the document 
text is stored within the OFBiz system.
-If you do not have a local OFBiz system write your text in an 
xml editor using the DocBook V5.0 schema's.
-If you have text to contribute create a Jira issue and upload 
your text to the issue.   
-
-
- 
-
-
-
-
-
diff --git a/cmssite/documents/ApacheOfbizTechnical.xml 
b/cmssite/documents/ApacheOfbizTechnical.xml
deleted file mode 100644
index a52a779..000
--- a/cmssite/documents/ApacheOfbizTechnical.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-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;>
-
-
-Apache OFBiz Technical documentation.
- 
-
-
-
-I was reading the book in development from Norman Walsh 

buildbot exception in on ofbizTrunkFramework

2020-10-26 Thread buildbot
The Buildbot has detected a build exception on builder ofbizTrunkFramework 
while building ofbiz-framework. Full details are available at:
https://ci.apache.org/builders/ofbizTrunkFramework/builds/1949

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' 
triggered this build
Build Source Stamp: [branch trunk] e6d77fdaa31dc5361184594c04bfdbf930926cd5
Blamelist: holivier 

BUILD FAILED: exception loadAll upload test-results part 1

Sincerely,
 -The Buildbot





[ofbiz-framework] 01/04: Documented: migration to help system using asciidoc files (OFBIZ-11587)

2020-10-26 Thread 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 302bc0eb154203682aee53d1d4bf2bfa5be1599c
Author: holivier 
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..000
--- a/applications/accounting/data/AccountingHelpData.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/applications/accounting/data/HELP_ACCOUNTING.xml 
b/applications/accounting/data/HELP_ACCOUNTING.xml
deleted file mode 100644
index e5703b7..000
--- a/applications/accounting/data/HELP_ACCOUNTING.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-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;>
-Accounting help screen redirection
-Accounting Help has been migrated to a new system, you can access it 
by using
-   https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_accounting;>OFBiz
 user documentation site / accounting
-
-
-
diff --git a/applications/commonext/data/CommonExtHelpData.xml 
b/applications/commonext/data/CommonExtHelpData.xml
deleted file mode 100644
index a535de5..000
--- a/applications/commonext/data/CommonExtHelpData.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/content/data/ContentHelpData.xml 
b/applications/content/data/ContentHelpData.xml
deleted file mode 100644
index a2030e3..000
--- a/applications/content/data/ContentHelpData.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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..000
--- a/applications/content/data/PartyHelpData.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
\ 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..000
--- a/applications/content/data/WebtoolsHelpData.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
\ 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..000
--- a/applications/content/data/helpdata/HELP_CONTENT.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-

[ofbiz-framework] 02/04: Documented: migration to help system using asciidoc files (OFBIZ-11587)

2020-10-26 Thread 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 
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..000
--- a/framework/resources/templates/HELP.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-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;>
-@component-resource-name@  Overview
-The @component-resource-name@ Help file template.
-
-
diff --git a/framework/resources/templates/document.xml 
b/framework/resources/templates/document.xml
deleted file mode 100644
index 63ec73c..000
--- a/framework/resources/templates/document.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-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;>
-
-The 
@component-resource-name@ Component
-
-Introduction
-
-
-
-
-
-



[ofbiz-framework] branch trunk updated (d56e397 -> e6d77fd)

2020-10-26 Thread holivier
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



[ofbiz-framework] 04/04: Documented: Help system using asciidoc files (OFBIZ-11693)

2020-10-26 Thread 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 
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>
   ${uiLabelMap.CommonLogin}
 
-<#if helpAnchor??>
-  
-<#else>
-  <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && 
helpTopic??-->
-  <#if parameters.componentName?? && 
requestAttributes._CURRENT_VIEW_?? && helpTopic??>
-<#include 
"component://common-theme/template/includes/HelpLink.ftl" />
-
-  
-
+#${helpAnchor}" target="help" 
title="${uiLabelMap.CommonHelp}">
 <#if userLogin??>
   <#if "Y" == (userPreferences.COMPACT_HEADER)?default("N")>
 
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>
 ${uiLabelMap.CommonWelcome}! ${uiLabelMap.CommonLogin}
   
-  <#if helpAnchor??>
-${uiLabelMap.CommonHelp}
-  <#else>
-  <#---if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && 
helpTopic??-->
-  <#if parameters.componentName?? && 
requestAttributes._CURRENT_VIEW_?? && helpTopic??>
-<#include 
"component://common-theme/template/includes/HelpLink.ftl" />
-class="alert" 
href="javascript:lookup_popup1('<@ofbizUrl>showHelp?helpTopic=${helpTopic}portalPageId=${(parameters.portalPageId!)?html}','help'
 ,500,500);">${uiLabelMap.CommonHelp}
-  
-  
+  #${helpAnchor}" 
target="help">${uiLabelMap.CommonHelp}
   
   
 
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.
 
 
 
-<#if helpAnchor??>
-  ${uiLabelMap.CommonHelp}
-<#else>
-  <#if parameters.componentName?exists && 
requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
-  
-  
-
+#${helpAnchor}" 
target="help">${uiLabelMap.CommonHelp}
 
 <#include "component://rainbowstone/template/includes/Avatar.ftl"/>
 
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 userLogin??>
-  <#if helpAnchor??>
-
-  <#else>
-<#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && 
helpTopic??-->
-<#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? 
&& helpTopic??>
-  <#include "component://common-theme/template/includes/HelpLink.ftl" 
/>
-  
-
-  
+  #${helpAnchor}" target="help" 
title="${uiLabelMap.CommonHelp}">
   ${uiLabelMap.CommonLogout}
   ${uiLabelMap.CommonVisualThemes}
 <#else>



[ofbiz-framework] 03/04: fixed: duplicate webtools include help from developer-manual to user-manual for help link work

2020-10-26 Thread 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 
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



[ofbiz-plugins] branch trunk updated: Documented: migration to help system using asciidoc files (OFBIZ-11587)

2020-10-26 Thread 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-plugins.git


The following commit(s) were added to refs/heads/trunk by this push:
 new eebd368  Documented: migration to help system using asciidoc files 
(OFBIZ-11587)
eebd368 is described below

commit eebd368718ae8a13f57bec68029f568580de4add
Author: holivier 
AuthorDate: Mon Oct 26 16:03:59 2020 +0100

Documented: migration to help system using asciidoc files (OFBIZ-11587)

Remove all related help docbook files
---
 birt/data/BirtHelpData.xml | 28 --
 birt/data/helpdata/HELP_BIRT.xml   | 33 
 ebay/data/EbayHelpData.xml | 28 --
 ebay/data/HELP_EBAY.xml| 35 -
 ebaystore/data/EbayStoreHelpData.xml   | 29 --
 ebaystore/data/HELP_EBAY_STORE.xml | 27 -
 example/data/ExampleHelpData.xml   | 29 --
 example/data/HELP_EXAMPLE.xml  | 28 --
 example/data/helpdata/HELP_EXAMPLE_FR.xml  | 44 --
 myportal/data/MyPortalPageDemoData.xml | 12 +-
 .../data/helpdata/HELP_Ofbiz-rest-jersey.xml   | 29 --
 ofbiz-rest-impl/documents/Ofbiz-rest-jersey.xml| 36 --
 projectmgr/data/HELP_PROJECTMGR.xml| 33 
 projectmgr/data/ProjectMgrHelpData.xml | 30 ---
 scrum/data/HELP_SCRUM.xml  | 36 --
 scrum/data/scrumHelpData.xml   | 28 --
 16 files changed, 2 insertions(+), 483 deletions(-)

diff --git a/birt/data/BirtHelpData.xml b/birt/data/BirtHelpData.xml
deleted file mode 100644
index 40acea5..000
--- a/birt/data/BirtHelpData.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/birt/data/helpdata/HELP_BIRT.xml b/birt/data/helpdata/HELP_BIRT.xml
deleted file mode 100644
index 4235c6f..000
--- a/birt/data/helpdata/HELP_BIRT.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-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;>
-
-OFBiz BIRT Overview redirection
-
-Welcome to OFBiz BIRT. The part installed within OFBiz allows you to 
run the reports which are prepared using Eclipse with the BIRT plugin installed.
-
-BIRT Help has been migrated to a new system, you can access it by 
using
-  https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_ebay_store;>OFBiz
 user documentation site / BIRT
-
-
diff --git a/ebay/data/EbayHelpData.xml b/ebay/data/EbayHelpData.xml
deleted file mode 100644
index e95be3e..000
--- a/ebay/data/EbayHelpData.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/ebay/data/HELP_EBAY.xml b/ebay/data/HELP_EBAY.xml
deleted file mode 100644
index d88b4ec..000
--- a/ebay/data/HELP_EBAY.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-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;>
-
-
-The Ebay application Help redirection.
-
-The Ebay component provides an interface to the Ebay website. It is 
possible to export products from your store into  eBay category  also import an 
orders from ebay.
-
-Ebay Help has been migrated to a new system, you can access it by 
using
-  https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html#_the_ebay_component;>OFBiz
 user documentation site / Ebay
-
-
-
diff --git a/ebaystore/data/EbayStoreHelpData.xml 
b/ebaystore/data/EbayStoreHelpData.xml
deleted file mode 100644
index 552675e..000
--- a/ebaystore/data/EbayStoreHelpData.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/ebaystore/data/HELP_EBAY_STORE.xml 
b/ebaystore/data/HELP_EBAY_STORE.xml
deleted file mode 100644
index ae9b432..000
--- a/ebaystore/data/HELP_EBAY_STORE.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-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;>
-Ebay Store help redirection.
-
-This application allows the user to access to ebay store by using their 
account and you can set up and manage your ebay