Author: jleroux
Date: Fri Feb 25 16:54:33 2011
New Revision: 1074624
URL:
http://svn.apache.org/viewvc?rev=1074624&view=revLog:
Fix issues when rendering as templates subContents in Content Manager
Modified:
ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=1074624&r1=1074623&r2=1074624&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri Feb 25 16:54:33 2011
@@ -18,7 +18,12 @@ under the License.
-->
<html xmlns="
http://www.w3.org/1999/xhtml">
-<#assign initialLocale = locale.toString()>
+<#if locale?exists>
+ <#assign initialLocale = locale.toString()>
+<#else>
+ <#assign initialLocale = "en">
+</#if>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${(decoratedContent.subcontent.title.render)!"CMS Site Generic Title (Set subcontent 'title' on your content!)"}</title>
Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1074624&r1=1074623&r2=1074624&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Fri Feb 25 16:54:33 2011
@@ -18,10 +18,15 @@ 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">
-<#assign initialLocale = locale.toString()>
+<#if locale?exists>
+ <#assign initialLocale = locale.toString()>
+<#else>
+ <#assign initialLocale = "en">
+</#if>
+
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
- <title>${uiLabelMap.OfbizTitle}</title>
+ <title>${(uiLabelMap.OfbizTitle)!"OFBiz, The Apache Open For Business Project"}</title>
<link rel="shortcut icon" href="/ofbiz/images/favicon.ico">
<script language="javascript" src="/images/jquery/jquery-1.4.2.min.js" type="text/javascript"></script>
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
Locked
