svn commit: r759871 [2/2] - in /ofbiz/trunk/framework/widget: src/org/ofbiz/widget/form/ src/org/ofbiz/widget/html/ src/org/ofbiz/widget/screen/ templates/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r759871 [2/2] - in /ofbiz/trunk/framework/widget: src/org/ofbiz/widget/form/ src/org/ofbiz/widget/html/ src/org/ofbiz/widget/screen/ templates/

jacopoc
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=759871&r1=759870&r2=759871&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Mar 30 08:32:37 2009
@@ -20,7 +20,7 @@
 <#macro renderField text><#if text?exists>${text}</#if></#macro>
 
 <#macro renderDisplayField idName description class alert>
-<#if class?has_content || alert=="true"><span class="<#if class?has_content>${class}<#if alert=="true"> alert</#if>"</#if>><#rt/></#if>
+<#if class?has_content || alert=="true"><span <@renderClass className alert />><#rt/></#if>
 <#if description?has_content>${description}<#else>&nbsp;</#if><#if class?has_content || alert=="true"></span></#if>
 </#macro>
 <#macro renderHyperlinkField></#macro>
@@ -55,7 +55,7 @@
 <#else>
  <a href="javascript:call_cal(document.<#rt/>
 </#if>
-${formName}.<#if timeDropdownParamName?has_content>${timeDropdownParamName},'</#if><#if defaultDateTimeString?has_content>${defaultDateTimeString},');"></#if><#rt/>
+${formName}.<#if timeDropdownParamName?has_content>${timeDropdownParamName}</#if><#if defaultDateTimeString?has_content>,'${defaultDateTimeString}'</#if>);"><#rt/>
 <#if calGif?has_content><img src="${calGif}" width="16" height="16" border="0" alt="<#if localizedIconTitle?has_content>${localizedIconTitle}</#if>" title="<#if localizedIconTitle?has_content>${localizedIconTitle}</#if>"/><#rt/></#if>
 </a><#rt/>
 </#if>
@@ -88,8 +88,14 @@
 </#if>
 </#macro>
 
