svn commit: r926987 [20/26] - in /ofbiz/branches/multitenant201
Locked
svn commit: r926987 [20/26] - in /ofbiz/branches/multitenant201
 
|
Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Wed Mar 24 09:23:07 2010 @@ -42,7 +42,7 @@ function ShowTab(lname) { <div class="screenlet-body"> <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2> <h2>${uiLabelMap.WebtoolsWithPk}: ${findByPk}</h2> - <br/> + <br /> <div class="button-bar"> <a href='<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>' class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a> <#if enableEdit = "false"> @@ -67,7 +67,7 @@ function ShowTab(lname) { </#list> </select> </form> - <br/> + <br /> </#if> <div id="area1" class="screenlet"> <div class="screenlet-title-bar"> @@ -270,7 +270,7 @@ function ShowTab(lname) { <p> <#if value?has_content> <#assign valueXmlDoc = Static["org.ofbiz.entity.GenericValue"].makeXmlDocument([value]) /> - ${Static["org.ofbiz.base.util.UtilXml"].writeXmlDocument(valueXmlDoc)?replace("\n", "<br/>")?replace(" ", " ")} + ${Static["org.ofbiz.base.util.UtilXml"].writeXmlDocument(valueXmlDoc)?replace("\n", "<br />")?replace(" ", " ")} </#if> </p> </div> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewRelations.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewRelations.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewRelations.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewRelations.ftl Wed Mar 24 09:23:07 2010 @@ -25,13 +25,13 @@ under the License. </div> <div class="screenlet-body"> <#if hasViewPermission> - <br/> + <br /> <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2> - <br/> + <br /> <div class="button-bar"> <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a> </div> - <br/> + <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.WebtoolsTitle}</td> @@ -44,12 +44,12 @@ under the License. <#list relations as relation> <tr<#if alt_row> class="alternate-row"</#if>> <td>${relation.title}</td> - <td class="button-col"><a href='<@ofbizUrl>FindGeneric?entityName=${relation.relEntityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${relation.relEntityName}</a></td> + <td class="button-col"><a href='<@ofbizUrl>FindGeneric?entityName=${relation.relEntityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${relation.relEntityName}</a></td> <td>${relation.type}</td> <td>${relation.fkName}</td> <td> <#list relation.relFields as field> - ${field.fieldName} -> ${field.relFieldName}<br/> + ${field.fieldName} -> ${field.relFieldName}<br /> </#list> </td> </tr> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/minervaObjects.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/minervaObjects.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/minervaObjects.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/minervaObjects.ftl Wed Mar 24 09:23:07 2010 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <h1>Minerva Connection Objects</h1> -<br/> +<br /> <div class="button-bar"> <a href="<@ofbizUrl>minervainfo</@ofbizUrl>" class="smallSubmit">Refresh</a> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/xmldsdump.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/xmldsdump.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Wed Mar 24 09:23:07 2010 @@ -20,7 +20,7 @@ under the License. <h1>${uiLabelMap.WebtoolsExportFromDataSource}</h1> <br /> <p>This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</p> -<hr/> +<hr /> <#if security.hasPermission("ENTITY_MAINT", session)> <a href="<@ofbizUrl>xmldsrawdump</@ofbizUrl>" class="buttontext" target="_blank">Click Here to Get Data (or save to file)</a> <#else> @@ -38,7 +38,7 @@ under the License. <h1>${uiLabelMap.PageTitleEntityExport}</h1> <br /> <p>${uiLabelMap.WebtoolsXMLExportInfo}</p> -<hr/> +<hr /> <#if security.hasPermission("ENTITY_MAINT", session)> <h2>${uiLabelMap.WebtoolsResults}:</h2> @@ -53,7 +53,7 @@ under the License. <p>${uiLabelMap.WebtoolsNoFilenameSpecified}</p> </#if> - <hr/> + <hr /> <h2>${uiLabelMap.WebtoolsExport}:</h2> <form method="post" action="<@ofbizUrl>xmldsdump</@ofbizUrl>" name="entityExport"> @@ -85,7 +85,7 @@ under the License. <td><input type="checkbox" name="tobrowser"<#if tobrowser?has_content> checked="checked"</#if>></td> </tr> </table> - <br/> + <br /> <p>${uiLabelMap.WebtoolsEntityNames}:</p> <@displayButtonBar/> <div>${uiLabelMap.WebtoolsEntitySyncDump}: @@ -100,7 +100,7 @@ under the License. <option value="Product3">${uiLabelMap.WebtoolsPreConfiguredSet4}</option> <option value="Product4">${uiLabelMap.WebtoolsPreConfiguredSet5}</option> </select> - <br/> + <br /> <table> <tr> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl Wed Mar 24 09:23:07 2010 @@ -89,13 +89,13 @@ under the License. <tr> <td colspan="4" align="center"> <#if (duplicatedLocalesLabels > 0)> - <br/> + <br /> <b>${uiLabelMap.WebtoolsLabelManagerWarningMessage} (${duplicatedLocalesLabels})</b> - <br/> + <br /> <#list duplicatedLocalesLabelsList as duplicatedLocalesLabel> <br>${duplicatedLocalesLabel.labelKey} </#list> - <br/><br/>${uiLabelMap.WebtoolsLabelManagerClearCacheAfterFixingDuplicateLabels} + <br /><br />${uiLabelMap.WebtoolsLabelManagerClearCacheAfterFixingDuplicateLabels} <#else> <input type="submit" name="searchLabels" value="${uiLabelMap.CommonFind}"/> </#if> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl Wed Mar 24 09:23:07 2010 @@ -123,11 +123,11 @@ under the License. <td/> <td>${uiLabelMap.WebtoolsLabelStatsTotal}: ${totalLabels}</td> <td colspan="2"> - ${uiLabelMap.WebtoolsLabelStatsExist}:<br/> + ${uiLabelMap.WebtoolsLabelStatsExist}:<br /> ${uiLabelMap.WebtoolsLabelStatsMissing}: </td> <td> - ${existingLabels}<br/> + ${existingLabels}<br /> ${missingLabels} </td> </tr> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl Wed Mar 24 09:23:07 2010 @@ -24,7 +24,7 @@ under the License. <div class="screenlet-body"> <#if security.hasPermission("ENTITY_MAINT", session)> <p>${uiLabelMap.WebtoolsNotePerformanceResultsMayVary}</p> - <br/> + <br /> <#if performanceList?has_content> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/service/availableservices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/service/availableservices.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/service/availableservices.ftl Wed Mar 24 09:23:07 2010 @@ -126,7 +126,7 @@ under the License. <b>${selectedServiceMap.implServices}</b> <#elseif selectedServiceMap.implServices?has_content> <#list selectedServiceMap.implServices as implSrv> - <a href='<@ofbizUrl>${url}?sel_service_name=${implSrv.getService()}</@ofbizUrl>'>${implSrv.getService()}</a><br/> + <a href='<@ofbizUrl>${url}?sel_service_name=${implSrv.getService()}</@ofbizUrl>'>${implSrv.getService()}</a><br /> </#list> </#if> </div> @@ -228,7 +228,7 @@ under the License. <td><b>${uiLabelMap.WebtoolsRHSValueName}</b> ${condition.rhsValueName?default(uiLabelMap.CommonNA)}</td> <td> </td> </tr> - </table><br/> + </table><br /> </#list> </td> </#if> @@ -258,7 +258,7 @@ under the License. <td colspan="2"> </td> </#if> </tr> - </table><br/> + </table><br /> </#list> </td> </#if> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl Wed Mar 24 09:23:07 2010 @@ -79,7 +79,7 @@ under the License. <div class="screenlet-body">${uiLabelMap.WebtoolsStatsNoRequests}</div> </#if> </div> - <br/> + <br /> <#-- Event Table --> <div id="event-statistics" class="screenlet"> <div class="screenlet-title-bar"> Modified: ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl Wed Mar 24 09:23:07 2010 @@ -105,29 +105,29 @@ under the License. <#else> <#-- Create new expression --> <@CreateForm "DATE_RANGE" CreateDateRange/> - <hr/> + <hr /> <@CreateForm "DAY_IN_MONTH" DayInMonth/> - <hr/> + <hr /> <@CreateForm "DAY_OF_MONTH_RANGE" DayOfMonthRange/> - <hr/> + <hr /> <@CreateForm "DAY_OF_WEEK_RANGE" DayOfWeekRange/> - <hr/> + <hr /> <@CreateForm "FREQUENCY" CreateFrequency/> - <hr/> + <hr /> <@CreateForm "HOUR_RANGE" HourOfDayRange/> - <hr/> + <hr /> <@CreateForm "MINUTE_RANGE" MinuteRange/> - <hr/> + <hr /> <@CreateForm "MONTH_RANGE" MonthRange/> - <hr/> + <hr /> <@CreateForm "TIME_OF_DAY_RANGE" TimeOfDayRange/> - <hr/> + <hr /> <@CreateForm "INTERSECTION"/> - <hr/> + <hr /> <@CreateForm "UNION"/> - <hr/> + <hr /> <@CreateForm "DIFFERENCE"/> - <hr/> + <hr /> <@CreateForm "SUBSTITUTION"/> </#if> Modified: ofbiz/branches/multitenant20100310/framework/widget/dtd/widget-form.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/dtd/widget-form.xsd?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/dtd/widget-form.xsd (original) +++ ofbiz/branches/multitenant20100310/framework/widget/dtd/widget-form.xsd Wed Mar 24 09:23:07 2010 @@ -836,6 +836,9 @@ under the License. <xs:annotation><xs:documentation>Specifies the string to display, can use the ${} syntax to insert context values; if empty the value of the field will be printed for a default.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="target-window"/> + <xs:attribute type="xs:string" name="alternate"> + <xs:annotation><xs:documentation>Alternate text if the image is not found at image-location</xs:documentation></xs:annotation> + </xs:attribute> <xs:attribute type="xs:string" name="image-location"/> <xs:attribute name="request-confirmation" default="false"> <xs:annotation><xs:documentation>If true then the user is presented with a dialog box, if confirmation-message is empty, use default</xs:documentation></xs:annotation> Modified: ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/WidgetWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original) +++ ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Wed Mar 24 09:23:07 2010 @@ -378,4 +378,34 @@ public class WidgetWorker { return linkType; } } + + /** Returns the script location based on a script combined name: + * <code>location#methodName</code>. + * + * @param combinedName The combined location/method name + * @return The script location + */ + public static String getScriptLocation(String combinedName) { + int pos = combinedName.lastIndexOf("#"); + if (pos == -1) { + return combinedName; + } + return combinedName.substring(0, pos); + } + + /** Returns the script method name based on a script combined name: + * <code>location#methodName</code>. Returns <code>null</code> if + * no method name is found. + * + * @param combinedName The combined location/method name + * @return The method name or <code>null</code> + */ + public static String getScriptMethodName(String combinedName) { + int pos = combinedName.lastIndexOf("#"); + if (pos == -1) { + return null; + } + return combinedName.substring(pos + 1); + } + } Modified: ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Wed Mar 24 09:23:07 2010 @@ -95,7 +95,6 @@ public class MacroFormRenderer implement protected HttpServletResponse response; protected boolean javaScriptEnabled = false; protected boolean renderPagination = true; - protected String contentType; public MacroFormRenderer(String macroLibraryPath, Appendable writer, HttpServletRequest request, HttpServletResponse response) throws TemplateException, IOException { macroLibrary = FreeMarkerWorker.getTemplate(macroLibraryPath); @@ -109,11 +108,6 @@ public class MacroFormRenderer implement internalEncoder = StringUtil.getEncoder("string"); } - public MacroFormRenderer(String macroLibraryPath, Appendable writer, HttpServletRequest request, HttpServletResponse response, String contentType) throws TemplateException, IOException { - this(macroLibraryPath, writer, request, response); - this.contentType = contentType; - } - public boolean getRenderPagination() { return this.renderPagination; } @@ -338,6 +332,8 @@ public class MacroFormRenderer implement this.request.setAttribute("image", hyperlinkField.getImage()); ModelFormField modelFormField = hyperlinkField.getModelFormField(); + String encodedAlternate = encode(hyperlinkField.getAlternate(context), modelFormField, context); + this.request.setAttribute("alternate", encodedAlternate); makeHyperlinkByType(writer, hyperlinkField.getLinkType(), modelFormField.getWidgetStyle(), hyperlinkField.getTargetType(), hyperlinkField.getTarget(context), hyperlinkField.getParameterList(), hyperlinkField.getDescription(context), hyperlinkField.getTargetWindow(context), hyperlinkField.getConfirmation(context), modelFormField, this.request, this.response, context); @@ -568,7 +564,7 @@ public class MacroFormRenderer implement // set the Calendar to the default time of the form or now() Calendar cal = null; try { - Timestamp defaultTimestamp = Timestamp.valueOf(modelFormField.getEntry(context, defaultDateTimeString)); + Timestamp defaultTimestamp = Timestamp.valueOf(dateTimeField.getDefaultDateTimeString(context)); cal = Calendar.getInstance(); cal.setTime(defaultTimestamp); } catch (IllegalArgumentException e) { @@ -1150,26 +1146,61 @@ public class MacroFormRenderer implement sb.append(" "); } else { titleText = encode(titleText, modelFormField, context); - renderHyperlinkTitle(sb, context, modelFormField, titleText); + if (UtilValidate.isNotEmpty(modelFormField.getHeaderLink())) { + StringBuilder targetBuffer = new StringBuilder(); + FlexibleStringExpander target = FlexibleStringExpander.getInstance(modelFormField.getHeaderLink()); + String fullTarget = target.expandString(context); + targetBuffer.append(fullTarget); + String targetType = HyperlinkField.DEFAULT_TARGET_TYPE; + if (UtilValidate.isNotEmpty(targetBuffer.toString()) && targetBuffer.toString().toLowerCase().startsWith("javascript:")) { + targetType="plain"; + } + StringWriter sr = new StringWriter(); + makeHyperlinkString(sr, modelFormField.getHeaderLinkStyle(), targetType, targetBuffer.toString(), null, titleText, "", modelFormField, this.request, this.response, context, ""); + + String title = sr.toString().replace("\"", "\'"); + sr = new StringWriter(); + sr.append("<@renderHyperlinkTitle "); + sr.append(" name=\""); + sr.append(modelFormField.getModelForm().getName()); + sr.append("\" title=\""); + sr.append(FreeMarkerWorker.encodeDoubleQuotes(title)); + sr.append("\" />"); + executeMacro(sr.toString()); + } else if (modelFormField.isSortField()) { + renderSortField(writer, context, modelFormField, titleText); + } else if (modelFormField.isRowSubmit()) { + StringWriter sr = new StringWriter(); + sr.append("<@renderHyperlinkTitle "); + sr.append(" name=\""); + sr.append(modelFormField.getModelForm().getName()); + sr.append("\" title=\""); + sr.append(titleText); + sr.append("\" showSelectAll=\"Y\"/>"); + executeMacro(sr.toString()); + } else { + sb.append(titleText); + } } } - //check for required field style on single forms - if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) { - String requiredStyle = modelFormField.getRequiredFieldStyle(); - if (UtilValidate.isNotEmpty(requiredStyle)) { - style = requiredStyle; + if (!sb.toString().isEmpty()) { + //check for required field style on single forms + if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) { + String requiredStyle = modelFormField.getRequiredFieldStyle(); + if (UtilValidate.isNotEmpty(requiredStyle)) { + style = requiredStyle; + } } + StringWriter sr = new StringWriter(); + sr.append("<@renderFieldTitle "); + sr.append(" style=\""); + sr.append(style); + sr.append("\" title=\""); + sr.append(sb.toString()); + sr.append("\" />"); + executeMacro(sr.toString()); } - - StringWriter sr = new StringWriter(); - sr.append("<@renderFieldTitle "); - sr.append(" style=\""); - sr.append(style); - sr.append("\" title=\""); - sr.append(sb.toString()); - sr.append("\" />"); - executeMacro(sr.toString()); } public void renderSingleFormFieldTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField) throws IOException { @@ -1961,6 +1992,14 @@ public class MacroFormRenderer implement if (UtilValidate.isEmpty(fadeBackground)){ fadeBackground = "false"; } + + String clearText = ""; + Map<String, Object> uiLabelMap = UtilGenerics.checkMap(context.get("uiLabelMap")); + if (uiLabelMap != null) { + clearText = (String) uiLabelMap.get("CommonClear"); + } else { + Debug.logWarning("Could not find uiLabelMap in context", module); + } StringWriter sr = new StringWriter(); sr.append("<@renderLookupField "); @@ -2015,6 +2054,8 @@ public class MacroFormRenderer implement sr.append(lookupPosition); sr.append("\" fadeBackground=\""); sr.append(fadeBackground); + sr.append("\" clearText=\""); + sr.append(clearText); sr.append("\" />"); executeMacro(sr.toString()); @@ -2392,12 +2433,11 @@ public class MacroFormRenderer implement public void renderImageField(Appendable writer, Map<String, Object> context, ImageField imageField) throws IOException { ModelFormField modelFormField = imageField.getModelFormField(); - String border = Integer.toString(imageField.getBorder()); String value = modelFormField.getEntry(context, imageField.getValue(context)); String width = ""; String height = ""; - String description = imageField.getDescription(); - String alternate = imageField.getAlternate(); + String description = imageField.getDescription(context); + String alternate = imageField.getAlternate(context); if(UtilValidate.isEmpty(description)){ description = imageField.getModelFormField().getTitle(context); @@ -2427,11 +2467,11 @@ public class MacroFormRenderer implement sr.append(" value=\""); sr.append(value); sr.append("\" description=\""); - sr.append(description); + sr.append(encode(description, modelFormField, context)); sr.append("\" alternate=\""); sr.append(alternate); sr.append("\" border=\""); - sr.append(border); + sr.append(encode(alternate, modelFormField, context)); sr.append("\" width=\""); sr.append(width); sr.append("\" height=\""); @@ -2597,43 +2637,6 @@ public class MacroFormRenderer implement executeMacro(sr.toString()); } } - public void renderHyperlinkTitle(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String titleText) throws IOException { - if (UtilValidate.isNotEmpty(modelFormField.getHeaderLink())) { - StringBuilder targetBuffer = new StringBuilder(); - FlexibleStringExpander target = FlexibleStringExpander.getInstance(modelFormField.getHeaderLink()); - String fullTarget = target.expandString(context); - targetBuffer.append(fullTarget); - String targetType = HyperlinkField.DEFAULT_TARGET_TYPE; - if (UtilValidate.isNotEmpty(targetBuffer.toString()) && targetBuffer.toString().toLowerCase().startsWith("javascript:")) { - targetType="plain"; - } - StringWriter sr = new StringWriter(); - makeHyperlinkString(sr, modelFormField.getHeaderLinkStyle(), targetType, targetBuffer.toString(), null, titleText, "", modelFormField, this.request, this.response, context, ""); - - String title = sr.toString().replace("\"", "\'"); - sr = new StringWriter(); - sr.append("<@renderHyperlinkTitle "); - sr.append(" name=\""); - sr.append(modelFormField.getModelForm().getName()); - sr.append("\" title=\""); - sr.append(title); - sr.append("\" />"); - executeMacro(sr.toString()); - } else if (modelFormField.isSortField() && !"text/csv".equals(this.getContentType()) && !"application/pdf".equals(this.getContentType())) { - renderSortField (writer, context, modelFormField, titleText); - } else if (modelFormField.isRowSubmit()) { - StringWriter sr = new StringWriter(); - sr.append("<@renderHyperlinkTitle "); - sr.append(" name=\""); - sr.append(modelFormField.getModelForm().getName()); - sr.append("\" title=\""); - sr.append(titleText); - sr.append("\" showSelectAll=\"Y\"/>"); - executeMacro(sr.toString()); - } else { - writer.append(titleText); - } - } public void renderSortField(Appendable writer, Map<String, Object> context, ModelFormField modelFormField, String titleText) throws IOException { boolean ajaxEnabled = false; @@ -2770,7 +2773,7 @@ public class MacroFormRenderer implement StringWriter sr = new StringWriter(); sr.append("<@renderTooltip "); sr.append("tooltip=\""); - sr.append(tooltip); + sr.append(FreeMarkerWorker.encodeDoubleQuotes(tooltip)); sr.append("\" tooltipStyle=\""); sr.append(modelFormField.getTooltipStyle()); sr.append("\" />"); @@ -2850,6 +2853,7 @@ public class MacroFormRenderer implement String event = ""; String action = ""; String imgSrc = ""; + String alt = ""; String hiddenFormName = WidgetWorker.makeLinkHiddenFormName(context, modelFormField); if (UtilValidate.isNotEmpty(modelFormField.getEvent()) && UtilValidate.isNotEmpty(modelFormField.getAction(context))) { @@ -2859,6 +2863,7 @@ public class MacroFormRenderer implement if (UtilValidate.isNotEmpty(request.getAttribute("image"))) { imgSrc = request.getAttribute("image").toString(); + alt = request.getAttribute("alternate").toString(); } StringWriter sr = new StringWriter(); @@ -2873,6 +2878,8 @@ public class MacroFormRenderer implement sr.append(action); sr.append("\" imgSrc=\""); sr.append(imgSrc); + sr.append("\" alternate=\""); + sr.append(alt); sr.append("\" linkUrl=\""); sr.append(linkUrl.toString()); sr.append("\" targetWindow=\""); @@ -2971,12 +2978,4 @@ public class MacroFormRenderer implement sr.append("\" />"); executeMacro(sr.toString()); } - - public void setContentType(String contentType){ - this.contentType = contentType; - } - - public String getContentType(){ - return this.contentType; - } } Modified: ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original) +++ ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Wed Mar 24 09:23:07 2010 @@ -31,6 +31,9 @@ import java.util.regex.PatternSyntaxExce import javolution.util.FastList; import javolution.util.FastMap; +import groovy.lang.Binding; + +import org.codehaus.groovy.runtime.InvokerHelper; import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -49,6 +52,7 @@ import org.ofbiz.entity.finder.PrimaryKe import org.ofbiz.entity.util.EntityListIterator; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.ModelService; +import org.ofbiz.widget.WidgetWorker; import org.w3c.dom.Element; @@ -267,11 +271,15 @@ public abstract class ModelFormAction { } public static class Script extends ModelFormAction { + protected static final Object[] EMPTY_ARGS = {}; protected String location; + protected String method; public Script(ModelForm modelForm, Element scriptElement) { super (modelForm, scriptElement); - this.location = scriptElement.getAttribute("location"); + String scriptLocation = scriptElement.getAttribute("location"); + this.location = WidgetWorker.getScriptLocation(scriptLocation); + this.method = WidgetWorker.getScriptMethodName(scriptLocation); } @Override @@ -286,7 +294,12 @@ public abstract class ModelFormAction { } } else if (location.endsWith(".groovy")) { try { - GroovyUtil.runScriptAtLocation(location, context); + groovy.lang.Script script = InvokerHelper.createScript(GroovyUtil.getScriptClassFromLocation(location), new Binding(context)); + if (UtilValidate.isEmpty(method)) { + script.run(); + } else { + script.invokeMethod(method, EMPTY_ARGS); + } } catch (GeneralException e) { String errMsg = "Error running Groovy script at location [" + location + "]: " + e.toString(); Debug.logError(e, errMsg, module); Modified: ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Wed Mar 24 09:23:07 2010 @@ -1367,7 +1367,7 @@ public class ModelFormField { } public boolean isSortField() { - return this.sortField != null ? this.sortField.booleanValue() : false; + return this.sortField != null && this.sortField.booleanValue(); } /** @@ -2075,11 +2075,11 @@ public class ModelFormField { return alsoHidden; } public String getType(){ - return this.type; + return this.type; } public String getImageLocation(){ - return this.imageLocation; + return this.imageLocation; } public String getDescription(Map<String, Object> context) { @@ -2251,6 +2251,7 @@ public class ModelFormField { protected String image; protected FlexibleStringExpander target; protected FlexibleStringExpander description; + protected FlexibleStringExpander alternate; protected FlexibleStringExpander targetWindowExdr; protected List<WidgetWorker.Parameter> parameterList = FastList.newInstance(); @@ -2272,6 +2273,7 @@ public class ModelFormField { super(element, modelFormField); this.setDescription(element.getAttribute("description")); + this.setAlternate(element.getAttribute("alternate")); this.setTarget(element.getAttribute("target")); this.alsoHidden = !"false".equals(element.getAttribute("also-hidden")); this.linkType = element.getAttribute("link-type"); @@ -2337,6 +2339,10 @@ public class ModelFormField { return this.description.expandString(context); } + public String getAlternate(Map<String, Object> context) { + return this.alternate.expandString(context); + } + public String getTarget(Map<String, Object> context) { return this.target.expandString(context); } @@ -2373,6 +2379,13 @@ public class ModelFormField { /** * @param string */ + public void setAlternate(String string) { + this.alternate = FlexibleStringExpander.getInstance(string); + } + + /** + * @param string + */ public void setTarget(String string) { this.target = FlexibleStringExpander.getInstance(string); } @@ -3620,8 +3633,8 @@ public class ModelFormField { protected FlexibleStringExpander defaultValue; protected FlexibleStringExpander value; protected SubHyperlink subHyperlink; - protected String description; - protected String alternate; + protected FlexibleStringExpander description; + protected FlexibleStringExpander alternate; protected ImageField() { super(); @@ -3730,20 +3743,28 @@ public class ModelFormField { this.value = FlexibleStringExpander.getInstance(string); } - public String getDescription() { - return this.description; + public String getDescription(Map<String, Object> context) { + if (this.description != null && !this.description.isEmpty()) { + return this.description.expandString(context); + } else { + return ""; + } } - public void setDescription(String string) { - this.description = string; + public void setDescription(String description) { + this.description = FlexibleStringExpander.getInstance(description); } - public String getAlternate() { - return this.alternate; + public String getAlternate(Map<String, Object> context) { + if (this.alternate != null && !this.alternate.isEmpty()) { + return this.alternate.expandString(context); + } else { + return ""; + } } - public void setAlternate(String string) { - this.alternate = string; + public void setAlternate(String alternate) { + this.alternate = FlexibleStringExpander.getInstance(alternate); } } Modified: ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java (original) +++ ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java Wed Mar 24 09:23:07 2010 @@ -25,16 +25,22 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpSession; + import javolution.util.FastList; import javolution.util.FastMap; +import groovy.lang.Binding; +import org.codehaus.groovy.runtime.InvokerHelper; + import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.GroovyUtil; import org.ofbiz.base.util.ObjectType; -import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilFormatOut; +import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -45,10 +51,8 @@ import org.ofbiz.entity.finder.ByConditi import org.ofbiz.entity.finder.PrimaryKeyFinder; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.ModelService; - +import org.ofbiz.widget.WidgetWorker; import org.w3c.dom.Element; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; /** @@ -324,11 +328,15 @@ public abstract class ModelMenuAction { } public static class Script extends ModelMenuAction { + protected static final Object[] EMPTY_ARGS = {}; protected String location; + protected String method; public Script(ModelMenu modelMenu, Element scriptElement) { super (modelMenu, scriptElement); - this.location = scriptElement.getAttribute("location"); + String scriptLocation = scriptElement.getAttribute("location"); + this.location = WidgetWorker.getScriptLocation(scriptLocation); + this.method = WidgetWorker.getScriptMethodName(scriptLocation); } @Override @@ -343,7 +351,12 @@ public abstract class ModelMenuAction { } } else if (location.endsWith(".groovy")) { try { - GroovyUtil.runScriptAtLocation(location, context); + groovy.lang.Script script = InvokerHelper.createScript(GroovyUtil.getScriptClassFromLocation(location), new Binding(context)); + if (UtilValidate.isEmpty(method)) { + script.run(); + } else { + script.invokeMethod(method, EMPTY_ARGS); + } } catch (GeneralException e) { String errMsg = "Error running Groovy script at location [" + location + "]: " + e.toString(); Debug.logError(e, errMsg, module); Modified: ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java (original) +++ ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java Wed Mar 24 09:23:07 2010 @@ -88,7 +88,7 @@ public class MacroScreenViewHandler exte } ScreenStringRenderer screenStringRenderer = new MacroScreenRenderer(UtilProperties.getPropertyValue("widget", getName() + ".name"), UtilProperties.getPropertyValue("widget", getName() + ".screenrenderer"), writer); - FormStringRenderer formStringRenderer = new MacroFormRenderer(UtilProperties.getPropertyValue("widget", getName() + ".formrenderer"), writer, request, response, contentType); + FormStringRenderer formStringRenderer = new MacroFormRenderer(UtilProperties.getPropertyValue("widget", getName() + ".formrenderer"), writer, request, response); TreeStringRenderer treeStringRenderer = new MacroTreeRenderer(UtilProperties.getPropertyValue("widget", getName() + ".treerenderer"), writer); // TODO: uncomment these lines when the renderers are implemented //MenuStringRenderer menuStringRenderer = new MacroMenuRenderer(UtilProperties.getPropertyValue("widget", getName() + ".menurenderer"), writer); Modified: ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java (original) +++ ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java Wed Mar 24 09:23:07 2010 @@ -33,6 +33,9 @@ import javax.servlet.http.HttpSession; import javolution.util.FastList; import javolution.util.FastMap; +import groovy.lang.Binding; +import org.codehaus.groovy.runtime.InvokerHelper; + import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -58,6 +61,7 @@ import org.ofbiz.minilang.method.MethodC import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.ModelService; +import org.ofbiz.widget.WidgetWorker; import org.w3c.dom.Element; @@ -392,11 +396,15 @@ public abstract class ModelScreenAction } public static class Script extends ModelScreenAction { + protected static final Object[] EMPTY_ARGS = {}; protected String location; + protected String method; public Script(ModelScreen modelScreen, Element scriptElement) { super (modelScreen, scriptElement); - this.location = scriptElement.getAttribute("location"); + String scriptLocation = scriptElement.getAttribute("location"); + this.location = WidgetWorker.getScriptLocation(scriptLocation); + this.method = WidgetWorker.getScriptMethodName(scriptLocation); } @Override @@ -409,19 +417,22 @@ public abstract class ModelScreenAction } } else if (location.endsWith(".groovy")) { try { - GroovyUtil.runScriptAtLocation(location, context); + groovy.lang.Script script = InvokerHelper.createScript(GroovyUtil.getScriptClassFromLocation(location), new Binding(context)); + if (UtilValidate.isEmpty(method)) { + script.run(); + } else { + script.invokeMethod(method, EMPTY_ARGS); + } } catch (GeneralException e) { throw new GeneralException("Error running Groovy script at location [" + location + "]", e); } - } else if (location.contains(".xml#")) { - String xmlResource = ScreenFactory.getResourceNameFromCombined(location); - String methodName = ScreenFactory.getScreenNameFromCombined(location); + } else if (location.endsWith(".xml")) { Map<String, Object> localContext = FastMap.newInstance(); localContext.putAll(context); DispatchContext ctx = this.modelScreen.getDispatcher(context).getDispatchContext(); MethodContext methodContext = new MethodContext(ctx, localContext, null); try { - SimpleMethod.runSimpleMethod(xmlResource, methodName, methodContext); + SimpleMethod.runSimpleMethod(location, method, methodContext); context.putAll(methodContext.getResults()); } catch (MiniLangException e) { throw new GeneralException("Error running simple method at location [" + location + "]", e); Modified: ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java (original) +++ ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java Wed Mar 24 09:23:07 2010 @@ -68,7 +68,7 @@ public class ScreenFopViewHandler extend Writer writer = new StringWriter(); try { ScreenStringRenderer screenStringRenderer = new MacroScreenRenderer(UtilProperties.getPropertyValue("widget", getName() + ".name"), UtilProperties.getPropertyValue("widget", getName() + ".screenrenderer"), writer); - FormStringRenderer formStringRenderer = new MacroFormRenderer(UtilProperties.getPropertyValue("widget", getName() + ".formrenderer"), writer, request, response, contentType); + FormStringRenderer formStringRenderer = new MacroFormRenderer(UtilProperties.getPropertyValue("widget", getName() + ".formrenderer"), writer, request, response); // TODO: uncomment these lines when the renderers are implemented //TreeStringRenderer treeStringRenderer = new MacroTreeRenderer(UtilProperties.getPropertyValue("widget", getName() + ".treerenderer"), writer); //MenuStringRenderer menuStringRenderer = new MacroMenuRenderer(UtilProperties.getPropertyValue("widget", getName() + ".menurenderer"), writer); Modified: ofbiz/branches/multitenant20100310/framework/widget/templates/csvFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/templates/csvFormMacroLibrary.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/templates/csvFormMacroLibrary.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/widget/templates/csvFormMacroLibrary.ftl Wed Mar 24 09:23:07 2010 @@ -113,7 +113,7 @@ under the License. <#macro renderFieldGroupClose style id title></#macro> <#macro renderHyperlinkTitle name title showSelectAll="N"></#macro> -<#macro renderSortField style title linkUrl ajaxEnabled></#macro> +<#macro renderSortField style title linkUrl ajaxEnabled><@renderFieldTitle style title /></#macro> <#macro formatBoundaryComment boundaryType widgetType widgetName></#macro> <#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description><@renderField description /></#macro> -<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc linkUrl targetWindow description confirmation><@renderField description /></#macro> +<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc alternate linkUrl targetWindow description confirmation><@renderField description /></#macro> Modified: ofbiz/branches/multitenant20100310/framework/widget/templates/foFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/templates/foFormMacroLibrary.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/templates/foFormMacroLibrary.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/widget/templates/foFormMacroLibrary.ftl Wed Mar 24 09:23:07 2010 @@ -132,9 +132,9 @@ under the License. <#macro renderFieldGroupClose style id title></#macro> <#macro renderHyperlinkTitle name title showSelectAll="N"></#macro> -<#macro renderSortField style title linkUrl ajaxEnabled></#macro> +<#macro renderSortField style title linkUrl ajaxEnabled><@renderFieldTitle style title /></#macro> <#macro formatBoundaryComment boundaryType widgetType widgetName></#macro> <#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description><@renderField description /></#macro> -<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc linkUrl targetWindow description confirmation><@makeBlock linkStyle description /></#macro> +<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc alternate linkUrl targetWindow description confirmation><@makeBlock linkStyle description /></#macro> <#macro renderTooltip tooltip tooltipStyle></#macro> <#macro renderAsterisks requiredField requiredStyle></#macro> Modified: ofbiz/branches/multitenant20100310/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Mar 24 09:23:07 2010 @@ -32,7 +32,7 @@ under the License. </#if> <#if description?has_content> - ${description?replace("\n", "<br/>")}<#t/> + ${description?replace("\n", "<br />")}<#t/> <#else> <#t/> </#if> @@ -417,7 +417,7 @@ ${item.description}</div> <#if titleStyle?has_content> </span><#rt/> </#if> -<br/><#rt/> +<br /><#rt/> <input type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/> <#if titleStyle?has_content> <span class="${titleStyle}" ><#rt/> @@ -431,7 +431,7 @@ ${item.description}</div> </#if> </#macro> -<#macro renderLookupField className="" alert="" name="" value="" size="20" maxlength="20" id="" event="" action="" disabled="" autocomplete="" descriptionFieldName="" formName="" lookupFieldFormName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled="" lookupPresentation="" lookupWidth="20" lookupHeight="20" lookupPosition="20" fadeBackground=""> +<#macro renderLookupField className="" alert="" name="" value="" size="20" maxlength="20" id="" event="" action="" disabled="" autocomplete="" descriptionFieldName="" formName="" lookupFieldFormName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled="" lookupPresentation="" lookupWidth="20" lookupHeight="20" lookupPosition="20" fadeBackground="" clearText=""> <div class="field-lookup"><ul> <#if size?has_content && size="0"><li><input type="hidden" <#if name?has_content> name="${name}"/></#if></li><#else><li><input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if disabled?has_content && disabled> disabled="disabled"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></li></#if> <li><#if lookupPresentation?has_content && descriptionFieldName?has_content && lookupPresentation == "layer"> @@ -451,6 +451,7 @@ ${item.description}</div> );"> <#if ajaxEnabled?has_content && ajaxEnabled><span id="${id}_indicator" style="display: none" class="indicator"><img /></span></#if> </a></li><#rt> +<#if disabled?has_content && disabled><li><a id="${id}_clear" style="background:none;margin-left:-6px;margin-right:15px;" class="clearField" href="javascript:void();" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></li></#if> </ul></div> <#if ajaxEnabled?has_content && ajaxEnabled> <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}');</script><#t/> @@ -478,7 +479,7 @@ ${item.description}</div> </#list> </select> ${paginateViewSizeLabel}</li></#if> <li class="nav-displaying">${commonDisplaying}</li> -</ul></div><br/> +</ul></div><br /> </#if> </#macro> @@ -510,7 +511,7 @@ ${item.description}</div> <#macro renderFieldGroupClose style id title><#if style?has_content || id?has_content || title?has_content></div></div></#if></#macro> -<#macro renderHyperlinkTitle name title showSelectAll="N"><#if title?has_content>${title}<br/></#if><#if showSelectAll="Y"><input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${name}');"/></#if></#macro> +<#macro renderHyperlinkTitle name title showSelectAll="N"><#if title?has_content>${title}<br /></#if><#if showSelectAll="Y"><input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${name}');"/></#if></#macro> <#macro renderSortField style title linkUrl ajaxEnabled><a<#if style?has_content> class="${style}"</#if> href="<#if ajaxEnabled?has_content && ajaxEnabled>javascript:ajaxUpdateAreas('${linkUrl}')<#else>${linkUrl}</#if>">${title}</a></#macro> <#macro formatBoundaryComment boundaryType widgetType widgetName><!-- ${boundaryType} ${widgetType} ${widgetName} --></#macro> @@ -526,4 +527,4 @@ ${item.description}</div> <#macro makeHiddenFormLinkForm actionUrl name parameters targetWindow><form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${name}"><#list parameters as parameter><input name="${parameter.name}" value="${parameter.value}" type="hidden"/></#list></form></#macro> <#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description confirmation><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="javascript:document.${hiddenFormName}.submit()"<#if action?has_content && event?has_content> ${event}="${action}"</#if><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>><#if imgSrc?has_content><img src="${imgSrc}"/></#if>${description}</a></#macro> -<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc linkUrl targetWindow description confirmation><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="${linkUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if><#if action?has_content && event?has_content> ${event}="${action}"</#if><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>><#if imgSrc?has_content><img src="${imgSrc}"/></#if>${description}</a></#macro> +<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc alternate linkUrl targetWindow description confirmation><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="${linkUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if><#if action?has_content && event?has_content> ${event}="${action}"</#if><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>><#if imgSrc?has_content><img src="${imgSrc}" alt="${alternate}"/></#if>${description}</a></#macro> Modified: ofbiz/branches/multitenant20100310/framework/widget/templates/textFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/templates/textFormMacroLibrary.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/templates/textFormMacroLibrary.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/widget/templates/textFormMacroLibrary.ftl Wed Mar 24 09:23:07 2010 @@ -113,7 +113,7 @@ under the License. <#macro renderFieldGroupClose style id title></#macro> <#macro renderHyperlinkTitle name title showSelectAll="N"></#macro> -<#macro renderSortField style title linkUrl ajaxEnabled></#macro> +<#macro renderSortField style title linkUrl ajaxEnabled><@renderFieldTitle style title /></#macro> <#macro formatBoundaryComment boundaryType widgetType widgetName></#macro> <#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description><@renderField description /></#macro> -<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc linkUrl targetWindow description><@renderField description /></#macro> \ No newline at end of file +<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc alternate linkUrl targetWindow description><@renderField description /></#macro> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/framework/widget/templates/xmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/widget/templates/xmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/multitenant20100310/framework/widget/templates/xmlFormMacroLibrary.ftl Wed Mar 24 09:23:07 2010 @@ -109,6 +109,6 @@ under the License. <#macro renderSortField style title linkUrl ajaxEnabled></#macro> <#macro formatBoundaryComment boundaryType widgetType widgetName></#macro> <#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description><@renderField description /></#macro> -<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc linkUrl targetWindow description confirmation><@renderField description /></#macro> +<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc alternate linkUrl targetWindow description confirmation><@renderField description /></#macro> <#macro renderTooltip tooltip tooltipStyle></#macro> <#macro renderAsterisks requiredField requiredStyle></#macro> Modified: ofbiz/branches/multitenant20100310/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/build.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/build.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/build.xml Wed Mar 24 09:23:07 2010 @@ -29,7 +29,7 @@ oagis/build.xml, googlebase/build.xml, ebay/build.xml, - ebaystore/build.xml, + ebaystore/build.xml, projectmgr/build.xml, ldap/build.xml, crowd/build.xml, Modified: ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/cms/BlogList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/cms/BlogList.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/cms/BlogList.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/cms/BlogList.ftl Wed Mar 24 09:23:07 2010 @@ -20,7 +20,7 @@ under the License. <#list blogList as blog> <i><b>${blog.contentName}</b></i> - <a href="ViewArticle?articleContentId=${blog.contentId}&blogContentId=${blogContentId}">[${blog.contentId}]</a><br/> + <a href="ViewArticle?articleContentId=${blog.contentId}&blogContentId=${blogContentId}">[${blog.contentId}]</a><br /> <@renderSubContentCache subContentId=blog.contentId mapKey="SUMMARY"/> - <br/><br/> + <br /><br /> </#list> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl Wed Mar 24 09:23:07 2010 @@ -18,16 +18,16 @@ under the License. --> </div> </div> -<br/> +<br /> <div align="center"> <a href="http://jigsaw.w3.org/css-validator/validator?uri=http://ofbiz.apache.org/"><img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"/></a> <a href="http://validator.w3.org/check?uri=referer"><img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!"/></a> </div> -<br/> +<br /> <div id="footer" align="center"> <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org/" class="tabletext" target="_blank">www.apache.org</a></div> </div> -<br/> +<br /> </body> </html> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml Wed Mar 24 09:23:07 2010 @@ -25,10 +25,10 @@ This screen allows the user to find prod <title>How to search products?</title> <orderedlist> <listitem><para>select products store you want to export products example : OFBiz E-Commerce [9000]</para></listitem> - <listitem><para>select catalog 'eBay Catalog'</para></listitem> - <listitem><para>select category in example you can use 'Ebay E-Commerce ... [eBay_ECom_Category]'</para></listitem> - <listitem><para>select the other condition if you want</para></listitem> - <listitem><para>Press 'Find' button at the below of page to find products</para></listitem> + <listitem><para>select catalog 'eBay Catalog'</para></listitem> + <listitem><para>select category in example you can use 'Ebay E-Commerce ... [eBay_ECom_Category]'</para></listitem> + <listitem><para>select the other condition if you want</para></listitem> + <listitem><para>Press 'Find' button at the below of page to find products</para></listitem> </orderedlist> </section> </section> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml Wed Mar 24 09:23:07 2010 @@ -29,17 +29,17 @@ This screen allows the user to create a Example product store is 'OFBiz E-Commerce Store [9000]') </para></listitem> <listitem><para>Enter 'Dev Id' (ex:f3586481-93c7-4aaf-ab87-d383d56b71b1)</para></listitem> - <listitem><para>Enter 'App Id' (ex:antwebc0f-9bf9-4829-998b-e5e8fb773ac)</para></listitem> - <listitem><para>Enter 'Cert Id' (ex:7f363bc0-11d6-489a-a54d-4a44de82f790)</para></listitem> - <listitem><para>Enter 'Token' (# token key generated from ebay account ex:AgAAAA**AQAAAA**aAAAAA**Ccn7Sg.....)</para></listitem> - <listitem><para>Enter 'Compatibility Level' (ex:635)</para></listitem> - <listitem><para>Enter 'Site Id' (ex:0=US ,15=AU)</para></listitem> - <listitem><para>Enter 'Xml Gateway Uri' (# sandbox + <listitem><para>Enter 'App Id' (ex:antwebc0f-9bf9-4829-998b-e5e8fb773ac)</para></listitem> + <listitem><para>Enter 'Cert Id' (ex:7f363bc0-11d6-489a-a54d-4a44de82f790)</para></listitem> + <listitem><para>Enter 'Token' (# token key generated from ebay account ex:AgAAAA**AQAAAA**aAAAAA**Ccn7Sg.....)</para></listitem> + <listitem><para>Enter 'Compatibility Level' (ex:635)</para></listitem> + <listitem><para>Enter 'Site Id' (ex:0=US ,15=AU)</para></listitem> + <listitem><para>Enter 'Xml Gateway Uri' (# sandbox -eBayExport.xmlGatewayUri=https://api.sandbox.ebay.com/ws/api.dll # production -eBayExport.xmlGatewayUri=https://api.ebay.com/ws/api.dll)</para></listitem> - <listitem><para>Enter 'Custom XML' </para></listitem> - <listitem><para>Enter 'Web Site' (ebay)</para></listitem> + <listitem><para>Enter 'Custom XML' </para></listitem> + <listitem><para>Enter 'Web Site' (ebay)</para></listitem> <listitem><para>Press the 'Update' button to create configurations.</para></listitem> </orderedlist> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml Wed Mar 24 09:23:07 2010 @@ -17,25 +17,25 @@ License. xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd"> <title>Ebay Features</title> - <orderedlist> - <listitem> - <para>Ebay configurations for ofbiz intregrate with ebay.</para> - </listitem> - <listitem> - <para>Setup shipping methods.</para> - </listitem> - <listitem> - <para>Export products into ebay categories.</para> - </listitem> - <listitem> - <para>Export products into ebay categories.</para> - </listitem> - <listitem> - <para>Import transactions from ebay</para> - </listitem> + <orderedlist> + <listitem> + <para>Ebay configurations for ofbiz intregrate with ebay.</para> + </listitem> + <listitem> + <para>Setup shipping methods.</para> + </listitem> + <listitem> + <para>Export products into ebay categories.</para> + </listitem> + <listitem> + <para>Export products into ebay categories.</para> + </listitem> + <listitem> + <para>Import transactions from ebay</para> + </listitem> <listitem> - <para>Import orders from ebay</para> - </listitem> - </orderedlist> + <para>Import orders from ebay</para> + </listitem> + </orderedlist> </section> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml Wed Mar 24 09:23:07 2010 @@ -21,34 +21,34 @@ <para> The default screen is for the Ebay Configurations tab is 'Find Ebay Configurations'. It is used to locate existing configurations that have been created automatically by the system or manually by the user. It can also be used to create a new configurations or edit to integration between OFBiz and eBay. </para> - <section> + <section> <title>How to find Ebay configurations?</title> <orderedlist> <listitem><para> - Select 'product store' you want to see configuration. - (Example product store is 'OFBiz E-Commerce Store [9000]') - </para></listitem> + Select 'product store' you want to see configuration. + (Example product store is 'OFBiz E-Commerce Store [9000]') + </para></listitem> <listitem><para> - Select 'web site' if known. - </para></listitem> - <listitem><para>Press the 'Search' button to view configurations.</para></listitem> - <listitem><para>Select 'Any' then Press the 'Search' button to view all configurations.</para></listitem> - </orderedlist> + Select 'web site' if known. + </para></listitem> + <listitem><para>Press the 'Search' button to view configurations.</para></listitem> + <listitem><para>Select 'Any' then Press the 'Search' button to view all configurations.</para></listitem> + </orderedlist> </section> <section> <title>Edit Ebay configurations.</title> <orderedlist> <listitem><para> - Press 'Edit' button at product store you want to edit configuration.System will show screen for edit configuration data. - </para></listitem> - </orderedlist> + Press 'Edit' button at product store you want to edit configuration.System will show screen for edit configuration data. + </para></listitem> + </orderedlist> </section> <section> <title>Delete Ebay configurations.</title> <orderedlist> <listitem><para> - Press 'Delete' button at product store you want to delete configuration. - </para></listitem> - </orderedlist> + Press 'Delete' button at product store you want to delete configuration. + </para></listitem> + </orderedlist> </section> </section> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml Wed Mar 24 09:23:07 2010 @@ -25,9 +25,9 @@ This screen allows the user to find orde <title>Section 'Search Single Transactions From eBay'.(use for select conditions to search results)</title> <orderedlist> <listitem><para>select product store ex: use 'OFBiz E-Commerce Store' because example ebay catalog link with this store.</para></listitem> - <listitem><para>enter begin time in field 'From Date Time' </para></listitem> - <listitem><para>enter end time in field 'Thru Date Time' </para></listitem> - <listitem><para>Press 'Search Single Transactions From eBay' button then system will show results from ebay site. </para></listitem> + <listitem><para>enter begin time in field 'From Date Time' </para></listitem> + <listitem><para>enter end time in field 'Thru Date Time' </para></listitem> + <listitem><para>Press 'Search Single Transactions From eBay' button then system will show results from ebay site. </para></listitem> </orderedlist> </section> <section> @@ -40,8 +40,8 @@ This screen allows the user to find orde <title>How to import single transactions from eBay?</title> <orderedlist> <listitem><para></para></listitem> - <listitem><para>Click checkbox at rows you want to import transaction in the 'Import Orders From eBay' section</para></listitem> - <listitem><para>Press 'Import Single Transactions' button then system will return the message on the screen. </para></listitem> + <listitem><para>Click checkbox at rows you want to import transaction in the 'Import Orders From eBay' section</para></listitem> + <listitem><para>Press 'Import Single Transactions' button then system will return the message on the screen. </para></listitem> </orderedlist> </section> </section> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml Wed Mar 24 09:23:07 2010 @@ -21,22 +21,22 @@ <para> This screen allows the user to setup properties of products for the start auction on ebay, And allows the user to export product to the ebay site. On the 'Export Products to eBay' section have many fields to use for start auction listing(products) on the ebay site. </para> - <section> - <title>Fields Description : </title> - <orderedlist> - <listitem><para>eBay Category : Ofbiz retrieve this field from ebay categories and threre are several levels. You may need to select several time to get your categories for example : Your product is in "Drawing" category but the category is lower level of "Art" and ".......". So you need to select "Art" first and .... and "Drawing" to get the category. </para></listitem> - <listitem><para>Country : use for select country you want to show the listing on the ebay site.</para></listitem> - <listitem><para>Location : for located item location. </para></listitem> - <listitem><para>Listing Duration is a duration for auction and show the listing on ebay. </para></listitem> - <listitem><para>Start Price is a price for start auction (note : if you product have a minimum price(* Purpose is 'eBay Auction') don't need to set this field, the system will auto use the minimum price for start auctions. )</para></listitem> - <listitem><para>Quantity : Quantity of product</para></listitem> - <listitem><para>Website : </para></listitem> - <listitem><para>Web Site Url :</para></listitem> - <listitem><para>Payment Methods Accepted : This is Type of payment you want to use on the ebay.</para></listitem> - <listitem><para>PayPal email : We need it when you select payment by paypal.</para></listitem> - <listitem><para>Custom XML : It was auto generate from ebay configurations, it use for ebay know about currency, shipping method and other informations for shipping with this listing.</para></listitem> - </orderedlist> - </section> + <section> + <title>Fields Description : </title> + <orderedlist> + <listitem><para>eBay Category : Ofbiz retrieve this field from ebay categories and threre are several levels. You may need to select several time to get your categories for example : Your product is in "Drawing" category but the category is lower level of "Art" and ".......". So you need to select "Art" first and .... and "Drawing" to get the category. </para></listitem> + <listitem><para>Country : use for select country you want to show the listing on the ebay site.</para></listitem> + <listitem><para>Location : for located item location. </para></listitem> + <listitem><para>Listing Duration is a duration for auction and show the listing on ebay. </para></listitem> + <listitem><para>Start Price is a price for start auction (note : if you product have a minimum price(* Purpose is 'eBay Auction') don't need to set this field, the system will auto use the minimum price for start auctions. )</para></listitem> + <listitem><para>Quantity : Quantity of product</para></listitem> + <listitem><para>Website : </para></listitem> + <listitem><para>Web Site Url :</para></listitem> + <listitem><para>Payment Methods Accepted : This is Type of payment you want to use on the ebay.</para></listitem> + <listitem><para>PayPal email : We need it when you select payment by paypal.</para></listitem> + <listitem><para>Custom XML : It was auto generate from ebay configurations, it use for ebay know about currency, shipping method and other informations for shipping with this listing.</para></listitem> + </orderedlist> + </section> <section> <title>How to set export products?</title> <orderedlist> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml Wed Mar 24 09:23:07 2010 @@ -25,13 +25,13 @@ This screen allows the user to add shipp <title>How to add shipping methods?</title> <orderedlist> <listitem><para>Enter 'Shipment Method Name ' (ex:'LocalDelivery')</para></listitem> - <listitem><para>Select 'product store' (ex:'OFBiz E-Commerce Store [9000]')</para></listitem> - <listitem><para>Enter 'Amount' </para></listitem> - <listitem><para>Enter 'Additional Amount' (if you want )</para></listitem> - <listitem><para>Enter 'Additional Percent' (if you want )</para></listitem> - <listitem><para>Enter 'Method Type Enum Id' (ex:Flat Rate Shipping)</para></listitem> - <listitem><para>Enter 'Carrier Party Id' select from lookup (Default is UPS)</para></listitem> - <listitem><para>select 'Shipment Method Type Id' </para></listitem> + <listitem><para>Select 'product store' (ex:'OFBiz E-Commerce Store [9000]')</para></listitem> + <listitem><para>Enter 'Amount' </para></listitem> + <listitem><para>Enter 'Additional Amount' (if you want )</para></listitem> + <listitem><para>Enter 'Additional Percent' (if you want )</para></listitem> + <listitem><para>Enter 'Method Type Enum Id' (ex:Flat Rate Shipping)</para></listitem> + <listitem><para>Enter 'Carrier Party Id' select from lookup (Default is UPS)</para></listitem> + <listitem><para>select 'Shipment Method Type Id' </para></listitem> <listitem><para>Press the 'Add' button to add shipping method.</para></listitem> </orderedlist> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml Wed Mar 24 09:23:07 2010 @@ -25,9 +25,9 @@ This screen allows the user to find and <title>Section 'Search Options'.</title> <orderedlist> <listitem><para>select product store ex: use 'OFBiz E-Commerce Store' because example ebay catalog link with this store.</para></listitem> - <listitem><para>enter begin time in field 'From Date Time' </para></listitem> - <listitem><para>enter end time in field 'Thru Date Time' </para></listitem> - <listitem><para>Press 'Find' button then system will show results from ebay site. </para></listitem> + <listitem><para>enter begin time in field 'From Date Time' </para></listitem> + <listitem><para>enter end time in field 'Thru Date Time' </para></listitem> + <listitem><para>Press 'Find' button then system will show results from ebay site. </para></listitem> </orderedlist> </section> <section> @@ -40,8 +40,8 @@ This screen allows the user to find and <title>How to import order from eBay?</title> <orderedlist> <listitem><para></para></listitem> - <listitem><para>Click checkbox at rows you want to import orders in the 'Search Result' section</para></listitem> - <listitem><para>Press 'Import Orders From ebay' button then system will return the message on the screen. and you can check orders list in the 'Order' module.</para></listitem> + <listitem><para>Click checkbox at rows you want to import orders in the 'Search Result' section</para></listitem> + <listitem><para>Press 'Import Orders From ebay' button then system will return the message on the screen. and you can check orders list in the 'Order' module.</para></listitem> </orderedlist> </section> </section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |