Author: chris.laprun(a)jboss.com Date: 2010-02-12 04:01:49 -0500 (Fri, 12 Feb 2010) New Revision: 1657 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml Log: - Removed usage of webui:commandButton for now as its behavior is erratic. No time to investigate why right now?\226?\128?\166 :( Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2010-02-12 08:01:39 UTC (rev 1656) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2010-02-12 09:01:49 UTC (rev 1657) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ Copyright 2010, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -52,18 +52,45 @@ <p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p> <h:form id="confirm-delete-form"> + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="destroy-link" action="#{consumersMgr.destroyConsumer}" + value="#{i18n.confirm_delete_consumer_submit}"> + <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> + </h:commandLink> + </div> + </div> + </div> + </td> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="cancel-link" action="#{consumersMgr.listConsumers}" + value="#{i18n.confirm_delete_consumer_cancel}"/> + </div> + </div> + </div> + </td> + </tr> + </table> - <webui:commandButton id="destroy-link" - action="destroyConsumer" - backingBean="#{consumersMgr}" - value="#{i18n.confirm_delete_consumer_submit}"> - <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> - </webui:commandButton> - <webui:commandButton id="cancel-link" - action="listConsumers" - backingBean="#{consumersMgr}" - value="#{i18n.confirm_delete_consumer_cancel}"/> + <ui:remove><webui:commandButton id="destroy-link" + action="destroyConsumer" + backingBean="#{consumersMgr}" + value="#{i18n.confirm_delete_consumer_submit}"> + <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> + </webui:commandButton> + + <webui:commandButton id="cancel-link" + action="listConsumers" + backingBean="#{consumersMgr}" + value="#{i18n.confirm_delete_consumer_cancel}"/></ui:remove> </h:form> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-12 08:01:39 UTC (rev 1656) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-12 09:01:49 UTC (rev 1657) @@ -52,14 +52,38 @@ <p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p> <h:form id="confirm-erase-form"> + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="submit" action="#{consumer.eraseLocalRegistration}" + value="#{i18n.confirm_delete_registration_submit}"/> + </div> + </div> + </div> + </td> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="cancel" action="#{consumer.cancel}" + value="#{i18n.confirm_delete_registration_cancel}"/> + </div> + </div> + </div> + </td> + </tr> + </table> - <webui:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}" + <ui:remove><webui:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}" action="eraseLocalRegistration" backingBean="#{consumer}"/> <webui:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}" backingBean="#{consumer}" - action="cancel"/> + action="cancel"/></ui:remove> </h:form> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-12 08:01:39 UTC (rev 1656) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-12 09:01:49 UTC (rev 1657) @@ -82,13 +82,26 @@ styleClass="portlet-form-input-field" label="Consumer Name" required="true"/>&#160;&#160; - <webui:commandButton id="createConsumerButton" - action="createConsumer" - backingBean="#{consumersMgr}" - value="#{i18n.consumers_create_submit}"/> + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="createConsumerButton" action="#{consumersMgr.createConsumer}" + value="#{i18n.consumers_create_submit}"/> + </div> + </div> + </div> + </td> + </tr> + </table> - <ui:remove> + <webui:commandButton id="createConsumerButton" + action="createConsumer" + backingBean="#{consumersMgr}" + value="#{i18n.consumers_create_submit}"/> <h:message for="consumerName" errorClass="portlet-msg-error"/> </ui:remove> </h:form> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-12 08:01:39 UTC (rev 1656) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-12 09:01:49 UTC (rev 1657) @@ -96,10 +96,23 @@ </h:form> <h:form> - - <webui:commandButton id="createConsumerButton" value="#{i18n.consumers_table_reload}" + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="reloadConsumersButton" action="#{consumersMgr.reload}" + value="#{i18n.consumers_table_reload}"/> + </div> + </div> + </div> + </td> + </tr> + </table> + <ui:remove><webui:commandButton id="reloadConsumersButton" value="#{i18n.consumers_table_reload}" action="reload" - backingBean="#{consumersMgr}"/> + backingBean="#{consumersMgr}"/></ui:remove> </h:form> </ui:define> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-12 08:01:39 UTC (rev 1656) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-12 09:01:49 UTC (rev 1657) @@ -102,23 +102,55 @@ </h:dataTable> - <webui:commandButton action="update" + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="cons-update-link" action="#{consumer.update}" + value="#{i18n.edit_consumer_registration_update_props}" + rendered="#{consumer.registered}"/> + </div> + </div> + </div> + </td> + </tr> + </table> + + <ui:remove><webui:commandButton action="update" backingBean="#{consumer}" id="cons-update-link" value="#{i18n.edit_consumer_registration_update_props}" - rendered="registered"/> + rendered="registered"/></ui:remove> </c:when> <c:otherwise> #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <webui:commandButton action="modifyRegistration" + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}" + rendered="#{consumer.registrationLocallyModified}"/> + </div> + </div> + </div> + </td> + </tr> + </table> + <ui:remove><webui:commandButton action="modifyRegistration" backingBean="#{consumer}" id="modify-reg-link" rendered="registrationLocallyModified" value="#{i18n.edit_consumer_registration_modify}" title="#{i18n.edit_consumer_registration_modify_title}"/> - + </ui:remove> <br style="clear:both;"/> </h:panelGroup> @@ -158,11 +190,26 @@ </c:otherwise> </c:choose> - <webui:commandButton action="modifyRegistration" + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}"/> + </div> + </div> + </div> + </td> + </tr> + </table> + <ui:remove><webui:commandButton action="modifyRegistration" backingBean="#{consumer}" id="edit-reg-link" value="#{i18n.edit_consumer_registration_modify}" - title="#{i18n.edit_consumer_registration_modify_title}"/> + title="#{i18n.edit_consumer_registration_modify_title}"/></ui:remove> <br style="clear:both;"/> </h:panelGroup> @@ -181,10 +228,25 @@ #{i18n.edit_consumer_registration_context_handle} <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> - <webui:commandButton id="erase-cons-link" action="confirmEraseRegistration" + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" + value="#{i18n.edit_consumer_registration_context_erase}" + title="#{i18n.edit_consumer_registration_context_erase_title}"/> + </div> + </div> + </div> + </td> + </tr> + </table> + <ui:remove><webui:commandButton id="erase-cons-link" action="confirmEraseRegistration" backingBean="#{consumer}" value="#{i18n.edit_consumer_registration_context_erase}" - title="#{i18n.edit_consumer_registration_context_erase_title}"/> + title="#{i18n.edit_consumer_registration_context_erase_title}"/></ui:remove> </td> </tr> @@ -193,14 +255,31 @@ <tr> <th/> <td class="portlet-section-buttonrow"> - <webui:commandButton action="refreshConsumer" - backingBean="#{consumer}" - id="refresh-cons-link" - value="#{i18n.edit_consumer_refresh}" - title="#{i18n.edit_consumer_refresh_title}"/> - - <webui:commandButton id="list-cons-link-two" action="listConsumers" backingBean="#{consumersMgr}" - value="#{i18n.edit_consumer_cancel}"/> + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="refresh-cons-link" action="#{consumer.refreshConsumer}" + value="#{i18n.edit_consumer_refresh}" + title="#{i18n.edit_consumer_refresh_title}"/> + </div> + </div> + </div> + </td> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" + value="#{i18n.edit_consumer_cancel}"/> + </div> + </div> + </div> + </td> + </tr> + </table> </td> </tr> </table> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-12 08:01:39 UTC (rev 1656) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-12 09:01:49 UTC (rev 1657) @@ -52,13 +52,37 @@ <p class="portlet-class">#{i18n.confirm_delete_reg_property_proceed}</p> <h:form id="confirm-prop-del-form"> - <webui:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}" + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="confirm-delete" action="#{producer.deleteRegistrationProperty}" + value="#{i18n.confirm_delete_reg_property_submit}"/> + </div> + </div> + </div> + </td> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="cancel-delete" action="#{producer.cancel}" + value="#{i18n.confirm_delete_reg_property_cancel}"/> + </div> + </div> + </div> + </td> + </tr> + </table> + <ui:remove><webui:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}" action="deleteRegistrationProperty" backingBean="#{producer}"/> <webui:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" backingBean="#{producer}" - action="cancel"/> + action="cancel"/></ui:remove> </h:form> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-12 08:01:39 UTC (rev 1656) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-12 09:01:49 UTC (rev 1657) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ Copyright 2010, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -59,16 +59,32 @@ </h:panelGroup> <h:outputText value=" " rendered="#{producer.registrationRequired}"/> - <f:subview rendered="#{producer.registrationRequired}"> + <f:subview id="producer-registration" rendered="#{producer.registrationRequired}"> <webui:blueHeaderBar> <div class="full-width float-left bold"> #{i18n.producer_config_reg_props} <div class="add-prop-container"> <div class="add-prop-button"> - <webui:commandButton id="add-reg-prop" action="addRegistrationProperty" + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="add-reg-prop" action="#{producer.addRegistrationProperty}" + value="#{i18n.producer_config_add_reg_prop}"/> + </div> + </div> + </div> + </td> + </tr> + </table> + <ui:remove><webui:commandButton id="add-reg-prop" action="addRegistrationProperty" backingBean="#{producer}" - value="#{i18n.producer_config_add_reg_prop}"/></div> + value="#{i18n.producer_config_add_reg_prop}"/> + </ui:remove> + </div> </div> </div> @@ -121,13 +137,37 @@ <h:outputText value=" "/> <h:panelGroup styleClass="portlet-section-buttonrow"> - <webui:commandButton id="reg-save" action="save" + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="reg-save" action="#{producer.save}" + value="#{i18n.producer_config_save}"/> + </div> + </div> + </div> + </td> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="reg-reload" action="#{producer.reloadConfiguration}" + value="#{i18n.producer_config_cancel}"/> + </div> + </div> + </div> + </td> + </tr> + </table> + <ui:remove><webui:commandButton id="reg-save" action="save" backingBean="#{producer}" value="#{i18n.producer_config_save}"/> <webui:commandButton id="reg-reload" action="reloadConfiguration" backingBean="#{producer}" - value="#{i18n.producer_config_cancel}"/> + value="#{i18n.producer_config_cancel}"/></ui:remove> </h:panelGroup> </h:panelGrid>