diff --git a/applications/accounting/data/AccountingHelpData.xml b/applications/accounting/data/AccountingHelpData.xml index 1bf45a3fb2b..700488a7198 100644 --- a/applications/accounting/data/AccountingHelpData.xml +++ b/applications/accounting/data/AccountingHelpData.xml @@ -19,20 +19,24 @@ under the License. --> - - + + The Accounting Manager. +
+ The Accounting Manager keeps track of financial charges, credit card processes, and receipts of payment. The link from the Order Manager to the Accounting Manager is the Invoice Number, generated when the Order is processed. + +
]]> - /> - + /> + diff --git a/applications/commonext/config/CommonExtUiLabels.xml b/applications/commonext/config/CommonExtUiLabels.xml index c5fafb34edc..035db318e87 100644 --- a/applications/commonext/config/CommonExtUiLabels.xml +++ b/applications/commonext/config/CommonExtUiLabels.xml @@ -28,6 +28,9 @@ What is it used for? + + What's on the screen? + Index diff --git a/applications/commonext/data/CommonExtHelpData.xml b/applications/commonext/data/CommonExtHelpData.xml index 41530713c4d..8462f8beefc 100644 --- a/applications/commonext/data/CommonExtHelpData.xml +++ b/applications/commonext/data/CommonExtHelpData.xml @@ -19,8 +19,10 @@ --> - - - + + + + + \ No newline at end of file diff --git a/applications/commonext/widget/HelpScreens.xml b/applications/commonext/widget/HelpScreens.xml index 6c5b3d459eb..b0cab982445 100644 --- a/applications/commonext/widget/HelpScreens.xml +++ b/applications/commonext/widget/HelpScreens.xml @@ -64,7 +64,10 @@ under the License.
- + + + + @@ -76,11 +79,8 @@ under the License. - - - - - + +
@@ -88,11 +88,7 @@ under the License. - - - - - + @@ -110,7 +106,7 @@ under the License. - + @@ -153,11 +149,11 @@ under the License. - + - + diff --git a/applications/content/data/ContentHelpData.xml b/applications/content/data/ContentHelpData.xml index e8643765565..1bcd867ec91 100644 --- a/applications/content/data/ContentHelpData.xml +++ b/applications/content/data/ContentHelpData.xml @@ -18,20 +18,46 @@ specific language governing permissions and limitations under the License. --> - - - + + + + + + Welcome to the Apache OFBiz help system + + +
+ If you arrived at this page without selecting the index, then a specific help page was not yet available +
+
+ This system will provide you context sensitive help throughout the system. +
+
+ For more info on the help system itself check the +
+ + + ]]> + + + + + + The Content Manager. - The Content Management System (CMS) is designed to store data once and then allow it to be reused in multiple arrangements. +
+ The Content Management System (CMS) is designed to store data once and then allow it to be reused in multiple arrangements. +
]]> - /> - + /> + diff --git a/applications/content/data/TemplateData.xml b/applications/content/data/TemplateData.xml index ddc58ce1f2c..b67d7783273 100644 --- a/applications/content/data/TemplateData.xml +++ b/applications/content/data/TemplateData.xml @@ -465,8 +465,8 @@ ${txt} - - + +
@@ -489,15 +489,16 @@ ${txt} <#if doc.root.general?has_content>

${doc.root.generalTitle?if_exists}

-

${doc.root.general}

+ <#list doc.root.general.section as section> +

${section.text}

+
- -<#if layoutSettings.VT_NAME[0] == "BIZZNESS_TIME"> +<#elseif layoutSettings.VT_NAME[0] == "BIZZNESS_TIME"> <#if doc.root.definition?has_content>

${uiLabelMap.CommonExtHelpDefinition}

${doc.root.definition}


@@ -515,28 +516,36 @@ ${txt} <#if doc.root.general?has_content>

${doc.root.generalTitle?if_exists}

-

${doc.root.general}

+ <#list doc.root.general.section as section> +

${section.text}

+ + +<#else> + <#if doc.root.definition?has_content> +

${uiLabelMap.CommonExtHelpDefinition}

+

${doc.root.definition}


+ + + <#if doc.root.usedFor?has_content> +

${uiLabelMap.CommonExtHelpUsedFor}

+

${doc.root.usedFor}


+ + + <#if doc.root.onScreen?has_content> +

${uiLabelMap.CommonExtHelpOnScreen}

+

${doc.root.onScreen}

+ <#if doc.root.general?has_content> +

${doc.root.generalTitle?if_exists}

+ <#list doc.root.general.section as section> +

${section.text}

