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

[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


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

commit 9eaf180a4bbddbb66436ab9fec064f53ba9fd1fb
Author: holivier <[hidden email]>
AuthorDate: Mon Sep 28 15:13:06 2020 +0200

    Documented: migration to help system using asciidoc files
    (OFBIZ-11587)
   
    Add <set field=helpAnchor... in CommonScreens for application where it's
    not present. With this commit all OFBiz application help go to the html
    generated from asciidoc files
---
 applications/accounting/widget/ap/CommonScreens.xml    | 5 +++--
 applications/accounting/widget/ar/CommonScreens.xml    | 1 +
 applications/product/widget/catalog/CommonScreens.xml  | 2 +-
 applications/product/widget/facility/CommonScreens.xml | 1 +
 applications/workeffort/widget/CommonScreens.xml       | 1 +
 framework/webtools/widget/CommonScreens.xml            | 6 +++---
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/applications/accounting/widget/ap/CommonScreens.xml b/applications/accounting/widget/ap/CommonScreens.xml
index 2cabfca..419b737 100644
--- a/applications/accounting/widget/ap/CommonScreens.xml
+++ b/applications/accounting/widget/ap/CommonScreens.xml
@@ -30,6 +30,7 @@ under the License.
                 <set field="applicationMenuName" value="ApAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://accounting/widget/ap/ApMenus.xml" global="true"/>
                 <set field="applicationTitle" from-field="uiLabelMap.AccountingApManagerApplication" global="true"/>
+                <set field="helpAnchor" from-field="helpAnchor" default-value="_accounting"/>
                 <set field="invoiceMenuLocation" value="component://accounting/widget/ap/ApInvoiceMenus.xml" global="true"/>
             </actions>
             <widgets>
@@ -146,7 +147,7 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
+
     <screen name="CommonInvoiceDecorator">
         <section>
             <actions>
@@ -193,7 +194,7 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
+
     <screen name="CommonPaymentGroupDecorator">
         <section>
             <actions>
diff --git a/applications/accounting/widget/ar/CommonScreens.xml b/applications/accounting/widget/ar/CommonScreens.xml
index 0f1034b..b9baeed 100644
--- a/applications/accounting/widget/ar/CommonScreens.xml
+++ b/applications/accounting/widget/ar/CommonScreens.xml
@@ -33,6 +33,7 @@ under the License.
                 <set field="applicationMenuName" value="ArAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://accounting/widget/ar/ArMenus.xml" global="true"/>
                 <set field="applicationTitle" from-field="uiLabelMap.AccountingArManagerApplication" global="true"/>
+                <set field="helpAnchor" from-field="helpAnchor" default-value="_accounting"/>
             </actions>
            <widgets>
                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
diff --git a/applications/product/widget/catalog/CommonScreens.xml b/applications/product/widget/catalog/CommonScreens.xml
index 5b3aa28..289d524 100644
--- a/applications/product/widget/catalog/CommonScreens.xml
+++ b/applications/product/widget/catalog/CommonScreens.xml
@@ -372,7 +372,7 @@ under the License.
                 <set field="headerItem" value="main"/>
                 <set field="productId" from-field="parameters.productId"/>
                 <entity-one entity-name="Product" value-field="product"/>
-                <set field="helpAnchor" value="_help_for_the_party_find_screen"/>
+                <set field="helpAnchor" value="_help_for_catalog_main_screen"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
diff --git a/applications/product/widget/facility/CommonScreens.xml b/applications/product/widget/facility/CommonScreens.xml
index d46439f..b584eac 100644
--- a/applications/product/widget/facility/CommonScreens.xml
+++ b/applications/product/widget/facility/CommonScreens.xml
@@ -42,6 +42,7 @@ under the License.
                 <set field="activeApp" value="facilitymgr" global="true"/>
                 <set field="applicationMenuName" value="FacilityAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://product/widget/facility/FacilityMenus.xml" global="true"/>
+                <set field="helpAnchor" from-field="helpAnchor" default-value="_core_business_applications"/>
                 <set field="applicationTitle" from-field="uiLabelMap.ProductFacilityManagerApplication" global="true"/>
             </actions>
             <widgets>
diff --git a/applications/workeffort/widget/CommonScreens.xml b/applications/workeffort/widget/CommonScreens.xml
index 9f9376f..a7bc76c 100644
--- a/applications/workeffort/widget/CommonScreens.xml
+++ b/applications/workeffort/widget/CommonScreens.xml
@@ -43,6 +43,7 @@ under the License.
                 <set field="activeApp" value="workeffort" global="true"/>
                 <set field="applicationMenuName" value="WorkEffortAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://workeffort/widget/WorkEffortMenus.xml" global="true"/>
+                <set field="helpAnchor" from-field="helpAnchor" default-value="_core_business_applications"/>
                 <set field="applicationTitle" from-field="uiLabelMap.WorkEffortManagerApplication" global="true"/>
             </actions>
             <widgets>
diff --git a/framework/webtools/widget/CommonScreens.xml b/framework/webtools/widget/CommonScreens.xml
index c119ad3..17dd97b 100644
--- a/framework/webtools/widget/CommonScreens.xml
+++ b/framework/webtools/widget/CommonScreens.xml
@@ -37,7 +37,7 @@ under the License.
                 <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
                 <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
                 <!-- Help link actions -->
-                <set field="helpTopic" value="${groovy: webappName.toUpperCase() + '_' + requestAttributes._CURRENT_VIEW_}"/>
+                <set field="helpAnchor" from-field="helpAnchor" default-value="_web_tools"/>
                 <set field="applicationMenuLocation" value="component://webtools/widget/Menus.xml" global="true"/>
                 <set field="applicationMenuName" value="WebtoolsAppBar" global="true"/>
                 <set field="applicationTitle" from-field="uiLabelMap.FrameworkWebTools" global="true"/>
@@ -214,7 +214,7 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
+
     <screen name="CommonArtifactDecorator">
         <section>
             <actions>
@@ -322,5 +322,5 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
+
 </screens>