7:51 p.m.
Author: wesleyhales
Date: 2010-02-10 20:51:38 -0500 (Wed, 10 Feb 2010)
New Revision: 1622
Added:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/errorTemplate.xhtml
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml
Log:
wsrp admin ui enhancements - fixed "Cannot reset a commited stream" error. Added
general error message catch for the ui.
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2010-02-10 21:52:19
UTC (rev 1621)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2010-02-11 01:51:38
UTC (rev 1622)
@@ -73,7 +73,12 @@
<url-pattern>/faces/*</url-pattern>
</servlet-mapping>
+ <error-page>
+ <exception-type>java.lang.Exception</exception-type>
+ <location>/faces/jsf/error.xhtml</location>
+ </error-page>
+
</web-app>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-10
21:52:19 UTC (rev 1621)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-11
01:51:38 UTC (rev 1622)
@@ -46,7 +46,7 @@
<div style="width:98%;margin: 0 auto">
- <ui:insert name="objectpath">Object path if
needed</ui:insert>
+ <ui:insert name="objectpath"/>
<div class="wsrp-content-container">
<ui:remove>
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-10
21:52:19 UTC (rev 1621)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-11
01:51:38 UTC (rev 1622)
@@ -57,8 +57,21 @@
action="eraseLocalRegistration"
backingBean="#{consumer}"/>
- <webui:commandLink id="cancel"
value="#{i18n.confirm_delete_registration_cancel}"
- actionString="configureConsumer"/>
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <h:commandLink id="cancel"
action="configureConsumer"
+
value="#{i18n.confirm_delete_registration_cancel}"/>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
</h:form>
</div>
</div>
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-10
21:52:19 UTC (rev 1621)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-11
01:51:38 UTC (rev 1622)
@@ -109,8 +109,9 @@
backingBean="#{consumer}"
id="modify-reg-link"
rendered="#{consumer.registrationLocallyModified}"
-
value="#{i18n.edit_consumer_registration_modify}"
-
title="#{i18n.edit_consumer_registration_modify_title}"/>
+
value="#{i18n.edit_consumer_registration_modify}"
+
title="#{i18n.edit_consumer_registration_modify_title}"/>
+
<br style="clear:both;"/>
</h:panelGroup>
@@ -153,8 +154,9 @@
<webui:commandButton
action="modifyRegistration"
backingBean="#{consumer}"
id="edit-reg-link"
-
value="#{i18n.edit_consumer_registration_modify}"
-
title="#{i18n.edit_consumer_registration_modify_title}"/>
+
value="#{i18n.edit_consumer_registration_modify}"
+
title="#{i18n.edit_consumer_registration_modify_title}"/>
+
<br style="clear:both;"/>
</h:panelGroup>
</c:if>
@@ -172,11 +174,24 @@
#{i18n.edit_consumer_registration_context_handle}
<h:outputText
value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <webui:commandLink
actionString="confirmEraseRegistration"
- id="erase-cons-link"
-
value="#{i18n.edit_consumer_registration_context_erase}"
-
title="#{i18n.edit_consumer_registration_context_erase_title}"/>
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <h:commandLink
action="confirmEraseRegistration"
+
id="erase-cons-link"
+
value="#{i18n.edit_consumer_registration_context_erase}"
+
title="#{i18n.edit_consumer_registration_context_erase_title}"/>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
</td>
</tr>
</c:if>
@@ -190,11 +205,21 @@
value="#{i18n.edit_consumer_refresh}"
title="#{i18n.edit_consumer_refresh_title}"/>
- <webui:commandButton action="listConsumers"
- backingBean="#{consumersMgr}"
- id="list-cons-link"
- value="#{i18n.edit_consumer_cancel}"
- immediate="true"/>
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <h:commandLink
id="list-cons-link-two" action="#{consumersMgr.listConsumers}"
+
value="#{i18n.edit_consumer_cancel}">
+ </h:commandLink>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
Added: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml
(rev 0)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml 2010-02-11 01:51:38
UTC (rev 1622)
@@ -0,0 +1,36 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2009, 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.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<ui:decorate template="errorTemplate.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:webui="http://jboss.org/gatein">
+
+ <ui:param name="title" value="Error"/>
+
+ <ui:define name="content">
+ An Error Has Occured.
+ </ui:define>
+</ui:decorate>
\ No newline at end of file
Copied: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/errorTemplate.xhtml (from rev
1620,
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml)
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/errorTemplate.xhtml
(rev 0)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/errorTemplate.xhtml 2010-02-11
01:51:38 UTC (rev 1622)
@@ -0,0 +1,71 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ 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.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<ui:decorate template="common/template.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:webui="http://jboss.org/gatein">
+
+ <ui:define name="topnav">
+ <h:form id="cons-temp-form" styleClass="cons-temp-form">
+
+ <div class="TabsContainer">
+ <table class="TabsActionContainer">
+ <tr>
+ <td>
+ <div class="UITab GrayTabStyle">
+ <div class="SelectedTab">
+ <div class="LeftTab">
+ <div class="RightTab">
+ <div class="MiddleTab">
+ #{i18n.nav_tabs_consumers}
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="UITab GrayTabStyle">
+ <div class="NormalTab">
+ <div class="LeftTab">
+ <div class="RightTab">
+ <div class="MiddleTab">
+ <h:commandLink id="producer-link"
value="#{i18n.nav_tabs_producer_config}"
+ action="producer"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </h:form>
+ </ui:define>
+
+</ui:decorate>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml 2010-02-10
21:52:19 UTC (rev 1621)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml 2010-02-11
01:51:38 UTC (rev 1622)
@@ -32,4 +32,4 @@
<ui:define name="content">
<p>Feature not quite ready yet! Check again in future versions of
Portal.</p>
</ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>
\ No newline at end of file
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-10
21:52:19 UTC (rev 1621)
+++
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-11
01:51:38 UTC (rev 1622)
@@ -56,8 +56,21 @@
action="deleteRegistrationProperty"
backingBean="#{producer}"/>
- <webui:commandLink id="cancel-delete"
value="#{i18n.confirm_delete_reg_property_cancel}"
- actionString="producer"/>
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <h:commandLink id="cancel-delete"
value="#{i18n.confirm_delete_reg_property_cancel}"
+ action="producer"/>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
</h:form>
</div>
</div>