modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 2 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 62 ---------- modules/enterprise/gui/portal-war/src/main/webapp/index.html | 10 - 3 files changed, 7 insertions(+), 67 deletions(-)
New commits: commit 4d5aee7d3cef032462a497626d53b9cf85a705a7 Author: Ian Springer ian.springer@redhat.com Date: Fri Mar 4 11:41:02 2011 -0500
remove Redirecting to coregui.war message from portal-war redirect page to make redirect less obvious; remove commented-out Struts taglibs from portal-war web.xml; fix typo in config editor
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java index a63e70f..a986d06 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java @@ -479,7 +479,7 @@ public class ConfigurationEditor extends LocatableVLayout { + group.getDisplayName() + "</div>" + (group.getDescription() != null ? ("<div style='padding-left: 10px; font-weight: normal; font-size: smaller; float: left;'>" - + " -" + group.getDescription() + "</div>") + + " - " + group.getDescription() + "</div>") : "")); section.setExpanded(!group.isDefaultHidden()); } diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml index 2cdedb1..c9b61e7 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml @@ -531,67 +531,5 @@ <error-code>404</error-code> <location>/common/GenericError.jsp</location> </error-page> - - - - <!----><!-- Struts Tag Library Descriptors --><!-- - <taglib> - <taglib-uri>struts-bean</taglib-uri> - <taglib-location>/WEB-INF/tld/struts-bean.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>struts-html</taglib-uri> - <taglib-location>/WEB-INF/tld/struts-html.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>struts-logic</taglib-uri> - <taglib-location>/WEB-INF/tld/struts-logic.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>struts-nested</taglib-uri> - <taglib-location>/WEB-INF/tld/struts-nested.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>struts-tiles</taglib-uri> - <taglib-location>/WEB-INF/tld/struts-tiles.tld</taglib-location> - </taglib> ---><!-- - <taglib> - <taglib-uri>struts-validator</taglib-uri> - <taglib-location>/WEB-INF/tld/struts-validator.tld</taglib-location> - </taglib> ---><!-- - <taglib> - <taglib-uri>struts-html-el</taglib-uri> - <taglib-location>/WEB-INF/tld/struts-html-el.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>struts-logic-el</taglib-uri> - <taglib-location>/WEB-INF/tld/struts-logic-el.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>jstl-c</taglib-uri> - <taglib-location>/WEB-INF/tld/c.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>jstl-c-rt</taglib-uri> - <taglib-location>/WEB-INF/tld/c-rt.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>jstl-fmt</taglib-uri> - <taglib-location>/WEB-INF/tld/fmt.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>hq</taglib-uri> - <taglib-location>/WEB-INF/tld/hq.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>display</taglib-uri> - <taglib-location>/WEB-INF/tld/display.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>rt</taglib-uri> - <taglib-location>/WEB-INF/tld/rt.tld</taglib-location> - </taglib>-->
</web-app> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/index.html b/modules/enterprise/gui/portal-war/src/main/webapp/index.html index cb07c35..74eaaa5 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/index.html +++ b/modules/enterprise/gui/portal-war/src/main/webapp/index.html @@ -1,9 +1,11 @@ <html> + <head> - <meta http-equiv="Refresh" content="0; URL=/coregui/CoreGUI.html#Dashboards"/> + <meta http-equiv="Refresh" content="0; URL=/coregui/"/> </head> - <body> - <p>Redirecting to <a href="/coregui/CoreGUI.html#Dashboards">coregui.war</a>...</p> + + <body bgcolor="white"> + </body> -</html>
+</html>