-<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize>
-<select name="${name?default("")}" <@renderClass className alert /><#if id?has_content> id="${id}"</#if><#if multiple?has_content> multiple="multiple"</#if><#if otherFieldSize?has_content> onchange="process_choice(this,document.${formName}.${otherFieldName})"</#if><#if event?has_content> ${event}="${action}"</#if><#if size?has_content> size="${size}"</#if>>
+<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch>
+<#if ajaxEnabled><input type="text"<#else><select</#if> name="${name?default("")}<#rt/>
+<#if ajaxEnabled>
+_description"<#if id?has_content> id="${id}_description"</#if><#if currentValue?has_content> value="${explicitDescription}"</#if>/><#rt/>
+<input type="hidden" name="${name}"<#if id?has_content> id="${id}"</#if><#if currentValue?has_content> value="${currentValue}"</#if>/><#rt/>
+<script language="JavaScript" type="text/javascript">var data = {${ajaxOptions}};ajaxAutoCompleteDropDown('<#if id?has_content>${id}_description</#if>','${id}',data,{autoSelect:${autoSelect},frequency:${frequency},minChars:${minChars},choices:${choices},partialSearch:${partialSearch},partialChars:${partialChars},ignoreCase:${ignoreCase},fullSearch:${fullSearch});</script>
+<#else>
+" <@renderClass className alert /><#if id?has_content> id="${id}"</#if><#if multiple?has_content> multiple="multiple"</#if><#if otherFieldSize gt 0> onchange="process_choice(this,document.${formName}.${otherFieldName})"</#if><#if event?has_content> ${event}="${action}"</#if><#if size?has_content> size="${size}"</#if>>
 <#if firstInList?has_content && currentValue?has_content>
  <option selected="selected" value="${currentValue}">${explicitDescription}</option><#rt/>
  <option value="${currentValue}">---</option><#rt/>
@@ -112,6 +118,7 @@
    document.${formName}.${fieldName}.style.visibility  = 'hidden';
 //--></script>
 </#if>
+</#if>
 </#macro>
 
 <#macro renderCheckField items className alert allChecked currentValue name event action>
@@ -133,9 +140,9 @@
 <#if buttonType=="text-link">
  <a <@renderClass className alert /> href="javascript:document.${formName}.submit()"><#if title?has_content> title="${title}"</#if> </a>
 <#elseif buttonType=="image">
- <input type="image" src="${imgSrc}" <#if className?has_content> class="${className}</#if><#if alert?has_content> ${alert}</#if>"<#if name?has_content> name="${name}"</#if><#if title?has_content> alt="${title}"</#if><#if event?has_content> ${event}="${action}"</#if> />
+ <input type="image" src="${imgSrc}" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if title?has_content> alt="${title}"</#if><#if event?has_content> ${event}="${action}"</#if> />
 <#else>
-<input type="submit" <#if className?has_content> class="${className}</#if><#if alert?has_content> ${alert}</#if>"<#if name?exists> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if> /></#if>
+<input type="submit" <@renderClass className alert /><#if name?exists> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if> /></#if>
 </#macro>
 <#macro renderResetField className alert name title><input type="reset" <@renderClass className alert /> name="${name}"<#if title?has_content> value="${title}"</#if>/></#macro>
 
@@ -145,7 +152,7 @@
 <#macro renderFieldTitle style title><#if style?has_content><span class="${style}></#if>${title}<#if style?has_content></span></#if></#macro>
 <#macro renderSingleFormFieldTitle></#macro>
     
-<#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit><form method="post" action="${linkUrl}"<#if formType=="upload"> enctype="multipart/form-data"</#if><#if targetWindow?has_content> target="${targetWindow}"</#if><#if containerId?has_content> id="${containerId}"</#if> class=<#if containerStyle?has_content>"${containerStyle}"<#else>"basic-form"</#if> onSubmit="javascript:submitFormDisableSubmits(this)"<#if autocomplete?has_content> autocomplete="${autocomplete}"</#if> name="${name}" <#if useRowSubmit?has_content && useRowSubmit><input type="hidden" name="_useRowSubmit" value="Y"/></#if>></#macro>
+<#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit><form method="post" action="${linkUrl}"<#if formType=="upload"> enctype="multipart/form-data"</#if><#if targetWindow?has_content> target="${targetWindow}"</#if><#if containerId?has_content> id="${containerId}"</#if> class=<#if containerStyle?has_content>"${containerStyle}"<#else>"basic-form"</#if> onSubmit="javascript:submitFormDisableSubmits(this)"<#if autocomplete?has_content> autocomplete="${autocomplete}"</#if> name="${name}" ><#if useRowSubmit?has_content && useRowSubmit><input type="hidden" name="_useRowSubmit" value="Y"/></#if></#macro>
 <#macro renderFormClose focusFieldName formName></form><#if focusFieldName?has_content><script language="JavaScript" type="text/javascript">document.${formName}.${focusFieldName}.focus();</script></#if></#macro>
 <#macro renderMultiFormClose></#macro>
     
@@ -154,7 +161,7 @@
 
 <#macro renderFormatHeaderRowOpen style>  <tr class="<#if style?has_content>${style}<#else>header-row</#if>"></#macro>
 <#macro renderFormatHeaderRowClose>  </tr></#macro>
-<#macro renderFormatHeaderRowCellOpen style positionSpan>  <td <#if positionSpan?has_content && positionSpan gt 1 >colspan="${positionSpan}"</#if><#if style?has_content>class="${style}"</#if></#macro>
+<#macro renderFormatHeaderRowCellOpen style positionSpan>  <td <#if positionSpan?has_content && positionSpan gt 1 >colspan="${positionSpan}"</#if><#if style?has_content>class="${style}"</#if>></#macro>
 <#macro renderFormatHeaderRowCellClose></td></#macro>
 
 <#macro renderFormatHeaderRowFormCellOpen style>   <td <#if style?has_content>class="${style}"</#if>></#macro>
@@ -163,7 +170,7 @@
     
 <#macro renderFormatItemRowOpen itemIndex altRowStyles evenRowStyle oddRowStyle> <tr <#if itemIndex?has_content><#if itemIndex%2==0><#if evenRowStyle?has_content>class="${evenRowStyle}<#if altRowStyles?has_content> ${altRowStyles}</#if>"<#elseif altRowStyles?has_content>class="${altRowStyles}"</#if><#else><#if oddRowStyle?has_content>class="${oddRowStyle}<#if altRowStyles?has_content> ${altRowStyles}</#if>"<#elseif altRowStyles?has_content>class="${altRowStyles}"</#if></#if></#if> ></#macro>
 <#macro renderFormatItemRowClose>  </tr></#macro>
-<#macro renderFormatItemRowCellOpen style positionSpan>  <td <#if positionSpan?has_content && positionSpan >1>colspan="${positionSpan}"</#if><#if style?has_content>class="${style}"</#if></#macro>
+<#macro renderFormatItemRowCellOpen style positionSpan>  <td <#if positionSpan?has_content && positionSpan gt 1>colspan="${positionSpan}"</#if><#if style?has_content>class="${style}"</#if>></#macro>
 <#macro renderFormatItemRowCellClose>  </td></#macro>
 <#macro renderFormatItemRowFormCellOpen style>   <td<#if style?has_content> class="${style}"</#if>></#macro>
 <#macro renderFormatItemRowFormCellClose></td></#macro>
@@ -181,21 +188,159 @@
 
 <#macro renderFormatEmptySpace>&nbsp;</#macro>
 
-<#macro renderTextFindField></#macro>
-<#macro renderDateFindField></#macro>
-<#macro renderRangeFindField></#macro>
-<#macro renderLookupField></#macro>
-<#macro renderFileField></#macro>
-<#macro renderPasswordField></#macro>
-<#macro renderImageField></#macro>
-<#macro renderBanner></#macro>
-<#macro renderFieldGroupOpen></#macro>
-<#macro renderFieldGroupClose></#macro>
+<#macro renderTextFindField name value defaultOption opEquals opBeginsWith opContains opIsEmpty opNotEqual className alert size maxlength autocomplete titleStyle hideIgnoreCase ignCase ignoreCase>
+<#if opEquals?has_content>
+<select <#if name?has_content>name="${name}_op"</#if> class="selectBox"><#rt/>
+<option value="equals"<#if defaultOption=="equals"> selected</#if>>${opEquals}</option><#rt/>
+<option value="like"<#if defaultOption=="like"> selected</#if>>${opBeginsWith}</option><#rt/>
+<option value="contains"<#if defaultOption=="contains"> selected</#if>>${opContains}</option><#rt/>
+<option value="empty"<#rt/><#if defaultOption=="empty"> selected</#if>>${opIsEmpty}</option><#rt/>
+<option value="notEqual"<#if defaultOption=="notEqual"> selected</#if>>${opNotEqual}</option><#rt/>
+</select>
+<#else>
+<input type="hidden" name=<#if name?has_content> "${name}_op"</#if> value="${defaultOption}"/><#rt/>
+</#if>
+ <input type="text" <@renderClass className alert /> name="${name}"<#if value?has_content> value="${value}"</#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/></#if>
+<#if hideIgnoreCase>
+ <input type="hidden" name="${name}_ic" value=<#if ignCase>"Y"<#else> ""</#if>/><#rt/>
+ <#else>
+ <input type="checkbox" name="${name}_ic" value="Y" <#if ignCase> checked="checked"</#if> /> ${ignoreCase}<#rt/>
+</#if><#if titleStyle?has_content></span></#if>
+</#macro>
+
+<#macro renderDateFindField className alert name localizedInputTitle value size maxlength dateType formName defaultDateTimeString imgSrc localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan opUpToDay opUpThruDay opIsEmpty>
+<input type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
+<#if dateType != "time">
+<#if dateType == "date">
+<a href="javascript:call_cal_notime(document.<#rt/>
+<#else>
+<a href="javascript:call_cal(document.<#rt/>
+</#if>
+<#if formName?has_content>${formName}.</#if><#if name?has_content>${name}_fld0_value,</#if>'<#if defaultDateTimeString?has_content>${defaultDateTimeString}</#if>');"><#rt/>
+<img src="${imgSrc}" width="16" height="16" border="0" alt="${localizedIconTitle}" title="${localizedIconTitle}" /></a><#rt/>
+</#if>
+<#if titleStyle?has_content>
+<span class="${titleStyle}"><#rt/>
+</#if>
+<select<#if name?has_content> name="${name}_fld0_op"</#if> class="selectBox"><#rt/>
+<option value="equals"<#if defaultOptionFrom=="equals"> selected</#if>>${opEquals}</option><#rt/>
+<option value="sameDay"<#if defaultOptionFrom=="sameDay"> selected</#if>>${opSameDay}</option><#rt/>
+<option value="greaterThanFromDayStart"<#if defaultOptionFrom=="greaterThanFromDayStart"> selected</#if>>${opGreaterThanFromDayStart}</option><#rt/>
+<option value="greaterThan"<#if defaultOptionFrom=="greaterThan"> selected</#if>>${opGreaterThan}</option><#rt/>
+</select><#rt/>
+<#if titleStyle?has_content>
+ </span><#rt/>
+</#if>
+<br/><#rt/>
+<input type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
+<#if dateType != "time">
+<#if dateType == "date">
+<a href="javascript:call_cal_notime(document.<#rt/>
+<#else>
+<a href="javascript:call_cal(document.<#rt/>
+</#if>
+<#if formName?has_content>${formName}.</#if><#if name?has_content>${name}_fld1_value,'</#if><#if defaultDateTimeString?has_content>${defaultDateTimeString}</#if>');"><#rt/>
+<img src="${imgSrc}" width="16" height="16" border="0" alt="${localizedIconTitle}" title="${localizedIconTitle}" /></a><#rt/>
+</#if>
+<#if titleStyle?has_content>
+ <span class="${titleStyle}"><#rt/>
+</#if>
+<select name=<#if name?has_content>"${name}_fld1_op"</#if> class="selectBox"><#rt/>
+<option value="opLessThan"<#if defaultOptionThru=="opLessThan"> selected</#if>>${opLessThan}</option><#rt/>
+<option value="upToDay"<#if defaultOptionThru=="upToDay"> selected</#if>>${opUpToDay}</option><#rt/>
+<option value="upThruDay"<#if defaultOptionThru=="upThruDay"> selected</#if>>${opUpThruDay}</option><#rt/>
+<option value="empty"<#if defaultOptionFrom=="empty"> selected</#if>>${opIsEmpty}</option><#rt/>
+</select><#rt/>
+<#if titleStyle?has_content>
+</span>
+</#if>
+</#macro>
+
+<#macro renderRangeFindField className alert name value size maxlength autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan opGreaterThanEquals value2 defaultOptionThru>
+<input type="text" <@renderClass className alert /> <#if name?has_content>name="${name}_fld0_value"</#if><#if value?has_content> value="${value}"</#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/>
+</#if>
+<select <#if name?has_content>name="${name}_fld0_op"</#if> class="selectBox"><#rt/>
+<option value="equals"<#if defaultOptionFrom=="equals"> selected</#if>>${opEquals}</option><#rt/>
+<option value="greaterThan"<#if defaultOptionFrom=="greaterThan"> selected</#if>>${opGreaterThan}</option><#rt/>
+<option value="greaterThanEqualTo"<#if defaultOptionFrom=="greaterThanEqualTo"> selected</#if>>${opGreaterThanEquals}</option><#rt/>
+</select><#rt/>
+<#if titleStyle?has_content>
+</span><#rt/>
+</#if>
+<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/>
+</#if>
+<select name=<#if name?has_content>"${name}_fld1_op"</#if> class="selectBox"><#rt/>
+<option value="lessThan"<#if defaultOptionThru=="lessThan"> selected</#if>>${rp.opLessThan?html}</option><#rt/>
+<option value="lessThanEqualTo"<#if defaultOptionThru=="lessThanEqualTo"> selected</#if>>${rp.opLessThanEquals?html}</option><#rt/>
+</select><#rt/>
+<#if titleStyle?has_content>
+ </span>
+</#if>
+</#macro>
+
+<#macro renderLookupField className alert name value size maxlength autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc>
+<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 autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
+<#if descriptionFieldName?has_content>
+ <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},'${descriptionFieldName}',<#rt/>
+ <#else>
+ <a href="javascript:call_fieldlookup2(document.${formName}.${name},<#rt/>
+</#if>'${lookupFieldFormName}'<#rt>
+<#if targetParameterIter?exists>
+ <#list targetParameterIter as item>
+  ,document.${formName}.${item}.value<#rt>
+ </#list>
+</#if>
+);"><#rt>
+<img src="${imgSrc}"width="15" height="14" border="0" alt="Lookup"/></a><#rt>
+</#macro>
+<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel>
+<div class="${paginateStyle}">&nbsp; <ul>&nbsp;
+<li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled">${paginateFirstLabel}</#if></li>
+<li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled">${paginatePreviousLabel}</#if></li>
+<#if listSize gt 0 && javaScriptEnabled><li>${pageLabel}<select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/>
+<#assign x=listSize/viewSize>
+<#if listSize gt (viewIndex*viewSize)><#assign x=x+1></#if>
+<#list 1..x as i>
+<#if i == (viewIndex+1)><option selected value="<#else><option value="</#if>${i-1}">${i}</option>
+</#list>
+</select></li><li>${commonDisplaying}</li>
+</#if>
+<li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxNextUrl}')<#else>${nextUrl}</#if>">${paginateNextLabel}</a><#else>-disabled">${paginateNextLabel}</#if></li>
+<li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxLastUrl}')<#else>${lastUrl}</#if>">${paginateLastLabel}</a><#else>-disabled">${paginateLastLabel}</#if></li>
+</ul></div>
+</#macro>
+<#macro renderFileField className alert name value size maxlength autocomplete><input type="file" <@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 autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#macro>
+<#macro renderPasswordField className alert name value size maxlength id autocomplete><input type="password" <@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><#if autocomplete?has_content> autocomplete="off"</#if>/></#macro>
+<#macro renderImageFiel value border width height event action><img<#if value?has_content> src="${value}"</#if><#if border?has_content> border="${border}"</#if><#if width?has_content> width="${width}"</#if><#if height?has_content> height="${height}"</#if><#if event?has_content> ${rp.event?html}="${action}" </#if>/></#macro>
+<#macro renderBanner style leftStyle rightStyle leftText text rightText>
+<table width="100%">  <tr><#rt/>
+<#if leftText?has_content><td align="left"><#if leftStyle?has_content><div class="${leftStyle}"></#if>${leftText}<#if leftStyle?has_content></div></#if></td><#rt/></#if>
+<#if text?has_content><td align="center"><#if style?has_content><div class="${style}"></#if>${text}<#if style?has_content></div></#if></td><#rt/></#if>
+<#if rightText?has_content><td align="right"><#if rightStyle?has_content><div class="${rightStyle}"></#if>${rightText}<#if rightStyle?has_content></div></#if></td><#rt/></#if>
+</tr> </table>
+</#macro>
+<#macro renderFieldGroupOpen style id title collapsed collapsibleAreaId collapsible expandToolTip collapseToolTip>
+<#if style?has_content || id?has_content || title?has_content>
+ <div class="fieldgroup<#if style?has_content> ${style}</#if>"<#if id?has_content> id="${id}"</#if>><div class="fieldgroup-title-bar"><table><tr><td class="collapse"><#rt/>
+ <#if collapsible><ul><li class="<#if collapsed>collapsed"><a onclick="javascript:toggleCollapsiblePanel(this, '${collapsibleAreaId}', '${expandToolTip}', '${collapseToolTip}');"<#else>expanded"><a onclick="javascript:toggleCollapsiblePanel(this, '${collapsibleAreaId}', '${expandToolTip}', '${collapseToolTip}');"</#if>>&nbsp&nbsp&nbsp</a></li></ul></#if></td><td><#rt/>
+ <#if title?has_content><div class="title">${title}</div></#if></td></tr></table></div><div id="${collapsibleAreaId}" class="fieldgroup-body" <#if collapsed && collapsible> style="display: none;"</#if>>
+</#if>
+</#macro>
+<#macro renderFieldGroupClose style id title><#if style?has_content || id?has_content || title?has_content></div></div></#if></#macro>
 
 <#macro renderHyperlinkTitle name title><#if title?has_content>${title}<br/></#if><input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${name}');"/></#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>
 
