svn commit: r1082916 [6/6] - in /ofbiz/trunk: applications/content/widget/content/ applications/order/email/default/ applications/party/webapp/partymgr/js/ applications/product/widget/catalog/ framework/common/webcommon/includes/ framework/common/webco...

[sascharodekamp]

Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/apple/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/apple/style.css?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/apple/style.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/apple/style.css Fri Mar 18 13:37:29 2011
@@ -42,9 +42,10 @@
 #vakata-dragged.jstree-apple ins { background:transparent !important; }
 #vakata-dragged.jstree-apple .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
 #vakata-dragged.jstree-apple .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-apple { background:url("d.png") -41px -57px no-repeat !important; }
+#jstree-marker.jstree-apple { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
 
 .jstree-apple a.jstree-search { color:aqua; }
+.jstree-apple .jstree-locked a { color:silver; cursor:default; }
 
 #vakata-contextmenu.jstree-apple-context,
 #vakata-contextmenu.jstree-apple-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }

Added: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/d.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/d.gif?rev=1082916&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/d.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/style.css?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/style.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/style.css Fri Mar 18 13:37:29 2011
@@ -41,9 +41,10 @@
 #vakata-dragged.jstree-classic ins { background:transparent !important; }
 #vakata-dragged.jstree-classic .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
 #vakata-dragged.jstree-classic .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-classic { background:url("d.png") -41px -57px no-repeat !important; }
+#jstree-marker.jstree-classic { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
 
 .jstree-classic a.jstree-search { color:aqua; }
+.jstree-classic .jstree-locked a { color:silver; cursor:default; }
 
 #vakata-contextmenu.jstree-classic-context,
 #vakata-contextmenu.jstree-classic-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
@@ -56,4 +57,21 @@
 #vakata-contextmenu.jstree-classic-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
 #vakata-contextmenu.jstree-classic-context li ul { margin-left:-4px; }
 
-/* TODO: IE6 support - the `>` selectors */
\ No newline at end of file
+/* IE6 BEGIN */
+.jstree-classic li,
+.jstree-classic ins,
+#vakata-dragged.jstree-classic .jstree-invalid,
+#vakata-dragged.jstree-classic .jstree-ok,
+#jstree-marker.jstree-classic { _background-image:url("d.gif"); }
+.jstree-classic .jstree-open ins { _background-position:-72px 0; }
+.jstree-classic .jstree-closed ins { _background-position:-54px 0; }
+.jstree-classic .jstree-leaf ins { _background-position:-36px 0; }
+.jstree-classic .jstree-open a ins.jstree-icon { _background-position:-56px -36px; }
+.jstree-classic .jstree-closed a ins.jstree-icon { _background-position:-56px -19px; }
+.jstree-classic .jstree-leaf a ins.jstree-icon { _background-position:-56px -19px; }
+#vakata-contextmenu.jstree-classic-context ins { _display:none; }
+#vakata-contextmenu.jstree-classic-context li { _zoom:1; }
+.jstree-classic .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }
+.jstree-classic .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }
+.jstree-classic .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }
+/* IE6 END */
\ No newline at end of file

Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default-rtl/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default-rtl/style.css?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default-rtl/style.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default-rtl/style.css Fri Mar 18 13:37:29 2011
@@ -40,9 +40,10 @@
 #vakata-dragged.jstree-default-rtl ins { background:transparent !important; }
 #vakata-dragged.jstree-default-rtl .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
 #vakata-dragged.jstree-default-rtl .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-default-rtl { background:url("d.png") -41px -57px no-repeat !important; }
+#jstree-marker.jstree-default-rtl { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
 
 .jstree-default-rtl a.jstree-search { color:aqua; }
+.jstree-default-rtl .jstree-locked a { color:silver; cursor:default; }
 
 #vakata-contextmenu.jstree-default-rtl-context,
 #vakata-contextmenu.jstree-default-rtl-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }

Modified: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.css?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.css Fri Mar 18 13:37:29 2011
@@ -40,9 +40,10 @@
 #vakata-dragged.jstree-default ins { background:transparent !important; }
 #vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
 #vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; }
+#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
 
 .jstree-default a.jstree-search { color:aqua; }
+.jstree-default .jstree-locked a { color:silver; cursor:default; }
 
 #vakata-contextmenu.jstree-default-context,
 #vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }

