fixing bug #11030 : removing reference of help which does not exist a…

…nymore (https://extranet.silverpeas.com/help_fr and /help_fr/Silverpeas.htm)
Silverpeas · Oct 16, 2019 · ebdd2f3 · ebdd2f3
1 parent 7e1c741
commit ebdd2f3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/...ain/config/properties/org/silverpeas/util/viewGenerator/settings/BigAndAngular.properties b/...ain/config/properties/org/silverpeas/util/viewGenerator/settings/BigAndAngular.properties
@@ -84,7 +84,7 @@ scheduleEventVisible = true
 display.all.components=false
 
 # URL aide en ligne
-helpURL = https://extranet.silverpeas.com/help_fr
+helpURL =
 
 # Domain's Bar frameset
 domainsBarFramesetWidth = 281

diff --git a/core-war/src/main/webapp/admin/jsp/silverpeas-header-part.jsp b/core-war/src/main/webapp/admin/jsp/silverpeas-header-part.jsp
@@ -28,6 +28,7 @@
 <%@ include file="importFrameSet.jsp" %>
 <%@ page import="org.silverpeas.core.web.look.LookHelper"%>
 <%@ page import="org.silverpeas.core.web.look.TopItem"%>
+<%@ page import="org.silverpeas.core.util.StringUtil" %>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%>
@@ -59,6 +60,8 @@ if (wallPaper == null) {
   wallPaper = m_sContext+"/admin/jsp/icons/silverpeasV5/bandeauTop.jpg";
 }
 
+String helpURL = helper.getSettings("helpURL", "");
+
 boolean outilDisplayed = false;
 %>
 <c:set var="isAnonymousAccess" value="<%=helper.isAnonymousAccess()%>"/>
@@ -184,13 +187,13 @@ window.USERSESSION_PROMISE.then(function() {
 		    %>
 				<a href="<%=m_sContext + "/admin/jsp/Map.jsp"%>" target="MyMain"><%=helper.getString("lookSilverpeasV5.Map")%></a>
 		<% } %>
-		<% if (helper.getSettings("helpVisible", true)) {
+		<% if (helper.getSettings("helpVisible", true) && StringUtil.isDefined(helpURL)) {
 			if (outilDisplayed) {
 			out.print(" | ");
 			}
 		    outilDisplayed = true;
 		%>
-			<a href="<%=helper.getSettings("helpURL", "/help_fr/Silverpeas.htm")%>" target="_blank"><%=helper.getString("lookSilverpeasV5.Help")%></a>
+			<a href="<%=helpURL%>" target="_blank"><%=helper.getString("lookSilverpeasV5.Help")%></a>
 		<% } %>
 		<% if (!isAnonymousAccess && helper.getSettings("logVisible", true)) {
 			if (outilDisplayed) {

diff --git a/core-war/src/main/webapp/jobManagerPeas/jsp/topBarManager.jsp b/core-war/src/main/webapp/jobManagerPeas/jsp/topBarManager.jsp
@@ -45,7 +45,7 @@
 <fmt:message var="clipboardIconUrl" key="JMP.clipboardIcon" bundle="${icons}"/>
 <c:url var="clipboardIconUrl" value="${clipboardIconUrl}"/>
 <c:url var="clipboardUrl" value='<%=URLUtil.getURL(URLUtil.CMP_CLIPBOARD) + "Idle.jsp?message=SHOWCLIPBOARD"%>'/>
-<c:set var="helpUrl" value='<%=helper.getSettings("helpURL", "/help_fr/Silverpeas.htm")%>'/>
+<c:set var="helpUrl" value='<%=helper.getSettings("helpURL", "")%>'/>
 <fmt:message var="helpLabel" key="JMP.help"/>
 <fmt:message var="helpIconUrl" key="JMP.help" bundle="${icons}"/>
 <c:url var="helpIconUrl" value="${helpIconUrl}"/>
@@ -61,7 +61,9 @@
 <div id="outilsAdmin">
   <a class="sp_back_front" href="javascript:void(0);" onclick="window.top.spWindow.leaveAdmin()">${backToSilverpeasLabel}</a>
   <a href="${clipboardUrl}" target="IdleFrame"><img src="${clipboardIconUrl}" border="0" alt="${clipboardLabel}" onfocus="self.blur()" title="${clipboardLabel}"/><span>${clipboardLabel}</span></a>
-  <a href="${helpUrl}" target="_blank"><img border="0" src="${helpIconUrl}" alt="${helpLabel}" title="${helpLabel}"/><span>${helpLabel}</span></a>
+  <c:if test="${not empty helpUrl}">
+    <a href="${helpUrl}" target="_blank"><img border="0" src="${helpIconUrl}" alt="${helpLabel}" title="${helpLabel}"/><span>${helpLabel}</span></a>
+  </c:if>
   <a class="sp_logout" href="javascript:onclick=window.top.spUserSession.logout();"><img border="0" src="${logoutIconUrl}" alt="${logoutLabel}" title="${logoutLabel}"/><span>${logoutLabel}</span></a>
 </div>
 <ul class="sp_menuAdmin">

diff --git a/...ing/resources/com/stratelia/webactiv/util/viewGenerator/settings/BigAndAngular.properties b/...ing/resources/com/stratelia/webactiv/util/viewGenerator/settings/BigAndAngular.properties
@@ -84,7 +84,7 @@ scheduleEventVisible = true
 display.all.components=false
 
 # URL aide en ligne
-helpURL = https://extranet.silverpeas.com/help_fr
+helpURL =
 
 # Domain's Bar frameset
 domainsBarFramesetWidth = 281

diff --git a/...st-awaiting/resources/org/silverpeas/util/viewGenerator/settings/BigAndAngular.properties b/...st-awaiting/resources/org/silverpeas/util/viewGenerator/settings/BigAndAngular.properties
@@ -84,7 +84,7 @@ scheduleEventVisible = true
 display.all.components=false
 
 # URL aide en ligne
-helpURL = https://extranet.silverpeas.com/help_fr
+helpURL =
 
 # Domain's Bar frameset
 domainsBarFramesetWidth = 281