+ + ]]> - - - - - Welcome to the Apache OFBiz help system - - - This system will provide you context sensitive help throughout the system. - - - ]]> - - - diff --git a/applications/content/ofbiz-component.xml b/applications/content/ofbiz-component.xml index 181ff9de60e..bc2321a24a7 100644 --- a/applications/content/ofbiz-component.xml +++ b/applications/content/ofbiz-component.xml @@ -29,21 +29,21 @@ under the License. - + + + + + - - - - diff --git a/applications/product/data/ProductHelpData.xml b/applications/product/data/ProductHelpData.xml index f687672e0d5..51cce36e0f9 100644 --- a/applications/product/data/ProductHelpData.xml +++ b/applications/product/data/ProductHelpData.xml @@ -19,19 +19,23 @@ under the License. --> - - + + The Catalog Manager. - The Catalog Manager creates and provides access to a variety of information related to Products, Catalogs, or Categories. +
+ + The Catalog Manager creates and provides access to a variety of information related to Products, Catalogs, or Categories. + +
]]> - /> - + /> + diff --git a/applications/workeffort/data/WorkEffortPortletData.xml b/applications/workeffort/data/WorkEffortPortletData.xml index 4dcc98edf43..9cc7dce03cb 100644 --- a/applications/workeffort/data/WorkEffortPortletData.xml +++ b/applications/workeffort/data/WorkEffortPortletData.xml @@ -29,8 +29,8 @@ editFormLocation="component://workeffort/widget/CalendarForms.xml" screenshot="/images/portlets/Calendar.png"/> - - + + @@ -45,8 +45,8 @@ ]]> - - + + diff --git a/framework/common/webcommon/includes/helplink.ftl b/framework/common/webcommon/includes/helplink.ftl index c4af6fd32b0..8be40457c96 100644 --- a/framework/common/webcommon/includes/helplink.ftl +++ b/framework/common/webcommon/includes/helplink.ftl @@ -21,13 +21,19 @@ under the License. <#assign helpUrlPrefix = "" /> <#assign helpUrlSuffix = "" /> -<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files -${helpTopic} ---> <#if Static["org.ofbiz.base.component.ComponentConfig"].componentExists("content")> - <#assign helpContent = delegator.findByAnd("Content", {"contentName" : helpTopic})?if_exists> + <#if (helpTopic?length > 20)> + <#assign helpTopic = helpTopic?substring(0,20)> + + <#assign helpContent = delegator.findByAnd("Content", {"contentId" : helpTopic})> + <#if !helpContent?has_content> + <#assign helpContent = delegator.findByAnd("Content", {"contentId" : webSiteId})> + +<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files +${helpTopic} +--> <#if helpUrlsMap["Prefix"] != "Prefix"> <#assign helpUrlPrefix = helpUrlsMap["Prefix"] /> diff --git a/framework/common/widget/PortalPageForms.xml b/framework/common/widget/PortalPageForms.xml index 6e7526df370..612c7457ab9 100644 --- a/framework/common/widget/PortalPageForms.xml +++ b/framework/common/widget/PortalPageForms.xml @@ -124,7 +124,7 @@ under the License. - + diff --git a/specialpurpose/ecommerce/data/DemoTreeContent.xml b/specialpurpose/ecommerce/data/DemoTreeContent.xml index 1159565c739..7ee866af7a0 100644 --- a/specialpurpose/ecommerce/data/DemoTreeContent.xml +++ b/specialpurpose/ecommerce/data/DemoTreeContent.xml @@ -18,7 +18,6 @@ under the License. --> - diff --git a/specialpurpose/myportal/data/MyPortalTypeData.xml b/specialpurpose/myportal/data/MyPortalTypeData.xml index 10d953c4613..48ff0095114 100644 --- a/specialpurpose/myportal/data/MyPortalTypeData.xml +++ b/specialpurpose/myportal/data/MyPortalTypeData.xml @@ -160,23 +160,26 @@ - - + + The My portal Component introduction. - Within the 'my portal' component it is possible to create a collection of screens for a specific type of user of the system. - Examples are a general employee, an account manager, a customer, a supplier etc... - The system makes use of special portlets which can be arranged and selected/hidden by the logged on user. +
+ + Within the 'my portal' component it is possible to create a collection of screens for a specific type of user of the system. + Examples are a general employee, an account manager, a customer, a supplier etc... + The system makes use of special portlets which can be arranged and selected/hidden by the logged on user. + +
]]> - - - + + \ No newline at end of file diff --git a/themes/bizznesstime/includes/header.ftl b/themes/bizznesstime/includes/header.ftl index 7021fd5873b..68f4c5486e5 100644 --- a/themes/bizznesstime/includes/header.ftl +++ b/themes/bizznesstime/includes/header.ftl @@ -126,7 +126,7 @@ under the License. ${uiLabelMap.CommonLogout} <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> - <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")> + <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")> ${uiLabelMap.CommonHelp} <#else> ${uiLabelMap.CommonHelp} diff --git a/themes/flatgrey/includes/header.ftl b/themes/flatgrey/includes/header.ftl index 9a25235fbb6..9e971e58708 100644 --- a/themes/flatgrey/includes/header.ftl +++ b/themes/flatgrey/includes/header.ftl @@ -182,7 +182,7 @@ under the License. <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> - <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")> + <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")>
  • ${uiLabelMap.CommonHelp}
    • <#else>
  • ${uiLabelMap.CommonHelp}