You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2009/04/24 09:59:08 UTC
svn commit: r768213 - in /ofbiz/trunk/framework: common/webcommon/includes/ common/widget/ widget/templates/

Author: jacopoc
Date: Fri Apr 24 07:59:08 2009
New Revision: 768213

URL: http://svn.apache.org/viewvc?rev=768213&view=rev
Log:
Implemented macros for new renderers methods for creen widgets; cleaned up SimpleDecorator.

Added:
    ofbiz/trunk/framework/common/webcommon/includes/minimal-decorator.ftl
      - copied, changed from r768164, ofbiz/trunk/framework/common/webcommon/includes/simple.xml.ftl
Removed:
    ofbiz/trunk/framework/common/webcommon/includes/simple.xml.ftl
Modified:
    ofbiz/trunk/framework/common/widget/CommonScreens.xml
    ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl
    ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl
    ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl

Copied: ofbiz/trunk/framework/common/webcommon/includes/minimal-decorator.ftl (from r768164, ofbiz/trunk/framework/common/webcommon/includes/simple.xml.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/minimal-decorator.ftl?p2=ofbiz/trunk/framework/common/webcommon/includes/minimal-decorator.ftl&p1=ofbiz/trunk/framework/common/webcommon/includes/simple.xml.ftl&r1=768164&r2=768213&rev=768213&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/simple.xml.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/minimal-decorator.ftl Fri Apr 24 07:59:08 2009
@@ -16,6 +16,4 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<export>
 ${sections.render("body")}
-</export>
\ No newline at end of file

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=768213&r1=768212&r2=768213&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Apr 24 07:59:08 2009
@@ -293,7 +293,7 @@
                 <platform-specific>
                     <html><html-template location="component://common/webcommon/includes/simple.ftl"/></html>
                     <xsl-fo><html-template location="component://common/webcommon/includes/simple.fo.ftl"/></xsl-fo>
-                    <xml><html-template location="component://common/webcommon/includes/simple.xml.ftl"/></xml>
+                    <xml><html-template location="component://common/webcommon/includes/minimal-decorator.ftl"/></xml>
                 </platform-specific>
             </widgets>
         </section>

Modified: ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl?rev=768213&r1=768212&r2=768213&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl Fri Apr 24 07:59:08 2009
@@ -32,8 +32,17 @@
     ${foStyle?default("")}
 </#macro>
 
-<#macro renderSectionBegin></#macro>
-<#macro renderSectionEnd>
+<#macro renderScreenBegin>
+<?xml version="1.0" encoding="UTF-8"?>
+</#macro>
+
+<#macro renderScreenEnd>
+</#macro>
+
+<#macro renderSectionBegin boundaryComment>
+</#macro>
+
+<#macro renderSectionEnd boundaryComment>
 </#macro>
 <#macro renderContainerBegin id style autoUpdateLink autoUpdateInterval><fo:block <#if style?has_content><@getFoStyle style/></#if>></#macro>
 <#macro renderContainerEnd></fo:block></#macro>

Modified: ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl?rev=768213&r1=768212&r2=768213&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl Fri Apr 24 07:59:08 2009
@@ -17,9 +17,18 @@
 under the License.
 -->
 
-<#macro renderSectionBegin></#macro>
-<#macro renderSectionEnd>
+<#macro renderScreenBegin>
 </#macro>
+
+<#macro renderScreenEnd>
+</#macro>
+
+<#macro renderSectionBegin boundaryComment>
+</#macro>
+
+<#macro renderSectionEnd boundaryComment>
+</#macro>
+
 <#macro renderContainerBegin containerId style autoUpdateLink autoUpdateInterval></#macro>
 <#macro renderContainerEnd></#macro>
 <#macro renderContentBegin></#macro>

Modified: ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl?rev=768213&r1=768212&r2=768213&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlScreenMacroLibrary.ftl Fri Apr 24 07:59:08 2009
@@ -17,9 +17,21 @@
 under the License.
 -->
 
-<#macro renderSectionBegin></#macro>
-<#macro renderSectionEnd>
+<#macro renderScreenBegin>
+<?xml version="1.0" encoding="UTF-8"?>
+<export>
 </#macro>
+
+<#macro renderScreenEnd>
+</export>
+</#macro>
+
+<#macro renderSectionBegin boundaryComment>
+</#macro>
+
+<#macro renderSectionEnd boundaryComment>
+</#macro>
+
 <#macro renderContainerBegin id style autoUpdateLink autoUpdateInterval>
 </#macro>
 <#macro renderContainerEnd></#macro>