|
From: <ma...@rh...> - 2009-01-30 18:39:11
|
<!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] [2852] [RHQ-1445] remove the create database button - its confusing people.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2852</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2009-01-30 12:39:07 -0600 (Fri, 30 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1445] remove the create database button - its confusing people. No matter how hard we try (document it, make it pretty), it'll never grow up to be what we want it to be. It's a disappointment and will never amount to much. Now go away and never come back, I never want to see you again.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiinstallerwarsrcmainwebappstartjsp">rhq/trunk/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiinstallerwarsrcmainwebappstartjsp"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp (2851 => 2852)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp 2009-01-30 17:42:06 UTC (rev 2851) +++ rhq/trunk/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp 2009-01-30 18:39:07 UTC (rev 2852) </span><span class="lines">@@ -14,11 +14,11 @@ </span><span class="cx"> <f:subview id="header"> <jsp:include page="/header.jsp" flush="true" /> </f:subview> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <p align="left"> <h:outputText value="#{bundle.setPropertiesInstructions}" /> </p> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <h:form> <p align="left"> <h5 align="left"> </span><span class="lines">@@ -31,7 +31,7 @@ </span><span class="cx"> value="#{bundle.showAdvancedSettings}" /> </p> </h:form> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <h:form id="propForm"> <br/> <h4 align="left"> </span><span class="lines">@@ -114,6 +114,7 @@ </span><span class="cx"> </h:panelGrid> </h:panelGrid> </span><span class="add">+<!-- this is confusing people, don't show this </span><span class="cx"> <h:panelGrid columns="1"> <h:outputText value="#{bundle.createDatabaseNote}" style="font-size: 100%"/> <h:panelGrid columns="2"> </span><span class="lines">@@ -124,8 +125,9 @@ </span><span class="cx"> <h:panelGroup rendered="#{configurationBean.lastCreate != null && configurationBean.lastCreate == 'OK'}"> <h:graphicImage value="/images/ok.gif" alt="OK"/> </h:panelGroup> </span><span class="rem">- </h:panelGrid> </span><span class="add">+ </h:panelGrid> </span><span class="cx"> </h:panelGrid> </span><span class="add">+--> </span><span class="cx"> </h:panelGrid> </h:panelGrid> </span><span class="lines">@@ -135,18 +137,18 @@ </span><span class="cx"> <f:selectItems value="#{configurationBean.existingSchemaOptions}" /> </h:selectOneMenu> </h:panelGrid> </span><span class="rem">- - </span><span class="add">+ + </span><span class="cx"> <br/> <h4 align="left"> <h:outputText value="#{bundle.installSettingsInstructions}" /> </h4> <h:panelGrid columns="1"> <h:panelGrid columns="1" rendered="#{configurationBean.registeredServers == true}" > </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <h:outputText value="#{bundle.installSettingsNote1}" /> <br/> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <h:panelGrid columns="2" > <h:outputLink value="javascript:popUp('#{bundle.helpDocRoot}#{bundle.helpDocRHQServerPropParentPage}-RegisteredServers', 'propertyHelp')" > </span><span class="lines">@@ -158,19 +160,19 @@ </span><span class="cx"> document.getElementById('propForm:haendpointport').value = ''; document.getElementById('propForm:haendpointsecureport').value = ''; if (document.getElementById('propForm:haaffinitygroup') != null) { </span><span class="rem">- document.getElementById('propForm:haaffinitygroup').value = ''; } </span><span class="add">+ document.getElementById('propForm:haaffinitygroup').value = ''; } </span><span class="cx"> submit(); }" > <f:selectItems value="#{configurationBean.registeredServerNames}" /> </span><span class="rem">- </h:selectOneMenu> - </span><span class="add">+ </h:selectOneMenu> + </span><span class="cx"> </h:panelGrid> <br/> <h:outputText value="#{bundle.installSettingsNote2}" /> </h:panelGrid> </span><span class="rem">- </span><span class="cx"> </span><span class="add">+ </span><span class="cx"> <h:panelGrid columns="3" headerClass="evenRow" rowClasses="evenRow,oddRow"> <h:outputText value=" " /> </span><span class="lines">@@ -183,9 +185,9 @@ </span><span class="cx"> <h:inputText id="haservername" size="#{configurationBean.propHaServerName.itemDefinition.fieldSize}" value="#{configurationBean.haServerName}" > </h:inputText> </span><span class="rem">- <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaServerName.itemDefinition.requiresRestart}" /> - <h:outputText value="#{bundle.noString}" rendered="#{!configurationBean.propHaServerName.itemDefinition.requiresRestart}" /> - </span><span class="add">+ <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaServerName.itemDefinition.requiresRestart}" /> + <h:outputText value="#{bundle.noString}" rendered="#{!configurationBean.propHaServerName.itemDefinition.requiresRestart}" /> + </span><span class="cx"> <h:outputLink value="javascript:popUp('#{bundle.helpDocRoot}#{bundle.helpDocRHQServerPropParentPage}-ServerPublicAddress', 'propertyHelp')" > <h:outputText value="#{bundle.propertyHighAvailabilityEndpointAddress}" /> </h:outputLink> </span><span class="lines">@@ -193,14 +195,14 @@ </span><span class="cx"> value="#{configurationBean.haServer.endpointAddress}" > </h:inputText> <h:outputText value="#{bundle.noString}" /> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <h:outputLink value="javascript:popUp('#{bundle.helpDocRoot}#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.propHaEndpointPort.itemDefinition.help}', 'propertyHelp')" > <h:outputText value="#{bundle.propertyHttpPort}" /> </h:outputLink> <h:inputText id="haendpointport" size="#{configurationBean.propHaEndpointPort.itemDefinition.fieldSize}" value="#{configurationBean.haServer.endpointPortString}" > </h:inputText> </span><span class="rem">- <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaEndpointPort.itemDefinition.requiresRestart}" /> </span><span class="add">+ <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaEndpointPort.itemDefinition.requiresRestart}" /> </span><span class="cx"> <h:outputLink value="javascript:popUp('#{bundle.helpDocRoot}#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.propHaEndpointSecurePort.itemDefinition.help}', 'propertyHelp')" > <h:outputText value="#{bundle.propertyHttpsPort}" /> </span><span class="lines">@@ -208,21 +210,21 @@ </span><span class="cx"> <h:inputText id="haendpointsecureport" size="#{configurationBean.propHaEndpointSecurePort.itemDefinition.fieldSize}" value="#{configurationBean.haServer.endpointSecurePortString}" > </h:inputText> </span><span class="rem">- <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaEndpointSecurePort.itemDefinition.requiresRestart}" /> </span><span class="add">+ <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaEndpointSecurePort.itemDefinition.requiresRestart}" /> </span><span class="cx"> </span><span class="rem">- <h:outputLink value="javascript:popUp('#{bundle.helpDocRoot}#{bundle.helpDocRHQServerPropParentPage}-ServerAffinityGroup', 'propertyHelp')" </span><span class="add">+ <h:outputLink value="javascript:popUp('#{bundle.helpDocRoot}#{bundle.helpDocRHQServerPropParentPage}-ServerAffinityGroup', 'propertyHelp')" </span><span class="cx"> rendered="#{configurationBean.showAdvancedSettings == true}" > <h:outputText value="#{bundle.propertyHighAvailabilityAffinityGroup}" /> </h:outputLink> <h:inputText id="haaffinitygroup" size="#{configurationBean.propHaServerName.itemDefinition.fieldSize}" value="#{configurationBean.haServer.affinityGroup}" </span><span class="rem">- rendered="#{configurationBean.showAdvancedSettings == true}" > - </h:inputText> - <h:outputText value="#{bundle.noString}" rendered="#{configurationBean.showAdvancedSettings == true}" /> </span><span class="add">+ rendered="#{configurationBean.showAdvancedSettings == true}" > + </h:inputText> + <h:outputText value="#{bundle.noString}" rendered="#{configurationBean.showAdvancedSettings == true}" /> </span><span class="cx"> </h:panelGrid> </h:panelGrid> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <br/> <h4 align="left"> <h:outputText value="#{bundle.serverSettingsInstructions}" /> </span><span class="lines">@@ -233,7 +235,7 @@ </span><span class="cx"> <f:facet name="header"> <h:outputText value="" /> </f:facet> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <h:outputLink value="javascript:popUp('#{bundle.helpDocRoot}#{bundle.helpDocRHQServerPropParentPage}#{prop.itemDefinition.help}', 'propertyHelp')"> <h:outputText value="#{prop.itemDefinition.propertyLabel}" /> </h:outputLink> </span><span class="lines">@@ -266,7 +268,7 @@ </span><span class="cx"> <h:outputText value="#{bundle.requiresRestart}" /> </f:facet> <h:outputText value="#{bundle.yesString}" rendered="#{prop.itemDefinition.requiresRestart}" /> </span><span class="rem">- <h:outputText value="#{bundle.noString}" rendered="#{!prop.itemDefinition.requiresRestart}" /> </span><span class="add">+ <h:outputText value="#{bundle.noString}" rendered="#{!prop.itemDefinition.requiresRestart}" /> </span><span class="cx"> </h:column> </h:dataTable> </span><span class="lines">@@ -275,7 +277,7 @@ </span><span class="cx"> <h:commandButton id="save" action="#{configurationBean.save}" value="#{bundle.save}" /> </p> </h:form> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> </body> </html> </span> </pre> </div> </div> </body> </html> |