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 2d0be47 Documented: Help link using asciidoc files via generated html
(OFBIZ-11693)
2d0be47 is described below
commit 2d0be47cdf48fe2eb822a076805337f07e4cfe0d
Author: holivier <[email protected]>
AuthorDate: Mon May 25 16:01:29 2020 +0200
Documented: Help link using asciidoc files via generated html
(OFBIZ-11693)
Migrate CommonExtHelData.xml to added some <set field="helpAnchor" to
the correct screens
Now in commonext component only asciidoc documents are used, help link
area now link to userDocUri
(ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc as default value in
general.property)
---
applications/commonext/widget/ofbizsetup/CommonScreens.xml | 1 +
applications/commonext/widget/ofbizsetup/ProfileScreens.xml | 2 ++
applications/commonext/widget/ofbizsetup/SetupScreens.xml | 7 +++++++
3 files changed, 10 insertions(+)
diff --git a/applications/commonext/widget/ofbizsetup/CommonScreens.xml
b/applications/commonext/widget/ofbizsetup/CommonScreens.xml
index 84d7463..7bdc2d7 100644
--- a/applications/commonext/widget/ofbizsetup/CommonScreens.xml
+++ b/applications/commonext/widget/ofbizsetup/CommonScreens.xml
@@ -41,6 +41,7 @@
<set field="applicationMenuName" value="SetupAppBar"
global="true"/>
<set field="applicationMenuLocation"
value="component://commonext/widget/ofbizsetup/Menus.xml" global="true"/>
<set field="applicationTitle" from-field="uiLabelMap.SetupApp"
global="true"/>
+ <set field="helpAnchor" from-field="helpAnchor"
default-value="_the_ofbiz_setup_application_overview"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator"
location="component://commonext/widget/CommonScreens.xml"/>
diff --git a/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
b/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
index 07c44f3..a2a5ae7 100644
--- a/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
+++ b/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
@@ -27,6 +27,7 @@
<actions>
<set field="titleProperty" value="PartyCreateNewCustomer"/>
<set field="tabButtonItemTop" value="firstcustomer"/>
+ <set field="helpAnchor"
value="_help_for_setup_create_first_customer"/>
<set field="target" value="createCustomer"/>
<set field="partyId" value="CUST"/>
<entity-condition entity-name="PartyRole" list="parties">
@@ -86,6 +87,7 @@
<section>
<actions>
<set field="parameters.partyId" from-field="partyId"/>
+ <set field="helpAnchor"
value="_help_for_view_organization_profile"/>
</actions>
<widgets>
<include-screen name="Party"
location="applications/party/widget/partymgr/ProfileScreens.xml"/>
diff --git a/applications/commonext/widget/ofbizsetup/SetupScreens.xml
b/applications/commonext/widget/ofbizsetup/SetupScreens.xml
index 62d4f91..db39601 100644
--- a/applications/commonext/widget/ofbizsetup/SetupScreens.xml
+++ b/applications/commonext/widget/ofbizsetup/SetupScreens.xml
@@ -25,6 +25,7 @@
<section>
<actions>
<set field="tabButtonItemTop" value="organization"/>
+ <set field="helpAnchor"
value="_the_main_ofbiz_setup_overview"/>
<set field="titleProperty" value="SetupCreateNewOrganization"/>
<set field="target" value="createOrganization"/>
<set field="previousParams" from-field="_PREVIOUS_PARAMS_"
from-scope="user"/>
@@ -79,6 +80,7 @@
<actions>
<set field="titleProperty" value="ProductNewFacility"/>
<set field="tabButtonItemTop" value="facility"/>
+ <set field="helpAnchor" value="_help_for_setup_edit_facility"/>
<set field="partyId" from-field="parameters.partyId"/>
<script
location="component://commonext/groovyScripts/ofbizsetup/FindFacility.groovy"/>
</actions>
@@ -122,6 +124,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditProductStore"/>
<set field="tabButtonItemTop" value="productstore"/>
+ <set field="helpAnchor"
value="_help_for_setup_edit_product_store"/>
<set field="labelTitleProperty"
value="PageTitleEditProductStore"/>
<set field="partyId" from-field="parameters.partyId"/>
@@ -173,6 +176,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditWebSite"/>
<set field="tabButtonItemTop" value="website"/>
+ <set field="helpAnchor" value="_help_for_setup_edit_website"/>
<set field="labelTitleProperty" value="PageTitleEditWebSite"/>
<set field="partyId" from-field="parameters.partyId"/>
<script
location="component://commonext/groovyScripts/ofbizsetup/GetProductStoreAndWebSite.groovy"/>
@@ -224,6 +228,7 @@
<actions>
<set field="titleProperty"
value="PageTitleEditProductCatalog"/>
<set field="tabButtonItem" value="productcatalog"/>
+ <set field="helpAnchor"
value="_help_for_setup_edit_first_catalog"/>
<set field="partyId" from-field="parameters.partyId"/>
<script
location="component://commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy"/>
</actions>
@@ -256,6 +261,7 @@
<set field="titleProperty"
value="PageTitleEditProductCategories"/>
<set field="tabButtonItem" value="productcategory"/>
+ <set field="helpAnchor"
value="_help_for_setup_edit_first_product_category"/>
<set field="labelTitleProperty" value="ProductCategory"/>
<set field="partyId" from-field="parameters.partyId"/>
@@ -291,6 +297,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditProduct"/>
<set field="tabButtonItem" value="product"/>
+ <set field="helpAnchor"
value="_help_for_setup_edit_first_product"/>
<set field="labelTitleProperty" value="ProductProduct"/>
<set field="partyId" from-field="parameters.partyId"/>