Author: ips Date: 2010-02-09 15:25:36 -0500 (Tue, 09 Feb 2010) New Revision: 875 Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml trunk/core/src/main/webapp/login.xhtml trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml Log: fix for https://jira.jboss.org/jira/browse/EMBJOPR-286; use #{credentials.username} and #{credentials.password}, rather than the deprecated #{identity.username} and #{identity.password} Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -57,7 +57,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{requiredLabel}"/><br/> - <h:outputText rendered="#{defaultRendered}">#{default}<br/></h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default}<br/></h:panelGroup> <h:selectOneMenu id="#{identifier}" value="#{beanValue}" required="#{required}"> <f:selectItems value="#{itemValues}"></f:selectItems> </h:selectOneMenu> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/><br/> - <h:outputText rendered="#{defaultRendered}">#{default}<br/></h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default}<br/></h:panelGroup> <!--TODO: for some reason the spacing on this is WAY bigger than the mockup,--> <!--I think its because this is rendered with a table, rather than a br to breakup each item--> <h:selectOneRadio id="#{identifier}" value="#{beanValue}" layout="pageDirection" styleClass="radiolabels"> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/><br/> - <h:outputText rendered="#{defaultRendered}">#{default}<br/></h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default}<br/></h:panelGroup> <h:inputSecret id="#{identifier}" value="#{beanValue}"/> <p><strong>#{label}:</strong>#{desc}</p> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/><br/> - <h:outputText rendered="#{defaultRendered}">#{default}<br/></h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default}<br/></h:panelGroup> <!--TODO need to get the size for the textArea to be used, from james:--> <h:inputTextarea id="#{identifier}" value="#{beanValue}" rows="5" cols="50"/> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/><br/> - <h:outputText rendered="#{defaultRendered}">#{default}<br/></h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default}<br/></h:panelGroup> <!--TODO need to get the size for the textArea to be used, from james:--> <h:inputTextarea id="#{identifier}" value="#{beanValue}" rows="5" cols="50"> <f:converter converterId="#{converter}"/> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/><br/> - <h:outputText rendered="#{defaultRendered}">#{default}<br/></h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default}<br/></h:panelGroup> <h:inputText id="#{identifier}" value="#{beanValue}"/> <p><strong>#{label}:</strong>#{desc}</p> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- ~ Embedded Jopr Project - ~ Copyright (C) 2006-2009 Red Hat, Inc. + ~ Copyright (C) 2006-2010 Red Hat, Inc. ~ All rights reserved. ~ ~ This program is free software; you can redistribute it and/or modify @@ -44,20 +44,20 @@ </h:panelGrid> </div> <div class="login"> - <h:outputText rendered="#{not empty identity.username}"> - #{messages['security.loggedIn']} #{identity.username}&nbsp; - [<s:link id="logoutLink" action="#{identity.logout}">#{messages['security.logout']}</s:link>] - </h:outputText> - <h:outputText rendered="#{empty identity.username}"> + <h:panelGroup rendered="#{not empty credentials.username}"> + #{messages['security.loggedIn']} #{credentials.username}&nbsp; + [<s:link id="logoutLink" action="#{identity.logout()}">#{messages['security.logout']}</s:link>] + </h:panelGroup> + <h:panelGroup rendered="#{empty credentials.username}"> #{messages['security.NotLoggedIn']}&nbsp; [<s:link action="/login.xhtml">#{messages['security.login']}</s:link>] - </h:outputText> + </h:panelGroup> <ui:remove> <!-- Disable the Help link until we actually have some online help to link to. --> | [<a href="#">#{messages['help.link']}</a>] </ui:remove> - <h:outputText rendered="#{debug}"> + <h:panelGroup rendered="#{debug}"> | [<s:link action="#{debugAction.dumpInventory()}">#{messages['debugAction.dumpInventory']}</s:link>] | @@ -66,7 +66,7 @@ [<s:link action="#{debugAction.runServiceScan()}">#{messages['debugAction.runServiceScan']}</s:link>] | [<s:link action="#{debugAction.testErrorPage()}">#{messages['debugAction.testErrorPage']}</s:link>] - </h:outputText> + </h:panelGroup> </div> </div> </ui:composition> Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/login.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!-- ~ Embedded Jopr Project - ~ Copyright (C) 2006-2009 Red Hat, Inc. + ~ Copyright (C) 2006-2010 Red Hat, Inc. ~ All rights reserved. ~ ~ This program is free software; you can redistribute it and/or modify @@ -65,12 +65,12 @@ <p>#{messages['login.loginToProceed']}</p> <p> <h:outputLabel for="name" value="#{messages['security.username']}"/><br/> - <h:inputText id="name" value="#{identity.username}" size="20"/> + <h:inputText id="name" value="#{credentials.username}" size="20"/> </p> </div> <div style="padding-top: 10px;"> <h:outputLabel for="password" value="#{messages['security.password']}"/><br/> - <h:inputSecret id="password" value="#{identity.password}" size="20"/> + <h:inputSecret id="password" value="#{credentials.password}" size="20"/> </div> <div style="padding-top: 10px;"> <h:commandButton value="#{messages['security.login']}" id="submit" Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -68,8 +68,6 @@ <rich:columnGroup styleClass="#{operationAction.getOperationRowStyleClass(operation)}"> <rich:column styleClass="buttonColumn"> - - <f:facet name="footer"><h:outputText>footer1</h:outputText></f:facet> <s:button value="#{operation.displayName}" action="#{operationAction.invokeOperation()}" styleClass="buttonmed" style="margin-right:40px;"> @@ -77,8 +75,6 @@ </s:button> </rich:column> <rich:column styleClass="descripColumn"> - <f:facet name="header"><h:outputText>header2</h:outputText></f:facet> - <f:facet name="footer"><h:outputText>footer2</h:outputText></f:facet> <h:outputText value="#{operation.description}"/> </rich:column> </rich:columnGroup> Modified: trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,15 +56,13 @@ <span style="padding-right:3px;"> <strong>#{messages['summary.resourceInstance.configuration.version']}</strong> </span> - <h:outputText rendered="#{not empty currentResource.version}">#{currentResource.version}</h:outputText> - <h:outputText rendered="#{empty currentResource.version}">--</h:outputText> + <h:outputText value="#{empty currentResource.version ? '--' : currentResource.version}"/> </h:panelGroup> <h:panelGroup layout="block"> <span style="padding-right:3px;"> <strong>#{messages['summary.resourceInstance.configuration.description']}</strong> </span> - <h:outputText rendered="#{not empty currentResource.description}">#{currentResource.description}</h:outputText> - <h:outputText rendered="#{empty currentResource.description}">--</h:outputText> + <h:outputText value="#{empty currentResource.description ? '--' : currentResource.description}"/> </h:panelGroup> </h:panelGrid>