You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/09/03 09:37:37 UTC

svn commit: r810795 - in /ofbiz/branches/release09.04: applications/order/webapp/ordermgr/request/ applications/party/templates/email/ applications/workeffort/webapp/workeffort/workeffort/ framework/common/webcommon/includes/ framework/widget/src/org/o...

Author: jleroux
Date: Thu Sep  3 07:37:36 2009
New Revision: 810795

URL: http://svn.apache.org/viewvc?rev=810795&view=rev
Log:
A patch from Matarazzo Angelo "Visual theme Bluelight and IE" (https://issues.apache.org/jira/browse/OFBIZ-2883) - OFBIZ-2883

Modified:
    ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl
    ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl
    ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl
    ofbiz/branches/release09.04/applications/party/templates/email/CreatePartyNotification.ftl
    ofbiz/branches/release09.04/applications/party/templates/email/VerifyEmailAddressNotification.ftl
    ofbiz/branches/release09.04/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
    ofbiz/branches/release09.04/framework/common/webcommon/includes/insertDropDown.ftl
    ofbiz/branches/release09.04/framework/common/webcommon/includes/lookup.ftl
    ofbiz/branches/release09.04/framework/common/webcommon/includes/simple.ftl
    ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java
    ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
    ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
    ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
    ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java
    ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java
    ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl
    ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl
    ofbiz/branches/release09.04/themes/bluelight/includes/messages.ftl
    ofbiz/branches/release09.04/themes/smoothfeather/includes/header.ftl

Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (original)
+++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl Thu Sep  3 07:37:36 2009
@@ -16,7 +16,6 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (original)
+++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl Thu Sep  3 07:37:36 2009
@@ -16,7 +16,6 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

Modified: ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl (original)
+++ ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl Thu Sep  3 07:37:36 2009
@@ -16,15 +16,14 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <title>${title?if_exists}</title>
+        <title>${title}</title>
         <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
     </head>
     <body>
-        <h1>${title?if_exists}</h1>
+        <h1>${title}</h1>
         <p>Hello ${(parameters.partyAndPerson.salutation)?if_exists} ${(parameters.partyAndPerson.personalTitle)?if_exists} ${(parameters.partyAndPerson.firstName)?if_exists} ${(parameters.partyAndPerson.middleName)?if_exists} ${(parameters.partyAndPerson.lastName)?if_exists} ${(parameters.partyAndPerson.suffix)?if_exists},</p>
         <p>Your personal information has been updated successfully.</p>
     </body>

Modified: ofbiz/branches/release09.04/applications/party/templates/email/CreatePartyNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/templates/email/CreatePartyNotification.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/templates/email/CreatePartyNotification.ftl (original)
+++ ofbiz/branches/release09.04/applications/party/templates/email/CreatePartyNotification.ftl Thu Sep  3 07:37:36 2009
@@ -16,7 +16,6 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

Modified: ofbiz/branches/release09.04/applications/party/templates/email/VerifyEmailAddressNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/templates/email/VerifyEmailAddressNotification.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/templates/email/VerifyEmailAddressNotification.ftl (original)
+++ ofbiz/branches/release09.04/applications/party/templates/email/VerifyEmailAddressNotification.ftl Thu Sep  3 07:37:36 2009
@@ -16,7 +16,6 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

Modified: ofbiz/branches/release09.04/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl (original)
+++ ofbiz/branches/release09.04/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl Thu Sep  3 07:37:36 2009
@@ -16,7 +16,6 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <#assign docLangAttr = locale.toString()?replace("_", "-")>
 <#assign langDir = "ltr">
 <#if "ar.iw"?contains(docLangAttr?substring(0, 2))>

Modified: ofbiz/branches/release09.04/framework/common/webcommon/includes/insertDropDown.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/includes/insertDropDown.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/webcommon/includes/insertDropDown.ftl (original)
+++ ofbiz/branches/release09.04/framework/common/webcommon/includes/insertDropDown.ftl Thu Sep  3 07:37:36 2009
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <#--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file

Modified: ofbiz/branches/release09.04/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/includes/lookup.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/branches/release09.04/framework/common/webcommon/includes/lookup.ftl Thu Sep  3 07:37:36 2009
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <#--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file

Modified: ofbiz/branches/release09.04/framework/common/webcommon/includes/simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/includes/simple.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/webcommon/includes/simple.ftl (original)
+++ ofbiz/branches/release09.04/framework/common/webcommon/includes/simple.ftl Thu Sep  3 07:37:36 2009
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <#--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java Thu Sep  3 07:37:36 2009
@@ -50,6 +50,13 @@
         return "xsl-fo";
     }
 
+    public void renderScreenBegin(Appendable writer, Map<String, Object> context) throws IOException {
+    }
+
+    public void renderScreenEnd(Appendable writer, Map<String, Object> context) throws IOException {
+        
+    }
+
     public void renderSectionBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException {
         renderBeginningBoundaryComment(writer, section.isMainSection?"Screen":"Section Widget", section);
     }

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Thu Sep  3 07:37:36 2009
@@ -71,6 +71,14 @@
         return "html";
     }
 
+    public void renderScreenBegin(Appendable writer, Map<String, Object> context) throws IOException {
+        writer.append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">");
+        appendWhitespace(writer);
+    }
+
+    public void renderScreenEnd(Appendable writer, Map<String, Object> context) throws IOException {
+    }
+
     public void renderSectionBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException {
         renderBeginningBoundaryComment(writer, section.isMainSection?"Screen":"Section Widget", section);
     }

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Thu Sep  3 07:37:36 2009
@@ -108,11 +108,35 @@
         return rendererName;
     }
 
