svn commit: r1003957 - in /ofbiz/branches/jquery: applications/marketing/widget/
Locked
svn commit: r1003957 - in /ofbiz/branches/jquery: applications/marketing/widget/
 
|
Author: jleroux
Date: Sun Oct 3 12:51:15 2010 New Revision: 1003957 URL: http://svn.apache.org/viewvc?rev=1003957&view=rev Log: Patches from Sascha Rodekamp OFBIZ-3966 * ProjectManagerApplicationMigration.patch * ProductApplicationMigration.patch * PartyApplicationMigration.patch * OrderApplicationMigration.patch * MarketingApplicationMigration.patch * GoogleApplicationMigration.patch * ExampleApplicationMigration.patch * EbayStoreApplicationMigration.patch * EbayApplicationMigration.patch * CommonUiLabels.patch * CommonDependentDropdownMigration.patch Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml ofbiz/branches/jquery/applications/party/webapp/partymgr/party/editShoppingList.ftl ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacilityLocation.ftl ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ResourceScreens.xml Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml Sun Oct 3 12:51:15 2010 @@ -198,9 +198,6 @@ under the License. <set field="tabButtonItem" value="profile"/> <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"/> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Sun Oct 3 12:51:15 2010 @@ -135,9 +135,6 @@ under the License. <screen name="product"> <section> <actions> - <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/> - <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/> - <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/popup.css" global="true"/> <set field="title-property" value="PageTitleProductPage"/> <set field="configproductdetailScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#configproductdetail"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy"/> Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/party/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/party/editShoppingList.ftl (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/party/editShoppingList.ftl Sun Oct 3 12:51:15 2010 @@ -25,9 +25,9 @@ under the License. <li> <form id="createEmptyShoppingList" action="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>" method="post"> <input type="hidden" name="partyId" value="${partyId?if_exists}" /> - <a href="javascript:$('createEmptyShoppingList').submit();" class="buttontext">${uiLabelMap.CommonCreateNew}</a> + <a href="javascript:document.getElementById('createEmptyShoppingList').submit();" class="buttontext">${uiLabelMap.CommonCreateNew}</a> </form> - </li> + </li> </ul> <br class="clear"/> </div> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl Sun Oct 3 12:51:15 2010 @@ -62,7 +62,7 @@ under the License. <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="advancedsearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> </div> <div> - <a href="javascript:$('advancedSearchForm').submit()" class="buttontext">${uiLabelMap.ProductAdvancedSearch}</a> + <a href="javascript:document.getElementById('advancedSearchForm').submit()" class="buttontext">${uiLabelMap.ProductAdvancedSearch}</a> </div> </fieldset> </form> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditContactMech.ftl Sun Oct 3 12:51:15 2010 @@ -102,7 +102,7 @@ under the License. </#if> (${uiLabelMap.CommonSince}: ${facilityContactMechPurpose.fromDate}) <#if facilityContactMechPurpose.thruDate?has_content>(${uiLabelMap.CommonExpires}: ${facilityContactMechPurpose.thruDate.toString()}</#if> - <a href="javascript:$('deleteFacilityContactMechPurpose_${facilityContactMechPurpose_index}').submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> + <a href="javascript:document.getElementById('deleteFacilityContactMechPurpose_${facilityContactMechPurpose_index}').submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> </td> </tr> <#-- toggle the row color --> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Sun Oct 3 12:51:15 2010 @@ -121,7 +121,7 @@ under the License. <input type="text" size="10" name="minimumStock" value="${(productFacilityLocation.minimumStock)?if_exists}"/> <input type="text" size="10" name="moveQuantity" value="${(productFacilityLocation.moveQuantity)?if_exists}"/> <input type="submit" value="${uiLabelMap.CommonUpdate}"/> - <a href="javascript:$('lineForm${productFacilityLocation_index}').action='<@ofbizUrl>deleteProductFacilityLocation</@ofbizUrl>';$('lineForm${productFacilityLocation_index}').submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> + <a href="javascript:document.getElementById('lineForm${productFacilityLocation_index}').action='<@ofbizUrl>deleteProductFacilityLocation</@ofbizUrl>';document.getElementById('lineForm${productFacilityLocation_index}').submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </td> </tr> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl Sun Oct 3 12:51:15 2010 @@ -262,6 +262,12 @@ under the License. <script language="JavaScript" type="text/javascript"> function setInventoryItemStatus(selection,index) { var statusId = "statusId_o_" + index; - new Ajax.Updater($(statusId), 'UpdatedInventoryItemStatus',{parameters: {inventoryItemType:selection.value,inventoryItemStatus:$(statusId).value}}); + jObjectStatusId = jQuery("#" + statusId); + jQuery.ajax({ + url: 'UpdatedInventoryItemStatus', + data: {inventoryItemType: selection.value, inventoryItemStatus: jObjectStatusId.val()}, + type: "POST", + success: function(data){jObjectStatusId.html(data);} + }); } </script> \ No newline at end of file Modified: ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml Sun Oct 3 12:51:15 2010 @@ -9855,4 +9855,24 @@ <value xml:lang="zh">ä¸æ</value> <value xml:lang="zh_CN">ä¸æ</value> </property> + <property key="CommonCharactorsLeft"> + <value xml:lang="de">Zeichen übrig.</value> + <value xml:lang="en">charactors left.</value> + </property> + <property key="CommonPleaseWait"> + <value xml:lang="de">Bitte warten Sie ...</value> + <value xml:lang="en">please wait ...</value> + </property> + <property key="CommonPleaseSelect"> + <value xml:lang="de">Bitte wählen</value> + <value xml:lang="en">please select</value> + </property> + <property key="CommonLoading"> + <value xml:lang="de">Empfange Daten ...</value> + <value xml:lang="en">Loading ...</value> + </property> + <property key="CommonDownloaded"> + <value xml:lang="de">Daten empfangen.</value> + <value xml:lang="en">Downloaded.</value> + </property> </resource> Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl Sun Oct 3 12:51:15 2010 @@ -27,12 +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="<@ofbizContentUrl>/images/prototypejs/prototype.js</@ofbizContentUrl>" type="text/javascript"></script> - <script language="javascript" src="<@ofbizContentUrl>/images/prototypejs/scriptaculous.js</@ofbizContentUrl>" type="text/javascript"></script> - <script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script> <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script> - <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script> - <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${(parameters.userLogin.lastLocale?substring(0,2))!initialLocale?substring(0,2)!'en'}.js</@ofbizContentUrl>" type="text/javascript"></script> <#if layoutSettings.javaScripts?has_content> <#--layoutSettings.javaScripts is a list of java scripts. --> <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order --> Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl Sun Oct 3 12:51:15 2010 @@ -17,12 +17,12 @@ specific language governing permissions under the License. --> <script type="text/javascript"> -document.observe('dom:loaded', function() { - if ($('${dependentForm}')) { - Event.observe($('${dependentForm}_countryGeoId'), 'change', function() { +jQuery(document).load ( function() { + if (jQuery('#${dependentForm}').length) { + jQuery('#${dependentForm}_countryGeoId').change( function() { getDependentDropdownValues('getAssociatedStateList', 'countryGeoId', '${dependentForm}_countryGeoId', '${dependentForm}_stateProvinceGeoId', 'stateList', 'geoId', 'geoName', '', ''); }); getDependentDropdownValues('getAssociatedStateList', 'countryGeoId', '${dependentForm}_countryGeoId', '${dependentForm}_stateProvinceGeoId', 'stateList', 'geoId', 'geoName', '${selectedStateProvinceGeoId}', ''); } -}) +}); </script> Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl Sun Oct 3 12:51:15 2010 @@ -18,7 +18,7 @@ under the License. --> <script type="text/javascript"> jQuery(document).ready(function() { - if (jQuery('#${dependentForm}')) { + if (jQuery('#${dependentForm}').length) { jQuery("#${dependentForm}_${mainId}").change(function(e, data) { getDependentDropdownValues('${requestName}', '${paramKey}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '', ''); }); Modified: ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml Sun Oct 3 12:51:15 2010 @@ -117,9 +117,6 @@ under the License. <screen name="EditExampleFeatureAppls"> <section> <actions> - <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/scriptaculous.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/> - <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/scriptaculouscontrols.css" global="true"/> <set field="titleProperty" value="PageTitleEditExampleFeatureAppls"/> <set field="tabButtonItem" value="EditExampleFeatureAppls"/> <set field="exampleId" from-field="parameters.exampleId"/> Modified: ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl Sun Oct 3 12:51:15 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="<@ofbizUrl>main</@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'); } } } @@ -58,7 +58,7 @@ under the License. <h3>${uiLabelMap.ProductAdvancedSearchInCategory}</h3> </div> <div class="screenlet-body"> - <form id="advToKeywordSearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> + <form id="advToKeywordSearchform" name="advToKeywordSearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> <fieldset> <input type="hidden" name="VIEW_SIZE" value="25"/> <input type="hidden" name="PAGING" value="Y"/> @@ -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 ebayConfigList?has_content> <#list ebayConfigList as ebayConfig> <#assign productStore = delegator.findOne("ProductStore", {"productStoreId" : ebayConfig.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> Modified: ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl Sun Oct 3 12:51:15 2010 @@ -107,7 +107,7 @@ under the License. <td align="right" class="label">${uiLabelMap.CommonWebsite}</td> <td> </td> <td> - <select name="webSiteId" onchange="javascript:changeWebSite($('ProductsExportToEbay'));"> + <select name="webSiteId" onchange="javascript:changeWebSite(document.getElementById('ProductsExportToEbay'));"> <#list webSiteList as webSite> <#assign displayDesc = webSite.siteName?default("${uiLabelMap.ProductNoDescription}")> <#if (18 < displayDesc?length)> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl Sun Oct 3 12:51:15 2010 @@ -17,104 +17,106 @@ specific language governing permissions under the License. --> <script language="Javascript" type="text/javascript"> - function countAreaChars(areaName,limit,charleft) + function countAreaChars(areaName, limit, charleft) { - if (areaName.value.length>limit){ + if (areaName.value.length > limit){ areaName.value=areaName.value.substring(0,limit); }else{ - charleft.innerHTML = (limit - areaName.value.length) + " charactors left."; + charleft.innerHTML = (limit - areaName.value.length) + " ${uiLabel.CommonCharactorsLeft}"; } } - function retrieveThemeColorSchemeByThemeId(url,themeId,productStoreId){ - var pars = 'themeId='+themeId+'&productStoreId='+productStoreId; - var myAjax = new Ajax.Request( url, { - method: 'get', - parameters: pars, - onLoading: function loading(){ - $('loading').innerHTML = ' Please wait...'; - }, - onComplete: function retrieveThemeColorSchemeByThemeId(originalRequest){ - if(originalRequest.responseJSON!=null){ - var resp = eval("("+originalRequest.responseText+")"); - if(resp.storeColorPrimary!=null)$('storePrimaryColor').value = resp.storeColorPrimary; - if(resp.storeColorAccent!=null)$('storeSecondaryColor').value = resp.storeColorAccent; - if(resp.storeColorSecondary!=null)$('storeAccentColor').value = resp.storeColorSecondary; - - if(resp.storeFontTypeFontFaceValue!=null) selectOption($('storeNameFont'),resp.storeFontTypeFontFaceValue); - if(resp.storeFontTypeNameFaceColor!=null)$('storeNameFontColor').value = resp.storeFontTypeNameFaceColor; - if(resp.storeFontTypeSizeFaceValue!=null) selectOption($('storeNameFontSize'), resp.storeFontTypeSizeFaceValue); - - if(resp.storeFontTypeTitleColor!=null)$('storeTitleFontColor').value = resp.storeFontTypeTitleColor; - if(resp.storeFontTypeFontTitleValue!=null)selectOption($('storeTitleFont'),resp.storeFontTypeFontTitleValue); - if(resp.storeFontSizeTitleValue!=null)selectOption($('storeTitleFontSize'),resp.storeFontSizeTitleValue); - - if(resp.storeFontTypeDescColor!=null)$('storeDescFontColor').value = resp.storeFontTypeDescColor; - if(resp.storeFontTypeFontDescValue!=null) selectOption($('storeDescFont'),resp.storeFontTypeFontDescValue); - if(resp.storeDescSizeValue!=null) selectOption($('storeDescFontSize'),resp.storeDescSizeValue); - } - $('loading').innerHTML = ''; - } - } ); + function retrieveThemeColorSchemeByThemeId(url, themeId, productStoreId){ + var pars = 'themeId='+themeId+'&productStoreId='+productStoreId; + + jQuery.ajax({ + url: url, + type: "GET", + data: pars, + beforeStart: function() {document.getElementById('loading').innerHTML = ' ${uiLabel.CommonPleaseWait}';}, + success: function(data) { + if (data != null){ + var resp = eval("("+data+")"); + if (resp.storeColorPrimary!=null) document.getElementById('storePrimaryColor').value = resp.storeColorPrimary; + if (resp.storeColorAccent!=null) document.getElementById('storeSecondaryColor').value = resp.storeColorAccent; + if (resp.storeColorSecondary!=null) document.getElementById('storeAccentColor').value = resp.storeColorSecondary; + + if (resp.storeFontTypeFontFaceValue!=null) selectOption( document.getElementById('storeNameFont'),resp.storeFontTypeFontFaceValue); + if (resp.storeFontTypeNameFaceColor!=null) document.getElementById('storeNameFontColor').value = resp.storeFontTypeNameFaceColor; + if (resp.storeFontTypeSizeFaceValue!=null) selectOption( document.getElementById('storeNameFontSize'), resp.storeFontTypeSizeFaceValue); + + if (resp.storeFontTypeTitleColor!=null) document.getElementById('storeTitleFontColor').value = resp.storeFontTypeTitleColor; + if (resp.storeFontTypeFontTitleValue!=null) selectOption( document.getElementById('storeTitleFont'),resp.storeFontTypeFontTitleValue); + if (resp.storeFontSizeTitleValue!=null) selectOption( document.getElementById('storeTitleFontSize'),resp.storeFontSizeTitleValue); + + if (resp.storeFontTypeDescColor!=null) document.getElementById('storeDescFontColor').value = resp.storeFontTypeDescColor; + if (resp.storeFontTypeFontDescValue!=null) selectOption( document.getElementById('storeDescFont'),resp.storeFontTypeFontDescValue); + if (resp.storeDescSizeValue!=null) selectOption( document.getElementById('storeDescFontSize'),resp.storeDescSizeValue); + } + document.getElementById('loading').innerHTML = ''; + } + }); } - function selectOption(myselect,val){ + + function selectOption(myselect, val){ for (var i=0; i<myselect.options.length; i++){ if ( myselect.options[i].value == val){ myselect.options[i].selected=true; break; } - + } } - function switchTheme(url,themeId,productStoreId){ + function switchTheme(url, themeId, productStoreId){ var size = document.StoreSettingForm.storeThemeType.length; var selectTheme = ''; for(i=0;i<size;i++){ - if(document.StoreSettingForm.storeThemeType[i].checked){ + if (document.StoreSettingForm.storeThemeType[i].checked){ selectTheme = document.StoreSettingForm.storeThemeType[i].value; break; } } - if(selectTheme=='Basic'){ - //retrieve basic theme by ajax then print new select list + if (selectTheme == 'Basic') { + //retrieve basic theme by ajax then print new select list document.StoreSettingForm.storeAdvancedTheme.disabled = true; document.StoreSettingForm.storeAdvancedThemeColor.disabled = true; - + document.StoreSettingForm.storeBasicTheme.disabled = false; document.StoreSettingForm.storePrimaryColor.disabled = false; document.StoreSettingForm.storeSecondaryColor.disabled = false; document.StoreSettingForm.storeAccentColor.disabled = false; - + document.StoreSettingForm.storeNameFont.disabled = false; document.StoreSettingForm.storeNameFontSize.disabled = false; document.StoreSettingForm.storeNameFontColor.disabled = false; - + document.StoreSettingForm.storeTitleFont.disabled = false; document.StoreSettingForm.storeTitleFontSize.disabled = false; document.StoreSettingForm.storeTitleFontColor.disabled = false; - + document.StoreSettingForm.storeDescFont.disabled = false; document.StoreSettingForm.storeDescFontSize.disabled = false; document.StoreSettingForm.storeDescFontColor.disabled = false; document.StoreSettingForm.themeType.value = "Basic"; - }else if(selectTheme=='Advanced'){ + + } else if (selectTheme == 'Advanced') { document.StoreSettingForm.themeType.value = "Advanced"; document.StoreSettingForm.storeBasicTheme.disabled = true; document.StoreSettingForm.storePrimaryColor.disabled = true; document.StoreSettingForm.storeSecondaryColor.disabled = true; document.StoreSettingForm.storeAccentColor.disabled = true; - + document.StoreSettingForm.storeNameFont.disabled = true; document.StoreSettingForm.storeNameFontSize.disabled = true; document.StoreSettingForm.storeNameFontColor.disabled = true; - + document.StoreSettingForm.storeTitleFont.disabled = true; document.StoreSettingForm.storeTitleFontSize.disabled = true; document.StoreSettingForm.storeTitleFontColor.disabled = true; - + document.StoreSettingForm.storeDescFont.disabled = true; document.StoreSettingForm.storeDescFontSize.disabled = true; document.StoreSettingForm.storeDescFontColor.disabled = true; - + document.StoreSettingForm.storeAdvancedTheme.disabled = false; document.StoreSettingForm.storeAdvancedThemeColor.disabled = false; } Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl Sun Oct 3 12:51:15 2010 @@ -21,10 +21,10 @@ under the License. //<![CDATA[ function selectChange(formId, elementId) { 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="<@ofbizUrl>main</@ofbizUrl>"; @@ -32,11 +32,11 @@ under the License. } function submit (id) { var formId = id; - if(!$('searchCatalogId').empty()){ - $(formId).submit(); + if(!jQuery('#searchCatalogId').is(":empty")){ + document.getElementById(formId).submit(); } else { - if($('searchCatalogId').empty()) { - $('catalogErrorMessage').show(); + if(jQuery('#searchCatalogId').is(":empty")) { + jQuery('#catalogErrorMessage').fadeIn("fast"); } } } @@ -60,7 +60,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)> @@ -132,7 +132,7 @@ under the License. <tr> <td align="center" colspan="2"> <hr /> - <a href="javascript:submit($('productSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a> + <a href="javascript:submit(document.getElementById('productSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a> </td> </tr> </table> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Sun Oct 3 12:51:15 2010 @@ -71,61 +71,63 @@ under the License. if (cateId.indexOf(':')!= -1) { cateId = cateId.substring(0,cateId.indexOf(':')); } - var pars = 'ebayCategoryId='+cateId+'&productStoreId='+productStoreId; - var myAjax = new Ajax.Request( url, { - method: 'get', - parameters: pars, - onLoading: function loading(){ - $('loading').innerHTML = '<b>Please wait...</b>'; - } , - onComplete: function writeCategoryList(originalRequest){ - $('loading').innerHTML = ''; - if(originalRequest.responseJSON!=null){ - removeOptions($(id)); - var resp = eval("("+originalRequest.responseText+")"); - var leng = resp.size(); - for (i=0;i<leng;i++) { - if (i == 0) { - $(id).options[0] = new Option("Please select",""); - } - var optVal = resp[i].CategoryCode; - var optName = resp[i].CategoryName; - var isLeaf = resp[i].IsLeafCategory; - $(id).options[i+1] = new Option(optName,optVal+":"+isLeaf); - } - } - } - } ); + var pars = 'ebayCategoryId='+cateId+'&productStoreId='+productStoreId; + jQuery.ajax({ + url: url, + type: "GET", + data: pars, + beforeStart: function({document.getElementById('loading').innerHTML = '<b>${uiLabel.CommonPleaseWait}</b>';}), + success: function(data) { + document.getElementById('loading').innerHTML = ''; + if(data != null){ + removeOptions(document.getElementById(id)); + var resp = eval("("+data+")"); + var leng = resp.size(); + for (i=0;i<leng;i++) { + if (i == 0) { + document.getElementById(id).options[0] = new Option("${uiLabel.CommonPleaseSelect}",""); + } + var optVal = resp[i].CategoryCode; + var optName = resp[i].CategoryName; + var isLeaf = resp[i].IsLeafCategory; + document.getElementById(id).options[i+1] = new Option(optName,optVal+":"+isLeaf); + } + } + } + }); } function retrieveTemplateByTemGroupId(templateGroupId,productStoreId,pkCategoryId){ - var pars = 'templateGroupId='+templateGroupId+'&productStoreId='+productStoreId+'&pkCategoryId='+pkCategoryId; + var pars = 'templateGroupId='+templateGroupId+'&productStoreId='+productStoreId+'&pkCategoryId='+pkCategoryId; var url = '<@ofbizUrl>ebayAdItemTemplate</@ofbizUrl>'; - var myAjax = new Ajax.Request( url, { - method: 'get', - parameters: pars, - onComplete: function writeItemTemplates(originalRequest){ - removeOptions('theme'); - previewPic(":http://pics.ebay.com/aw/pics/vit/None2_sample_100x120.gif"); - if(originalRequest.responseJSON!=null){ - var resp = eval("("+originalRequest.responseText+")"); - var leng = resp.size(); - var j = 0; - for (i=0;i<leng+1;i++) { - if (i == 0) { - $('theme').options[0] = new Option("Please select","_NA_"); - } else { - var optVal = resp[i].TemplateId+":"+resp[i].TemplateImageURL; - $('theme').options[i] = new Option(resp[i].TemplateName,optVal); - j++; - } - } - } + + jQuery.ajax({ + url: url, + type: "GET", + data: pars, + success: function(data){ + removeOptions('theme'); + previewPic(":http://pics.ebay.com/aw/pics/vit/None2_sample_100x120.gif"); + if(data!=null){ + var resp = eval("("+data+")"); + var leng = resp.size(); + var j = 0; + for (i=0;i<leng+1;i++) { + if (i == 0) { + document.getElementById('theme').options[0] = new Option("${uiLabel.CommonPleaseSelect}","_NA_"); + } else { + var optVal = resp[i].TemplateId+":"+resp[i].TemplateImageURL; + document.getElementById('theme').options[i] = new Option(resp[i].TemplateName,optVal); + j++; + } } - } ); + } + } + }); } + function removeOptions(id){ - var elSel = $(id); + var elSel = jQuery("#" + id); var i; for (i = elSel.length - 1; i>=0; i--) { elSel.remove(i); @@ -133,21 +135,21 @@ under the License. } function enabledItemTemplate(val){ var field = "enabledTheme"; - if ($(field).checked) { - $('themeGroup').disabled = false; - $('theme').disabled = false; + if (document.getElementById(field).checked) { + document.getElementById('themeGroup').disabled = false; + document.getElementById('theme').disabled = false; } else { - $('themeGroup').disabled = true; - $('theme').disabled = true; + document.getElementById('themeGroup').disabled = true; + document.getElementById('theme').disabled = true; } } function previewPic(val) { if (val != null) val = val.substr(val.indexOf(":")+1); - $('themeImg').src = val; + document.getElementById('themeImg').src = val; } function toggleDisp() { for (var i=0;i<arguments.length;i++){ - var d = $(arguments[i]); + var d = document.getElementById(arguments[i]); if (d.style.display == 'none') d.style.display = 'block'; else @@ -155,34 +157,34 @@ under the License. } } function toggleTab(num,numelems,opennum,animate) { - if ($('tabContent'+num).style.display == 'none'){ + if (document.getElementById('tabContent'+num).style.display == 'none'){ for (var i=1;i<=numelems;i++){ if ((opennum == null) || (opennum != i)){ var temph = 'tabHeader_'+i; - var h = $(temph); + var h = document.getElementById(temph); if (!h){ - var h = $('tabHeaderActive_'); + var h = document.getElementById('tabHeaderActive_'); h.id = temph; } var tempc = 'tabContent'+i; - var c = $(tempc); + var c = document.getElementById(tempc); if(c.style.display != 'none'){ if (animate || typeof animate == 'undefined') - Effect.toggle(tempc,'blind',{duration:0.2, queue:{scope:'menus', limit: 3}}); + jQuery("#" + tempc).animate({opacity: 'toggle', height: 'toggle'}, "slow"); else toggleDisp(tempc); } } } - var h = $('tabHeader_'+num); + var h = document.getElementById('tabHeader_'+num); if (h){ h.id = 'tabHeaderActive_'; } h.blur(); - var c = $('tabContent'+num); + var c = document.getElementById('tabContent'+num); c.style.marginTop = '2px'; if (animate || typeof animate == 'undefined'){ - Effect.toggle('tabContent'+num,'blind',{duration:0.2, queue:{scope:'menus', position:'end', limit: 3}}); + jQuery("#tabContent" + num).animate({opacity: 'toggle', height: 'toggle'}, "slow"); }else{ toggleDisp('tabContent'+num); } @@ -211,9 +213,9 @@ under the License. <#if contentList?has_content> <#list contentList as content> <#if !isProductId?has_content> - <li <#if id == 1>class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:$('ProductsExportToEbay').action = '<@ofbizUrl>exportProductListing</@ofbizUrl>?isProductId=${content.product.productId?if_exists}';$('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li> + <li <#if id == 1>class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>exportProductListing</@ofbizUrl>?isProductId=${content.product.productId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li> <#else> - <li <#if isProductId?exists && isProductId?if_exists == content.product.productId?if_exists >class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:$('ProductsExportToEbay').action = '<@ofbizUrl>exportProductListing</@ofbizUrl>?isProductId=${content.product.productId?if_exists}';$('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li> + <li <#if isProductId?exists && isProductId?if_exists == content.product.productId?if_exists >class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>exportProductListing</@ofbizUrl>?isProductId=${content.product.productId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li> </#if> <#assign id = id+1> </#list> @@ -305,7 +307,7 @@ under the License. </#if> </#if> </select> - <a class="buttontext" href="javascript:retrieveEbayCategoryByParent('<@ofbizUrl>retrieveEbayCategoryByParent</@ofbizUrl>','CH_<#if primaryCate?has_content>${primaryCate.getCategoryID()?if_exists}</#if>','${productStoreId}','ebayCategory')">${uiLabelMap.EbayChangeCategory}</a> <a class="buttontext" href="javascript:$('ProductsExportToEbay').action = '<@ofbizUrl>setSelectedCategory</@ofbizUrl>?isProductId=${isProductId?if_exists}';$('ProductsExportToEbay').submit();">${uiLabelMap.EbaySet}</a> + <a class="buttontext" href="javascript:retrieveEbayCategoryByParent('<@ofbizUrl>retrieveEbayCategoryByParent</@ofbizUrl>','CH_<#if primaryCate?has_content>${primaryCate.getCategoryID()?if_exists}</#if>','${productStoreId}','ebayCategory')">${uiLabelMap.EbayChangeCategory}</a> <a class="buttontext" href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>setSelectedCategory</@ofbizUrl>?isProductId=${isProductId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${uiLabelMap.EbaySet}</a> </div> <input type="hidden" name="primaryCateId" value="${primaryCateId?if_exists}"/> <div id="ebayCategory_Name">${priCateName?if_exists}</div> @@ -535,7 +537,7 @@ under the License. <td valign="top"> <script type="text/javascript"> function popUpImg(){ - //popUp($('themeImg').src, 'themeImgBig', '400', '550'); + //popUp(document.getElementById('themeImg').src, 'themeImgBig', '400', '550'); } </script> <a id="themeImgUrl" href="javascript:popUpImg();"><img hspace="5" height="120" border="0" align="top" width="100" id="themeImg" name="themeImg" src="http://pics.ebay.com/aw/pics/vit/None2_sample_100x120.gif" alt="" /></a> Modified: ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl Sun Oct 3 12:51:15 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="<@ofbizUrl>main</@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> Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl Sun Oct 3 12:51:15 2010 @@ -58,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/branches/jquery/specialpurpose/projectmgr/widget/ResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=1003957&r1=1003956&r2=1003957&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ResourceScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ResourceScreens.xml Sun Oct 3 12:51:15 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"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |