Author: chris.laprun(a)jboss.com Date: 2012-03-10 05:15:30 -0500 (Sat, 10 Mar 2012) New Revision: 8559 Removed: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/tags/ Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/producer.xhtml components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/styles/style.css Log: - GTNWSRP-278: Simplified button styles to improve compatibility with browsers. Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-10 10:15:30 UTC (rev 8559) @@ -63,11 +63,6 @@ <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> - <servlet> <servlet-name>FacesServlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -51,45 +51,12 @@ <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> - - - <ui:remove><webui:commandButton id="destroy-link" - action="destroyConsumer" - backingBean="#{consumersMgr}" - value="#{i18n.confirm_delete_consumer_submit}"> + <h:commandLink id="destroy-link" action="#{consumersMgr.destroyConsumer}" styleClass="ActionButton" + 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:commandLink> + <h:commandLink id="cancel-link" action="#{consumersMgr.listConsumers}" styleClass="ActionButton" + value="#{i18n.confirm_delete_consumer_cancel}"/> </h:form> </div> </div> Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -51,38 +51,10 @@ <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> - - <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"/></ui:remove> + <h:commandLink id="submit" action="#{consumer.eraseLocalRegistration}" styleClass="ActionButton" + value="#{i18n.confirm_delete_registration_submit}"/> + <h:commandLink id="cancel" action="#{consumer.cancel}" styleClass="ActionButton" + value="#{i18n.confirm_delete_registration_cancel}"/> </h:form> </div> </div> Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -71,51 +71,31 @@ <ui:define name="objectpath"> - <webui:blueHeaderBar> - <div class="full-width"> - <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}"> - <div class="float-left half-width"> - <!-- Consumer creation --> - <div class="create-container"> - <h:form id="createConsumer" styleClass="createObjectForm"> - <span class="portlet-font bold">#{i18n.consumers_create_title}</span>&#160; - <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" - styleClass="portlet-form-input-field" - label="Consumer Name" required="true"/>&#160;&#160; - - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton id="createConsumerButton" - action="#{consumersMgr.createConsumer}" - value="#{i18n.consumers_create_submit}"/> - </div> - </div> - </div> - </td> - </tr> - </table> - </h:form> - </div> - </div> - </f:subview> - <c:if test="#{empty showAddConsumer}"> - <strong> - <h:outputFormat value="#{i18n.path_consumers_consumer}"> - <f:param value="#{consumer.id}"/> - </h:outputFormat> - </strong> + <div class="bar"> + <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}"> + <h:form id="createConsumer" styleClass="createObjectForm"> + <span class="portlet-font bold">#{i18n.consumers_create_title}</span>&#160; + <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" + styleClass="portlet-form-input-field" + label="Consumer Name" required="true"/>&#160;&#160; + <h:commandButton id="createConsumerButton" styleClass="ActionButton" + action="#{consumersMgr.createConsumer}" + value="#{i18n.consumers_create_submit}"/> + </h:form> + </f:subview> + <c:if test="#{empty showAddConsumer}"> + <strong> + <h:outputFormat value="#{i18n.path_consumers_consumer}"> + <f:param value="#{consumer.id}"/> + </h:outputFormat> + </strong> <span class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} swatch"> #{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive} #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} </span> - </c:if> - </div> - </webui:blueHeaderBar> + </c:if> + </div> </ui:define> Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -107,20 +107,8 @@ </h:form> <h:form> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton id="reloadConsumersButton" action="#{consumersMgr.reload}" - value="#{i18n.consumers_table_reload}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <h:commandButton id="reloadConsumersButton" action="#{consumersMgr.reload}" styleClass="ActionButton" + value="#{i18n.consumers_table_reload}"/> </h:form> </ui:define> </ui:decorate> \ No newline at end of file Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -112,53 +112,19 @@ </h:dataTable> - <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> - <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="update" - backingBean="#{consumer}" - id="cons-update-link" - value="#{i18n.edit_consumer_registration_update_props}" - rendered="registered"/></ui:remove> + <h:commandLink id="cons-update-link" action="#{consumer.update}" + value="#{i18n.edit_consumer_registration_update_props}" + rendered="#{consumer.registered}" styleClass="ActionButton"/> + <h:commandLink id="modify-reg-link" styleClass="ActionButton" + action="#{consumer.modifyRegistration}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}" + rendered="#{consumer.registrationLocallyModified}"/> </c:when> <c:otherwise> #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <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> @@ -198,28 +164,10 @@ </c:otherwise> </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> - </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}"/></ui:remove> - + <h:commandLink id="edit-reg-link" styleClass="ActionButton" + action="#{consumer.modifyRegistration}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}"/> <br style="clear:both;"/> </h:panelGroup> </c:if> @@ -234,26 +182,9 @@ #{i18n.edit_consumer_registration_context_handle} <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> - <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}"/></ui:remove> - + <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" styleClass="ActionButton" + value="#{i18n.edit_consumer_registration_context_erase}" + title="#{i18n.edit_consumer_registration_context_erase_title}"/> </td> </tr> </c:if> @@ -261,61 +192,25 @@ <tr> <th/> <td class="portlet-section-buttonrow"> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="export-cons-link" action="#{consumersMgr.exportPortlets}" - actionListener="#{consumersMgr.selectConsumer}" - rendered="#{consumer.supportsExport}" - value="#{i18n.edit_consumer_export}" - title="#{i18n.edit_consumer_export_title}"> - <f:param name="id" value="#{consumer.id}"/> - </h:commandLink> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="import-cons-link" action="#{consumersMgr.importPortlets}" - actionListener="#{consumersMgr.selectConsumer}" - rendered="#{consumer.supportsExport and ! consumer.availableExportInfosEmpty}" - value="#{i18n.edit_consumer_import}" - title="#{i18n.edit_consumer_import_title}"> - <f:param name="id" value="#{consumer.id}"/> - </h:commandLink> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton 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}" immediate="true" - value="#{i18n.edit_consumer_cancel}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <h:commandLink id="export-cons-link" action="#{consumersMgr.exportPortlets}" styleClass="ActionButton" + actionListener="#{consumersMgr.selectConsumer}" + rendered="#{consumer.supportsExport}" + value="#{i18n.edit_consumer_export}" + title="#{i18n.edit_consumer_export_title}"> + <f:param name="id" value="#{consumer.id}"/> + </h:commandLink> + <h:commandLink id="import-cons-link" action="#{consumersMgr.importPortlets}" styleClass="ActionButton" + actionListener="#{consumersMgr.selectConsumer}" + rendered="#{consumer.supportsExport and ! consumer.availableExportInfosEmpty}" + value="#{i18n.edit_consumer_import}" + title="#{i18n.edit_consumer_import_title}"> + <f:param name="id" value="#{consumer.id}"/> + </h:commandLink> + <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" + value="#{i18n.edit_consumer_refresh}" + title="#{i18n.edit_consumer_refresh_title}" styleClass="ActionButton"/> + <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" immediate="true" + value="#{i18n.edit_consumer_cancel}" styleClass="ActionButton"/> </td> </tr> </table> Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/confirmDeleteExport.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -50,43 +50,10 @@ <p class="portlet-class">#{i18n.confirm_detete_export_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="#{consumer.deleteExport}" - value="#{i18n.confirm_delete_export_submit}"/> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="cancel-link" action="exports" - value="#{i18n.confirm_delete_export_cancel}"/> - </div> - </div> - </div> - </td> - </tr> - </table> - - - <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:commandLink id="destroy-link" action="#{consumer.deleteExport}" styleClass="ActionButton" + value="#{i18n.confirm_delete_export_submit}"/> + <h:commandLink id="cancel-link" action="exports" styleClass="ActionButton" + value="#{i18n.confirm_delete_export_cancel}"/> </h:form> </div> </div> Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -45,42 +45,14 @@ #{portlet.handle} </h:column> </h:dataTable> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton id="exportButton" action="#{consumer.exportPortlets}" - value="#{i18n.portlets_table_export}" - disabled="#{! consumer.readyForExport}"/> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure"> - <f:param name="id" value="#{consumer.id}"/> - #{i18n.portlets_table_configure} - </h:commandLink> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <h:commandButton id="exportButton" action="#{consumer.exportPortlets}" styleClass="ActionButton" + value="#{i18n.portlets_table_export}" + disabled="#{! consumer.readyForExport}"/> + <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton"> + <f:param name="id" value="#{consumer.id}"/> + #{i18n.portlets_table_configure} + </h:commandLink> + <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/> </h:form> </ui:define> </ui:decorate> \ No newline at end of file Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -75,39 +75,11 @@ </table> <h:form id="exportDetail-form"> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink action="import" id="use"> - #{i18n.exports_actions_use} - </h:commandLink> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton id="exports" action="exports" value="#{i18n.export_detail_exports}"/> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <h:commandLink action="import" id="use" styleClass="ActionButton"> + #{i18n.exports_actions_use} + </h:commandLink> + <h:commandButton id="exports" action="exports" value="#{i18n.export_detail_exports}" styleClass="ActionButton"/> + <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/> </h:form> </ui:define> </ui:decorate> \ No newline at end of file Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -65,31 +65,11 @@ </h:commandLink> </h:column> </h:dataTable> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}"/> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure"> - <f:param name="id" value="#{consumer.id}"/> - #{i18n.portlets_table_configure} - </h:commandLink> - </div> - </div> - </div> - </td> - </tr> - </table> + <h:commandButton id="consumers" action="consumers" value="#{i18n.export_detail_consumers}" styleClass="ActionButton"/> + <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton"> + <f:param name="id" value="#{consumer.id}"/> + #{i18n.portlets_table_configure} + </h:commandLink> </h:form> </ui:define> </ui:decorate> \ No newline at end of file Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -60,41 +60,13 @@ </h:column> </h:dataTable> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton id="import" action="#{consumer.importPortlets}" disabled="#{!consumer.currentExport.readyForImport}" - value="#{i18n.import_import}"/> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure"> - <f:param name="id" value="#{consumer.id}"/> - #{i18n.portlets_table_configure} - </h:commandLink> - </div> - </div> - </div> - </td> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="exports" action="exports" value="#{i18n.export_detail_exports}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <h:commandButton id="import" action="#{consumer.importPortlets}" disabled="#{!consumer.currentExport.readyForImport}" + value="#{i18n.import_import}" styleClass="ActionButton"/> + <h:commandLink action="#{consumersMgr.configureConsumer}" id="configure" styleClass="ActionButton"> + <f:param name="id" value="#{consumer.id}"/> + #{i18n.portlets_table_configure} + </h:commandLink> + <h:commandLink id="exports" action="exports" value="#{i18n.export_detail_exports}" styleClass="ActionButton"/> </h:form> </ui:define> </ui:decorate> \ No newline at end of file Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -51,37 +51,10 @@ <p class="portlet-class">#{i18n.confirm_delete_reg_property_proceed}</p> <h:form id="confirm-prop-del-form"> - <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"/></ui:remove> + <h:commandLink id="confirm-delete" action="#{producer.deleteRegistrationProperty}" styleClass="ActionButton" + value="#{i18n.confirm_delete_reg_property_submit}"/> + <h:commandLink id="cancel-delete" action="#{producer.cancel}" styleClass="ActionButton" + value="#{i18n.confirm_delete_reg_property_cancel}"/> </h:form> </div> </div> Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/producer.xhtml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2012-03-10 10:15:30 UTC (rev 8559) @@ -26,7 +26,7 @@ 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"> + xmlns:div="http://jboss.org/gatein"> <ui:param name="title" value="#{i18n.producer_config_title}"/> @@ -72,38 +72,14 @@ <h:outputText value=" " 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"> - <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}"/> - </ui:remove> - </div> - </div> - </div> + <div class="bar"> + <h:outputText value="#{i18n.producer_config_reg_props}" style="font-weight: bold; margin-right: .3em;"/> + <h:commandLink id="add-reg-prop" styleClass="ActionButton" + action="#{producer.addRegistrationProperty}" + value="#{i18n.producer_config_add_reg_prop}"/> + </div> - </webui:blueHeaderBar> - - <f:subview rendered="#{!producer.registrationPropertiesEmpty}" id="reg-props"> <h:dataTable id="reg-properties" value="#{producer.registrationProperties}" var="property" rendered="#{producer.registrationRequired}" @@ -148,38 +124,8 @@ <h:outputText value=" "/> <h:panelGroup styleClass="portlet-section-buttonrow"> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandButton 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:commandButton 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}"/></ui:remove> - + <h:commandButton id="reg-save" action="#{producer.save}" styleClass="ActionButton" value="#{i18n.producer_config_save}"/> + <h:commandButton id="reg-reload" action="#{producer.reloadConfiguration}" styleClass="ActionButton" value="#{i18n.producer_config_cancel}"/> </h:panelGroup> </h:panelGrid> </h:form> Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2012-03-10 10:15:30 UTC (rev 8559) @@ -21,16 +21,6 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -.UIWsrpPortlet .UIControlBar { -/*background: url('background/ControlIcon.gif') repeat-x center -222px;*/ -/*border: 1px solid #b7b7b7;*/ -/*height: 23px;*/ - line-height: 28px; - padding: 4px 10px 0 0; /*margin: 5px 0px;*/ - font-weight: bold; - text-align: right; -} - /***************************** Consumer Form Style ************************/ .UIWsrpPortlet .cons-temp-form, @@ -40,6 +30,7 @@ .UIWsrpPortlet .UIGrid { border: 1px solid #B7B7B7; + margin-bottom: 0.3em; } .UIWsrpPortlet .ConsumerGrid thead tr th, @@ -56,25 +47,6 @@ color: darkblue; } -.UIWsrpPortlet .create-container .ActionContainer { - position: absolute; - margin: 7px 0 0 0; -} - -/***************************** Producer Form Style ************************/ - -.UIWsrpPortlet .add-prop-container { - position: relative; - display: inline -} - -.UIWsrpPortlet .add-prop-button { - position: absolute; - top: -5px; - left: 10px; - font-weight: normal -} - /***************************** Messages Style ************************/ .portlet-msg-success { @@ -101,36 +73,6 @@ font-weight: bold; } -/***************************** ActionButton Style ************************/ -.UIWsrpPortlet .ActionContainer { - width: auto; - display: inline; /*margin: auto;*/ -} - -.UIWsrpPortlet .ButtonLeft { - background: url('background/LightBlueStyle.gif') no-repeat left top; - padding: 0px 0px 0px 3px; -} - -.UIWsrpPortlet .ButtonRight { - background: url('background/LightBlueStyle.gif') no-repeat right top; - padding: 0px 3px 0px 0px; -} - -.UIWsrpPortlet .ButtonMiddle { - line-height: 22px; - text-align: center; - background: url('background/LightBlueStyle.gif') repeat-x bottom; - white-space: nowrap; - display: table-cell; - padding: 0px 12px; -} - -.UIWsrpPortlet .ButtonMiddle input { - background: transparent; - border: none; -} - /***************************** GrayTabStyle ************************/ .UIWsrpPortlet .TabsActionContainer { @@ -196,3 +138,29 @@ .UIWsrpPortlet .tab-blank { border-bottom: 1px solid #B7B7B7; } + +.UIWsrpPortlet .ActionButton { + line-height: 19px; + text-align: center; + background: url('background/LightBlueStyle.gif') repeat-x center; + white-space: nowrap; + padding: 0 12px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + border: 1px solid #8A8A8A; + border-bottom: 1px solid #5D5D5D; + display: inline-block; + margin: 0; + cursor: pointer; +} + +.UIWsrpPortlet .bar { + padding: .4em; + margin: 0 0 0.3em 0; + border: 1px solid #B7B7B7; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: #eee; +} Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif =================================================================== (Binary files differ) Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/styles/style.css =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/styles/style.css 2012-03-09 10:33:12 UTC (rev 8558) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/styles/style.css 2012-03-10 10:15:30 UTC (rev 8559) @@ -21,8 +21,6 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -@import url(basestyles.css); - .wsrp-consumers-ui { padding: 10px; } @@ -424,5 +422,6 @@ background-color: #ffa200; -moz-border-radius: 6px; -webkit-border-radius: 6px; + border-radius: 6px; padding: .5em; } \ No newline at end of file