Author: chris.laprun(a)jboss.com Date: 2010-09-13 16:49:31 -0400 (Mon, 13 Sep 2010) New Revision: 4178 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml Log: - GTNWSRP-61: Improved navigation. Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-09-13 20:48:02 UTC (rev 4177) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-09-13 20:49:31 UTC (rev 4178) @@ -82,6 +82,7 @@ portlets_table_column_include = Include in export? portlets_table_column_portlet_name = Portlet portlets_table_export = Export +portlets_table_configure = Back to consumer configuration export_detail_export_time = Export time export_detail_expiration_time = Expiration time export_detail_portlets = Exported portlets @@ -135,6 +136,10 @@ edit_consumer_refresh = Refresh & Save edit_consumer_refresh_title = Save changes and refresh information from producer edit_consumer_cancel = Cancel +edit_consumer_import = Import portlets +edit_consumer_import_title = Importing portlets +edit_consumer_export = Export portlets +edit_consumer_export_title = Exporting portlets # Confirm registration property deletion screen confirm_delete_reg_property_title = Delete ''{0}'' registration property description? @@ -180,7 +185,8 @@ bean_consumer_cannot_erase_reg = Couldn't erase local registration! bean_consumer_malformed_url = ''{0}'' is not a valid URL: {1} bean_consumer_update_success = Successfully updated consumer! -bean_consumer_import_success = ''{0}'' portlets were successfully imported! +bean_consumer_import_success = {0} portlets were successfully imported! +bean_consumer_import_failed_portlets = The following portlets couldn't be imported: {0} # ConsumerManagerBean bean_consumermanager_invalid_new_consumer_name = Need a non-null, non-empty name for the new consumer! Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-09-13 20:48:02 UTC (rev 4177) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-09-13 20:49:31 UTC (rev 4178) @@ -174,4 +174,9 @@ import_assign=Assigner � la fen�tre import_import=Importer import_use=Importer? -bean_consumer_import_success=''{0}'' portlets ont �t� correctement import�es! \ No newline at end of file +bean_consumer_import_success=''{0}'' portlets ont �t� correctement import�es! +bean_consumer_import_failed_portlets=Les portlets suivantes n'ont pas pu �tre import�es: {0} +edit_consumer_export=Exporter portlets +edit_consumer_export_title=Portlets en export +edit_consumer_import=Importer portlets +edit_consumer_import_title=Portlets en import \ 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-09-13 20:48:02 UTC (rev 4177) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-09-13 20:49:31 UTC (rev 4178) @@ -258,6 +258,36 @@ <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}"/> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2010-09-13 20:48:02 UTC (rev 4177) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/export.xhtml 2010-09-13 20:49:31 UTC (rev 4178) @@ -56,6 +56,27 @@ </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:form> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2010-09-13 20:48:02 UTC (rev 4177) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2010-09-13 20:49:31 UTC (rev 4178) @@ -79,6 +79,18 @@ <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> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2010-09-13 20:48:02 UTC (rev 4177) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exports.xhtml 2010-09-13 20:49:31 UTC (rev 4178) @@ -43,7 +43,7 @@ <h:column> <f:facet name="header">#{i18n.export_detail_has_failed}</f:facet> - <h:selectBooleanCheckbox id="hasFailed" value="#{export.hasFailedPortlets}" disabled="true"/> + <h:selectBooleanCheckbox id="hasFailed" value="#{export.hasFailedPortlets}" disabled="true"/> </h:column> <h:column> @@ -53,7 +53,8 @@ #{i18n.exports_actions_view} </h:commandLink> | - <h:commandLink action="confirmDeleteExport" actionListener="#{consumer.selectExport}" styleClass="actionDelete" id="delete"> + <h:commandLink action="confirmDeleteExport" actionListener="#{consumer.selectExport}" + styleClass="actionDelete" id="delete"> #{i18n.exports_actions_delete} </h:commandLink> | @@ -73,6 +74,18 @@ </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:form> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml 2010-09-13 20:48:02 UTC (rev 4177) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/import.xhtml 2010-09-13 20:49:31 UTC (rev 4178) @@ -33,7 +33,7 @@ rowClasses="EvenRow,OddRow" styleClass="UIGrid" width="100%"> <h:column> <f:facet name="header">#{i18n.import_use}</f:facet> - <h:selectBooleanCheckbox id="selected" value="#{portlet.selected}" + <h:selectBooleanCheckbox id="selected" value="#{portlet.selected}" valueChangeListener="#{portlet.select}" immediate="true" onclick="this.form.submit()"/> </h:column> @@ -56,17 +56,40 @@ </h:selectOneListbox> </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}" value="#{i18n.import_import}"/> + <h:commandButton id="import" action="#{consumer.importPortlets}" + 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:form>