.gitignore | 1
java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java | 28
++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 12 ++++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 3 -
java/code/webapp/WEB-INF/nav/sitenav.xml | 3 -
java/code/webapp/WEB-INF/pages/help/chatindex.jsp | 24
++++++++
java/code/webapp/WEB-INF/struts-config.xml | 6 ++
web/html/nav/sitenav-authenticated.xml | 3 -
web/html/nav/sitenav.xml | 3 -
9 files changed, 75 insertions(+), 8 deletions(-)
New commits:
commit c108740c0f1e6bd52b8f8ec02541e97edd851f0e
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Tue Sep 21 15:54:04 2010 +0200
630585 - about-chat now points to proper channel (branding)
diff --git a/.gitignore b/.gitignore
index b8a5f20..836f5db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ web/html/templates
web/html/bootstrap/
web/rpm-build
web/rhn-web-*.tar.gz
+sqlnet.log
diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
b/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
new file mode 100644
index 0000000..0f6e8cf
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
@@ -0,0 +1,28 @@
+package com.redhat.rhn.frontend.action.help;
+
+import com.redhat.rhn.common.conf.Config;
+import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+/**
+ * Static action page.
+ *
+ * @author Lukas Zapletal
+ */
+public class ChatAction extends org.apache.struts.action.Action {
+
+ /** {@inheritDoc} */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ return mapping.findForward("default");
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 8e47995..5314185 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -21465,6 +21465,18 @@ given channel.</source>
<context
context-type="sourcefile">/rhn/help/Search</context>
</context-group>
</trans-unit>
+ <trans-unit id="help.jsp.chat">
+ <source>IRC Chat</source>
+ </trans-unit>
+ <trans-unit id="help.jsp.chatinfo">
+ <source>Please contact Red Hat Support for direct assistance for RHN
Satellite.
+This page allows you to join an IRC chat room for discussions with other users of
+RHN Satellite and not an official means of gaining support for RHN Satellite
+from Red Hat.</source>
+ </trans-unit>
+ <trans-unit id="help.jsp.chatlink">
+ <source>Access <a
href="http://webchat.freenode.net?channels=#spacewalk"
target="_blank">#spacewalk</a> channel on
IRC.</source>
+ </trans-unit>
<trans-unit id="help.jsp.refguide">
<source>@@PRODUCT_NAME@@ Reference Guide</source>
</trans-unit>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 97e2870..1cc4f2e 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -326,8 +326,7 @@
<rhn-tab name="Sample Scripts"
url="/rhn/apidoc/scripts.jsp" />
</rhn-tab>
<rhn-tab name="Search" url="/rhn/help/Search.do" />
- <rhn-tab name="Chat"
url="http://webchat.freenode.net/?channels=#spacewalk"
- target="_blank" />
+ <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
</rhn-tab>
</rhn-navi-tree>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav.xml
b/java/code/webapp/WEB-INF/nav/sitenav.xml
index 719d780..88a2aa3 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav.xml
@@ -35,8 +35,7 @@
<rhn-tab name="Sample Scripts"
url="/rhn/apidoc/scripts.jsp" />
</rhn-tab>
<rhn-tab name="Search" url="/rhn/help/Search.do" />
- <rhn-tab name="Chat"
- url="http://webchat.freenode.net?channels=#spacewalk"
target="_blank" />
+ <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
</rhn-tab>
diff --git a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
new file mode 100644
index 0000000..d0a8471
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
@@ -0,0 +1,24 @@
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-html"
prefix="html" %>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
+<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-bean"
prefix="bean" %>
+
+<html>
+<head>
+<script type="text/javascript"
src="/javascript/highlander.js"></script>
+</head>
+<body>
+
+ <h1><img src="/img/rhn-icon-help-h1.gif" alt="help"
/><bean:message key="help.jsp.chat"/></h1>
+
+ <ul id="help-url-list">
+
+ <div><bean:message key="help.jsp.chatinfo"/></div>
+ <br/><br/>
+ <div><bean:message key="help.jsp.chatlink"/></div>
+
+ </ul>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 674b833..f7138ba 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -6884,6 +6884,12 @@
path="/help/Search.do" redirect="true"/>
</action>
+ <action path="/help/Chat"
+ scope="request"
+ type="com.redhat.rhn.frontend.action.help.ChatAction">
+ <forward name="default"
path="/WEB-INF/pages/help/chatindex.jsp"/>
+ </action>
+
<action path="/help/index"
scope="request"
type="com.redhat.rhn.frontend.action.help.HelpAction">
diff --git a/web/html/nav/sitenav-authenticated.xml
b/web/html/nav/sitenav-authenticated.xml
index 59db59c..6948884 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -255,8 +255,7 @@
</rhn-tab>
<rhn-tab name="API" url="/rhn/apidoc/index.jsp" />
<rhn-tab name="Search" url="/rhn/help/Search.do" />
- <rhn-tab name="Chat"
url="http://webchat.freenode.net/?channels=#spacewalk"
- target="_blank" />
+ <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
</rhn-tab>
</rhn-navi-tree>
diff --git a/web/html/nav/sitenav.xml b/web/html/nav/sitenav.xml
index 6d9e3fa..9775219 100644
--- a/web/html/nav/sitenav.xml
+++ b/web/html/nav/sitenav.xml
@@ -35,8 +35,7 @@
<rhn-tab name="Sample Scripts"
url="/rhn/apidoc/scripts.jsp" />
</rhn-tab>
<rhn-tab name="Search" url="/rhn/help/Search.do" />
- <rhn-tab name="Chat"
- url="http://webchat.freenode.net?channels=#spacewalk"
target="_blank" />
+ <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
</rhn-tab>