Author: wesleyhales Date: 2009-12-21 19:09:45 -0500 (Mon, 21 Dec 2009) New Revision: 1113 Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerEditor.gtmpl portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/skin/wsrp/webui/component/DefaultStylesheet.css Log: wsrp ui enhancements Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java =================================================================== --- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java 2009-12-21 22:20:03 UTC (rev 1112) +++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java 2009-12-22 00:09:45 UTC (rev 1113) @@ -48,14 +48,14 @@ @EventConfig(listeners = UIWsrpConsumerEditor.SaveActionListener.class)}) public class UIWsrpConsumerEditor extends UIForm { - protected static final String CONSUMER_NAME = "id"; - protected static final String CACHE_EXPIRATION = "expirationCacheSeconds"; - protected static final String WSDL_URL = "wsdlDefinitionURL"; + protected static final String CONSUMER_NAME = "Consumer Name: "; + protected static final String CACHE_EXPIRATION = "Cache Expiration Seconds: "; + protected static final String WSDL_URL = "WSDL URL: "; public UIWsrpConsumerEditor() throws Exception { - addUIFormInput(new UIFormStringInput(CONSUMER_NAME, CONSUMER_NAME, "123").addValidator(MandatoryValidator.class)); + addUIFormInput(new UIFormStringInput(CONSUMER_NAME, CONSUMER_NAME, null).addValidator(MandatoryValidator.class)); addUIFormInput(new UIFormStringInput(CACHE_EXPIRATION, CACHE_EXPIRATION, null)); addUIFormInput(new UIFormStringInput(WSDL_URL, WSDL_URL, null)); //addChild(UIWsrpEndpointConfigForm.class,null,null); Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java =================================================================== --- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java 2009-12-21 22:20:03 UTC (rev 1112) +++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java 2009-12-22 00:09:45 UTC (rev 1113) @@ -123,8 +123,8 @@ public UIWsrpConsumerOverview() throws Exception { UIPopupWindow popup = addChild(UIPopupWindow.class, null, null); - popup.setWindowSize(400, 0); - UIWsrpConsumerEditor consumerForm = createUIComponent(UIWsrpConsumerEditor.class, null, null); + popup.setWindowSize(450, 0); + UIWsrpConsumerEditor consumerForm = createUIComponent(UIWsrpConsumerEditor.class, null, "Consumer Editor"); popup.setUIComponent(consumerForm); popup.setRendered(false); Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java =================================================================== --- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2009-12-21 22:20:03 UTC (rev 1112) +++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2009-12-22 00:09:45 UTC (rev 1113) @@ -72,7 +72,7 @@ public UIWsrpProducerOverview() throws Exception { ProducerConfiguration producerConfiguration = getProducerConfigurationService().getConfiguration(); - UIWsrpProducerEditor producerForm = createUIComponent(UIWsrpProducerEditor.class, null, null); + UIWsrpProducerEditor producerForm = createUIComponent(UIWsrpProducerEditor.class, null, "Producer Editor"); producerForm.setProducerConfig(producerConfiguration); addChild(producerForm); @@ -90,7 +90,7 @@ //add the popup for property edit and adding new properties UIPopupWindow popup = addChild(UIPopupWindow.class, null, null); popup.setWindowSize(400, 300); - UIWsrpProducerPropertyEditor propertyForm = createUIComponent(UIWsrpProducerPropertyEditor.class, null, null); + UIWsrpProducerPropertyEditor propertyForm = createUIComponent(UIWsrpProducerPropertyEditor.class, null, "Producer Property Editor"); popup.setUIComponent(propertyForm); popup.setRendered(false); } Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerEditor.gtmpl =================================================================== --- portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerEditor.gtmpl 2009-12-21 22:20:03 UTC (rev 1112) +++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerEditor.gtmpl 2009-12-22 00:09:45 UTC (rev 1113) @@ -9,8 +9,7 @@ %> <div class="UserName"> - <div> - <label>Consumer Name</label> + <div> <% //uiform.renderChild(0); %> <% for (field in uiform.getChildren()) @@ -18,26 +17,31 @@ if (field.isRendered()) { %> - <div> + <div class="form-row"> + <label> <% fieldName = uicomponent.getLabel(field.getName()); %> <% if (!fieldName.equals(uicomponent.getId())) { %> - <div class="FieldLabel"> + <span class="FieldLabel"> <% if (fieldName != null && fieldName.length() > 0) { %> <%=uicomponent.getLabel(field.getName())%> <% } %> - </div> - <div class="FieldComponent"><% uiform.renderField(field) %></div> + </span> + <% uiform.renderField(field) %> <% } else { %> - <div class="FieldComponent"><% uiform.renderField(field) %></div> + <% uiform.renderField(field) %> <% } %> + </label> </div> <% } } %> + + + </div> </div> @@ -59,6 +63,8 @@ </table> </div> + + <% uiform.end() %> </div> \ No newline at end of file Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/skin/wsrp/webui/component/DefaultStylesheet.css =================================================================== --- portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/skin/wsrp/webui/component/DefaultStylesheet.css 2009-12-21 22:20:03 UTC (rev 1112) +++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/skin/wsrp/webui/component/DefaultStylesheet.css 2009-12-22 00:09:45 UTC (rev 1113) @@ -53,4 +53,37 @@ .UIWsrpPortlet .UIAction .ActionContainer { margin:0; width:auto; -} \ No newline at end of file +} + +.UIWsrpPortlet .form-row { + /*border-bottom: 1px solid #ddd;*/ + padding: 3px; + clear:both; +} + +.UIWsrpPortlet .form-row label { + float:left; + width: 100%; +} + +.UIWsrpPortlet .form-row label span { + display:block; + float:left; + width: 26%; +} + +.UIWsrpPortlet .form-row label input { + float:left; + width: 69%; +} + +.UIWsrpPortlet .UILoginForm .UIAction { + clear:both; + padding: 8px 0; +} + +.UIWsrpPortlet .UILoginForm .ActionContainer { + float:right; + margin:0; +} +