-<#macro renderTooltip tooltip tooltipStyle><#if tooltip?has_content><span class="<#if tooltipStyle?exists>${tooltipStyle}<#else>tooltip</#if>">${tooltip}</span><#rt/></#if></#macro>
-<#macro renderClass className alert><#if className?has_content>class="${className}</#if><#if alert?exists> ${alert}</#if><#if className?exists>"<#rt/></#if></#macro>
-<#macro renderAsterisks requiredField requiredStyle><#if requiredField=="true"><#if requiredStyle?has_content>*</#if></#if></#macro>
\ No newline at end of file
+<#macro renderTooltip tooltip tooltipStyle><#if tooltip?has_content><span class="<#if tooltipStyle?has_content>${tooltipStyle}<#else>tooltip</#if>">${tooltip}</span><#rt/></#if></#macro>
+<#macro renderClass className alert><#if className?has_content>class="${className}<#if alert?has_content> ${alert}</#if>"<#rt/></#if></#macro>
+<#macro renderAsterisks requiredField requiredStyle><#if requiredField=="true"><#if requiredStyle?has_content>*</#if></#if></#macro>
+<#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><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="javascript:document.${hiddenFormName}.submit()"<#if action?has_content && event?has_content> ${event}="${action}"</#if>><#if imgSrc?has_content><img src="${imgSrc}"/></#if>${description}</a></#macro>
+<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc linkUrl targetWindow description><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 imgSrc?has_content><img src="${imgSrc}"/></#if>${description}</a></#macro>
\ No newline at end of file

Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=759871&r1=759870&r2=759871&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Mon Mar 30 08:32:37 2009
@@ -19,70 +19,90 @@
 
 <#macro renderField text><#if text?exists>${text}</#if></#macro>
 