Modified: ofbiz/trunk/framework/images/webapp/images/myportal.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/myportal.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/myportal.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/myportal.js Fri Mar 18 13:37:29 2011
@@ -149,7 +149,6 @@ function updatePortletOrder(currentItem,
     jQuery.ajax({
         url: "/myportal/control/updatePortalPagePortletSeqAjax",
         data: requestData,
-        dataType: "JSON",
         type: "POST",
         success: function(data){
             onCompleteRequest();

Modified: ofbiz/trunk/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/selectall.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/selectall.js Fri Mar 18 13:37:29 2011
@@ -378,7 +378,6 @@ function ajaxSubmitFormUpdateAreas(form,
        type: "POST",
        url: jQuery("#" + form).attr("action"),
        data: jQuery("#" + form).serialize(),
-       dataType: "json",
        success: function(data) {
                updateFunction(data);
        }

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=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Fri Mar 18 13:37:29 2011
@@ -21,7 +21,7 @@ under the License.
 <html>
 <head>
     <title>Main</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <script language="javascript" src="<@ofbizContentUrl>/images/selectall.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'>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Fri Mar 18 13:37:29 2011
@@ -254,7 +254,6 @@ function createUpdateCustomerAndShipping
     jQuery.ajax({
         url: 'createUpdateShippingAddress',
         type: 'POST',
-        dataType: 'json',
         async: false,
         data: jQuery('#shippingForm').serialize(),
         success: function(json) {
@@ -288,7 +287,6 @@ function getShipOptions() {
         jQuery.ajax({
             url: 'getShipOptions',
             type: 'POST',
-            dataType: 'json',
             async: false,
             success: function(json) {
                 jQuery('#shippingFormServerError').fadeOut('fast');
@@ -327,7 +325,6 @@ function setShippingOption() {
     jQuery.ajax({
         url: 'setShippingOption',
         type: 'POST',
-        dataType: 'json',
         async: false,
         data: jQuery('#shippingOptionForm').serialize(),
         success: function(json) {
@@ -374,7 +371,6 @@ function processBillingAndPayment() {
     jQuery.ajax({
         url: 'createUpdateBillingAndPayment',
         type: 'POST',
-        dataType: 'json',
         data: jQuery('#billingForm').serialize(),
         async: false,
         success: function(json) {
@@ -432,7 +428,6 @@ function addPromoCode() {
     jQuery.ajax({
         url: 'silentAddPromoCode',
         type: 'POST',
-        dataType: 'json',
         data: {"productPromoCodeId" : jQuery('#productPromoCode').val()},
         success: function(json) {
             jQuery('#cartFormServerError').fadeOut('fast');
@@ -454,7 +449,6 @@ function getProductLineItemIndex(event,
     jQuery.ajax({
         url: 'getShoppingCartItemIndex',
         type: 'POST',
-        dataType: 'json',
         async: false,
         data: formValues,
         success: function(json) {
@@ -495,7 +489,6 @@ function updateCartData(elementId, formV
     jQuery.ajax({
         url: 'cartItemQtyUpdate',
         type: 'POST',
-        dataType: 'json',
         data: formValues,
         success: function(json) {
             if (json.totalQuantity == 0) {

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Fri Mar 18 13:37:29 2011
@@ -42,7 +42,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/selectall.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/jquery-1.4.4.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/>
 
                 <script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
 
@@ -251,7 +251,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/selectall.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/jquery-1.4.4.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/>
 
                 <script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
 

Modified: ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl Fri Mar 18 13:37:29 2011
@@ -20,7 +20,7 @@ under the License.
 <#if parameters.redirect?exists>
 <html>
 <head>
-<meta HTTP-EQUIV="REFRESH" content="0; url=${parameters.redirect}">
+<meta HTTP-EQUIV="REFRESH" content="0; url=${parameters.redirect}"/>
 </head>
 </html>
 

Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Fri Mar 18 13:37:29 2011
@@ -28,7 +28,7 @@ under the License.
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
     <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.4.min.js" type="text/javascript"></script>
+    <script language="javascript" src="/images/jquery/jquery-1.5.1.min.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="/ofbiz/script/search.js" type="text/javascript"></script>

Modified: ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Fri Mar 18 13:37:29 2011
@@ -49,7 +49,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
                 <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocale}.js" global="true"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/>
 
                 <script location="component://webpos/widget/WebPosSetup.groovy"/>