Author: wesleyhales Date: 2010-01-14 12:24:58 -0500 (Thu, 14 Jan 2010) New Revision: 1298 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerPropertyEditor.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpRegistrationDetails.java portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerPropertyEditor.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/skin/wsrp/webui/component/DefaultStylesheet.css portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties Log: Wsrp cleanup and try to make buttons work Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerPropertyEditor.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerPropertyEditor.java 2010-01-14 15:35:44 UTC (rev 1297) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerPropertyEditor.java 2010-01-14 17:24:58 UTC (rev 1298) @@ -29,6 +29,7 @@ import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.UIApplication; +import org.exoplatform.webui.core.UIPopupWindow; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; @@ -85,7 +86,11 @@ { public void execute(Event<UIWsrpProducerPropertyEditor> event) throws Exception { - // todo: implement + UIWsrpProducerPropertyEditor source = event.getSource(); + source.save(event.getRequestContext()); + UIPopupWindow popup = source.getParent(); + popup.setRendered(false); + popup.setShow(false); } } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpRegistrationDetails.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpRegistrationDetails.java 2010-01-14 15:35:44 UTC (rev 1297) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpRegistrationDetails.java 2010-01-14 17:24:58 UTC (rev 1298) @@ -35,7 +35,9 @@ import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.core.UIGrid; import org.exoplatform.webui.core.UIPopupWindow; +import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle; import org.exoplatform.webui.core.lifecycle.UIContainerLifecycle; +import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; import org.exoplatform.webui.core.renderers.ValueRenderer; import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; @@ -67,11 +69,11 @@ @ComponentConfigs({ @ComponentConfig(id = UIWsrpRegistrationDetails.REGISTRATION_PROPERTIES, type = UIGrid.class, template = "system:/groovy/webui/core/UIGrid.gtmpl"), @ComponentConfig( - lifecycle = UIContainerLifecycle.class, + lifecycle = UIApplicationLifecycle.class, events = { @EventConfig(listeners = UIWsrpRegistrationDetails.AddPropertyActionListener.class), @EventConfig(listeners = UIWsrpRegistrationDetails.EditPropertyActionListener.class), - @EventConfig(listeners = UIWsrpRegistrationDetails.DeletePropertyActionListener.class) + @EventConfig(listeners = UIWsrpRegistrationDetails.DeleteActionListener.class) }) }) public class UIWsrpRegistrationDetails extends UIFormInputSet @@ -81,7 +83,7 @@ private UIGrid registrationProperties; private static final String NAME = "name"; static String[] FIELDS = {NAME, "description", "label", "hint"}; - static String[] SELECT_ACTIONS = {"EditProperty", "DeleteProperty"}; + static String[] SELECT_ACTIONS = {"EditProperty", "Delete"}; static final String POLICY_CLASS = "policyClassName"; static final String VALIDATOR_CLASS = "validatorClassName"; static final String REGISTRATION_PROPERTIES = "RegistrationPropertySelector"; @@ -260,11 +262,11 @@ // todo: deal with registration properties } - static public class EditPropertyActionListener extends EventListener<UIWsrpProducerEditor> + static public class EditPropertyActionListener extends EventListener<UIWsrpRegistrationDetails> { - public void execute(Event<UIWsrpProducerEditor> event) throws Exception + public void execute(Event<UIWsrpRegistrationDetails> event) throws Exception { - UIWsrpProducerEditor source = event.getSource(); + UIWsrpRegistrationDetails source = event.getSource(); UIPopupWindow popup = source.getChild(UIPopupWindow.class); UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent(); String id = event.getRequestContext().getRequestParameter(OBJECTID); @@ -283,11 +285,11 @@ } } - static public class DeletePropertyActionListener extends EventListener<UIWsrpProducerEditor> + static public class DeleteActionListener extends EventListener<UIWsrpRegistrationDetails> { - public void execute(Event<UIWsrpProducerEditor> event) + public void execute(Event<UIWsrpRegistrationDetails> event) { - UIWsrpProducerEditor source = event.getSource(); + UIWsrpRegistrationDetails source = event.getSource(); UIApplication uiApp = event.getRequestContext().getUIApplication(); UIPopupWindow popup = source.getChild(UIPopupWindow.class); String id = event.getRequestContext().getRequestParameter(OBJECTID); @@ -306,11 +308,11 @@ } } - static public class AddPropertyActionListener extends EventListener<UIWsrpProducerEditor> + static public class AddPropertyActionListener extends EventListener<UIWsrpRegistrationDetails> { - public void execute(Event<UIWsrpProducerEditor> event) throws Exception + public void execute(Event<UIWsrpRegistrationDetails> event) throws Exception { - UIWsrpProducerEditor source = event.getSource(); + UIWsrpRegistrationDetails source = event.getSource(); UIPopupWindow popup = source.getChild(UIPopupWindow.class); UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent(); Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl 2010-01-14 15:35:44 UTC (rev 1297) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl 2010-01-14 17:24:58 UTC (rev 1298) @@ -13,11 +13,11 @@ <table class="ActionContainer"> <tr> <td> - <div onclick="<%=uicomponent.getChild(UIWsrpProducerEditor.class).getChild(UIWsrpRegistrationDetails.class).event("Add")%>" class="ActionButton LightBlueStyle"> + <div onclick="<%=uicomponent.getChild(UIWsrpProducerEditor.class).getChild(UIWsrpRegistrationDetails.class).event("AddProperty")%>" class="ActionButton LightBlueStyle"> <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getChild(UIWsrpProducerEditor.class).getChild(UIWsrpRegistrationDetails.class).getId() + ".action.Add")%></a> + <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getChild(UIWsrpProducerEditor.class).getChild(UIWsrpRegistrationDetails.class).getId() + ".action.AddProperty")%></a> </div> </div> </div> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerPropertyEditor.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerPropertyEditor.gtmpl 2010-01-14 15:35:44 UTC (rev 1297) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerPropertyEditor.gtmpl 2010-01-14 17:24:58 UTC (rev 1298) @@ -58,4 +58,4 @@ <% uiform.end() %> -</div> \ No newline at end of file +</div> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/wsrp/webui/component/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/skin/wsrp/webui/component/DefaultStylesheet.css 2010-01-14 15:35:44 UTC (rev 1297) +++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/wsrp/webui/component/DefaultStylesheet.css 2010-01-14 17:24:58 UTC (rev 1298) @@ -97,3 +97,18 @@ margin: 0; } +.UIWsrpPortlet .UIFormInputSet div.row { + clear: both; + margin: 0; + width: 500px; +} + +.UIWsrpPortlet .UIFormInputSet div.row label { + float: left; + width: 26%; +} + +.UIWsrpPortlet .UIFormInputSet div.row input { + float: left; + width: 69%; +} Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-01-14 15:35:44 UTC (rev 1297) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-01-14 17:24:58 UTC (rev 1298) @@ -1403,7 +1403,7 @@ UIWsrp.consumer.grid.action.delete.fail=Failed to delete Consumer. Cause: {0} UIWsrp.consumer.grid.action.refresh.success=Consumer Refreshed Successfully. UIWsrp.consumer.grid.action.refresh.needfix=Consumer refresh resulted in errors that need to be fixed. -UIWsrp.consumer.grid.action.refresh.fail=Failed to refresh Consumer. +UIWsrp.consumer.grid.action.refresh.fail=Failed to refresh Consumer. Cause: {0} UIWsrp.consumer.grid.action.activate.success=Consumer successfully activated. UIWsrp.consumer.grid.action.activate.fail=Problem Activating Consumer: {0} UIWsrp.consumer.grid.action.deactivate.success=Consumer successfully deactivated.