-<#macro renderDisplayField></#macro>
+<#macro renderDisplayField idName description class alert><@renderField description /></#macro>
 <#macro renderHyperlinkField></#macro>
 
-<#macro renderTextField></#macro>
-<#macro renderTextareaField></#macro>
-<#macro renderDateTimeField></#macro>
-
-<#macro renderDropDownField></#macro>
-<#macro renderCheckField></#macro>
-<#macro renderRadioField></#macro>
+<#macro renderTextField name className alert value textSize maxlength id event action clientAutocomplete ajaxUrl ajaxEnabled><@renderField value /></#macro>
 
-<#macro renderSubmitField></#macro>
-<#macro renderResetField></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble buttons><@renderField value /></#macro>
 
-<#macro renderHiddenField></#macro>
-<#macro renderHiddenField></#macro>
+<#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString calGif localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value /></#macro>
+
+<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch>
+<#if currentValue?has_content && firstInList?has_content>
+<@renderField explicitDescription />
+<#else>
+<#list options as item>
+<@renderField item.description />
+</#list>
+</#if>
+</#macro>
+
+<#macro renderCheckField items className alert allChecked currentValue name event action></#macro>
+<#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event ation></#macro>
+
+<#macro renderSubmitField buttonType className alert formName title name event action imgSrc></#macro>
+<#macro renderResetField className alert name title></#macro>
+
+<#macro renderHiddenField name value></#macro>
 <#macro renderIgnoredField></#macro>
 
