java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2 ++ java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1 + java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2 ++ java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 +++++--- java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 +++++--- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5 +++-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 +++++--- 7 files changed, 23 insertions(+), 11 deletions(-)
New commits: commit 89ec6aedc9640768daf0eb984e72486f9d7e5400 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 18 16:41:28 2012 +0200
803353 - fixing another two broken documentation links
- Click here for more information on the differences between text and binary files. - Tip: A full listing of the available macros is listed in the RHN Reference Guide.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java index 71f1e74..43ac013 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.configuration;
+import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.common.validator.ValidatorResult; @@ -56,6 +57,7 @@ public abstract class BaseAddFilesAction extends RhnAction { StringUtil.displayFileSize(ConfigFile.getMaxFileSize()));
request.setAttribute(CSRF_TOKEN, request.getSession().getAttribute("csrf_token")); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable());
if (isSubmitted(cff)) { ConfigChannel channel = getConfigChannel(request); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java index a676332..074195b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java @@ -93,6 +93,7 @@ public class FileDetailsAction extends RhnAction { cff.updateFromRevision(request, cr); setupRequestParams(context, cr); request.setAttribute("form", cff); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable());
return getStrutsDelegate().forwardParams(mapping.findForward("default"), params); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java index 770be15..a0f6cf7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.configuration.files;
+import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.config.ConfigRevision; import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper; import com.redhat.rhn.frontend.action.configuration.ConfigFileForm; @@ -47,6 +48,7 @@ public class FileDownloadAction extends RhnAction { ConfigFileForm cff = (ConfigFileForm) form;
request.setAttribute(CSRF_TOKEN, request.getSession().getAttribute("csrf_token")); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable());
ConfigRevision cr = ConfigActionHelper.findRevision(request);
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf index e5623d9..2accd2c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf @@ -115,9 +115,11 @@ <html:text property="cffMacroStart" size="3" styleId="cffMacroStart" disabled = "${configFileForm.map.filetype == 'symlink'}" /> <bean:message key="filedetails.add_details.jspf.macro.end" /> <html:text property="cffMacroEnd" size="3" styleId="cffMacroEnd" disabled = "${configFileForm.map.filetype == 'symlink'}" /><br /> - <span class="small-text"> - <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> - </span> + <c:if test="${documentation == 'true'}"> + <span class="small-text"> + <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> + </span> + </c:if> </td> </tr> <tr id = "contentsRow" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf index e01f323..d449873 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf @@ -59,9 +59,11 @@ <html:text property="cffMacroStart" size="3" /> <bean:message key="filedetails.add_details.jspf.macro.end" /> <html:text property="cffMacroEnd" size="3" /><br /> - <span class="small-text"> - <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> - </span> + <c:if test="${documentation == 'true'}"> + <span class="small-text"> + <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> + </span> + </c:if> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf index 7c07033..af4c355 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf @@ -31,8 +31,9 @@ <c:out value="${revision.configContent.delimEnd}" /> </rhn:require> <br /> - - <span class="small-text"><bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span> + <c:if test="${documentation == 'true'}"> + <span class="small-text"><bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span> + </c:if> </tr> </c:if> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf index 72cb8be..9151f12 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf @@ -101,10 +101,12 @@ </c:if> </rhn:require> <br /> - <span class="small-text"> - <bean:message key="filedetails.jsp.binarytoggletip" + <c:if test="${documentation == 'true'}"> + <span class="small-text"> + <bean:message key="filedetails.jsp.binarytoggletip" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp" /> - </span> + </span> + </c:if> </c:otherwise> </c:choose> </td>
spacewalk-commits@lists.fedorahosted.org