Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2839] [RHQ-1434] - tidy up monitor>tables; return to fixed width; adjust overlay offsets (AGAIN); add padding to bottom so time overlay doesn't cover metric display range;
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2839] [RHQ-1434] - tidy up monitor>tables; return to fixed width; adjust overlay offsets (AGAIN); add padding to bottom so time overlay doesn't cover metric display range; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2839</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-01-29 22:28:14 -0600 (Thu, 29 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1434] - tidy up monitor>tables; return to fixed width; adjust overlay offsets (AGAIN); add padding to bottom so time overlay doesn't cover metric display range; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappjspopupjs">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/js/popup.js</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqcommonmonitoreventsdataxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/events/data.xhtml</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqcommonmonitorgraphsxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/graphs.xhtml</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqcommonmonitormeasurementdataxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/data.xhtml</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqcommonmonitormeasurementviewsxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/views.xhtml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappjspopupjs"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/js/popup.js (2838 => 2839)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/js/popup.js 2009-01-30 01:36:09 UTC (rev 2838) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/js/popup.js 2009-01-30 04:28:14 UTC (rev 2839) </span><span class="lines">@@ -1,3 +1,5 @@ </span><span class="add">+var yOffset = 28; + </span><span class="cx"> var overlay = { curTime : null, times: new Array(), </span><span class="lines">@@ -35,8 +37,8 @@ </span><span class="cx"> var anchorY = this.findPosY(anchor); var left = this.findPosX(anchor); </span><span class="rem">- var top = this.findPosY($('charttop')); - var bottom = this.findPosY($('timetop')); </span><span class="add">+ var top = this.findPosY($('charttop')) - yOffset; + var bottom = this.findPosY($('timetop')) - yOffset; </span><span class="cx"> ovl.style.visibility='visible'; ovl.style.left = left + 'px'; </span><span class="lines">@@ -49,14 +51,15 @@ </span><span class="cx"> this.curPopup.style.visibility='hidden'; } var anchor = $('timePopup_' + index); </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> var left = this.findPosX(anchor) - 50; </span><span class="rem">- var top = this.findPosY(anchor) + 10; </span><span class="add">+ var top = this.findPosY(anchor) - yOffset + 10; </span><span class="cx"> this.curPopup = $('timePopup'); this.curPopup.innerHTML = time; this.curPopup.style.left = left + 'px'; this.curPopup.style.top = top + 'px'; </span><span class="add">+ this.curPopup.style.height = '25px'; </span><span class="cx"> this.curPopup.style.visibility ='visible'; new Effect.Appear(this.curPopup); }, </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqcommonmonitoreventsdataxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/events/data.xhtml (2838 => 2839)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/events/data.xhtml 2009-01-30 01:36:09 UTC (rev 2838) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/events/data.xhtml 2009-01-30 04:28:14 UTC (rev 2839) </span><span class="lines">@@ -140,11 +140,11 @@ </span><span class="cx"> <c:forEach var="timeTick" items="#{EventsTimelineUIBean.data}" varStatus="status"> <c:set var="count" value="#{status.index}"/> <ui:param name="formattedTimeTick" value="#{onf:formatTimestamp(timeTick.time)}"/> </span><span class="rem">- <td width="9"> </span><span class="add">+ <td width="12"> </span><span class="cx"> <div id="timePopup_#{count}" onmouseover="overlay.showTimePopup('#{count}','#{formattedTimeTick}')" onmousedown="overlay.moveOverlay(this); overlay.curTime = '#{formattedTimeTick}';" </span><span class="rem">- onmouseout="overlay.hideTimePopup()"> </span><span class="add">+ onmouseout="overlay.curTime = null"> </span><span class="cx"> <img src="/images/timeline_off.gif" height="10" width="9" onmouseover="imageSwap(this, imagePath + 'timeline', '_on')" onmouseout="imageSwap(this, imagePath + 'timeline', '_off');" </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqcommonmonitorgraphsxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/graphs.xhtml (2838 => 2839)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/graphs.xhtml 2009-01-30 01:36:09 UTC (rev 2838) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/graphs.xhtml 2009-01-30 04:28:14 UTC (rev 2839) </span><span class="lines">@@ -33,7 +33,7 @@ </span><span class="cx"> <tr class="BlockContent"> <td> </span><span class="rem">- <div id="indicatorDiv" style="width: 100%; height: 400px; border: 1; overflow-x: hidden; overflow-y: scroll;"> </span><span class="add">+ <div id="indicatorDiv" style="width: 750px; height: 400px; border: 1; overflow-x: hidden; overflow-y: scroll;"> </span><span class="cx"> <ui:include src="measurement/data.xhtml"/> </div> </td> </span><span class="lines">@@ -49,8 +49,16 @@ </span><span class="cx"> </td> </tr> </span><span class="add">+<!-- spacer for date/time overlay, so it doesn't overlap metric display range --> </span><span class="cx"> <tr class="BlockContent"> <td> </span><span class="add">+ &nbsp;<br /> + &nbsp;<br /> + </td> +</tr> + +<tr class="BlockContent"> + <td> </span><span class="cx"> <h:form id="MetricComponentForm"> <input type="hidden" name="id" value="#{IndicatorChartsUIBean.context.resourceId}" /> <input type="hidden" name="groupId" value="#{IndicatorChartsUIBean.context.groupId}" /> </span><span class="lines">@@ -75,6 +83,7 @@ </span><span class="cx"> </td> </tr> </span><span class="add">+<!-- footerDiv used purely for calculating the height for the overlay --> </span><span class="cx"> <tr class="BlockContent"> <td> <div id="footerDiv"></div> </span><span class="lines">@@ -94,7 +103,7 @@ </span><span class="cx"> var footerTopPos = getElementTopPos(footerDiv) ; var eventsDivHeight = footerTopPos - eventsTopPos; </span><span class="rem">- var newIndicatorDivHeight = browserHeight - indicatorTopPos - eventsDivHeight; </span><span class="add">+ var newIndicatorDivHeight = browserHeight - indicatorTopPos - eventsDivHeight - 2; </span><span class="cx"> indicatorDiv.style.height = newIndicatorDivHeight + "px"; } </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqcommonmonitormeasurementdataxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/data.xhtml (2838 => 2839)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/data.xhtml 2009-01-30 01:36:09 UTC (rev 2838) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/data.xhtml 2009-01-30 04:28:14 UTC (rev 2839) </span><span class="lines">@@ -91,6 +91,13 @@ </span><span class="cx"> </c:choose> <h:outputText value="#{metric.label} " /> </h:outputLink> </span><span class="add">+ &nbsp;&nbsp; + <h:outputLink target="_top" value="/rhq/resource/monitor/graphs.xhtml"> + <f:param name="id" value="#{metric.metricSourceId}" /> + <h:outputFormat value="#{msg['common.value.parenthesis']}"> + <f:param value="#{metric.metricSource}" /> + </h:outputFormat> + </h:outputLink> </span><span class="cx"> </font> <rich:toolTip followMouse="true" showDelay="500"> <h:outputText value="#{metric.description}" rendered="#{not empty metric.description}" /> </span><span class="lines">@@ -141,23 +148,7 @@ </span><span class="cx"> </td> </tr> </span><span class="rem">- <c:if test="#{not empty metric.metricSource}"> </span><span class="cx"> <tr> </span><span class="rem">- <td colspan="3" valign="top"> - <img src="/images/hierarchy.gif" /> - <font class="FooterSmall"> - <h:outputLink target="_top" value="/rhq/resource/monitor/graphs.xhtml"> - <f:param name="id" value="#{metric.metricSourceId}" /> - <h:outputFormat value="#{msg['common.value.parenthesis']}"> - <f:param value="#{metric.metricSource}" /> - </h:outputFormat> - </h:outputLink> - </font> - </td> - </tr> - </c:if> - - <tr> </span><span class="cx"> <td colspan="3"> <h:graphicImage value="/resource/HighLowChart?#{onf:getChartURLParams(metric)}" width="647" height="100" /> </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqcommonmonitormeasurementviewsxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/views.xhtml (2838 => 2839)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/views.xhtml 2009-01-30 01:36:09 UTC (rev 2838) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/views.xhtml 2009-01-30 04:28:14 UTC (rev 2839) </span><span class="lines">@@ -15,50 +15,55 @@ </span><span class="cx"> <ui:composition> </span><span class="rem">-<table cellpadding="0" cellspacing="2" border="0"> </span><span class="add">+<table align="left" width="750" cellpadding="0" cellspacing="0" border="0"> </span><span class="cx"> <tr> </span><span class="rem">- <td> - <h:outputFormat value="#{msg['Filter.ViewLabel']}" /> - <select name="action" onchange="reviewAction(this.options[this.selectedIndex]);"> - <option value="update"> - <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.Update']}" /> - <h:outputText value=" #{IndicatorChartsUIBean.view}" /> - </option> - <option value="create"> - <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.New']}" /> - </option> - <c:if test="#{onf:sizeOf(IndicatorViewsForm.views) > 1}"> - <option value="delete"> - <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.Delete']}" /> </span><span class="add">+ <td align="right"> + <table cellpadding="0" cellspacing="1" border="0"> + <tr> + <td> + <h:outputFormat value="#{msg['Filter.ViewLabel']}" /> + <select name="action" onchange="reviewAction(this.options[this.selectedIndex]);"> + <option value="update"> + <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.Update']}" /> </span><span class="cx"> <h:outputText value=" #{IndicatorChartsUIBean.view}" /> </option> </span><span class="rem">- <option disabled="disabled"> - <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.Separator']}" /> </span><span class="add">+ <option value="create"> + <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.New']}" /> </span><span class="cx"> </option> </span><span class="rem">- <option disabled="disabled"> - <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.Goto']}" /> - </option> - <c:forEach var="viewname" items="#{IndicatorViewsForm.views}"> - <option value="go"> - <h:outputText value="#{viewname}" /> </span><span class="add">+ <c:if test="#{onf:sizeOf(IndicatorViewsForm.views) > 1}"> + <option value="delete"> + <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.Delete']}" /> + <h:outputText value=" #{IndicatorChartsUIBean.view}" /> </span><span class="cx"> </option> </span><span class="rem">- </c:forEach> - </c:if> - </select> </span><span class="add">+ <option disabled="disabled"> + <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.Separator']}" /> + </option> + <option disabled="disabled"> + <h:outputFormat value="#{msg['resource.common.monitor.visibility.view.Goto']}" /> + </option> + <c:forEach var="viewname" items="#{IndicatorViewsForm.views}"> + <option value="go"> + <h:outputText value="#{viewname}" /> + </option> + </c:forEach> + </c:if> + </select> + </td> + <td> + <h:outputFormat value="#{msg['common.label.Name']}" /> + <input type="text" value="#{IndicatorChartsUIBean.view}" readonly="readonly" /> + </td> + <td> + <!-- Use hidden input because IE doesn't pass value of of image --> + <input type="hidden" name="update" value="#{IndicatorChartsUIBean.view}" /> + <input type="image" name="submit" src="/images/dash-button_go-arrow.gif" alt="Save View" /> + </td> + </tr> + </table> </span><span class="cx"> </td> </span><span class="rem">- <td> - <h:outputFormat value="#{msg['common.label.Name']}" /> - <input type="text" value="#{IndicatorChartsUIBean.view}" readonly="readonly" /> - </td> - <td> - <!-- Use hidden input because IE doesn't pass value of of image --> - <input type="hidden" name="update" value="#{IndicatorChartsUIBean.view}" /> - <input type="image" name="submit" src="/images/dash-button_go-arrow.gif" alt="Save View" /> - </td> </span><span class="cx"> </tr> </table> </span><span class="rem">- </span><span class="cx"> </ui:composition> </html> \ No newline at end of file </span> </pre> </div> </div> </body> </html> |