Author: jleroux
Date: Sat Mar 27 17:50:16 2010
New Revision: 928240
URL: http://svn.apache.org/viewvc?rev=928240&view=rev
Log:
To be consistent with definitions in widget-form.xsd, change renderLookupField
attributes names prefixed by lookup to no prefixes (eg lookupPresentation
becomes presentation)
Modified:
ofbiz/trunk/applications/product/webapp/catalog/main.ftl
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/applications/product/webapp/catalog/main.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/main.ftl?rev=928240&r1=928239&r2=928240&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/main.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/main.ftl Sat Mar 27
17:50:16 2010
@@ -31,7 +31,7 @@ under the License.
<br />
<div class="label">${uiLabelMap.ProductEditCategoryWithCategoryId}:</div>
<form method="post" action="<@ofbizUrl>EditCategory</@ofbizUrl>"
style="margin: 0;" name="EditCategoryForm">
- <@formrenderer.renderLookupField name="productCategoryId"
id="productCategoryId" formName="EditCategoryForm"
lookupFieldFormName="LookupProductCategory"/>
+ <@formrenderer.renderLookupField name="productCategoryId"
id="productCategoryId" formName="EditCategoryForm"
fieldFormName="LookupProductCategory" presentation="layer" position="center"/>
<input type="submit" value="${uiLabelMap.ProductEditCategory}"
class="smallSubmit"/>
</form>
<br />
@@ -39,7 +39,7 @@ under the License.
<br />
<div class="label">${uiLabelMap.ProductEditProductWithProductId}:</div>
<form method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>"
style="margin: 0;" name="EditProductForm">
- <@formrenderer.renderLookupField name="productId" id="productId"
formName="EditProductForm" lookupFieldFormName="LookupProduct"/>
+ <@formrenderer.renderLookupField name="productId" id="productId"
formName="EditProductForm" fieldFormName="LookupProduct"/>
<input type="submit" value=" ${uiLabelMap.ProductEditProduct}"
class="smallSubmit"/>
</form>
<br />
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=928240&r1=928239&r2=928240&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
Sat Mar 27 17:50:16 2010
@@ -2034,7 +2034,7 @@ public class MacroFormRenderer implement
sr.append(descriptionFieldName);
sr.append("\" formName=\"");
sr.append(formName);
- sr.append("\" lookupFieldFormName=\"");
+ sr.append("\" fieldFormName=\"");
sr.append(lookupFieldFormName);
sr.append("\" targetParameterIter=");
sr.append(targetParameterIter.toString());
@@ -2044,13 +2044,13 @@ public class MacroFormRenderer implement
sr.append(ajaxUrl);
sr.append("\" ajaxEnabled=");
sr.append(Boolean.toString(ajaxEnabled));
- sr.append(" lookupPresentation=\"");
+ sr.append(" presentation=\"");
sr.append(lookupPresentation);
- sr.append("\" lookupHeight=\"");
+ sr.append("\" height=\"");
sr.append(lookupHeight);
- sr.append("\" lookupWidth=\"");
+ sr.append("\" width=\"");
sr.append(lookupWidth);
- sr.append("\" lookupPosition=\"");
+ sr.append("\" position=\"");
sr.append(lookupPosition);
sr.append("\" fadeBackground=\"");
sr.append(fadeBackground);
Modified: ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl?rev=928240&r1=928239&r2=928240&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl Sat Mar 27
17:50:16 2010
@@ -103,7 +103,7 @@ under the License.
<@renderField value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth
lookupHeight lookupPosition fadeBackground></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete><@renderField value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete></#macro>
Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=928240&r1=928239&r2=928240&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Sat Mar 27
17:50:16 2010
@@ -122,7 +122,7 @@ under the License.
<@makeBlock className value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth
lookupHeight lookupPosition fadeBackground></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete><@makeBlock className value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete><@makeBlock className "" /></#macro>
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=928240&r1=928239&r2=928240&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Mar 27
17:50:16 2010
@@ -431,17 +431,17 @@ ${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="" clearText="">
+<#macro renderLookupField className="" alert="" name="" value="" size="20"
maxlength="20" id="" event="" action="" disabled="" autocomplete=""
descriptionFieldName="" formName="" fieldFormName="" targetParameterIter=""
imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="" width="20" height="20"
position="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">
- <a
href="javascript:call_fieldlookupLayer3(document.${formName?html}.${name?html},
document.${formName?html}.${descriptionFieldName},'${lookupFieldFormName}','${lookupWidth}','${lookupHeight}','${lookupPosition}',
'${fadeBackground}'<#rt/>
-<#elseif lookupPresentation?has_content && lookupPresentation == "layer">
- <a
href="javascript:call_fieldlookupLayer(document.${formName?html}.${name?html},'${lookupFieldFormName}','${lookupWidth}','${lookupHeight}','${lookupPosition}',
'${fadeBackground}'<#rt/>
+<li><#if presentation?has_content && descriptionFieldName?has_content &&
presentation == "layer">
+ <a
href="javascript:call_fieldlookupLayer3(document.${formName?html}.${name?html},
document.${formName?html}.${descriptionFieldName},'${fieldFormName}','${width}','${height}','${position}',
'${fadeBackground}'<#rt/>
+<#elseif presentation?has_content && presentation == "layer">
+ <a
href="javascript:call_fieldlookupLayer(document.${formName?html}.${name?html},'${fieldFormName}','${width}','${height}','${position}',
'${fadeBackground}'<#rt/>
<#elseif descriptionFieldName?has_content>
- <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},
document.${formName?html}.${descriptionFieldName},'${lookupFieldFormName}'<#rt/>
+ <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},
document.${formName?html}.${descriptionFieldName},'${fieldFormName}'<#rt/>
<#else>
- <a
href="javascript:call_fieldlookup2(document.${formName}.${name},'${lookupFieldFormName}'<#rt/>
+ <a
href="javascript:call_fieldlookup2(document.${formName}.${name},'${fieldFormName}'<#rt/>
</#if>
<#if targetParameterIter?has_content>
<#list targetParameterIter as item>
Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=928240&r1=928239&r2=928240&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Sat Mar 27
17:50:16 2010
@@ -103,7 +103,7 @@ under the License.
<@renderField value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth
lookupHeight lookupPosition fadeBackground><@renderField value /></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground><@renderField value /></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete><@renderField value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete></#macro>
Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=928240&r1=928239&r2=928240&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Sat Mar 27
17:50:16 2010
@@ -96,7 +96,7 @@ under the License.
<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
</#macro>
-<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled lookupPresentation lookupWidth
lookupHeight lookupPosition fadeBackground></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action disabled autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete></#macro>