-<#macro renderFieldTitle></#macro>
+<#macro renderFieldTitle style title><@renderField title /></#macro>
 <#macro renderSingleFormFieldTitle></#macro>
     
-<#macro renderFormOpen></#macro>
-<#macro renderFormClose></#macro>
+<#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit></#macro>
+<#macro renderFormClose focusFieldName formName></#macro>
 <#macro renderMultiFormClose></#macro>
     
-<#macro renderFormatListWrapperOpen formName></#macro>
-<#macro renderFormatListWrapperClose formName></#macro>
+<#macro renderFormatListWrapperOpen style></#macro>
+<#macro renderFormatListWrapperClose></#macro>
 
-<#macro renderFormatHeaderRowOpen></#macro>
-<#macro renderFormatHeaderRowClose></#macro>
-<#macro renderFormatHeaderRowCellOpen></#macro>
+<#macro renderFormatHeaderRowOpen style></#macro>
+<#macro renderFormatHeaderRowClose> </#macro>
+<#macro renderFormatHeaderRowCellOpen style positionSpan></#macro>
 <#macro renderFormatHeaderRowCellClose></#macro>
 
-<#macro renderFormatHeaderRowFormCellOpen></#macro>
+<#macro renderFormatHeaderRowFormCellOpen style> </#macro>
 <#macro renderFormatHeaderRowFormCellClose></#macro>
