Author: chris.laprun(a)jboss.com Date: 2010-04-02 09:00:21 -0400 (Fri, 02 Apr 2010) New Revision: 2468 Modified: 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/producer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml Log: - GTNWSRP-15, GTNWSRP-18: Use commandButton where needed instead of commandLink. Downside: now looks weird, stylesheet must be tweaked. 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-04-02 12:57:17 UTC (rev 2467) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-04-02 13:00:21 UTC (rev 2468) @@ -40,7 +40,8 @@ <div class="LeftTab"> <div class="RightTab"> <div class="MiddleTab"> - #{i18n.nav_tabs_consumers} + <h:commandLink id="consumersTab" action="consumers" + value="#{i18n.nav_tabs_consumers}"/> </div> </div> </div> @@ -88,23 +89,15 @@ <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <h:commandLink id="createConsumerButton" - action="#{consumersMgr.createConsumer}" - value="#{i18n.consumers_create_submit}"/> + <h:commandButton 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> </div> </div> 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-04-02 12:57:17 UTC (rev 2467) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-04-02 13:00:21 UTC (rev 2468) @@ -102,18 +102,14 @@ <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <h:commandLink id="reloadConsumersButton" action="#{consumersMgr.reload}" - value="#{i18n.consumers_table_reload}"/> + <h:commandButton 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}"/></ui:remove> - </h:form> </ui:define> </ui:decorate> \ No newline at end of file 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-04-02 12:57:17 UTC (rev 2467) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-04-02 13:00:21 UTC (rev 2468) @@ -258,9 +258,9 @@ <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}"/> + <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" + value="#{i18n.edit_consumer_refresh}" + title="#{i18n.edit_consumer_refresh_title}"/> </div> </div> </div> @@ -269,7 +269,7 @@ <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" + <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" immediate="true" value="#{i18n.edit_consumer_cancel}"/> </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-04-02 12:57:17 UTC (rev 2467) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-04-02 13:00:21 UTC (rev 2468) @@ -144,8 +144,8 @@ <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <h:commandLink id="reg-save" action="#{producer.save}" - value="#{i18n.producer_config_save}"/> + <h:commandButton id="reg-save" action="#{producer.save}" + value="#{i18n.producer_config_save}"/> </div> </div> </div> @@ -154,8 +154,8 @@ <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <h:commandLink id="reg-reload" action="#{producer.reloadConfiguration}" - value="#{i18n.producer_config_cancel}"/> + <h:commandButton id="reg-reload" action="#{producer.reloadConfiguration}" + value="#{i18n.producer_config_cancel}"/> </div> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-04-02 12:57:17 UTC (rev 2467) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-04-02 13:00:21 UTC (rev 2468) @@ -53,7 +53,8 @@ <div class="LeftTab"> <div class="RightTab"> <div class="MiddleTab"> - #{i18n.nav_tabs_producer_config} + <h:commandLink id="producer-link" value="#{i18n.nav_tabs_producer_config}" + action="producer"/> </div> </div> </div>