Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2680] rhq-1050.
|
From: <jsh...@rh...> - 2009-01-20 16:52:03
|
<!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] [2680] rhq-1050.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2680</dd> <dt>Author</dt> <dd>jshaughn</dd> <dt>Date</dt> <dd>2009-01-20 10:52:01 -0600 (Tue, 20 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>rhq-1050. Fixing a bad check-in (r2615) which negated the entire second table on this page. Lovely.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqgroupmonitortablesxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/monitor/tables.xhtml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqgroupmonitortablesxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/monitor/tables.xhtml (2679 => 2680)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/monitor/tables.xhtml 2009-01-20 16:44:18 UTC (rev 2679) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/monitor/tables.xhtml 2009-01-20 16:52:01 UTC (rev 2680) </span><span class="lines">@@ -17,13 +17,111 @@ </span><span class="cx"> <ui:composition template="/rhq/group/layout/main.xhtml"> <ui:param name="pageTitle" </span><span class="rem">- value="#{ResourceGroupUIBean.groupCategoryName} '#{ResourceGroupUIBean.name}' - Metric Tables" /> </span><span class="add">+ value="#{ResourceGroupUIBean.groupCategoryName} '#{ResourceGroupUIBean.name}' - Metric Tables" /> </span><span class="cx"> <ui:param name="selectedTabName" value="Monitor.Tables" /> <ui:define name="content"> </span><span class="add">+ <ui:param name="resourceGroupHealthSummaryDataModel" + value="#{ResourceGroupMetricsTableUIBean.dataModel}" /> + </span><span class="cx"> <ui:include src="/rhq/common/monitor/tables.xhtml" /> </span><span class="add">+ <rich:panel styleClass="BlockContent"> + + <f:facet name="header" styleClass="BlockTitle"> + <a name="Group member Health" /> + Group Member Health + </f:facet> + + <h:form id="groupHealthSummaryForm"> + + <!-- On submit make sure these are provided for the context of any new instance of the UI beans --> + <input type="hidden" name="groupId" + value="#{ResourceGroupUIBean.groupId}" /> + + <rich:dataTable id="resourceGroupHealthSummaryDataTable" + binding="#{ResourceGroupMetricsTableUIBean.dataTable}" + rows="#{PageControl.ResourceGroupHealthSummary.pageSize}" + value="#{resourceGroupHealthSummaryDataModel}" + var="healthSummary" columnsWidth="1%" width="100%" + footerClass="on-pager-footer"> + + <rich:column width="1%"> + <f:facet name="header"> + <onc:allSelect target="selectedResources" /> + </f:facet> + + <onc:select name="selectedResources" + value="#{healthSummary.id}" /> + </rich:column> + + <rich:column> + <f:facet name="header"> + <h:outputText value="Resource Name" /> + </f:facet> + + <h:outputLink + value="/rhq/resource/monitor/graphs.xhtml"> + <f:param name="id" value="#{healthSummary.id}" /> + <h:outputText value="#{healthSummary.name}" /> + </h:outputLink> + </rich:column> + + <rich:column> + <f:facet name="header"> + <h:outputText value="Alerts" /> + </f:facet> + <h:outputText value="#{healthSummary.alerts}" /> + </rich:column> + + <rich:column> + <f:facet name="header"> + <h:outputText value="Availability" /> + </f:facet> + + <h:graphicImage + value="/images/icon_available_green.png" alt="Up" + title="Up" + rendered="#{healthSummary.availabilityType == 'UP'}" /> + <h:graphicImage value="/images/icon_available_red.png" + alt="Down" title="Down" + rendered="#{healthSummary.availabilityType == 'DOWN'}" /> + <h:graphicImage + value="/images/icon_available_grey.png" + alt="Unknown" title="Unknown" + rendered="#{healthSummary.availabilityType == null}" /> + </rich:column> + + <f:facet name="footer"> + <rich:columnGroup> + <rich:column colspan="4" width="100%"> + + <onc:selectCommandButton + action="#{ResourceGroupMetricsCompareUIBean.compareSelected}" + value="COMPARE METRICS" + target="selectedResources" low="2" + styleClass="on-pager-button buttonsmall" /> + + <ui:param name="paginationDataTableName" + value="resourceGroupHealthSummaryDataTable" /> + <ui:param name="paginationDataModel" + value="#{resourceGroupHealthSummaryDataModel}" /> + <ui:param name="paginationPageControl" + value="#{PageControl.ResourceGroupHealthSummary}" /> + <ui:include + src="/rhq/resource/include/pagination.xhtml" /> + + </rich:column> + </rich:columnGroup> + </f:facet> + + </rich:dataTable> + + </h:form> + + </rich:panel> + </span><span class="cx"> </ui:define> </ui:composition> </span> </pre> </div> </div> </body> </html> |