OFBiz › OFBiz - Commits

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

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

holivier

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

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 30aa013 Documented: migration to help system using asciidoc files (OFBIZ-11587)
30aa013 is described below

commit 30aa0132e6f903625342c9cc5d99eadcbf3cd76b
Author: holivier <[hidden email]>
AuthorDate: Fri Oct 23 18:34:33 2020 +0200

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

Add <set field=helpAnchor... in CommonScreens for plugins where it's
not present. With this commit all OFBiz plugins application help go to the html
generated from asciidoc files
---
assetmaint/widget/CommonScreens.xml | 3 ++-
assetmaint/widget/ismgr/CommonScreens.xml | 1 +
bi/widget/BiScreens.xml | 1 +
myportal/widget/CommonScreens.xml | 11 ++++++-----
pricat/widget/CommonScreens.xml | 1 +
webpos/widget/CommonScreens.xml | 25 +++++++++++++------------
6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/assetmaint/widget/CommonScreens.xml b/assetmaint/widget/CommonScreens.xml
index 3492f87..2c0d44f 100644
--- a/assetmaint/widget/CommonScreens.xml
+++ b/assetmaint/widget/CommonScreens.xml
@@ -39,6 +39,7 @@ under the License.
<set field="applicationMenuName" value="AssetMaintAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://assetmaint/widget/AssetmaintMenus.xml" global="true"/>
<set field="applicationTitle" from-field="uiLabelMap.AssetMaintApplication"/>
+ <set field="helpAnchor" from-field="helpAnchor" default-value="_apache_ofbiz_plugins"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
@@ -138,6 +139,6 @@ under the License.
</widgets>
</section>
</screen>
-
+
</screens>

diff --git a/assetmaint/widget/ismgr/CommonScreens.xml b/assetmaint/widget/ismgr/CommonScreens.xml
index 38f2488..db660e2 100644
--- a/assetmaint/widget/ismgr/CommonScreens.xml
+++ b/assetmaint/widget/ismgr/CommonScreens.xml
@@ -34,6 +34,7 @@ under the License.
<set field="activeApp" value="ismgr" global="true"/>
<set field="applicationMenuName" value="IsMgrAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://assetmaint/widget/ismgr/Menus.xml" global="true"/>
+ <set field="helpAnchor" from-field="helpAnchor" default-value="_apache_ofbiz_plugins"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.IsMgrCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.IsMgrCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
diff --git a/bi/widget/BiScreens.xml b/bi/widget/BiScreens.xml
index 43f92c9..90636a7 100644
--- a/bi/widget/BiScreens.xml
+++ b/bi/widget/BiScreens.xml
@@ -33,6 +33,7 @@ under the License.
<set field="applicationMenuName" value="BiAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://bi/widget/BiMenus.xml" global="true"/>
<set field="applicationTitle" from-field="uiLabelMap.BusinessIntelligenceApplication" global="true"/>
+ <set field="helpAnchor" from-field="helpAnchor" default-value="_apache_ofbiz_plugins"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
diff --git a/myportal/widget/CommonScreens.xml b/myportal/widget/CommonScreens.xml
index 897d84a..332cd13 100644
--- a/myportal/widget/CommonScreens.xml
+++ b/myportal/widget/CommonScreens.xml
@@ -39,6 +39,7 @@ under the License.
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
<set field="applicationMenuName" value="MyPortalAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://myportal/widget/MyPortalMenus.xml" global="true"/>
+ <set field="helpAnchor" from-field="helpAnchor" default-value="_my_portal_plugin"/>
<set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" global="true"/>
<script location="component://common/groovyScripts/GetParentPortalPageId.groovy"/>
<set field="applicationTitle" from-field="uiLabelMap.PageTitleMyPortalForNoLogin"/>
@@ -49,7 +50,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="AdminDecorator">
<section>
<actions>
@@ -69,7 +70,7 @@ under the License.
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
<set field="applicationMenuName" value="MyPortalAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://myportal/widget/MyPortalMenus.xml" global="true"/>
- <!--
+ <!--
<set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" global="true"/>
<script location="component://common/groovyScripts/GetParentPortalPageId.groovy"/>
<set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
@@ -139,7 +140,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="CommonWorkEffortDecorator">
<section>
<widgets>
@@ -151,7 +152,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="login">
<section>
<widgets>
@@ -191,7 +192,7 @@ under the License.
<widgets>
<platform-specific>
<html><html-template multi-block="true" location="component://myportal/template/RegisterPerson.ftl"/></html>
- </platform-specific>
+ </platform-specific>
</widgets>
</section>
</screenlet>
diff --git a/pricat/widget/CommonScreens.xml b/pricat/widget/CommonScreens.xml
index a9485a6..73ad3e1 100644
--- a/pricat/widget/CommonScreens.xml
+++ b/pricat/widget/CommonScreens.xml
@@ -32,6 +32,7 @@ under the License.
<set field="applicationMenuName" value="PriCatAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://pricat/widget/PriCatMenus.xml" global="true"/>
<set field="applicationTitle" from-field="uiLabelMap.PriCatApplication" global="true"/>
+ <set field="helpAnchor" from-field="helpAnchor" default-value="_apache_ofbiz_plugins"/>
<set field="layoutSettings.styleSheets[]" value="/pricat/includes/pricat.css" global="true"/>
</actions>
<widgets>
diff --git a/webpos/widget/CommonScreens.xml b/webpos/widget/CommonScreens.xml
index 230a414..b4ea99b 100644
--- a/webpos/widget/CommonScreens.xml
+++ b/webpos/widget/CommonScreens.xml
@@ -20,7 +20,7 @@ under the License.

<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
-
+
<screen name="main-decorator">
<section>
<actions>
@@ -32,7 +32,7 @@ under the License.
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://webpos/groovyScripts/WebPosSetup.groovy"/>
-
+
<set field="layoutSettings.styleSheets[+0]" value="/webpos/images/webpos.css" global="true"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.WebPosCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WebPosCompanySubtitle" global="true"/>
@@ -40,6 +40,7 @@ under the License.
<set field="applicationMenuName" value="WebPosAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://webpos/widget/WebPosMenus.xml" global="true"/>
<set field="applicationTitle" from-field="uiLabelMap.WebPosMenuMain" global="true"/>
+ <set field="helpAnchor" from-field="helpAnchor" default-value="_apache_ofbiz_plugins"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/jquery.hotkeys-0.7.9.min.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/WebPosHotkeys.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/webpos/images/js/Shortcuts.js" global="true"/>
@@ -71,7 +72,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="CommonWebPosMainDecorator">
<section>
<widgets>
@@ -112,7 +113,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="CommonWebPosManagerDecorator">
<section>
<widgets>
@@ -155,7 +156,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="TopBar">
<section>
<widgets>
@@ -171,7 +172,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="LeftBar">
<section>
<widgets>
@@ -181,7 +182,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="CenterBar">
<section>
<widgets>
@@ -203,7 +204,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="RightBar">
<section>
<widgets>
@@ -212,7 +213,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="SchortcutsBar">
<section>
<widgets>
@@ -220,7 +221,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="Header">
<section>
<widgets>
@@ -228,7 +229,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="Login">
<section>
<actions>
@@ -248,7 +249,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="RequirePasswordChange">
<section>
<actions>