[gatein-commits] gatein SVN: r1661 - in components/wsrp/trunk/admin-gui/src/main: webapp/WEB-INF and 6 other directories.

Author: chris.laprun(a)jboss.com Date: 2010-02-12 06:58:08 -0500 (Fri, 12 Feb 2010) New Revision: 1661 Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 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/error.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 components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css Log: - Re-formatted code... Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java 2010-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java 2010-02-12 11:58:08 UTC (rev 1661) @@ -248,6 +248,7 @@ /** * Default action: returns to outcome specified by {@link #setCancelOutcome(String)} + * * @return */ public String cancel() Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java 2010-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java 2010-02-12 11:58:08 UTC (rev 1661) @@ -1,25 +1,25 @@ -/****************************************************************************** - * 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. * - ******************************************************************************/ +/* + * 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. + */ package org.gatein.wsrp.admin.ui; import javax.faces.context.FacesContext; @@ -35,62 +35,78 @@ public class ResourceBean implements Map<String, String> { - public void clear() { - } + public void clear() + { + } - public boolean containsKey(Object key) { - return true; - } + public boolean containsKey(Object key) + { + return true; + } - public boolean containsValue(Object value) { - return true; - } + public boolean containsValue(Object value) + { + return true; + } - public Set<Entry<String, String>> entrySet() { - return Collections.emptySet(); - } + public Set<Entry<String, String>> entrySet() + { + return Collections.emptySet(); + } - public String get(Object key) { + public String get(Object key) + { FacesContext facesContext = FacesContext.getCurrentInstance(); String url = null; - if(null == key){ + if (null == key) + { url = null; - } else if(null != facesContext){ + } + else if (null != facesContext) + { url = facesContext.getApplication().getViewHandler().getResourceURL(facesContext, key.toString()); url = facesContext.getExternalContext().encodeResourceURL(url); - } else { + } + else + { url = key.toString(); } - return url; - } + return url; + } - public boolean isEmpty() { - return false; - } + public boolean isEmpty() + { + return false; + } - public Set<String> keySet() { - return Collections.emptySet(); - } + public Set<String> keySet() + { + return Collections.emptySet(); + } - public String put(String key, String value) { - return null; - } + public String put(String key, String value) + { + return null; + } - public void putAll(Map<? extends String, ? extends String> t) { - } + public void putAll(Map<? extends String, ? extends String> t) + { + } - public String remove(Object key) { - return null; - } + public String remove(Object key) + { + return null; + } - public int size() { - return 0; - } + public int size() + { + return 0; + } - public Collection<String> values() { - return Collections.emptySet(); - } + public Collection<String> values() + { + return Collections.emptySet(); + } - } Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml 2010-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml 2010-02-12 11:58:08 UTC (rev 1661) @@ -1,21 +1,44 @@ <?xml version="1.0"?> +<!-- + ~ 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. + --> + <!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> <facelet-taglib> <namespace>http://jboss.org/gatein</namespace> <tag> - <tag-name>commandButton</tag-name> - <source>xhtml/commandButton.xhtml</source> - </tag> + <tag-name>commandButton</tag-name> + <source>xhtml/commandButton.xhtml</source> + </tag> - <tag> - <tag-name>commandLink</tag-name> - <source>xhtml/commandLink.xhtml</source> - </tag> + <tag> + <tag-name>commandLink</tag-name> + <source>xhtml/commandLink.xhtml</source> + </tag> - <tag> - <tag-name>blueHeaderBar</tag-name> - <source>xhtml/blueHeaderBar.xhtml</source> - </tag> + <tag> + <tag-name>blueHeaderBar</tag-name> + <source>xhtml/blueHeaderBar.xhtml</source> + </tag> </facelet-taglib> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml 2010-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -22,21 +22,21 @@ --> <ui:composition 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: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"> - <div class="UIBarStyle"> - <div class="BarStyle2"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <ui:insert/> - </div> - </div> - </div> - </div> + <div class="UIBarStyle"> + <div class="BarStyle2"> + <div class="LeftBar"> + <div class="RightBar"> + <div class="MiddleBar"> + <ui:insert/> + </div> </div> + </div> + </div> + </div> </ui:composition> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml 2010-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -22,23 +22,24 @@ --> <ui:composition 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: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"> -<table class="ActionContainer"> - <tr> - <td> + <table class="ActionContainer"> + <tr> + <td> <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="#{id}" action="#{actionString}" value="#{value}" title="#{title}" immediate="#{immediate}"/> - </div> - </div> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="#{id}" action="#{actionString}" value="#{value}" title="#{title}" + immediate="#{immediate}"/> + </div> + </div> </div> - </td> - </tr> -</table> + </td> + </tr> + </table> </ui:composition> \ No newline at end of file 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-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2010-02-12 11:58:08 UTC (rev 1661) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ 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. @@ -57,10 +57,10 @@ <param-value>server</param-value> </context-param> - <context-param> - <param-name>facelets.LIBRARIES</param-name> - <param-value>/WEB-INF/tags/webui.taglib.xml</param-value> - </context-param> + <context-param> + <param-name>facelets.LIBRARIES</param-name> + <param-value>/WEB-INF/tags/webui.taglib.xml</param-value> + </context-param> <servlet> <servlet-name>FacesServlet</servlet-name> 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 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -25,7 +25,6 @@ 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:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core" xmlns:webui="http://jboss.org/gatein"> @@ -59,7 +58,7 @@ <div class="ButtonRight"> <div class="ButtonMiddle"> <h:commandLink id="destroy-link" action="#{consumersMgr.destroyConsumer}" - value="#{i18n.confirm_delete_consumer_submit}"> + value="#{i18n.confirm_delete_consumer_submit}"> <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> </h:commandLink> </div> @@ -71,7 +70,7 @@ <div class="ButtonRight"> <div class="ButtonMiddle"> <h:commandLink id="cancel-link" action="#{consumersMgr.listConsumers}" - value="#{i18n.confirm_delete_consumer_cancel}"/> + value="#{i18n.confirm_delete_consumer_cancel}"/> </div> </div> </div> @@ -81,16 +80,16 @@ <ui:remove><webui:commandButton id="destroy-link" - action="destroyConsumer" - backingBean="#{consumersMgr}" - value="#{i18n.confirm_delete_consumer_submit}"> + 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="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 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -25,7 +25,6 @@ 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:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core" xmlns:webui="http://jboss.org/gatein"> @@ -59,7 +58,7 @@ <div class="ButtonRight"> <div class="ButtonMiddle"> <h:commandLink id="submit" action="#{consumer.eraseLocalRegistration}" - value="#{i18n.confirm_delete_registration_submit}"/> + value="#{i18n.confirm_delete_registration_submit}"/> </div> </div> </div> @@ -69,7 +68,7 @@ <div class="ButtonRight"> <div class="ButtonMiddle"> <h:commandLink id="cancel" action="#{consumer.cancel}" - value="#{i18n.confirm_delete_registration_cancel}"/> + value="#{i18n.confirm_delete_registration_cancel}"/> </div> </div> </div> @@ -78,12 +77,12 @@ </table> <ui:remove><webui:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}" - action="eraseLocalRegistration" - backingBean="#{consumer}"/> + action="eraseLocalRegistration" + backingBean="#{consumer}"/> - <webui:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}" - backingBean="#{consumer}" - action="cancel"/></ui:remove> + <webui:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}" + backingBean="#{consumer}" + 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 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -83,19 +83,20 @@ label="Consumer Name" required="true"/>&#160;&#160; <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> + <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" 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 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -97,22 +97,22 @@ <h:form> <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> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="reloadConsumersButton" action="#{consumersMgr.reload}" + value="#{i18n.consumers_table_reload}"/> </div> - </td> - </tr> - </table> + </div> + </div> + </td> + </tr> + </table> <ui:remove><webui:commandButton id="reloadConsumersButton" value="#{i18n.consumers_table_reload}" - action="reload" - backingBean="#{consumersMgr}"/></ui:remove> + action="reload" + 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 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -129,21 +129,22 @@ </c:otherwise> </c:choose> <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> + <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> - </td> - </tr> - </table> + </div> + </div> + </td> + </tr> + </table> <ui:remove><webui:commandButton action="modifyRegistration" backingBean="#{consumer}" id="modify-reg-link" @@ -191,20 +192,21 @@ </c:choose> <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> + <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> - </td> - </tr> - </table> + </div> + </td> + </tr> + </table> <ui:remove><webui:commandButton action="modifyRegistration" backingBean="#{consumer}" id="edit-reg-link" Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml 2010-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -9,7 +9,7 @@ ~ 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 @@ -28,6 +28,6 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:webui="http://jboss.org/gatein"> <ui:define name="content"> - An Error Has Occured. + An Error Has Occured. </ui:define> </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-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -25,7 +25,6 @@ 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:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core" xmlns:webui="http://jboss.org/gatein"> @@ -59,7 +58,7 @@ <div class="ButtonRight"> <div class="ButtonMiddle"> <h:commandLink id="confirm-delete" action="#{producer.deleteRegistrationProperty}" - value="#{i18n.confirm_delete_reg_property_submit}"/> + value="#{i18n.confirm_delete_reg_property_submit}"/> </div> </div> </div> @@ -69,7 +68,7 @@ <div class="ButtonRight"> <div class="ButtonMiddle"> <h:commandLink id="cancel-delete" action="#{producer.cancel}" - value="#{i18n.confirm_delete_reg_property_cancel}"/> + value="#{i18n.confirm_delete_reg_property_cancel}"/> </div> </div> </div> @@ -77,12 +76,12 @@ </tr> </table> <ui:remove><webui:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}" - action="deleteRegistrationProperty" - backingBean="#{producer}"/> + action="deleteRegistrationProperty" + backingBean="#{producer}"/> - <webui:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" - backingBean="#{producer}" - action="cancel"/></ui:remove> + <webui:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" + backingBean="#{producer}" + 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 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -67,22 +67,23 @@ <div class="add-prop-container"> <div class="add-prop-button"> <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> + <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}"/> + backingBean="#{producer}" + value="#{i18n.producer_config_add_reg_prop}"/> </ui:remove> </div> </div> @@ -144,7 +145,7 @@ <div class="ButtonRight"> <div class="ButtonMiddle"> <h:commandLink id="reg-save" action="#{producer.save}" - value="#{i18n.producer_config_save}"/> + value="#{i18n.producer_config_save}"/> </div> </div> </div> @@ -154,7 +155,7 @@ <div class="ButtonRight"> <div class="ButtonMiddle"> <h:commandLink id="reg-reload" action="#{producer.reloadConfiguration}" - value="#{i18n.producer_config_cancel}"/> + value="#{i18n.producer_config_cancel}"/> </div> </div> </div> @@ -162,12 +163,12 @@ </tr> </table> <ui:remove><webui:commandButton id="reg-save" action="save" - backingBean="#{producer}" - value="#{i18n.producer_config_save}"/> + backingBean="#{producer}" + value="#{i18n.producer_config_save}"/> - <webui:commandButton id="reg-reload" action="reloadConfiguration" - backingBean="#{producer}" - value="#{i18n.producer_config_cancel}"/></ui:remove> + <webui:commandButton id="reg-reload" action="reloadConfiguration" + backingBean="#{producer}" + value="#{i18n.producer_config_cancel}"/></ui:remove> </h:panelGroup> </h:panelGrid> 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-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-02-12 11:58:08 UTC (rev 1661) @@ -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. @@ -31,33 +31,38 @@ <h:form id="producer-temp-form" styleClass="producer-temp-form"> <div class="TabsContainer"> - <table class="TabsActionContainer"><tr><td> - <div class="UITab GrayTabStyle"> - <div class="NormalTab"> - <div class="LeftTab"> - <div class="RightTab"> - <div class="MiddleTab"> - <h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/> - </div> + <table class="TabsActionContainer"> + <tr> + <td> + <div class="UITab GrayTabStyle"> + <div class="NormalTab"> + <div class="LeftTab"> + <div class="RightTab"> + <div class="MiddleTab"> + <h:commandLink id="consumersTab" action="consumers" + value="#{i18n.nav_tabs_consumers}"/> + </div> + </div> + </div> </div> - </div> - </div> - </div> - </td><td> - <div class="UITab GrayTabStyle"> - <div class="SelectedTab"> - <div class="LeftTab"> - <div class="RightTab"> - <div class="MiddleTab"> - #{i18n.nav_tabs_producer_config} - </div> + </div> + </td> + <td> + <div class="UITab GrayTabStyle"> + <div class="SelectedTab"> + <div class="LeftTab"> + <div class="RightTab"> + <div class="MiddleTab"> + #{i18n.nav_tabs_producer_config} + </div> + </div> + </div> </div> - </div> - </div> - </div> - </td> - </tr></table> - </div> + </div> + </td> + </tr> + </table> + </div> </h:form> </ui:define> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css 2010-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css 2010-02-12 11:58:08 UTC (rev 1661) @@ -1,3 +1,26 @@ +/* + * 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. + */ + .zero { margin: 0; padding: 0; @@ -86,7 +109,7 @@ } .bold { - font-weight: bold; + font-weight: bold; } .dotted-blue-border { Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-12 10:39:33 UTC (rev 1660) +++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-12 11:58:08 UTC (rev 1661) @@ -1,11 +1,34 @@ +/* + * 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. + */ + @import url(basestyles.css); .wsrp-consumers-ui { - padding: 10px; + padding: 10px; } + .wsrp-consumers-ui table { - border: 0; - /*border-collapse: separate;*/ + border: 0; /*border-collapse: separate;*/ } .wsrp-consumers-ui form {