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 2010/07/06 12:57:48 UTC
svn commit: r960868 - in /ofbiz/branches/release10.04: ./
framework/common/webcommon/includes/ framework/common/widget/
specialpurpose/cmssite/template/cms/
specialpurpose/ecommerce/webapp/ecommerce/blog/
specialpurpose/ecommerce/widget/ specialpurpose...
Author: jleroux
Date: Tue Jul 6 10:57:47 2010
New Revision: 960868
URL: http://svn.apache.org/viewvc?rev=960868&view=rev
Log:
"Applied fix from trunk for revision: 960491 " (handled conflict by hand)
------------------------------------------------------------------------
r960491 | jleroux | 2010-07-05 11:10:19 +0200 (lun. 05 juil. 2010) | 3 lignes
Improvement on r960336. Fix a problem reported by Scott on dev ML.
I tested locally, and I think I have done it right this time
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/framework/common/webcommon/includes/lookup.ftl
ofbiz/branches/release10.04/framework/common/widget/CommonScreens.xml
ofbiz/branches/release10.04/specialpurpose/cmssite/template/cms/HtmlHead.ftl
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/branches/release10.04/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 6 10:57:47 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491
Modified: ofbiz/branches/release10.04/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/webcommon/includes/lookup.ftl?rev=960868&r1=960867&r2=960868&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/branches/release10.04/framework/common/webcommon/includes/lookup.ftl Tue Jul 6 10:57:47 2010
@@ -32,7 +32,7 @@ under the License.
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
<#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
Modified: ofbiz/branches/release10.04/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/widget/CommonScreens.xml?rev=960868&r1=960867&r2=960868&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release10.04/framework/common/widget/CommonScreens.xml Tue Jul 6 10:57:47 2010
@@ -120,7 +120,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale?.toString()?.substring(0,2)?:'en'}"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/GooglemapMarkers.js" global="true"/>
<set field="layoutSettings.commonHeaderImageLinkUrl" from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main" global="true"/>
@@ -318,7 +318,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale?.toString()?.substring(0,2)?:'en'}"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/GooglemapSimple.js" global="true"/>
<!-- The default (global) shortcut icon -->
Modified: ofbiz/branches/release10.04/specialpurpose/cmssite/template/cms/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=960868&r1=960867&r2=960868&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/branches/release10.04/specialpurpose/cmssite/template/cms/HtmlHead.ftl Tue Jul 6 10:57:47 2010
@@ -21,20 +21,18 @@ under the License.
<#assign initialLocale = locale.toString()>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${(decoratedContent.subcontent.title.render)?default("CMS Site Generic Title (Set subcontent 'title' on your content!)")}</title>
+ <title>${(decoratedContent.subcontent.title.render)!"CMS Site Generic Title (Set subcontent 'title' on your content!)"}</title>
<link rel="shortcut icon" href="/images/ofbiz.ico" />
<script language="javascript" src="/images/prototypejs/prototype.js" type="text/javascript"></script>
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
<script language="javascript" src="/images/calendarDateSelect/calendar_date_select.js" type="text/javascript"></script>
- <#if parameters.userLogin?has_content>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- </#if>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
<link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
<link rel="stylesheet" href="/content/images/contentForum.css" type="text/css"/>
- <meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)?default("")}"/>
- <meta name="keywords" content="${(decoratedContent.subcontent.metaKeywords.render)?default("")}"/>
+ <meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)!}"/>
+ <meta name="keywords" content="${(decoratedContent.subcontent.metaKeywords.render)!}"/>
</head>
<body>
Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=960868&r1=960867&r2=960868&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original)
+++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Tue Jul 6 10:57:47 2010
@@ -20,13 +20,13 @@ under the License.
<#assign initialLocale = locale.toString()>
<html>
<head>
- <title>Automation Groups - Main</title>
+ <title>Main</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=960868&r1=960867&r2=960868&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/CommonScreens.xml Tue Jul 6 10:57:47 2010
@@ -42,7 +42,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale?.toString()?.substring(0,2)?:'en'}"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
@@ -257,7 +257,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
- <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale?.toString()?.substring(0,2)?:'en'}"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
Modified: ofbiz/branches/release10.04/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=960868&r1=960867&r2=960868&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/branches/release10.04/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Tue Jul 6 10:57:47 2010
@@ -18,7 +18,7 @@ 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()>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
<title>${uiLabelMap.OfbizTitle}</title>
@@ -27,6 +27,7 @@ under the License.
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
<script language="javascript" src="/images/calendar_date_select.js" type="text/javascript"></script>
+ <script language="javascript" src="/images/calendarDateSelect/locale/${(parameters.userLogin.lastLocale?substring(0,2))!initialLocale?substring(0,2)!'en'}.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/effects.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/search.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/slides.js" type="text/javascript"></script>
@@ -34,6 +35,6 @@ under the License.
<link rel="stylesheet" href="/ofbiz/images/global.css" type="text/css"/>
<meta content="OFBiz_Thai for Thai user" name="Description"/>
- <meta content="OFBiz, ofbiz support, ofbiz training, Ant websystems, outsource, outsourcing,framework, cheap, competitive, quality, OFBiz, Open Source ERP,Open Source CRM,Open Source E-Commerce,Open Source eCommerce,Open Source POS,Open Source SCM,Open Source MRP,Open Source CMMS,Open Source EAM,web services,workflow,ebusiness,e-business,ecommerce,e-commerce,automation,enterprise software,open source,entity engine,service engine,erp,crm,party,accounting,facility,supply,chain,management,catalog,order,project,task,work effort,financial,ledger,content management,customer,inventory" name="keywords"/>
+ <meta content="Open Source ERP,Open Source CRM,Open Source E-Commerce,Open Source eCommerce,Open Source POS,Open Source SCM,Open Source MRP,Open Source CMMS,Open Source EAM,web services,workflow,ebusiness,e-business,ecommerce,e-commerce,automation,enterprise software,open source,entity engine,service engine,erp,crm,party,accounting,facility,supply,chain,management,catalog,order,project,task,work effort,financial,ledger,content management,customer,inventory" name="keywords"/>
</head>