Author: jleroux
Date: Mon Oct 26 18:53:33 2015
New Revision: 1710675
URL: http://svn.apache.org/viewvc?rev=1710675&view=rev
Log:
Reverts r1710527 and r1710528 (was for OFBIZ-6354), thanks to Deepak for
warning on dev ML (BuildBot still down but infra is working on it)
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java?rev=1710675&r1=1710674&r2=1710675&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java
Mon Oct 26 18:53:33 2015
@@ -394,7 +394,6 @@ public class FormRenderer {
// ===========================
// Rendering
// ===========================
- formStringRenderer.renderFormatHeaderOpen(writer, context, modelForm);
for (Map<String, List<ModelFormField>> listsMap : fieldRowsByPosition)
{
List<ModelFormField> innerDisplayHyperlinkFieldsBegin =
listsMap.get("displayBefore");
List<ModelFormField> innerFormFields = listsMap.get("inputFields");
@@ -493,7 +492,6 @@ public class FormRenderer {
formStringRenderer.renderFormatHeaderRowClose(writer, context,
modelForm);
}
}
- formStringRenderer.renderFormatHeaderClose(writer, context, modelForm);
return maxNumOfColumns;
}
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java?rev=1710675&r1=1710674&r2=1710675&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java
Mon Oct 26 18:53:33 2015
@@ -59,8 +59,6 @@ public interface FormStringRenderer {
public void renderFormatHeaderRowOpen(Appendable writer, Map<String,
Object> context, ModelForm modelForm) throws IOException;
public void renderFormatHeaderRowClose(Appendable writer, Map<String,
Object> context, ModelForm modelForm) throws IOException;
- public void renderFormatHeaderOpen(Appendable writer, Map<String, Object>
context, ModelForm modelForm) throws IOException;
- public void renderFormatHeaderClose(Appendable writer, Map<String, Object>
context, ModelForm modelForm) throws IOException;
public void renderFormatHeaderRowCellOpen(Appendable writer, Map<String,
Object> context, ModelForm modelForm, ModelFormField modelFormField, int
positionSpan) throws IOException;
public void renderFormatHeaderRowCellClose(Appendable writer, Map<String,
Object> context, ModelForm modelForm, ModelFormField modelFormField) throws
IOException;
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java?rev=1710675&r1=1710674&r2=1710675&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java
Mon Oct 26 18:53:33 2015
@@ -1327,18 +1327,6 @@ public class HtmlFormRenderer extends Ht
}
renderEndingBoundaryComment(writer, "Form Widget - Formal List
Wrapper", modelForm);
}
-
- public void renderFormatHeaderOpen(Appendable writer, Map<String, Object>
context, ModelForm modelForm) throws IOException {
- writer.append(" <thead");
- writer.append(">");
- appendWhitespace(writer);
- }
-
- public void renderFormatHeaderClose(Appendable writer, Map<String, Object>
context, ModelForm modelForm) throws IOException {
- writer.append(" </thead");
- writer.append(">");
- appendWhitespace(writer);
- }
/* (non-Javadoc)
* @see
org.ofbiz.widget.form.FormStringRenderer#renderFormatHeaderRowOpen(java.io.Writer,
java.util.Map, org.ofbiz.widget.form.model.ModelForm)
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1710675&r1=1710674&r2=1710675&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
Mon Oct 26 18:53:33 2015
@@ -1532,20 +1532,6 @@ public final class MacroFormRenderer imp
renderEndingBoundaryComment(writer, "Grid Widget - Grid Element",
modelForm);
}
}
-
- public void renderFormatHeaderOpen(Appendable writer, Map<String, Object>
context, ModelForm modelForm) throws IOException {
- StringWriter sr = new StringWriter();
- sr.append("<@renderFormatHeaderOpen ");
- sr.append(" />");
- executeMacro(writer, sr.toString());
- }
-
- public void renderFormatHeaderClose(Appendable writer, Map<String, Object>
context, ModelForm modelForm) throws IOException {
- StringWriter sr = new StringWriter();
- sr.append("<@renderFormatHeaderClose");
- sr.append(" />");
- executeMacro(writer, sr.toString());
- }
public void renderFormatHeaderRowOpen(Appendable writer, Map<String,
Object> context, ModelForm modelForm) throws IOException {
String headerStyle =
FlexibleStringExpander.expandString(modelForm.getHeaderRowStyle(), context);
Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=1710675&r1=1710674&r2=1710675&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Mon Oct 26
18:53:33 2015
@@ -86,11 +86,8 @@ under the License.
<#macro renderFormatListWrapperOpen formName style columnStyles><fo:table
border="solid black" <@getFoStyle style/>><#list columnStyles as
columnStyle><fo:table-column<#if columnStyle?has_content> <@getFoStyle
columnStyle/></#if>/></#list></#macro>
<#macro renderFormatListWrapperClose
formName></fo:table-body></fo:table></#macro>
-<#macro renderFormatHeaderOpen><fo:table-header></#macro>
-<#macro renderFormatHeaderClose></fo:table-header><fo:table-body></#macro>
-
-<#macro renderFormatHeaderRowOpen style><fo:table-row></#macro>
-<#macro renderFormatHeaderRowClose></fo:table-row>
+<#macro renderFormatHeaderRowOpen
style><fo:table-header><fo:table-row></#macro>
+<#macro
renderFormatHeaderRowClose></fo:table-row></fo:table-header><fo:table-body>
<#-- FIXME: this is an hack to avoid FOP rendering errors for empty lists
(fo:table-body cannot be null) -->
<fo:table-row><fo:table-cell><fo:block/></fo:table-cell></fo:table-row>
</#macro>
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1710675&r1=1710674&r2=1710675&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Oct 26
18:53:33 2015
@@ -376,13 +376,6 @@ under the License.
</table><#lt/>
</#macro>
-<#macro renderFormatHeaderOpen>
- <thead>
-</#macro>
-<#macro renderFormatHeaderClose>
- </thead>
-</#macro>
-
<#macro renderFormatHeaderRowOpen style>
<tr class="<#if style?has_content>${style}<#else>header-row</#if>">
</#macro>