+    public void renderScreenBegin(Appendable writer, Map<String, Object> context) throws IOException {
+        executeMacro("<@renderScreenBegin/>");
+    }
+
+    public void renderScreenEnd(Appendable writer, Map<String, Object> context) throws IOException {
+        executeMacro("<@renderScreenEnd/>");
+    }
+
     public void renderSectionBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException {
-        // TODO: not implemented FIXME
+        if (section.boundaryCommentsEnabled()) {
+            StringWriter sr = new StringWriter();
+            sr.append("<@renderSectionBegin ");
+            sr.append("boundaryComment=\"Begin ");
+            sr.append(section.isMainSection ? "Screen " : "Section Widget ");
+            sr.append(section.getBoundaryCommentName());
+            sr.append("\"/>");
+            executeMacro(sr.toString());
+        }
     }
     public void renderSectionEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException {
-        // TODO: not implemented FIXME
+        if (section.boundaryCommentsEnabled()) {
+            StringWriter sr = new StringWriter();
+            sr.append("<@renderSectionEnd ");
+            sr.append("boundaryComment=\"End ");
+            sr.append(section.isMainSection ? "Screen " : "Section Widget ");
+            sr.append(section.getBoundaryCommentName());
+            sr.append("\"/>");
+            executeMacro(sr.toString());
+        }
     }
 
     public void renderContainerBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Container container) throws IOException {

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Thu Sep  3 07:37:36 2009
@@ -118,7 +118,9 @@
             GenericWidgetOutput gwo = screenCache.get(screenCombinedName, wcck);
             if (gwo == null) {
                 Writer sw = new StringWriter();
+                screenStringRenderer.renderScreenBegin(writer, context);
                 modelScreen.renderScreenString(sw, context, screenStringRenderer);
+                screenStringRenderer.renderScreenEnd(writer, context);
                 gwo = new GenericWidgetOutput(sw.toString());
                 screenCache.put(screenCombinedName, wcck, gwo);
                 writer.append(gwo.toString());
@@ -126,7 +128,9 @@
                 writer.append(gwo.toString());
             }
         } else {
+            screenStringRenderer.renderScreenBegin(writer, context);
             modelScreen.renderScreenString(writer, context, screenStringRenderer);
+            screenStringRenderer.renderScreenEnd(writer, context);
         }
         return "";
     }

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java Thu Sep  3 07:37:36 2009
@@ -28,6 +28,8 @@
  */
 public interface ScreenStringRenderer {
     public String getRendererName();
+    public void renderScreenBegin(Appendable writer, Map<String, Object> context) throws IOException;
+    public void renderScreenEnd(Appendable writer, Map<String, Object> context) throws IOException;
     public void renderSectionBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException;
     public void renderSectionEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException;
     public void renderContainerBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Container container) throws IOException;

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java Thu Sep  3 07:37:36 2009
@@ -39,6 +39,12 @@
         return "text";
     }
 
+    public void renderScreenBegin(Appendable writer, Map<String, Object> context) throws IOException {
+    }
+
+    public void renderScreenEnd(Appendable writer, Map<String, Object> context) throws IOException {
+    }
+
     public void renderSectionBegin(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException {
         // do nothing, this is just a place holder container for HTML
     }

Modified: ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl Thu Sep  3 07:37:36 2009
@@ -17,9 +17,25 @@
 under the License.
 -->
 
-<#macro renderSectionBegin></#macro>
-<#macro renderSectionEnd>
+<#macro renderScreenBegin>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 </#macro>
+
+<#macro renderScreenEnd>
+</#macro>
+
+<#macro renderSectionBegin boundaryComment>
+<#if boundaryComment?has_content>
+<!-- ${boundaryComment} -->
+</#if>
+</#macro>
+
+<#macro renderSectionEnd boundaryComment>
+<#if boundaryComment?has_content>
+<!-- ${boundaryComment} -->
+</#if>
+</#macro>
+
 <#macro renderContainerBegin id style autoUpdateLink autoUpdateInterval>
 <#if autoUpdateLink?has_content>
 <script type="text/javascript">ajaxUpdateAreaPeriodic('${id}', '${autoUpdateLink}', '', '${autoUpdateInterval}');</script>

Modified: ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/branches/release09.04/themes/bluelight/includes/header.ftl Thu Sep  3 07:37:36 2009
@@ -16,16 +16,13 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
 <#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if>
 <#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if>
-
 <#assign docLangAttr = locale.toString()?replace("_", "-")>
 <#assign langDir = "ltr">
 <#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
     <#assign langDir = "rtl">
 </#if>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

Modified: ofbiz/branches/release09.04/themes/bluelight/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/includes/messages.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bluelight/includes/messages.ftl (original)
+++ ofbiz/branches/release09.04/themes/bluelight/includes/messages.ftl Thu Sep  3 07:37:36 2009
@@ -28,6 +28,9 @@
 </div>
 <div class="clear">
 </div>
+
+<#if (errorMessage?has_content || errorMessageList?has_content || eventMessage?has_content || eventMessageList?has_content)>
 <div id="messages-container">
 <#include "component://common/webcommon/includes/messages.ftl" />
 </div>
+</#if>

Modified: ofbiz/branches/release09.04/themes/smoothfeather/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/smoothfeather/includes/header.ftl?rev=810795&r1=810794&r2=810795&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/smoothfeather/includes/header.ftl (original)
+++ ofbiz/branches/release09.04/themes/smoothfeather/includes/header.ftl Thu Sep  3 07:37:36 2009
@@ -23,7 +23,6 @@
 <#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
     <#assign langDir = "rtl">
 </#if>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${docLangAttr}" lang="${docLangAttr}" dir="${langDir}">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />