[Hyperic-hq-discuss] hq r3688 - in trunk/web: WEB-INF/classes admin

[<he...@hy...>]

Author: heather
Date: 2007-03-09 11:36:11 -0800 (Fri, 09 Mar 2007)
New Revision: 3688
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3688

Modified:
   trunk/web/WEB-INF/classes/ApplicationResources.properties
   trunk/web/admin/Settings.jsp
Log:
adding key for the admin page for ee

Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2007-03-09 19:13:34 UTC (rev 3687)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2007-03-09 19:36:11 UTC (rev 3688)
@@ -2650,6 +2650,7 @@
 inform.config.escalation.scheme.newAction.noactions=Currently there are no actions for this escalation. Click on the "Create Action" button below to create an action to perform when this escalation is invoked.
 inform.config.escalation.scheme.inProgressEscalation=If you edit an escalation that is currently in progress, the escalation will be stopped.
 inform.config.escalation.scheme.NoOP=Suppress Additional Alerts
-inform.config.admin.HQServerConfig=Change settings for email, data compression, database maintenance and authentication services
-inform.config.admin.MonitoringDefaults=Define monitoring policies for the entire environment
-inform.config.admin.EscalationScheme=Define global escalation schemes that can be applied to individual alerts
\ No newline at end of file
+inform.config.admin.HQServerConfig= - Change settings for email, data compression, database maintenance and authentication services
+inform.config.admin.MonitoringDefaults= - Define monitoring policies for the entire environment
+inform.config.admin.PolicyDefaults= - Define monitoring and alerting policies for the entire environment
+inform.config.admin.EscalationScheme= - Define global escalation schemes that can be applied to individual alerts
\ No newline at end of file

Modified: trunk/web/admin/Settings.jsp
===================================================================
--- trunk/web/admin/Settings.jsp	2007-03-09 19:13:34 UTC (rev 3687)
+++ trunk/web/admin/Settings.jsp	2007-03-09 19:36:11 UTC (rev 3688)
@@ -4,6 +4,7 @@
 <%@ taglib uri="jstl-fmt" prefix="fmt" %>
 <%@ taglib uri="struts-html-el" prefix="html" %>
 <%@ taglib uri="struts-tiles" prefix="tiles" %>
+<%@ taglib uri="struts-bean" prefix="bean" %>
 <%--
   NOTE: This copyright does *not* cover user programs that use HQ
   program services by normal system calls through the application
@@ -39,17 +40,27 @@
 <c:if test="${useroperations['administerCAM']}">
 	<tr>
 		<td width="20%" class="BlockLabel"><fmt:message key="admin.home.Settings"/></td>
-		<td class="BlockContent"><html:link page="/admin/config/Config.do?mode=edit"><fmt:message key="admin.home.ServerConfig"/></html:link> - <fmt:message key="inform.config.admin.HQServerConfig"/></td>
+		<td class="BlockContent"><html:link page="/admin/config/Config.do?mode=edit"><fmt:message key="admin.home.ServerConfig"/></html:link><fmt:message key="inform.config.admin.HQServerConfig"/></td>
 	</tr>
 </c:if>
 	<tr>
 		<td  width="20%" class="BlockLabel"></td>
-		<td class="BlockContent"><html:link page="/admin/config/Config.do?mode=monitor"><fmt:message key="admin.home.ResourceTemplates"/></html:link> - <fmt:message key="inform.config.admin.MonitoringDefaults"/></td>
+		<td class="BlockContent"><html:link page="/admin/config/Config.do?mode=monitor"><fmt:message key="admin.home.ResourceTemplates"/></html:link>
+            <tiles:importAttribute name="defaultMsg" ignore="true"/>
+            <c:choose>
+                <c:when test="${not empty defaultMsg}">
+                    <fmt:message key="${defaultMsg}"/>
+                </c:when>
+                <c:otherwise>
+                    <fmt:message key="inform.config.admin.MonitoringDefaults"/>
+                </c:otherwise>
+            </c:choose>
+        </td>
 	</tr>
     <c:if test="${useroperations['administerCAM']}">
     <tr>
 		<td class="BlockLabel"></td>
-		<td class="BlockContent"><html:link page="/admin/config/Config.do?mode=escalate"><fmt:message key="admin.home.EscalationSchemes"/></html:link> - <fmt:message key="inform.config.admin.EscalationScheme"/></td>
+		<td class="BlockContent"><html:link page="/admin/config/Config.do?mode=escalate"><fmt:message key="admin.home.EscalationSchemes"/></html:link><fmt:message key="inform.config.admin.EscalationScheme"/></td>
 	</tr>
     </c:if>
 </table>