|
From: <he...@hy...> - 2007-03-09 18:47:21
|
Author: heather Date: 2007-03-09 10:47:18 -0800 (Fri, 09 Mar 2007) New Revision: 3686 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3686 Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties trunk/web/admin/Settings.jsp Log: text change/addition to the administration links page to explain what is under the links and get rid of the word configuration Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2007-03-09 13:04:58 UTC (rev 3685) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2007-03-09 18:47:18 UTC (rev 3686) @@ -480,8 +480,8 @@ admin.home.ListRoles=List Roles admin.home.Settings=Settings: -admin.home.ServerConfig=HQ Server Configuration -admin.home.ResourceTemplates=Monitoring Defaults Configuration +admin.home.ServerConfig=HQ Server Settings +admin.home.ResourceTemplates=Monitoring Defaults admin.home.EscalationSchemes=Escalation Schemes Configuration # ADMIN.SETTINGS @@ -2649,4 +2649,7 @@ inform.config.escalation.scheme.newAction.dragaction=Drag individual actions to change the order of events 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 \ No newline at end of file +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 Modified: trunk/web/admin/Settings.jsp =================================================================== --- trunk/web/admin/Settings.jsp 2007-03-09 13:04:58 UTC (rev 3685) +++ trunk/web/admin/Settings.jsp 2007-03-09 18:47:18 UTC (rev 3686) @@ -39,17 +39,17 @@ <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></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></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> </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></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> |