Author: deepak
Date: Sat Nov 19 12:04:52 2016
New Revision: 1770491
URL:
http://svn.apache.org/viewvc?rev=1770491&view=revLog:
Applied fix from trunk for revision: 1770490
===
Fixed: layered-modal hyperlink doesn't show style
(OFBIZ-7323)
Thanks Pierre Smits for reporting the issue.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/framework/widget/templates/HtmlFormMacroLibrary.ftl
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 19 12:04:52 2016
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1770481
+/ofbiz/trunk:1770481,1770490
Modified: ofbiz/branches/release16.11/framework/widget/templates/HtmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/widget/templates/HtmlFormMacroLibrary.ftl?rev=1770491&r1=1770490&r2=1770491&view=diff==============================================================================
--- ofbiz/branches/release16.11/framework/widget/templates/HtmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release16.11/framework/widget/templates/HtmlFormMacroLibrary.ftl Sat Nov 19 12:04:52 2016
@@ -873,7 +873,7 @@ Parameter: tabindex, String, optional -
<#if uniqueItemName?has_content>
<div id="${uniqueItemName}"></div>
<a href="javascript:void(0);" id="${uniqueItemName}_link"
- <#if style?has_content>class="${style}"</#if>>
+ <#if linkStyle?has_content>class="${linkStyle}"</#if>>
<#if description?has_content>${description}</#if></a>
<script type="text/javascript">
function ${uniqueItemName}_data () {