Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [4851] [RHQ-2321] - add new column on resource alert definition list page to show whether updates to the containing alert template / group alert definition are blocked;
<!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] [4851] [RHQ-2321] - add new column on resource alert definition list page to show whether updates to the containing alert template / group alert definition are blocked; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4851</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-08-11 05:27:06 -0500 (Tue, 11 Aug 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-2321] - add new column on resource alert definition list page to show whether updates to the containing alert template / group alert definition are blocked; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourcealertlistAlertDefinitionsxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourcealertlistAlertDefinitionsxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml (4850 => 4851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml 2009-08-11 10:05:48 UTC (rev 4850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml 2009-08-11 10:27:06 UTC (rev 4851) </span><span class="lines">@@ -37,7 +37,7 @@ </span><span class="cx"> value="#{alertDefinitionsDataModel}" var="item" width="100%" </span><span class="rem">- columnsWidth="1%, 25%, 30%, 20%, 12%, 12%" </span><span class="add">+ columnsWidth="1%, 25%, 30%, 20%, 5%, 14%, 5%" </span><span class="cx"> styleClass="resources-table" headerClass="tableRowHeader" footerClass="on-pager-footer" </span><span class="lines">@@ -56,16 +56,6 @@ </span><span class="cx"> <onc:select name="selectedAlertDefinitions" value="#{item.id}" /> </rich:column> </span><span class="rem">- - <rich:column rendered="#{param.debug}"> - <f:facet name="header"> - <onc:sortableColumnHeader sort="a.id"> - <h:outputText styleClass="headerText" value="ID" /> - </onc:sortableColumnHeader> - </f:facet> - - <h:outputText value="#{item.id}"/> - </rich:column> </span><span class="cx"> <rich:column> <f:facet name="header"> </span><span class="lines">@@ -119,7 +109,7 @@ </span><span class="cx"> <h:outputText styleClass="headerText" value="Parent" /> </f:facet> </span><span class="rem">- <h:outputLink value="/alerts/Config.do" rendered="#{not empty item.parentId and item.parentId ne 0}"> </span><span class="add">+ <h:outputLink value="/alerts/Config.do" rendered="#{item.parentId ne 0}"> </span><span class="cx"> <f:param name="mode" value="viewRoles"/> <f:param name="type" value="#{item.resource.resourceType.id}"/> <f:param name="from" value="#{item.id}"/> </span><span class="lines">@@ -136,10 +126,18 @@ </span><span class="cx"> </h:outputLink> </rich:column> </span><span class="add">+ <rich:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Read Only" /> + </f:facet> + + <h:outputText value="N/A" rendered="#{item.parentId eq 0 and empty item.groupAlertDefinition}"/> + <h:outputText value="#{item.readOnly}" rendered="#{item.parentId ne 0 or not empty item.groupAlertDefinition}"/> + </rich:column> + </span><span class="cx"> <f:facet name="footer"> <rich:columnGroup> </span><span class="rem">- <!-- colspan 7:6 for the debug 'id' column --> - <rich:column colspan="#{param.debug ? 7 : 6}" width="100%"> </span><span class="add">+ <rich:column colspan="7" width="100%"> </span><span class="cx"> <h:commandButton action="#{ListAlertDefinitionsUIBean.createNewAlertDefinition}" value="NEW DEFINITION" styleClass="on-pager-button buttonsmall" rendered="#{ResourceUIBean.permissions.alert}" > </span> </pre> </div> </div> </body> </html> |