-<#macro renderFormatHeaderRowFormCellTitleSeparator></#macro>
+<#macro renderFormatHeaderRowFormCellTitleSeparator style isLast></#macro>
     
-<#macro renderFormatItemRowOpen formName></#macro>
-<#macro renderFormatItemRowClose formName></#macro>
-<#macro renderFormatItemRowCellOpen fieldName></#macro>
-<#macro renderFormatItemRowCellClose fieldName></#macro>
-<#macro renderFormatItemRowFormCellOpen></#macro>
+<#macro renderFormatItemRowOpen itemIndex altRowStyles evenRowStyle oddRowStyle></#macro>
+<#macro renderFormatItemRowClose></#macro>
+<#macro renderFormatItemRowCellOpen style positionSpan></#macro>
+<#macro renderFormatItemRowCellClose></#macro>
+<#macro renderFormatItemRowFormCellOpen style></#macro>
 <#macro renderFormatItemRowFormCellClose></#macro>
 
-<#macro renderFormatSingleWrapperOpen formName></#macro>
-<#macro renderFormatSingleWrapperClose formName></#macro>
+<#macro renderFormatSingleWrapperOpen style></#macro>
+<#macro renderFormatSingleWrapperClose></#macro>
 
 <#macro renderFormatFieldRowOpen></#macro>
 <#macro renderFormatFieldRowClose></#macro>
-<#macro renderFormatFieldRowTitleCellOpen></#macro>
+<#macro renderFormatFieldRowTitleCellOpen style> </#macro>
 <#macro renderFormatFieldRowTitleCellClose></#macro>
 <#macro renderFormatFieldRowSpacerCell></#macro>
