svn commit: r1369563 - in /ofbiz/branches/release11.04: ./ framework/widget/templates/htmlFormMacroLibrary.ftl

Author: jleroux
Date: Sun Aug  5 11:53:59 2012
New Revision: 1369563

URL: http://svn.apache.org/viewvc?rev=1369563&view=rev
Log:
"Applied fix from trunk for revision: 1369561  " (conflict handled by hand)
------------------------------------------------------------------------
r1369561 | jleroux | 2012-08-05 13:48:44 +0200 (dim., 05 août 2012) | 5 lines

renderLookupField macro comments improvement
Simple formatting (tabs to 2 spaces)
Fixes a bug which prevented to show an i18n "clear" text when layered lookups were used in read only mode from FTL templates
Fixes a bug which prevented to clear the description (at right of button) when layered lookups were used in read only mode

------------------------------------------------------------------------

Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1369561

Modified: ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1369563&r1=1369562&r2=1369563&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Aug  5 11:53:59 2012
@@ -611,7 +611,17 @@ ${item.description}</span>
         });
     </script>
 </#if>
-<#if readonly?has_content && readonly><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void(0);" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if>
+<#if readonly?has_content && readonly>
+  <a id="${id}_clear"
+      style="background:none;margin-left:5px;margin-right:15px;"
+      class="clearField"
+      href="javascript:void(0);"
+      onclick="javascript:document.${formName}.${name}.value='';
+              jQuery('#' + jQuery('#${id}_clear').next().attr('id').replace('_button','') + '_${id}_lookupDescription').html('');
+              <#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">
+      <#if clearText?has_content>${clearText}<#else>${uiLabelMap.CommonClear}</#if>
+  </a>
+</#if>
 </span>
 <#if ajaxEnabled?has_content && ajaxEnabled && (presentation?has_content && presentation == "window")>
       <#if ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0>