Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2850] [RHQ-634] - fix for creating a new alert definition/template because the struts controller logic is shared due to how the corresponding tiles are laid out and can thus only satisfy one navigation rule correctly at a time;
|
From: <jma...@rh...> - 2009-01-30 17:08:18
|
<!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] [2850] [RHQ-634] - fix for creating a new alert definition/template because the struts controller logic is shared due to how the corresponding tiles are laid out and can thus only satisfy one navigation rule correctly at a time; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2850</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-01-30 11:08:14 -0600 (Fri, 30 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-634] - fix for creating a new alert definition/template because the struts controller logic is shared due to how the corresponding tiles are laid out and can thus only satisfy one navigation rule correctly at a time; instead, we'll simply suppress the cancel button and put explicit links at the top of the page (via ".events.config.view.nav" tile) to take care of return navigation; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappresourcecommonmonitoralertsconfigDefinitionFormButtonsjsp">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/DefinitionFormButtons.jsp</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappresourcecommonmonitoralertsconfigNewDefinitionjsp">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/NewDefinition.jsp</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappresourcecommonmonitoralertsconfigDefinitionFormButtonsjsp"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/DefinitionFormButtons.jsp (2849 => 2850)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/DefinitionFormButtons.jsp 2009-01-30 15:35:27 UTC (rev 2849) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/DefinitionFormButtons.jsp 2009-01-30 17:08:14 UTC (rev 2850) </span><span class="lines">@@ -5,8 +5,12 @@ </span><span class="cx"> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> </span><span class="add">+<!-- cancel button suppressed because the struts controller logic is shared between definitions and templates, + so instead we're simply including the ".events.config.view.nav" tile to take care of return navigation --> </span><span class="cx"> <hq:authorization permission="MANAGE_ALERTS"> </span><span class="rem">-<tiles:insert definition=".form.buttons"/> </span><span class="add">+<tiles:insert definition=".form.buttons"> + <tiles:put name="noCancel" value="true" /> +</tiles:insert> </span><span class="cx"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td width="21%">&nbsp;</td> </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappresourcecommonmonitoralertsconfigNewDefinitionjsp"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/NewDefinition.jsp (2849 => 2850)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/NewDefinition.jsp 2009-01-30 15:35:27 UTC (rev 2849) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/NewDefinition.jsp 2009-01-30 17:08:14 UTC (rev 2850) </span><span class="lines">@@ -18,6 +18,8 @@ </span><span class="cx"> <c:if test="${not empty ResourceType}" > <html:hidden property="type" value="${ResourceType.id}"/> </c:if> </span><span class="add">+ +<tiles:insert definition=".events.config.view.nav"/> </span><span class="cx"> <tiles:insert definition=".events.config.new.properties"/> </span><span class="lines">@@ -25,7 +27,7 @@ </span><span class="cx"> <tiles:put name="formName" value="NewAlertDefinitionForm"/> </tiles:insert> </span><span class="rem">-<tiles:insert definition=".events.config.form.buttons"/> </span><span class="add">+<tiles:insert definition=".events.config.form.buttons" /> </span><span class="cx"> <tiles:insert definition=".page.footer"/> </span> </pre> </div> </div> </body> </html> |