-<#macro renderFormatFieldRowWidgetCellOpen></#macro>
+<#macro renderFormatFieldRowWidgetCellOpen positionSpan style></#macro>
 <#macro renderFormatFieldRowWidgetCellClose></#macro>
 
-<#macro renderFormatEmptySpace></#macro>
+<#macro renderFormatEmptySpace>&nbsp;</#macro>
+
+<#macro renderTextFindField name value defaultOption opEquals opBeginsWith opContains opIsEmpty opNotEqual className alert size maxlength autocomplete titleStyle hideIgnoreCase ignCase ignoreCase><@renderField value /></#macro>
+
+<#macro renderDateFindField className alert name localizedInputTitle value size maxlength dateType formName defaultDateTimeString imgSrc localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan opUpToDay opUpThruDay opIsEmpty><@renderField value /></#macro>
+
+<#macro renderRangeFindField className alert name value size maxlength autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan opGreaterThanEquals value2 defaultOptionThru><@renderField value /></#macro>
 
-<#macro renderTextFindField></#macro>
-<#macro renderDateFindField></#macro>
-<#macro renderRangeFindField></#macro>
-<#macro renderLookupField></#macro>
-<#macro renderFileField></#macro>
-<#macro renderPasswordField></#macro>
-<#macro renderImageField></#macro>
-<#macro renderBanner></#macro>
-<#macro renderFieldGroupOpen></#macro>
-<#macro renderFieldGroupClose></#macro>
+<#macro renderLookupField className alert name value size maxlength autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc><@renderField value /></#macro>
+<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel></#macro>
+<#macro renderFileField className alert name value size maxlength autocomplete><@renderField value /></#macro>
+<#macro renderPasswordField className alert name value size maxlength id autocomplete></#macro>
+<#macro renderImageFiel value border width height event action></#macro>
+<#macro renderBanner style leftStyle rightStyle leftText text rightText></#macro>
+<#macro renderFieldGroupOpen style id title collapsed collapsibleAreaId collapsible expandToolTip collapseToolTip></#macro>
+<#macro renderFieldGroupClose style id title></#macro>
+
+<#macro renderHyperlinkTitle name title></#macro>
+<#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><@renderField description /></#macro>
\ No newline at end of file

Modified: ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl?rev=759871&r1=759870&r2=759871&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl Mon Mar 30 08:32:37 2009
@@ -30,7 +30,7 @@
 <#macro renderSubContentEnd></#macro>
 
 <#macro renderHorizontalSeparator id style></#macro>
-<#macro renderLabel text id style><#if text?exists>${text}</#if></#macro>
+<#macro renderLabel text><#if text?exists>${text}</#if></#macro>
 <#macro renderLink></#macro>
 <#macro renderImage></#macro>
 

Modified: ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl?rev=759871&r1=759870&r2=759871&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl Mon Mar 30 08:32:37 2009
@@ -18,23 +18,77 @@
 -->
 
 <#macro renderSectionBegin></#macro>
-<#macro renderSectionEnd></#macro>
-<#macro renderContainerBegin containerId style autoUpdateLink autoUpdateInterval></#macro>
-<#macro renderContainerEnd></#macro>
-<#macro renderContentBegin></#macro>
+<#macro renderSectionEnd>
+</#macro>
+<#macro renderContainerBegin id style autoUpdateLink autoUpdateInterval>
+<#if autoUpdateLink?has_content>
+<script type="text/javascript">ajaxUpdateAreaPeriodic('${id}', '${autoUpdateLink}', '', '${autoUpdateInterval}');</script>
+</#if>
+<div<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>>
+</#macro>
+<#macro renderContainerEnd></div></#macro>
+<#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if editRequest?has_content && enableEditValue><div class=${editContainerStyle}></#if></#macro>
 <#macro renderContentBody></#macro>
-<#macro renderContentEnd></#macro>
-<#macro renderSubContentBegin></#macro>
+<#macro renderContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
+<#if editRequest?exists && enableEditValue>
+<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if>
+<#if editContainerStyle?exists></div><#rt/></#if>
+</#if>
+</#macro>
+<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?exists && enableEditValue><div class="${editContainerStyle}"></#if></#macro>
 <#macro renderSubContentBody></#macro>
-<#macro renderSubContentEnd></#macro>
+<#macro renderSubContentEnd>
+<#if editRequest?exists && enableEditValue>
+<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if>
+<#if editContainerStyle?exists></div><#rt/></#if>
+</#if>
+</#macro>
 
