You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/11/08 13:35:39 UTC
svn commit: r1199218 [1/17] - in /ofbiz/trunk:
applications/content/widget/content/ framework/common/webcommon/includes/
framework/common/webcommon/includes/flotCharts/ framework/common/widget/
framework/example/webapp/example/flot/ framework/images/we...
Author: sascharodekamp
Date: Tue Nov 8 12:35:33 2011
New Revision: 1199218
URL: http://svn.apache.org/viewvc?rev=1199218&view=rev
Log:
Update jQuery:
jQuery library to version 1.7
jQuery UI to version 1.8.16
jQuery Validation to version 1.9
jQuery Flot to version 0.7
jQuery datetimepicker to version 0.9.7
and jsTree
Added:
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ca.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fi.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ja.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pl.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt-BR.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ro.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.fillbetween.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.image.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.stack.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.symbol.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.threshold.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/lib/jquery.mockjax.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_eu.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_sl.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/ui/css/ui-lightness/jquery-ui-1.8.16.custom.css (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery-ui-1.8.16.custom.css (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery-ui-1.8.16.custom.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js (with props)
Removed:
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery-ui-1.8.13.custom.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js
Modified:
ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl
ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl
ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/Makefile
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/additional-methods.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/changelog.txt
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_fi.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_no.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ptbr.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ru.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_se.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/version.txt
ofbiz/trunk/framework/images/webapp/images/jquery/ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/external/qunit.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/external/qunit.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.accordion.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.all.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.button.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.core.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.datepicker.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.dialog.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.progressbar.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.resizable.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.selectable.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.slider.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.tabs.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.theme.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/images/ui-icons_ffd27a_256x240.png
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.accordion.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.all.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.autocomplete.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.button.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.core.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.datepicker.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.dialog.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.progressbar.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.resizable.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.selectable.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.slider.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.tabs.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/themes/ui-lightness/jquery.ui.theme.css
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery-ui-i18n.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-nl.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.blind.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.bounce.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.clip.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.core.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.drop.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.explode.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.fade.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.fold.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.highlight.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.pulsate.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.scale.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.shake.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.slide.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.effects.transfer.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.accordion.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.autocomplete.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.button.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.core.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.dialog.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.draggable.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.droppable.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.mouse.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.position.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.progressbar.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.resizable.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.selectable.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.slider.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.sortable.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.tabs.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/jquery.ui.widget.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.blind.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.bounce.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.clip.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.core.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.drop.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.explode.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.fade.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.fold.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.highlight.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.pulsate.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.scale.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.shake.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.slide.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.effects.transfer.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.accordion.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.autocomplete.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.button.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.core.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.datepicker.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.dialog.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.draggable.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.droppable.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.mouse.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.position.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.progressbar.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.resizable.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.selectable.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.slider.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.sortable.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.tabs.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/ui/minified/jquery.ui.widget.min.js
ofbiz/trunk/framework/images/webapp/images/jquery/ui/development-bundle/version.txt
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/images/ui-icons_454545_256x240.png
ofbiz/trunk/themes/bluelight/webapp/bluelight/images/ui-icons_454545_256x240.png
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/images/ui-icons_454545_256x240.png
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/images/ui-icons_469bdd_256x240.png
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/images/ui-icons_6da8d5_256x240.png
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/javascript.css
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/images/ui-icons_ffd27a_256x240.png
Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=1199218&r1=1199217&r2=1199218&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Tue Nov 8 12:35:33 2011
@@ -86,7 +86,7 @@ under the License.
<screen name="navigateContent">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/>
<set field="titleProperty" value="PageTitleNavigateContent"/>
<set field="tabButtonItem" value="navigateContent"/>
<set field="labelTitleProperty" value="PageTitleNavigateContent"/>
Modified: ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl?rev=1199218&r1=1199217&r2=1199218&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl Tue Nov 8 12:35:33 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<div id="${chartId}Div" style="width:600px;height:300px;"></div>
Modified: ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl?rev=1199218&r1=1199217&r2=1199218&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl Tue Nov 8 12:35:33 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=1199218&r1=1199217&r2=1199218&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Tue Nov 8 12:35:33 2011
@@ -27,7 +27,7 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title?if_exists}</title>
- <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. -->
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1199218&r1=1199217&r2=1199218&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Nov 8 12:35:33 2011
@@ -118,16 +118,16 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/>
<!-- jQuery CSSs -->
<set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/>
<set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/>
@@ -379,13 +379,13 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/>
<!-- jQuery CSSs -->
<set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/>
<set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/>
Modified: ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl?rev=1199218&r1=1199217&r2=1199218&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl (original)
+++ ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl Tue Nov 8 12:35:33 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>