From: <dcr...@hy...> - 2009-04-30 21:12:34
|
Author: dcrutchf Date: 2009-04-30 14:12:22 -0700 (Thu, 30 Apr 2009) New Revision: 13111 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13111 Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties trunk/web/css/HQ_40.css trunk/web/resource/hub/ResourceHub.jsp Log: Changed list view / chart view buttons to render a bit differently based on feedback from CBSi Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2009-04-30 18:52:01 UTC (rev 13110) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2009-04-30 21:12:22 UTC (rev 13111) @@ -1017,6 +1017,9 @@ resource.navmap.linktext=Map resource.toolsmenu.text=Tools Menu +resource.view.chart=Show Chart View +resource.view.list=Show List View + # RESOURCE GENERAL ERRORS resource.common.error.ResourceNotFound=The specified resource does not exist. resource.common.error.ResourceViewPermission=You do not have permission to view this resource. @@ -2021,6 +2024,9 @@ alert.view.confirm.fixed=You have fixed this alert alert.view.error.acknowledged=This alert is no longer acknowledgeable +alert.view.listDetails=Show Alerts +alert.view.listDefinitions=Show Alert Definitions + # MONITORING: EVENTS monitoring.events.MiniTabs.Roles=Notify Roles monitoring.events.MiniTabs.Users=Notify HQ Users Modified: trunk/web/css/HQ_40.css =================================================================== --- trunk/web/css/HQ_40.css 2009-04-30 18:52:01 UTC (rev 13110) +++ trunk/web/css/HQ_40.css 2009-04-30 21:12:22 UTC (rev 13111) @@ -2319,6 +2319,13 @@ cursor:pointer; } +.button42disabled { + color: #888; + background-color: #ccc; + border-color: #aaa; + cursor: default +} + .successDialogMsg { color:cornflowerblue; font-size:10pt; @@ -2355,4 +2362,8 @@ .deprecated { color: #888; +} + +.dijitDialogUnderlay { + background-color: #000; } \ No newline at end of file Modified: trunk/web/resource/hub/ResourceHub.jsp =================================================================== --- trunk/web/resource/hub/ResourceHub.jsp 2009-04-30 18:52:01 UTC (rev 13110) +++ trunk/web/resource/hub/ResourceHub.jsp 2009-04-30 21:12:22 UTC (rev 13111) @@ -267,24 +267,19 @@ </c:otherwise> </c:choose> -<div class="FilterImage" style="padding: 4px; text-align: right;"> +<div class="FilterImage" style="padding: 4px;text-align: right;"> <c:choose> - <c:when test="${ResourceHubForm.view == CHART}"> - <html:img page="/images/SubHub_ChartView_on.gif" alt="Chart View" border="0"/> - </c:when> - <c:otherwise> - <html:link page="/ResourceHub.do" onclick="ResourceHubForm.view.value = 'chart'; ResourceHubForm.submit(); return false;"><html:img page="/images/SubHub_ChartView_off.gif" alt="Chart View" border="0" onmouseover="imageSwap (this, imagePath + 'SubHub_ChartView', '_over')" onmouseout="imageSwap (this, imagePath + 'SubHub_ChartView', '_off')"/></html:link> - </c:otherwise> + <c:when test="${ResourceHubForm.view == LIST}"> + <input type="button" id="showChartBtn" class="button42" + value="<fmt:message key='resource.view.chart' />" + onclick="ResourceHubForm.view.value = 'chart'; ResourceHubForm.submit(); return false;" /> + </c:when> + <c:when test="${ResourceHubForm.view == CHART}"> + <input type="button" id="showChartBtn" class="button42" + value="<fmt:message key='resource.view.list' />" + onclick="ResourceHubForm.view.value = 'list'; ResourceHubForm.submit(); return false;" /> + </c:when> </c:choose> - - <c:choose> - <c:when test="${ResourceHubForm.view == LIST}"> - <html:img page="/images/SubHub_ListView_on.gif" alt="List View" border="0"/> - </c:when> - <c:otherwise> - <html:link page="/ResourceHub.do" onclick="ResourceHubForm.view.value = 'list'; ResourceHubForm.submit(); return false;"><html:img page="/images/SubHub_ListView_off.gif" alt="List View" border="0" onmouseover="imageSwap (this, imagePath + 'SubHub_ListView', '_over')" onmouseout="imageSwap (this, imagePath + 'SubHub_ListView', '_off')"/></html:link> - </c:otherwise> - </c:choose> </div> <!-- / --> |