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/12/10 21:40:26 UTC
svn commit: r1044503 [11/15] - in /ofbiz/trunk: ./
applications/accounting/webapp/accounting/finaccounttrans/
applications/accounting/webapp/accounting/images/
applications/accounting/webapp/accounting/payment/
applications/accounting/webapp/ap/invoice...
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl Fri Dec 10 20:40:08 2010
@@ -34,12 +34,13 @@ under the License.
function shippingMethodChanged(shippingMethod) {
var submitToUri = "<@o...@ofbizUrl>?shipping_method=" + shippingMethod;
- dojo.io.bind({url: submitToUri,
- load: function(type, data, evt){
- if(type == "load"){
+ jQuery.ajax({
+ url: submitToUri,
+ type: "POST",
+ success: function(data) {
document.getElementById("orderItemsSection").innerHTML = data;
}
- },mimetype: "text/html"});
+ });
}
// -->
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Fri Dec 10 20:40:08 2010
@@ -18,13 +18,9 @@ under the License.
-->
<script language="JavaScript" type="text/javascript">
-dojo.require("dojo.event.*");
-dojo.require("dojo.io.*");
-
-dojo.addOnLoad(init);
+jQuery(document).ready(init);
function init() {
- dojo.event.connect("around", "processOrder", "aroundOptSubmitOrder");
var optForm = document.quickAnonOptSetupForm;
document.getElementById("noShippingMethodSelectedError").innerHTML = "";
}
@@ -38,12 +34,14 @@ function aroundOptSubmitOrder(invocation
}
}
if (shipMethodOption != "none") {
- dojo.io.bind({ url: formToSubmit.action, load: function(type, evaldObj){
- document.getElementById("optInfoSection").innerHTML = evaldObj;
-
- var result = invocation.proceed();
- return result;
- },formNode: document.quickAnonOptSetupForm});
+ jQuery.ajax({
+ url: formToSubmit.action,
+ type: "POST",
+ data: jQuery("#quickAnonOptSetupForm").serialize(),
+ success: function(data) {
+ document.getElementById("optInfoSection").innerHTML = data;
+ }
+ });
} else {
document.getElementById("noShippingMethodSelectedError").innerHTML = "${uiLabelMap.EcommerceMessagePleaseSelectShippingMethod}";
}
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl Fri Dec 10 20:40:08 2010
@@ -21,14 +21,10 @@ under the License.
</#if>
<script language="JavaScript" type="text/javascript">
-dojo.require("dojo.event.*");
-dojo.require("dojo.io.*");
-
-dojo.addOnLoad(init);
+jQuery(document).ready(init);
function init() {
getPaymentInformation();
- dojo.event.connect("around", "processOrder", "aroundSubmitOrder");
var paymentForm = document.setPaymentInformation;
}
@@ -39,35 +35,31 @@ function aroundSubmitOrder(invocation) {
document.setPaymentInformation.action = "<@o...@ofbizUrl>";
}
- dojo.io.bind({ url: formToSubmit.action, load: function(type, evaldObj){
- if(type == "load"){
- if(paymentMethodTypeOption == "EXT_OFFLINE"){
- var result = invocation.proceed();
- return result;
- }else {
- if(paymentMethodTypeOption == "none"){
- document.getElementById("noPaymentMethodSelectedError").innerHTML = "${uiLabelMap.EcommerceMessagePleaseSelectPaymentMethod}";
- return result;
- } else {
- document.getElementById("paymentInfoSection").innerHTML = evaldObj;
- }
- if(formToSubmit.paymentMethodTypeId.value != "") {
- var result = invocation.proceed();
- return result;
- }
- }
- }
- },formNode: document.setPaymentInformation});
+ jQuery.ajax({
+ url: formToSubmit.action,
+ type: "POST",
+ data: jQuery("#setPaymentInformation").serialize(),
+ success: function(data) {
+ if (paymentMethodTypeOption != "EXT_OFFLINE"){
+ if(paymentMethodTypeOption == "none"){
+ document.getElementById("noPaymentMethodSelectedError").innerHTML = "${uiLabelMap.EcommerceMessagePleaseSelectPaymentMethod}";
+ } else {
+ document.getElementById("paymentInfoSection").innerHTML = data;
+ }
+ }
+ }
+ });
}
function getGCInfo() {
if (document.setPaymentInformation.addGiftCard.checked) {
- dojo.io.bind({url: "<@o...@ofbizUrl>",
- load: function(type, data, evt){
- if(type == "load"){
- document.getElementById("giftCardSection").innerHTML = data;
+ jQuery.ajax({
+ url: "<@o...@ofbizUrl>",
+ type: "POST",
+ success: function(data) {
+ document.getElementById("giftCardSection").innerHTML = data;
}
- },mimetype: "text/html"});
+ });
} else {
document.getElementById("giftCardSection").innerHTML = "";
}
@@ -77,22 +69,32 @@ function getPaymentInformation() {
document.getElementById("noPaymentMethodSelectedError").innerHTML = "";
var paymentMethodTypeOption = document.setPaymentInformation.paymentMethodTypeOptionList.options[document.setPaymentInformation.paymentMethodTypeOptionList.selectedIndex].value;
var connectionObject;
- if(paymentMethodTypeOption.length > 0){
+ if (paymentMethodTypeOption.length > 0){
if(paymentMethodTypeOption == "CREDIT_CARD"){
- dojo.io.bind({url: "<@o...@ofbizUrl>",
- load: function(type, data, evt){
- if(type == "load"){document.getElementById("paymentInfoSection").innerHTML = data;}
- },mimetype: "text/html"});
+
+ jQuery.ajax({
+ url: "<@o...@ofbizUrl>",
+ type: "POST",
+ success: function(data) {
+ document.getElementById("paymentInfoSection").innerHTML = data;
+ }
+ });
+
document.setPaymentInformation.paymentMethodTypeId.value = "CREDIT_CARD";
document.setPaymentInformation.action = "<@o...@ofbizUrl>";
- } else if(paymentMethodTypeOption == "EFT_ACCOUNT"){
- dojo.io.bind({url: "<@o...@ofbizUrl>",
- load: function(type, data, evt){
- if(type == "load"){document.getElementById("paymentInfoSection").innerHTML = data;}
- },mimetype: "text/html"});
- document.setPaymentInformation.paymentMethodTypeId.value = "EFT_ACCOUNT";
+ } else if (paymentMethodTypeOption == "EFT_ACCOUNT"){
+
+ jQuery.ajax({
+ url: "<@o...@ofbizUrl>",
+ type: "POST",
+ success: function(data) {
+ document.getElementById("paymentInfoSection").innerHTML = data;
+ }
+ });
+
+ document.setPaymentInformation.paymentMethodTypeId.value = "EFT_ACCOUNT";
document.setPaymentInformation.action = "<@o...@ofbizUrl>";
- } else if(paymentMethodTypeOption == "EXT_OFFLINE"){
+ } else if (paymentMethodTypeOption == "EXT_OFFLINE"){
document.setPaymentInformation.paymentMethodTypeId.value = "EXT_OFFLINE";
document.getElementById("paymentInfoSection").innerHTML = "";
document.setPaymentInformation.action = "<@o...@ofbizUrl>";
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Fri Dec 10 20:40:08 2010
@@ -197,14 +197,12 @@ under the License.
<td> </td>
<td><div class="tableheadtext">${uiLabelMap.CommonStartDate}</div></td>
<td>
- <input type="text" class="textBox" name="startDateTime" size="22" value="${(recurrenceInfo.startDateTime)?if_exists}" />
- <a href="javascript:call_cal(document.reorderinfo.startDateTime, '${nowTimestamp.toString()}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="startDateTime" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceInfo.startDateTime)?if_exists}" size="25" maxlength="30" id="startDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
<td> </td>
<td><div class="tableheadtext">${uiLabelMap.CommonEndDate}</div></td>
<td>
- <input type="text" class="textBox" name="endDateTime" size="22" value="${(recurrenceRule.untilDateTime)?if_exists}" />
- <a href="javascript:call_cal(document.reorderinfo.endDateTime, '${nowTimestamp.toString()}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="endDateTime" className="textBox" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceRule.untilDateTime)?if_exists}" size="25" maxlength="30" id="endDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
<td> </td>
</tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml Fri Dec 10 20:40:08 2010
@@ -248,7 +248,6 @@ under the License.
<set field="rightbarScreenName" value="rightbar"/>
<set field="MainColumnStyle" value="center"/>
<set field="titleProperty" value="PageTitleProductPage"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/productAdditionalView.js" global="true"/>
<set field="configproductdetailScreen" value="component://ecommerce/widget/CatalogScreens.xml#configproductdetail"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Fri Dec 10 20:40:08 2010
@@ -41,13 +41,14 @@ under the License.
<!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: -->
<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="${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"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
+
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.7.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.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="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.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
@@ -255,13 +256,14 @@ under the License.
<!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: -->
<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="${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"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
+
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.7.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.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="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.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml Fri Dec 10 20:40:08 2010
@@ -39,43 +39,6 @@ under the License.
</widgets>
</section>
</screen>
-
- <screen name="newcustomer">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleNewCustomer"/>
- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newcustomer.ftl"/></html></platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="viewprofile">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleViewProfile"/>
-
- <set field="partyId" from-field="userLogin.partyId"/>
- <entity-one entity-name="Party" value-field="party"/>
- <entity-one entity-name="Person" value-field="person"/>
- <entity-one entity-name="PartyGroup" value-field="partyGroup"/>
-
- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/viewprofile.ftl"/></html></platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="editcontactmech">
<section>
<actions>
@@ -514,7 +477,7 @@ under the License.
</section>
</screen>
<!-- To use new pages uncomment following screens i.e. newcustomer and viewprofile and comment existing newcustomer and viewprofile screens above -->
- <!--
+
<screen name="newcustomer">
<section>
<actions>
@@ -543,7 +506,6 @@ under the License.
<entity-one entity-name="Person" value-field="person"/>
<entity-one entity-name="PartyGroup" value-field="partyGroup"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/controls.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/profile.js" global="true"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/>
@@ -558,7 +520,7 @@ under the License.
</widgets>
</section>
</screen>
- -->
+
<screen name="EditProfile">
<section>
@@ -585,7 +547,6 @@ under the License.
<set field="titleProperty" value="EcommerceManageAddresses"/>
<set field="partyId" from-field="userLogin.partyId"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/controls.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/profile.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml Fri Dec 10 20:40:08 2010
@@ -33,11 +33,11 @@ under the License.
<field name="pubPtContentId"><hidden value="${parameters.forumId}"/></field>
<field name="contentAssocTypeId"><hidden value="${contentAssoc.contentAssocTypeId}"/></field>
<field name="textData" map-name="dummy">
- <textarea rows="10" visual-editor-enable="true" visual-editor-buttons="undo redo bold italic underline bullet indent outdent link"/>
+ <textarea rows="10" visual-editor-enable="true" visual-editor-buttons="compact"/>
</field>
<field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
+
<form name="EditCombo" target="uploadContentAndImage" title="" type="upload"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="imageData" >
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml Fri Dec 10 20:40:08 2010
@@ -439,8 +439,6 @@ under the License.
<screen name="quickAnonCheckoutDecorator">
<section>
<actions>
- <set field="layoutSettings.javaScripts[]" value="/images/dojo/dojo.js" global="true"/>
- <set field="requireDojo" value="true"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCheckoutLinks.groovy"/>
</actions>
<widgets>
@@ -613,10 +611,6 @@ under the License.
<section>
<actions>
<set field="titleProperty" value="EcommerceOnePageCheckout"/>
- <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/scriptaculouscontrols.css" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/scriptaculous.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/controls.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/checkoutProcess.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy"/>
Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl (original)
+++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl Fri Dec 10 20:40:08 2010
@@ -21,18 +21,18 @@ under the License.
//<![CDATA[
function selectChange(formId, elementId) {
if (elementId.id == 'searchProductStoreId') {
- $('searchCatalogId')[$('searchCatalogId').selectedIndex].value = "";
- if ($('searchCategoryId').selectedIndex) {
- $('searchCategoryId')[$('searchCategoryId').selectedIndex].value = "";
+ document.getElementById('searchCatalogId')[document.getElementById('searchCatalogId').selectedIndex].value = "";
+ if (document.getElementById('searchCategoryId').selectedIndex) {
+ document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId').selectedIndex].value = "";
} else {
- $('searchCategoryId').value = "";
+ document.getElementById('searchCategoryId').value = "";
}
}
if (elementId.id == 'searchCatalogId') {
- if ($('searchCategoryId').selectedIndex) {
- $('searchCategoryId')[$('searchCategoryId').selectedIndex].value = "";
+ if (document.getElementById('searchCategoryId').selectedIndex) {
+ document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId').selectedIndex].value = "";
} else {
- $('searchCategoryId').value = "";
+ document.getElementById('searchCategoryId').value = "";
}
}
formId.action="<@o...@ofbizUrl>";
@@ -40,14 +40,14 @@ under the License.
}
function submit (id) {
var formId = id;
- if(!$('searchCatalogId').empty() && !$('searchProductStoreId').empty()){
- $(formId).submit();
+ if(!jQuery('#searchCatalogId').is(":empty") && !jQuery('#searchProductStoreId').is(":empty")){
+ document.getElementById(formId).submit();
} else {
- if($('searchProductStoreId').empty()) {
- $('productStoreErrorMessage').show();
+ if(jQuery('#searchProductStoreId').is(":empty")) {
+ jQuery('#productStoreErrorMessage').fadeIn("fast");
}
- if($('searchCatalogId').empty()) {
- $('catalogErrorMessage').show();
+ if(jQuery('#searchCatalogId').is(":empty")) {
+ jQuery('#catalogErrorMessage').fadeIn("fast");
}
}
}
@@ -84,7 +84,7 @@ under the License.
${uiLabelMap.ProductProductStore}:
</td>
<td valign="middle">
- <select name="productStoreId" id="searchProductStoreId" onchange="javascript:selectChange($('advToKeywordSearchform'), $('searchProductStoreId'));">
+ <select name="productStoreId" id="searchProductStoreId" onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), document.getElementById('searchProductStoreId'));">
<#if googleBaseConfigList?has_content>
<#list googleBaseConfigList as googleBaseConfig>
<#assign productStore = delegator.findOne("ProductStore", {"productStoreId" : googleBaseConfig.productStoreId}, true) />
@@ -105,7 +105,7 @@ under the License.
</td>
<td valign="middle">
<div>
- <select name="SEARCH_CATALOG_ID" id="searchCatalogId" onchange="javascript:selectChange($('advToKeywordSearchform'), $('searchCatalogId'));" class="required">
+ <select name="SEARCH_CATALOG_ID" id="searchCatalogId" onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), document.getElementById('searchCatalogId'));" class="required">
<#list prodCatalogList as prodCatalog>
<#assign displayDesc = prodCatalog.catalogName?default("${uiLabelMap.ProductNoDescription}") />
<#if (18 < displayDesc?length)>
@@ -377,7 +377,7 @@ under the License.
<tr>
<td align="center" colspan="2">
<hr />
- <a href="javascript:submit($('advToKeywordSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a>
+ <a href="javascript:submit(document.getElementById('advToKeywordSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a>
</td>
</tr>
</table>
Propchange: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 20:40:08 2010
@@ -1,2 +1,4 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
+/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
+/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
Propchange: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 20:40:08 2010
@@ -1,2 +1,4 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
+/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
+/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
Propchange: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 20:40:08 2010
@@ -1,2 +1,4 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
+/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
+/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Fri Dec 10 20:40:08 2010
@@ -137,9 +137,6 @@ under the License.
<!--New Register Person-->
<screen name="newRegisterLogin">
<section>
- <actions>
- <set field="layoutSettings.javaScripts[]" value="/images/dojo/dojo.js" global="true"/>
- </actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/config/OfbizUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/config/OfbizUiLabels.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/config/OfbizUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/config/OfbizUiLabels.xml Fri Dec 10 20:40:08 2010
@@ -45,9 +45,9 @@
<value xml:lang="nl">We have<br/> street cred</value>
</property>
<property key="OfbizCallout5">
- <value xml:lang="en">Just like muscles,<br/> e-commerce should<br/>be flexible.</value>
- <value xml:lang="fr">Just like muscles,<br/> e-commerce should<br/>be flexible.</value>
- <value xml:lang="nl">Just like muscles,<br/> e-commerce should<br/>be flexible.</value>
+ <value xml:lang="en">Just like muscles,<br/> e-commerce should be flexible.</value>
+ <value xml:lang="fr">Just like muscles,<br/> e-commerce should be flexible.</value>
+ <value xml:lang="nl">Just like muscles,<br/> e-commerce should be flexible.</value>
</property>
<property key="OfbizCommunity">
<value xml:lang="en">Community</value>
Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/data/OfbizData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/data/OfbizData.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/data/OfbizData.xml (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/data/OfbizData.xml Fri Dec 10 20:40:08 2010
@@ -96,33 +96,33 @@ under the License.
</form>
</div>
<div id="slides">
- <div class="slideshow" id="mantleSlides">
- <div style="display: none;" id="slide1">
+ <ul class="jcarousel-skin-tango" id="mantleSlides">
+ <li>
<div class="callout">${uiLabelMap.OfbizCallout1}</div>
<div class="description">${uiLabelMap.OfbizMantle1}</div>
<div class="mantle"><img src="/ofbiz/images/mantle.png"></div>
- </div>
- <div id="slide2" style="display: none;">
+ </li>
+ <li>
<div class="callout">${uiLabelMap.OfbizCallout2}</div>
<div class="description">${uiLabelMap.OfbizMantle2}</div>
<div class="mantle"><img src="/ofbiz/images/mantle2.png"></div>
- </div>
- <div id="slide3" style="">
+ </li>
+ <li>
<div class="callout">${uiLabelMap.OfbizCallout3}</div>
<div class="description">${uiLabelMap.OfbizMantle3}</div>
<div class="mantle"><img src="/ofbiz/images/mantle3.png"></div>
- </div>
- <div id="slide4" style="display: none;">
+ </li>
+ <li>
<div class="callout">${uiLabelMap.OfbizCallout4}</div>
<div class="description">${uiLabelMap.OfbizMantle4}</div>
<div class="mantle"><img src="/ofbiz/images/mantle4.png"></div>
- </div>
- <div id="slide5" style="display: none;">
+ </li>
+ <li>
<div class="callout">${uiLabelMap.OfbizCallout5}</div>
<div class="description">${uiLabelMap.OfbizMantle5}</div>
<div class="mantle"><img src="/ofbiz/images/mantle5.png"></div>
- </div>
- </div>
+ </li>
+ </ul>
<div class="controls">
<a class="next" id="next" title="Next" href="#">Next</a>
<a class="previous" id="previous" title="Previous" href="#">Previous</a>
@@ -132,9 +132,48 @@ under the License.
</div>
<script type="text/javascript">
function StartSlides() {
- new Slides('mantleSlides');
+ // casrousel scrolling interval set to 2 sec
+ var carouselScrollInterval = 2;
+
+ jQuery('#mantleSlides').jcarousel({
+ auto: carouselScrollInterval,
+ wrap: "circular",
+ initCallback: mycarousel_initCallback,
+ buttonNextHTML: null,
+ buttonPrevHTML: null
+ });
+
+ // create functions for the controll menu
+ function mycarousel_initCallback(carousel) {
+ jQuery('#stop').bind('click', function() {
+ carousel.options.auto = 0;
+ jQuery('#start').css({"display": ""});
+ jQuery('#stop').css({"display": "none"});
+ return false;
+ });
+
+ jQuery('#start').bind('click', function() {
+ carousel.options.auto = carouselScrollInterval;
+ carousel.next();
+ jQuery('#stop').css({"display": ""});
+ jQuery('#start').css({"display": "none"});
+ return false;
+ });
+
+ jQuery('#next').bind('click', function() {
+ carousel.next();
+ return false;
+ });
+
+ jQuery('#previous').bind('click', function() {
+ carousel.prev();
+ return false;
+ });
+ };
+
}
- document.observe ('dom:loaded', StartSlides);
+
+ jQuery(document).ready(StartSlides);
</script>
</div>
<div id="content-wrap" class="clearfix">
@@ -330,8 +369,8 @@ under the License.
</form>
</div>
<div id="slides">
- <div class="slideshow" id="mantleSlides">
- <div id="slide1">
+ <ul class="jcarousel-skin-tango" id="mantleSlides">
+ <li>
<div class="callout">
The best things in life<br />
are FREE.<br />
@@ -343,8 +382,8 @@ under the License.
<div class="mantle">
<img src="/ofbiz/images/mantle.png" />
</div>
- </div>
- <div id="slide2" style="display:none">
+ </li>
+ <li>
<div class="callout">
Lower Costs,<br />
Higher Margins.<br />
@@ -357,8 +396,8 @@ under the License.
<div class="mantle">
<img src="/ofbiz/images/mantle2.png" />
</div>
- </div>
- <div id="slide3" style="display:none">
+ </li>
+ <li>
<div class="callout">
OPEN yourself up to all<br />
of the possibilities<br />
@@ -371,8 +410,8 @@ under the License.
<div class="mantle">
<img src="/ofbiz/images/mantle3.png" />
</div>
- </div>
- <div id="slide4" style="display:none">
+ </li>
+ <li>
<div class="callout">
We have<br />
street cred.<br />
@@ -384,11 +423,11 @@ under the License.
<div class="mantle">
<img src="/ofbiz/images/mantle4.png" />
</div>
- </div>
- <div id="slide5" style="display:none">
+ </li>
+ <li>
<div class="callout">
Just like muscles,<br />
- e-commerce should<br />
+ e-commerce should
be flexible.
</div>
<div class="description">
@@ -398,21 +437,60 @@ under the License.
<div class="mantle">
<img src="/ofbiz/images/mantle5.png" />
</div>
- </div>
- </div>
+ </li>
+ </ul>
<div class="controls">
<a class="next" id="next" title="Next" href="#">Next</a>
<a class="previous" id="previous" title="Previous" href="#">Previous</a>
- <a class="start" id="start" title="Start" href="#">Start</a>
+ <a class="start" id="start" style="display:none;" title="Start" href="#">Start</a>
<a class="stop" id="stop" title="Stop" href="#">Stop</a>
</div>
</div>
<script type="text/javascript">
function StartSlides() {
- new Slides('mantleSlides');
+ // casrousel scrolling interval set to 2 sec
+ var carouselScrollInterval = 2;
+
+ jQuery('#mantleSlides').jcarousel({
+ auto: carouselScrollInterval,
+ wrap: "circular",
+ initCallback: mycarousel_initCallback,
+ buttonNextHTML: null,
+ buttonPrevHTML: null
+ });
+
+ // create functions for the controll menu
+ function mycarousel_initCallback(carousel) {
+ jQuery('#stop').bind('click', function() {
+ carousel.options.auto = 0;
+ jQuery('#start').css({"display": ""});
+ jQuery('#stop').css({"display": "none"});
+ return false;
+ });
+
+ jQuery('#start').bind('click', function() {
+ carousel.options.auto = carouselScrollInterval;
+ carousel.next();
+ jQuery('#stop').css({"display": ""});
+ jQuery('#start').css({"display": "none"});
+ return false;
+ });
+
+ jQuery('#next').bind('click', function() {
+ carousel.next();
+ return false;
+ });
+
+ jQuery('#previous').bind('click', function() {
+ carousel.prev();
+ return false;
+ });
+ };
+
}
- document.observe ('dom:loaded', StartSlides);
+
+ jQuery(document).ready(StartSlides);
</script>
</div>
Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Fri Dec 10 20:40:08 2010
@@ -23,17 +23,16 @@ under the License.
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
<title>${uiLabelMap.OfbizTitle}</title>
<link rel="shortcut icon" href="/ofbiz/images/favicon.ico">
- <script language="javascript" src="/images/prototypejs/prototype.js" type="text/javascript"></script>
+ <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>
<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>
+ <script language="javascript" src="/images/jquery/plugins/jcarousel/jquery.jcarousel.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="/images/jquery/plugins/jcarousel/skins/tango/skin.css" />
+
<link rel="stylesheet" href="/ofbiz/images/global.css" type="text/css"/>
-
+
<meta content="OFBiz_Thai for Thai user" name="Description"/>
<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>
Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css Fri Dec 10 20:40:08 2010
@@ -812,6 +812,7 @@ body#home #header #slides {
position: absolute;
top: 128px;
left: 10px;
+ overflow: hidden;
background: url(/ofbiz/images/slideshow-bg.jpg) top center no-repeat;
width: 923px;
height: 260px;
@@ -825,7 +826,7 @@ body#home #header #slides .slideshow {
}
body#home #header #slides .callout {
- position: absolute;
+ position: relative;
top: 35px;
left: 30px;
font-size: 30px;
@@ -834,8 +835,8 @@ body#home #header #slides .callout {
}
body#home #header #slides .description {
- position: absolute;
- top: 175px;
+ position: relative;
+ top: 110px;
left: 30px;
font-size: 14px;
line-height: 15px;
@@ -896,9 +897,21 @@ body#home #header #slides .controls a im
}
body#home #header #slides .mantle{
- position:absolute;
- top:58px;
+ position:relative;
+ top:-80px;
left:385px;
+ float:right;
+}
+
+#mantleSlides{
+ width: 20000em;
+ height: 260px;
+ position: absolute;
+}
+
+#mantleSlides div {
+ float:left;
+ width: 923px;
}
body#home #col1 {
Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/script/search.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/script/search.js?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/script/search.js (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/script/search.js Fri Dec 10 20:40:08 2010
@@ -17,24 +17,17 @@
* under the License.
*/
-function initSearch(){
- var methods = {
- defaultValueActsAsHint: function(element){
- element = $(element);
- element._default = element.value;
- return element.observe('focus', function(){
- if(element._default != element.value) return;
- element.removeClassName('hint').value = '';
- }).observe('blur', function(){
- if(element.value.strip() != '') return;
- element.addClassName('hint').value = element._default;
- }).addClassName('hint');
+jQuery(document).ready(function () {
+ var jOsearchDocs = jQuery('#searchDocs');
+ var _default = jOsearchDocs.val();
+
+ jOsearchDocs.focus(function() {
+ if (jOsearchDocs.val() != "") {
+ jOsearchDocs.val("").removeClass("hint");
}
- };
- $w('input textarea').each(function(tag){ Element.addMethods(tag, methods) });
-}
-initSearch();
-
-document.observe('dom:loaded', function(){
- $('searchDocs').defaultValueActsAsHint();
+ }).blur(function() {
+ if (jOsearchDocs.val() == "") {
+ jOsearchDocs.val(_default).addClass("hint");
+ }
+ });
});
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Fri Dec 10 20:40:08 2010
@@ -168,44 +168,43 @@ under the License.
<td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
<td>
<#if task?exists>
- <input type="text" name="estimatedStartDate" value="${task.estimatedStartDate?if_exists}"/>
+ <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedStartDate?if_exists}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#else>
- <input type="text" name="estimatedStartDate" value=""/>
+ <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</#if>
- <a href="javascript:call_cal(document.addTaskAndAssocForm.estimatedStartDate,'${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
<td>
<#if task?exists>
- <input type="text" name="estimatedCompletionDate" value="${task.estimatedCompletionDate?if_exists}"/>
+ <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedCompletionDate?if_exists}" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#else>
- <input type="text" name="estimatedCompletionDate" value=""/>
+ <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</#if>
- <a href="javascript:call_cal(document.addTaskAndAssocForm.estimatedCompletionDate,'${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
<td>
+
+
<#if task?exists>
- <input type="text" name="actualStartDate" value="${task.actualStartDate?if_exists}"/>
+ <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualStartDate?if_exists}" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#else>
- <input type="text" name="actualStartDate" value=""/>
+ <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</#if>
- <a href="javascript:call_cal(document.addTaskAndAssocForm.actualStartDate,'${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
<td>
+
<#if task?exists>
- <input type="text" name="actualCompletionDate" value="${task.actualCompletionDate?if_exists}"/>
+ <@htmlTemplate.renderDateTimeField name="actualCompletionDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualCompletionDate?if_exists}" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<#else>
- <input type="text" name="actualCompletionDate" value=""/>
+ <@htmlTemplate.renderDateTimeField name="actualCompletionDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</#if>
- <a href="javascript:call_cal(document.addTaskAndAssocForm.actualCompletionDate,'${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl Fri Dec 10 20:40:08 2010
@@ -44,8 +44,7 @@ under the License.
<td><a href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId?if_exists}" class="buttontext">${workEffortSurveyAppl.surveyId?if_exists} - ${survey.surveyName?if_exists}</a></td>
<td>${workEffortSurveyAppl.fromDate?if_exists}</td>
<td>
- <input type="text" size="20" name="thruDate" value="${(workEffortSurveyAppl.thruDate)?if_exists}" <#if isReadable?exists> readonly="readonly"</#if> />
- <a href="javascript:call_cal(document.editWorkEffortSurveyAppl_${workEffortSurveyAppl_index}.thruDate, '${nowTimeStampString}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(workEffortSurveyAppl.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td>
<#if !isReadable?exists>
@@ -59,7 +58,7 @@ under the License.
<input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId?if_exists}" />
<input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId?if_exists}" />
<input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate?if_exists}" />
- <a href="javascript:$('deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}').submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ <a href="javascript:document.getElementById('deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}').submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
</form>
</td>
</#if>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml Fri Dec 10 20:40:08 2010
@@ -78,9 +78,6 @@ under the License.
<set field="titleProperty" value="PartyProfile"/>
<set field="headerItem" value="find"/>
<set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/control.progress_bar.js" global="true"/>
- <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/progress_bar.css" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js Fri Dec 10 20:40:08 2010
@@ -17,87 +17,77 @@ specific language governing permissions
under the License.
*/
-document.observe('dom:loaded', function() {
+jQuery(document).ready( function() {
// Autocompleter for good identification field
- var j = 0;
- var autoCompleteIdent = null;
var productsIdent = [];
var productsIdIdent = [];
- var previousIdent = '';
- Event.observe($('productGoodIdentification'), 'focus', function(s) {
- var ident = $('productGoodIdentification').value;
- if (j == 0 || previousIdent != ident) {
- var pars = 'productGoodIdentification' + $('productGoodIdentification').value;
- new Ajax.Request("FindProductsByIdentification",
- {
- asynchronous: false,
- parameters: pars,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- productsIdent = data.productsList;
- productsIdIdent = data.productsId;
- autoComplete = new Autocompleter.Local('productGoodIdentification', 'productsIdent', productsIdent, {partialSearch: false});
- }
- });
- previousIdent = ident;
- j++;
+
+ jQuery( "#productGoodIdentification" ).autocomplete({
+ minLength: 2,
+ source: function( request, response ) {
+ var term = request.term;
+ term = 'productGoodIdentification=' + term;
+ jQuery.ajax({
+ url: "FindProductsByIdentification",
+ type: 'POST',
+ async: false,
+ data: term,
+ success: function(data) {
+ productsIdent = data.productsList;
+ productsIdIdent = data.productsId;
+ response( productsIdent );
+ }
+
+ });
+ },
+ select: function( event, ui ) {
+ var identValues = ui.item.value;
+
+ jQuery.each(productsIdent, function(product) {
+ if (identValues == this) {
+ document.getElementById('add_product_id').value = productsIdIdent[product];
+ return false;
+ }
+ });
}
});
- Event.observe($('productGoodIdentification'), 'blur', function(s) {
- identValues = $('productGoodIdentification').value;
- var l = 0;
- productsIdent.each(function(product) {
- if (identValues == product) {
- $('add_product_id').value = productsIdIdent[l];
- throw $break;
- }
- l++;
- });
- });
-
// Autocompleter for search by field
- Event.observe($('searchBy'), 'change', function(s) {
- $('add_product_id').value = '';
- $('productToSearch').value = '';
- Form.Element.focus('productToSearch');
+ jQuery('#searchBy').change( function(s) {
+ document.getElementById('add_product_id').value = '';
+ document.getElementById('productToSearch').value = '';
+ jQuery('#productToSearch').focus();
});
-
- var i = 0;
- var autoComplete = null;
- var products = [];
- var productsId = [];
- var previousSearchBy = '';
- Event.observe($('productToSearch'), 'focus', function(s) {
- var searchBy = $('searchBy').value;
- if (i == 0 || previousSearchBy != searchBy) {
- var pars = 'searchBy=' + $('searchBy').value + '&productToSearch=' + $('productToSearch').value;
- new Ajax.Request("FindProducts",
- {
- asynchronous: false,
- parameters: pars,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- products = data.productsList;
- productsId = data.productsId;
- autoComplete = new Autocompleter.Local('productToSearch', 'products', products, {partialSearch: false});
- }
- });
- previousSearchBy = searchBy;
- i++;
+
+ jQuery( "#productToSearch" ).autocomplete({
+ minLength: 2,
+ source: function( request, response ) {
+ var term = request.term;
+ term = 'searchBy=' + document.getElementById('searchBy').value + '&productToSearch=' + term;
+ jQuery.ajax({
+ url: "FindProducts",
+ async: false,
+ type: 'POST',
+ data: term,
+ success: function(data) {
+ products = data.productsList;
+ productsId = data.productsId;
+ response( products );
+ }
+
+ });
+ },
+ select: function( event, ui ) {
+ var productToSearchValues = ui.item.value;
+
+ jQuery.each(products, function(product){
+ if (productToSearchValues == this) {
+ document.getElementById('add_product_id').value = productsId[product];
+ return false;
+ }
+ });
}
});
-
- Event.observe($('productToSearch'), 'blur', function(s) {
- productToSearchValues = $('productToSearch').value;
- var p = 0;
- products.each(function(product){
- if (productToSearchValues == product) {
- $('add_product_id').value = productsId[p];
- throw $break;
- }
- p++;
- });
- });
+
});
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl Fri Dec 10 20:40:08 2010
@@ -53,12 +53,6 @@ under the License.
<#if metaKeywords?exists>
<meta name="keywords" content="${metaKeywords}"/>
</#if>
-
- <#if requireDojo?exists>
- <script type="text/javascript">
- dojo.require("dojo.widget.*");
- </script>
- </#if>
</head>
<body>
Modified: ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Fri Dec 10 20:40:08 2010
@@ -42,8 +42,14 @@ under the License.
<!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: -->
<set field="layoutSettings.javaScripts[+0]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/selectall.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/calendar1.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/>
+
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.7.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.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="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.2.min.js" global="true"/>
<script location="component://webpos/widget/WebPosSetup.groovy"/>
Modified: ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml Fri Dec 10 20:40:08 2010
@@ -25,10 +25,6 @@ under the License.
<section>
<actions>
<set field="MainColumnStyle" value="rightonly"/>
-
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/scriptaculous.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/controls.js" global="true"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">