You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ho...@apache.org on 2020/10/26 16:42:56 UTC
[ofbiz-framework] 04/04: Documented: Help system using asciidoc
files (OFBIZ-11693)
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 <ho...@apache.org>
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>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
</#if>
- <#if helpAnchor??>
- <li><a class="help-link alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}#${helpAnchor}" target="help" title="${uiLabelMap.CommonHelp}"></a></li>
- <#else>
- <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->
- <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??>
- <#include "component://common-theme/template/includes/HelpLink.ftl" />
- <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('<@o...@ofbizUrl>','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
- </#if>
- </#if>
+ <li><a class="help-link alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}<#if helpAnchor??>#${helpAnchor}</#if>" target="help" title="${uiLabelMap.CommonHelp}"></a></li>
<#if userLogin??>
<#if "Y" == (userPreferences.COMPACT_HEADER)?default("N")>
<li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()"> </a>
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>
<li>${uiLabelMap.CommonWelcome}! <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
</#if>
- <#if helpAnchor??>
- <li><a class="alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}#${helpAnchor}" target="help">${uiLabelMap.CommonHelp}</a></li>
- <#else>
- <#---if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->
- <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??>
- <#include "component://common-theme/template/includes/HelpLink.ftl" />
- <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup1('<@o...@ofbizUrl>','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
- </#if>
- </#if>
+ <li><a class="alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}<#if helpAnchor??>#${helpAnchor}</#if>" target="help">${uiLabelMap.CommonHelp}</a></li>
</ul>
</li>
</ul>
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.
</div>
<div id="main-nav-bar-right">
<div id="company-logo"></div>
- <#if helpAnchor??>
- <a class="dark-color" title="${uiLabelMap.CommonHelp}" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}#${helpAnchor}" target="help">${uiLabelMap.CommonHelp}<img class="appbar-btn-img" id="help-btn" src="/rainbowstone/images/help.svg" alt="Help"></a>
- <#else>
- <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
- <a class="dark-color" title="${uiLabelMap.CommonHelp}" href="javascript:lookup_popup1('<@o...@ofbizUrl>','help' ,500,500);"><img class="appbar-btn-img" id="help-btn" src="/rainbowstone/images/help.svg" alt="Help"></a>
- </#if>
- </#if>
+ <a class="dark-color" title="${uiLabelMap.CommonHelp}" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}<#if helpAnchor??>#${helpAnchor}</#if>" target="help">${uiLabelMap.CommonHelp}<img class="appbar-btn-img" id="help-btn" src="/rainbowstone/images/help.svg" alt="Help"></a>
<#include "component://rainbowstone/template/includes/Avatar.ftl"/>
</div>
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>
</#if>
<#if userLogin??>
- <#if helpAnchor??>
- <li><a class="help-link alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}#${helpAnchor}" target="help" title="${uiLabelMap.CommonHelp}"></a></li>
- <#else>
- <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->
- <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??>
- <#include "component://common-theme/template/includes/HelpLink.ftl" />
- <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('<@o...@ofbizUrl>','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
- </#if>
- </#if>
+ <li><a class="help-link alert" href="${userDocUri!Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "userDocUri", delegator)}<#if helpAnchor??>#${helpAnchor}</#if>" target="help" title="${uiLabelMap.CommonHelp}"></a></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
<#else>