Author: jleroux
Date: Thu Dec 3 09:45:33 2009
New Revision: 886723
URL: http://svn.apache.org/viewvc?rev=886723&view=rev
Log:
Fix a bug introduced with r886143 (when a language.js was missing no default
was given)
Modified:
ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=886723&r1=886722&r2=886723&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Thu Dec 3
09:45:33 2009
@@ -30,8 +30,8 @@
<script language="javascript"
src="<@ofbizContentUrl>/images/prototypejs/scriptaculous.js</@ofbizContentUrl>"
type="text/javascript"></script>
<script language="javascript"
src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>"
type="text/javascript"></script>
<script language="javascript"
src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>"
type="text/javascript"></script>
- <script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>"
type="text/javascript"></script>
- <script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale}.js</@ofbizContentUrl>"
type="text/javascript"></script>
+ <script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>"
type="text/javascript"></script>
+ <script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!"en"}.js</@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/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=886723&r1=886722&r2=886723&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Thu Dec 3
09:45:33 2009
@@ -27,7 +27,7 @@
<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>
- <script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale}.js</@ofbizContentUrl>"
type="text/javascript"></script>
+ <script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!"en"}.js</@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"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=886723&r1=886722&r2=886723&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Thu Dec
3 09:45:33 2009
@@ -25,7 +25,7 @@
<script language="javascript"
src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>"
type="text/javascript"></script>
<script language="javascript"
src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>"
type="text/javascript"></script>
<script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>"
type="text/javascript"></script>
- <script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!}.js</@ofbizContentUrl>"
type="text/javascript"></script>
+ <script language="javascript"
src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!"en"}.js</@ofbizContentUrl>"
type="text/javascript"></script>
<link rel='stylesheet'
href='<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet'
href='<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>'
type='text/css'>
<link rel='stylesheet'
href='<@ofbizContentUrl>/ecommerce/images/blog.css</@ofbizContentUrl>'
type='text/css'>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=886723&r1=886722&r2=886723&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Thu Dec 3
09:45:33 2009
@@ -246,7 +246,7 @@
<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="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale}.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale}.js"
default-value="en.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"/>
<set field="layoutSettings.javaScripts[+0]"
value="/images/prototypejs/prototype.js" global="true"/>