-<#macro renderHorizontalSeparator id style></#macro>
-<#macro renderLabel text id style><#if text?exists>${text}</#if></#macro>
-<#macro renderLink></#macro>
-<#macro renderImage></#macro>
+<#macro renderHorizontalSeparator id style><hr<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>/></#macro>
+<#macro renderLabel text id style><#if text?exists><#if id?has_content || style?has_content><span<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>></#if>${text}<#if id?has_content || style?has_content></span></#if></#if></#macro>
+<#macro renderLink parameterList targetWindow target uniqueItemName linkType actionUrl id style name linkUrl text imgStr>
+<#if "hidden-form" == linkType>
+<form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onSubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/>
+<#list parameterList as parameter>
+<input name="${parameter.name}" value="${parameter.value}" type="hidden"/><#rt/>
+</#list>
+</form><#rt/>
+</#if>
+<a <#if id?has_content>id="${id}"</#if> <#if style?has_content>class="${style}"</#if> <#if name?has_content>name="${name}"</#if> <#if targetWindow?has_content>target="${targetWindow}"</#if> href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>
+<#if image?has_content>${imgStr}<#else><#if text?has_content>${text}</#if></#if></a>
+</#macro>
+<#macro renderImage src id style wid hgt border alt urlString>
+<#if src?has_content>
+<img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if><#if alt?has_content> alt="${alt}"</#if> src="${urlString}" />
+</#if>
+</#macro>
 
-<#macro renderContentFrame></#macro>
-<#macro renderScreenletBegin id></#macro>
+<#macro renderContentFrame fullUrl width height border><iframe src="${fullUrl}" width="${width}" height="${height}" <#if border?has_content>border="${border}"</#if> /></#macro>
+<#macro renderScreenletBegin id title collapsible collapsibleAreaId expandToolTip collapseToolTip fullUrlString padded menuString showMore collapsed javaScriptEnabled>
+<div class="screenlet"<#if id?has_content> id="${id}"</#if>><#rt/>
+<#if showMore>
+<div class="screenlet-title-bar"><ul><#if title?has_content><li class="h3">${title}</li></#if>
+<#if collapsible>
+<li class="<#rt/>
+<#if collapsed>
+collapsed"><a <#if javaScriptEnabled>onclick="javascript:toggleScreenlet(this, '${collapsibleAreaId}', '${expandToolTip}', '${collapseToolTip}');"<#else>href="${fullUrlString}"</#if><#if expandToolTip?has_content> title="${expandToolTip}"</#if>
+<#else>
+expanded"><a <#if javaScriptEnabled>onclick="javascript:toggleScreenlet(this, '${collapsibleAreaId}', '${expandToolTip}', '${collapseToolTip}');"<#else>href="${fullUrlString}"</#if><#if expandToolTip?has_content> title="${expandToolTip}"</#if>
+</#if>
+>&nbsp</a></li>
+</#if>
+<#if !collapsed>
+${menuString}
+</#if>
+</ul><br class="clear" /></div><div <#if collapsibleAreaId?has_content> id="${collapsibleAreaId}" <#if collapsed> style="${collapsed}display: none;"</#if></#if><#if padded> class="screenlet-body"</#if>>
+</#if>
+</#macro>
 <#macro renderScreenletSubWidget></#macro>
-<#macro renderScreenletEnd></#macro>
-
+<#macro renderScreenletEnd></div></div></#macro>
+<#macro renderScreenletPaginateMenu>
+<li class="${paginateLastStyle}<#if lastLinkUrl?has_content>"><a href="${lastLinkUrl}">${paginateLastLabel}</a><#else> disabled">${paginateLastLabel}</#if></li><#rt/>
+<li class="${paginateNextStyle}<#if nextLinkUrl?has_content>"><a href="${nextLinkUrl}">${paginateNextLabel}</a><#else> disabled">${paginateNextLabel}</#if></li><#rt/>
+<#if listSize>0>${lowIndex + 1}" - "${lowIndex + actualPageSize}" "${ofLabel}" "${listSize}<#rt/></#if>
+<li class="${paginatePreviousStyle}<#if previousLinkUrl?has_content>"><a href="${previousLinkUrl}">${paginatePreviousLabel}</a><#else> disabled">${paginatePreviousLabel}</#if></li><#rt/>
+<li class="${paginateFirstStyle}<#if firstLinkUrl?has_content>"><a href="${firstLinkUrl}">${paginateFirstLabel}</a><#else> disabled">${paginateFirstLabel}</#if></li>
+</#macro>
\ No newline at end of file