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 [4/15] - in /ofbiz/trunk: ./
applications/accounting/webapp/accounting/finaccounttrans/
applications/accounting/webapp/accounting/images/
applications/accounting/webapp/accounting/payment/
applications/accounting/webapp/ap/invoices...
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js Fri Dec 10 20:40:08 2010
@@ -17,109 +17,102 @@
* under the License.
*/
-document.observe('dom:loaded', function() {
- // Autocompleter for shipping panel
- // Preventing getCountryList() from calling and not removed all autocompleter functions so that we can reuse in future.
- //getCountryList();
-});
-
function getCountryList() {
- countryTargetField = $('shipToCountryGeo');
- countryDivToPopulate = $('shipToCountries');
- countryHiddenTarget = $('shipToCountryGeoId');
- new Ajax.Request("getCountryList", {
- asynchronous: false,
- onSuccess: callCountryAutocompleter
+ countryTargetField = jQuery('#shipToCountryGeo');
+ countryDivToPopulate = jQuery('#shipToCountries');
+ countryHiddenTarget = jQuery('#shipToCountryGeoId');
+ jQuery.ajax({
+ url: "getCountryList",
+ type: "POST",
+ async: false,
+ success: callCountryAutocompleter
});
}
-function callCountryAutocompleter(transport) {
- var geos = new Hash();
- var data = transport.responseText.evalJSON(true);
+function callCountryAutocompleter(data) {
countryList = data.countryList;
- countryList.each(function(country) {
- var countryName = country.split(': ');
- geos.set(countryName[1], countryName[0]);
- });
- new Autocompleter.Local(countryTargetField, countryDivToPopulate, $H(geos), { partialSearch: false, afterUpdateElement: setKeyAsParameterAndGetStateList});
+ countryTargetField.autcomplete({source: countryList, select: setKeyAsParameterAndGetStateList});
}
-function setKeyAsParameterAndGetStateList(text, li) {
- countryHiddenTarget.value = li.id;
+function setKeyAsParameterAndGetStateList(event, ui) {
+ countryHiddenTarget.value = ui.item;
getAssociatedStateListForAutoComplete();
}
function getAssociatedStateListForAutoComplete() {
- stateTargetField = $('shipToStateProvinceGeo');
- stateDivToPopulate = $('shipToStates');
- stateHiddenTarget = $('shipToStateProvinceGeoId');
- new Ajax.Request("getAssociatedStateList", {
- asynchronous: false,
- parameters: $('shippingForm').serialize(),
- onSuccess: callStateAutocompleter
+ stateTargetField = jQuery('#shipToStateProvinceGeo');
+ stateDivToPopulate = jQuery('#shipToStates');
+ stateHiddenTarget = jQuery('#shipToStateProvinceGeoId');
+ jQuery.ajax({
+ url: "getAssociatedStateList",
+ type: "POST",
+ data: jQuery('#shippingForm').serialize(),
+ async: false,
+ success: function(data) {callStateAutocompleter(data); }
});
}
-function callStateAutocompleter(transport) {
- var geos = new Hash();
- var data = transport.responseText.evalJSON(true);
+function callStateAutocompleter(data){
stateList = data.stateList;
- stateList.each(function(state) {
- var stateName = state.split(': ');
- geos.set(stateName[1], stateName[0]);
- });
if (stateList.size() <= 1) {
- $('shipToStateProvinceGeo').value = "No States/Provinces exists";
- $('shipToStateProvinceGeoId').value = "_NA_";
- Effect.Fade('shipStates', {duration: 0.0});
- Effect.Fade('advice-required-shipToStateProvinceGeo', {duration: 0.0});
- Event.stopObserving($('shipToStateProvinceGeo'), 'blur');
+ jQuery('#shipToStateProvinceGeo').value = "No States/Provinces exists";
+ jQuery('#shipToStateProvinceGeoId').value = "_NA_";
+ jQuery("#shipStates").fadeOut("fast");
+ jQuery("#advice-required-shipToStateProvinceGeo").fadeOut("fast");
+ jQuery("#shipToStateProvinceGeo").unbind("blur");
} else {
- $('shipToStateProvinceGeo').value = "";
- $('shipToStateProvinceGeoId').value = "";
- Effect.Appear('shipStates', {duration: 0.0});
- Event.observe($('shipToStateProvinceGeo'), 'blur', function() {
- if ($('shipToStateProvinceGeo').value == "") {
- Effect.Appear('advice-required-shipToStateProvinceGeo', {duration: 0.0});
+ jQuery('#shipToStateProvinceGeo').value = "";
+ jQuery('#shipToStateProvinceGeoId').value = "";
+ jQuery("#shipStates").fadeIn("fast");
+ jQuery("#shipToStateProvinceGeo").bind("blur", function() {
+ if (jQuery('#shipToStateProvinceGeo').val() == "") {
+ jQuery("#advice-required-shipToStateProvinceGeo").fadeIn("fast");
}
});
}
- new Autocompleter.Local(stateTargetField, stateDivToPopulate, $H(geos), { partialSearch: false, afterUpdateElement: setKeyAsParameter });
+ stateTargetField.autocomplete({source: stateList, select: setKeyAsParameter});
}
-function setKeyAsParameter(text, li) {
- stateHiddenTarget.value = li.id;
+function setKeyAsParameter(event, ui) {
+ stateHiddenTarget.value = ui.item;
}
//Generic function for fetching country's associated state list.
function getAssociatedStateList(countryId, stateId, errorId, divId) {
- var optionList = [];
+ var countryGeoId = jQuery("#" + countryId).val();
var requestToSend = "getAssociatedStateList";
- if ($('orderViewed')) {
+ if (jQuery('#orderViewed')) {
requestToSend = "/ordermgr/control/getAssociatedStateList"
}
- new Ajax.Request(requestToSend, {
- asynchronous: false,
- parameters: {countryGeoId:$F(countryId)},
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
+ jQuery.ajax({
+ url: requestToSend,
+ sync: false,
+ type: "POST",
+ data: {countryGeoId: countryGeoId},
+ success: function(data) {
+ if (data._ERROR_MESSAGE_ ) {
+ // no data found/ error occured
+ return;
+ }
stateList = data.stateList;
- stateList.each(function(state) {
- geoValues = state.split(': ');
- optionList.push("<option value = "+geoValues[1]+" >"+geoValues[0]+"</option>");
+ var stateSelect = jQuery("#" + stateId);
+ stateSelect.find("option").remove();
+ jQuery.each(stateList, function(state) {
+ geoValues = this.split(': ');
+ stateSelect.append(jQuery('<option value = '+geoValues[1]+' >'+geoValues[0]+'</option>'));
});
- $(stateId).update(optionList);
- if (stateList.size() <= 1) {
- if ($(divId).visible() || $(errorId).visible()) {
- Effect.Fade(divId, {duration: 0.0});
- Effect.Fade(errorId, {duration: 0.0});
- Event.stopObserving(stateId, 'blur');
+
+ if (stateList.length <= 1) {
+ if (jQuery("#" + divId).is(':visible') || jQuery("#" + errorId).is(':visible')) {
+ jQuery("#divId").fadeOut("fast");
+ jQuery("#errorId").fadeOut("fast");
+ jQuery("#stateId").unbind("blur");
}
} else {
- Effect.Appear(divId, {duration: 0.0});
- Event.observe(stateId, 'blur', function() {
- if ($F(stateId) == "") {
- Effect.Appear(errorId, {duration: 0.0});
+ jQuery("#divId").fadeIn("fast");
+ jQuery("#stateId").bind("blur", function() {
+ if (jQuery("#" + stateId).val() == "") {
+ jQuery("#errorId").fadeIn("fast")
}
});
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/images/js/order.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/images/js/order.js?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/images/js/order.js (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/images/js/order.js Fri Dec 10 20:40:08 2010
@@ -18,10 +18,13 @@ under the License.
*/
function markOrderViewed() {
- new Ajax.Request('markOrderViewed',{parameters: $('orderViewed').serialize(), requestHeaders: {Accept: 'application/json'},
- onSuccess: function() {
- Effect.Fade('isViewed', {duration: 0.0});
- Effect.Appear('viewed', {duration: 0.3});
+ jQuery.ajax({
+ url: 'markOrderViewed',
+ type: "POST",
+ data: jQuery('#orderViewed').serialize(),
+ succes: function(data) {
+ jQuery("#isViewed").fadeOut('fast');
+ jQuery("#viewed").fadeIn('fast');
}
});
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/images/js/return.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/images/js/return.js?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/images/js/return.js (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/images/js/return.js Fri Dec 10 20:40:08 2010
@@ -17,23 +17,26 @@ specific language governing permissions
under the License.
*/
-document.observe('dom:loaded', function() {
- Event.observe($('returnHeaderTypeId'), 'change', function() {
+jQuery(document).ready( function() {
+ jQuery('#returnHeaderTypeId').change( function() {
changeStatusCorrespondingToHeaderType();
});
});
function changeStatusCorrespondingToHeaderType() {
var listOptions = [];
- new Ajax.Request('/ordermgr/control/getStatusItemsForReturn', {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
+ jQuery.ajax({
+ url: '/ordermgr/control/getStatusItemsForReturn',
+ async: false,
+ type: 'POST',
+ data: {returnHeaderTypeId: jQuery('#returnHeaderTypeId').val()},
+ success: function (data) {
var statusItems = data.statusItems;
+ var status = jQuery('#statusId');
+ status.find("option").remove();
statusItems.each( function(statusItem) {
- listOptions.push("<option value = " + statusItem.statusId + " > " + statusItem.description + " </option>");
+ status.append(jQuery("<option value = " + statusItem.statusId + " > " + statusItem.description + " </option>"));
});
- $('statusId').update(listOptions);
- }, parameters: {returnHeaderTypeId: $F('returnHeaderTypeId')}, requestHeaders: {Accept: 'application/json'}
+ }
});
}
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl Fri Dec 10 20:40:08 2010
@@ -91,8 +91,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.OrderDesiredDeliveryDate}</td>
<td>
- <input type="text" size="25" maxlength="30" name="itemDesiredDeliveryDate"/>
- <a href="javascript:call_cal(document.appendItemForm.itemDesiredDeliveryDate,'${todayDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="itemDesiredDeliveryDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="itemDesiredDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Fri Dec 10 20:40:08 2010
@@ -196,11 +196,9 @@ under the License.
<input type="text" name="icm_${orderItem.orderItemSeqId}" value="" size="30" maxlength="60"/>
<#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')>
<span class="label">${uiLabelMap.OrderEstimatedShipDate}</span>
- <input type="text" name="isdm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedShipDate?if_exists}" size="25" maxlength="30"/>
- <a href="javascript:call_cal(document.updateItemInfo.isdm_${orderItem.orderItemSeqId},'${todayDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="isdm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedShipDate?if_exists}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="isdm_${orderItem.orderItemSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span>
- <input type="text" name="iddm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedDeliveryDate?if_exists}" size="25" maxlength="30"/>
- <a href="javascript:call_cal(document.updateItemInfo.iddm_${orderItem.orderItemSeqId},'${todayDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="iddm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedDeliveryDate?if_exists}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="iddm_${orderItem.orderItemSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</#if>
</td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Fri Dec 10 20:40:08 2010
@@ -60,7 +60,7 @@ function toggleOrderIdList() {
if (element.name == "orderIdList" && !element.checked)
isAllSelected = false;
}
- $('checkAllOrders').checked = isAllSelected;
+ jQuery('#checkAllOrders').attr("checked", isAllSelected);
}
// -->
@@ -115,7 +115,7 @@ function toggleOrderIdList() {
<input type='hidden' name='gatewayScoreResult' value='${requestParameters.gatewayScoreResult?if_exists}'/>
</form>
</#if>
-<form method="post" name="lookuporder" action="<@o...@ofbizUrl>" onsubmit="javascript:lookupOrders();">
+<form method="post" name="lookuporder" id="lookuporder" action="<@o...@ofbizUrl>" onsubmit="javascript:lookupOrders();">
<input type="hidden" name="lookupFlag" value="Y"/>
<input type="hidden" name="hideFields" value="Y"/>
<input type="hidden" name="viewSize" value="${viewSize}"/>
@@ -185,7 +185,7 @@ function toggleOrderIdList() {
<td width='25%' align='right' class='label'>${uiLabelMap.PartyRoleType}</td>
<td width='5%'> </td>
<td align='left'>
- <select name='roleTypeId' multiple="multiple">
+ <select name='roleTypeId' id='roleTypeId' multiple="multiple">
<#if currentRole?has_content>
<option value="${currentRole.roleTypeId}">${currentRole.get("description", locale)}</option>
<option value="${currentRole.roleTypeId}">---</option>
@@ -363,15 +363,13 @@ function toggleOrderIdList() {
<table class="basic-table" cellspacing='0'>
<tr>
<td nowrap="nowrap">
- <input type='text' size='25' name='minDate' value='${requestParameters.minDate?if_exists}'/>
- <a href="javascript:call_cal(document.lookuporder.minDate,'${fromDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
+ <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" value="${requestParameters.minDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span class='label'>${uiLabelMap.CommonFrom}</span>
</td>
</tr>
<tr>
<td nowrap="nowrap">
- <input type='text' size='25' name='maxDate' value='${requestParameters.maxDate?if_exists}'/>
- <a href="javascript:call_cal(document.lookuporder.maxDate,'${thruDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
+ <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" value="${requestParameters.maxDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span class='label'>${uiLabelMap.CommonThru}</span>
</td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Fri Dec 10 20:40:08 2010
@@ -19,29 +19,29 @@ under the License.
<script language="JavaScript" type="text/javascript">
function editInstruction() {
- $('shippingInstructions').style.display="block";
- $('saveInstruction').style.display="inline";
- $('editInstruction').style.display="none";
- $('instruction').style.display="none";
+ jQuery('#shippingInstructions').css({display:'block'});
+ jQuery('#saveInstruction').css({display:'inline'});
+ jQuery('#editInstruction').css({display:'none'});
+ jQuery('#instruction').css({display:'none'});
}
function addInstruction() {
- $('shippingInstructions').style.display="block";
- $('saveInstruction').style.display="inline";
- $('addInstruction').style.display="none";
+ jQuery('#shippingInstructions').css({display:'block'});
+ jQuery('#saveInstruction').css({display:'inline'});
+ jQuery('#addInstruction').css({display:'none'});
}
function saveInstruction() {
document.updateShippingInstructionsForm.submit();
}
function editGiftMessage() {
- $('giftMessage').style.display="block";
- $('saveGiftMessage').style.display="inline";
- $('editGiftMessage').style.display="none";
- $('message').style.display="none";
+ jQuery('#giftMessage').css({display:'block'});
+ jQuery('#saveGiftMessage').css({display:'inline'});
+ jQuery('#editGiftMessage').css({display:'none'});
+ jQuery('#message').css({display:'none'});
}
function addGiftMessage() {
- $('giftMessage').style.display="block";
- $('saveGiftMessage').style.display="inline";
- $('addGiftMessage').style.display="none";
+ jQuery('#giftMessage').css({display:'block'});
+ jQuery('#saveGiftMessage').css({display:'inline'});
+ jQuery('#addGiftMessage').css({display:'none'});
}
function saveGiftMessage() {
document.setGiftMessageForm.submit();
@@ -280,6 +280,9 @@ under the License.
<td valign="top" width="80%">
<input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
<a class="buttontext" id="newShippingAddress" href="javascript:void(0);">${uiLabelMap.OrderNewShippingAddress}</a>
+ <script type="text/javascript">
+ jQuery("#newShippingAddress").click(function(){jQuery("#newShippingAddressForm").dialog("open")});
+ </script>
</td>
</tr>
</#if>
@@ -312,7 +315,7 @@ under the License.
</div>
<div class="form-row">
<label for="postalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-postalCode" style="display: none" class="custom-advice">(required)</span></label>
- <div class="form-field"><input type="text" class="required" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div>
+ <div class="form-field"><input type="text" class="required number" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div>
</div>
<div class="form-row">
<label for="countryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label>
@@ -338,16 +341,27 @@ under the License.
</div>
</div>
<div class="form-row">
- <input id="submitAddShippingAddress" type="button" value="${uiLabelMap.CommonSubmit}"/>
+ <input id="submitAddShippingAddress" type="button" value="${uiLabelMap.CommonSubmit}" style="display:none"/>
<form action="">
- <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}"/>
+ <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}" style="display:none"/>
</form>
</div>
</form>
</div>
<script language="JavaScript" type="text/javascript">
- document.observe('dom:loaded', function() {
- new Popup('newShippingAddressForm', 'newShippingAddress', {modal: true, position: 'center', trigger: 'click'})
+ jQuery(document).ready( function() {
+ jQuery("#newShippingAddressForm").dialog({autoOpen: false, modal: true,
+ buttons: {
+ '${uiLabelMap.CommonSubmit}': function() {
+ var addShippingAddress = jQuery("#addShippingAddress");
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(addShippingAddress);
+ addShippingAddress.submit();
+ },
+ '${uiLabelMap.CommonClose}': function() {
+ jQuery(this).dialog('close');
+ }
+ }
+ });
});
</script>
<table width="100%" border="0" cellpadding="1" cellspacing="0">
@@ -364,13 +378,13 @@ under the License.
</td>
</tr>
</#if>
-
+
<#-- This section appears when Shipment of order is in picked status and its items are packed,this case comes when new shipping estimates based on weight of packages are more than or less than default percentage (defined in shipment.properties) of original shipping estimate-->
<#-- getShipGroupEstimate method of ShippingEvents class can be used for get shipping estimate from system, on the basis of new package's weight -->
<#if shippingRateList?has_content>
<#if orderReadHelper.getOrderTypeId() != "PURCHASE_ORDER">
<tr><td colspan="3"><hr /></td></tr>
- <tr>
+ <tr>
<td colspan="3">
<table>
<tr>
@@ -388,7 +402,7 @@ under the License.
<#if (shippingRate.rate > -1)>
<@ofbizCurrency amount=shippingRate.rate isoCode=orderReadHelper.getCurrency()/>
<#else>
- ${uiLabelMap.OrderCalculatedOffline}
+ ${uiLabelMap.OrderCalculatedOffline}
</#if>
</td>
</tr>
@@ -486,7 +500,7 @@ under the License.
<td id="instruction">
<label>${shipGroup.shippingInstructions}</label>
</td>
- <td>
+ <td>
<a href="javascript:editInstruction();" class="buttontext" id="editInstruction">${uiLabelMap.CommonEdit}</a>
</td>
</tr>
@@ -541,11 +555,9 @@ under the License.
<form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
<input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
- <input type="text" size="23" name="shipAfterDate" value="${shipGroup.shipAfterDate?if_exists}"/>
- <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipAfterDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br/>
- <input type="text" size="23" name="shipByDate" value="${shipGroup.shipByDate?if_exists}"/>
- <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipByDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}"/>
</form>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl Fri Dec 10 20:40:08 2010
@@ -28,18 +28,14 @@ these reports and helping to improve the
<table>
<tr>
<td><div>From Date:</div></td>
-<td><input type="text" name="fromDate" tabindex="10" size="22" maxlength="25" align="middle">
- <a tabindex="10" target="_self" href="javascript:call_cal(document.orderreportform.fromDate, '${fromStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
- </a>
+<td>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
<td><div>To Date:</div></td>
-<td><input type="text" name="toDate" tabindex="12" size="22" maxlength="25" align="middle">
- <a tabindex="12" target="_self" href="javascript:call_cal(document.orderreportform.toDate, '${toStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
- </a>
+<td>
+ <@htmlTemplate.renderDateTimeField name="toDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="t" oDate1dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<#--
@@ -66,18 +62,14 @@ these reports and helping to improve the
<table>
<tr>
<td><div>From Date:</div></td>
-<td><input type="text" name="fromDate" tabindex="10" size="22" maxlength="25" align="middle">
- <a tabindex="10" target="_self" href="javascript:call_cal(document.itemreportform.fromDate, '${fromStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
- </a>
+<td>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
<td><div>To Date:</div></td>
-<td><input type="text" name="toDate" tabindex="12" size="22" maxlength="25" align="middle">
- <a tabindex="12" target="_self" href="javascript:call_cal(document.itemreportform.toDate, '${toStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
- </a>
+<td>
+ <@htmlTemplate.renderDateTimeField name="toDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="toDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<#--
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl Fri Dec 10 20:40:08 2010
@@ -77,8 +77,7 @@ under the License.
<#if returnInfo.entryDate?exists>
<#assign entryDate = returnInfo.get("entryDate").toString()>
</#if>
- <input type='text' size='25' name='entryDate' value='${entryDate?if_exists}' />
- <a href="javascript:call_cal(document.returnhead.entryDate, '');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar' /></a>
+ <@htmlTemplate.renderDateTimeField name="entryDate" event="" action="" value="${entryDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="entryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Fri Dec 10 20:40:08 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="titleProperty" 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/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml Fri Dec 10 20:40:08 2010
@@ -22,16 +22,13 @@ under the License.
<section>
<actions>
<set field="headerItem" value="orderentry"/>
-
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
-
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="left-column">
<include-screen name="leftbar"/>
- </decorator-section>
+ </decorator-section>
<decorator-section name="body">
<section>
<widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Fri Dec 10 20:40:08 2010
@@ -183,10 +183,20 @@ under the License.
<set field="stepLabelId" value="PartyParties"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy"/>
+
+ <!-- asmslect parameters, must be prefixed by asm_ for setMultipleSelectJs.ftl -->
+ <!--set field="asm_multipleSelectForm" value="addAdditionalPartyForm"/>
+ <set field="asm_multipleSelect" value="additionalRoleTypeId"/>
+ <set field="asm_formSize" value="700"/>
+ <set field="asm_asmListItemPercentOfForm" value="95"/>
+ <set field="asm_sortable" value="false"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="asm_title" value="${uiLabelMap.OrderPartySelectRoleForParty}"/-->
</actions>
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
+ <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/entry/setAdditionalParty.ftl"/></html>
</platform-specific>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Fri Dec 10 20:40:08 2010
@@ -52,9 +52,6 @@ under the License.
<actions>
<set field="titleProperty" value="OrderViewOrder"/>
<set field="headerItem" value="findorders"/>
- <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/popup.css" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/order.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/OrderShippingInfo.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
@@ -230,10 +227,21 @@ under the License.
<set field="headerItem" value="findorders"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy"/>
<script location="component://content/webapp/content/WEB-INF/actions/print/FindPrinters.groovy"/>
+
+ <!-- asmslect parameters, must be prefixed by asm_ for setMultipleSelectJs.ftl -->
+ <set field="asm_multipleSelectForm" value="lookuporder"/>
+ <set field="asm_multipleSelect" value="roleTypeId"/>
+ <set field="asm_formSize" value="700"/>
+ <set field="asm_asmListItemPercentOfForm" value="95"/>
+ <set field="asm_sortable" value="false"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="asm_title" value="${uiLabelMap.OrderPartySelectRoleForParty}"/>
+
</actions>
<widgets>
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
+ <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/order/findOrders.ftl"/></html>
</platform-specific>
@@ -488,9 +496,9 @@ under the License.
<include-form name="ListCustomerOrders" location="component://order/widget/ordermgr/OrderForms.xml"/>
</screenlet>
</widgets>
- </section>
+ </section>
</screen>
-
+
<screen name="ListSalesOrders">
<section>
<actions>
@@ -537,6 +545,6 @@ under the License.
</fail-widgets>
</section>
</widgets>
- </section>
+ </section>
</screen>
</screens>
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 20:40:08 2010
@@ -1,2 +1,4 @@
/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
+/ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
+/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Dec 10 20:40:08 2010
@@ -1073,13 +1073,6 @@ under the License.
<response name="success" type="view" value="partyContentList"/>
</request-map>
- <request-map uri="getFileUploadProgressStatus">
- <security https="true" auth="false"/>
- <event type="service" invoke="getFileUploadProgressStatus"/>
- <response name="success" type="request" value="json"/>
- <response name="error" type="request" value="json"/>
- </request-map>
-
<request-map uri="img">
<security auth="false" https="false"/>
<event type="java" path="org.ofbiz.content.data.DataEvents" invoke="serveImage"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js Fri Dec 10 20:40:08 2010
@@ -17,80 +17,93 @@ specific language governing permissions
under the License.
* */
-var progressBar;
-
-document.observe('dom:loaded', function() {
- Event.observe('uploadPartyContent', 'submit', uploadPartyContent);
- Event.observe('uploadPartyContent', 'submit', getUploadProgressStatus);
- progressBar = new Control.ProgressBar('progress_bar');
+/**
+ *
+ **/
+jQuery(document).ready(function() {
+ jQuery("#uploadPartyContent").bind("submit", uploadPartyContent);
+ jQuery("#uploadPartyContent").bind("submit", getUploadProgressStatus);
+ jQuery("#progress_bar").progressbar({value: 0});
+
});
+
function uploadPartyContent(event){
- var targetFrame = $('target_upload');
- if(!targetFrame){
- $('partyContent').insert("<iframe id='target_upload' name='target_upload' style='display: none' src=''> </iframe>");
+ jQuery("#progress_bar").progressbar("option", "value", 0);
+ var targetFrame = jQuery('#target_upload');
+ var infodiv = jQuery('#content-messages');
+ if(infodiv.length < 1){
+ jQuery('<div id="content-messages"></div>').insertAfter(jQuery("#partyContentList"));
}
- $('uploadPartyContent').target="target_upload";
- Event.observe('target_upload', 'load', uploadCompleted);
- var errordiv = $('content-messages');
- if(errordiv){
- $('content-messages').remove();
+ if(targetFrame.length < 1){
+ jQuery('#partyContent').append("<iframe id='target_upload' name='target_upload' style='display: none' src=''> </iframe>");
}
+ jQuery('#uploadPartyContent').attr("target", "target_upload");
}
-function uploadCompleted(event){
- var doc = getIframeDocument($('target_upload'));
- var errordiv = doc.getElementById('content-messages');
- //console.log(errordiv);
- if(errordiv){
- $('partyContent').insert(errordiv);
- }
- var partyContentListDiv = doc.getElementById('partyContentList');
- //console.log(partyContentListDiv);
- if(partyContentListDiv){
- $('partyContentList').update(partyContentListDiv.innerHTML);
- }
- if($('progressBarSavingMsg')){
- $('progressBarSavingMsg').remove();
- }
- progressBar.reset();
+function uploadCompleted(){
+ var iframePartyContentList = jQuery("#target_upload").contents().find("#partyContentList").html();
+
+ // update partyContentList - copy the Data from the iFrame partyContentList to the page partyContentList
+ jQuery("#partyContentList").html(iframePartyContentList);
+
+ jQuery('#progressBarSavingMsg').html("Saving complete!");
+ // reset progressbar
+ jQuery("#progress_bar").progressbar("option", "value", 0);
+
+ // remove iFrame
+ jQuery("#target_upload").remove();
+ return;
+}
+
+function checkIframeStatus() {
+ var iframePartyContentList = null;
+ // if the new partyContentList isn't created wait a few ms and call the method again
+ jQuery.fjTimer({
+ interval: 500,
+ repeat: true,
+ tick: function(counter, timerId) {
+ iframePartyContentList = jQuery("#target_upload").contents().find("#partyContentList");
+ if (iframePartyContentList != null && iframePartyContentList.length > 0) {
+ timerId.stop();
+ uploadCompleted();
+ }
+ }
+ });
+ return;
}
function getUploadProgressStatus(event){
+ jQuery('#uploadPartyContent').append("<span id='progressBarSavingMsg' class='label'>Uploading...</span>");
var i=0;
- new PeriodicalExecuter(function(event){
- new Ajax.Request('/partymgr/control/getFileUploadProgressStatus', {
- onSuccess: function(transport){
- var data = transport.responseText.evalJSON(true);
- if (data._ERROR_MESSAGE_LIST_ != undefined) {
- //console.log(data._ERROR_MESSAGE_LIST_);
- //alert(data._ERROR_MESSAGE_LIST_);
- }else if (data._ERROR_MESSAGE_ != undefined) {
- //console.log(data._ERROR_MESSAGE_);
- //alert(data._ERROR_MESSAGE_);
- }else {
- //console.log(data.readPercent);
- var readPercent = data.readPercent;
- progressBar.setProgress(readPercent);
- if(readPercent > 99){
- $('uploadPartyContent').insert("<span id='progressBarSavingMsg' class='label'>Saving..</span>");
- event.stop();
- }
-
+ jQuery.fjTimer({
+ interval: 1000,
+ repeat: true,
+ tick: function(counter, timerId) {
+ var timerId = timerId;
+ jQuery.ajax({
+ url: 'getFileUploadProgressStatus',
+ dataType: "json",
+ success: function(data) {
+ if (data._ERROR_MESSAGE_LIST_ != undefined) {
+ jQuery('#content-messages').html(data._ERROR_MESSAGE_LIST_);
+ timerId.stop();
+ } else if (data._ERROR_MESSAGE_ != undefined) {
+ jQuery('#content-messages').html(data._ERROR_MESSAGE_);
+ timerId.stop();
+ } else {
+ var readPercent = data.readPercent;
+ jQuery("#progress_bar").progressbar("option", "value", readPercent);
+ jQuery('#progressBarSavingMsg').html("Uploading... (" + readPercent + "%)");
+ if(readPercent > 99){
+ jQuery('#progressBarSavingMsg').html("Saving...");
+ // stop the fjTimer
+ timerId.stop();
+ // call the upload complete method to do final stuff
+ checkIframeStatus();
+ }
+ }
}
- }});
- },1);
-}
-
-function getIframeDocument(frameElement) {
- var doc = null;
- if (frameElement.contentDocument) {
- doc = frameElement.contentDocument;
- } else if (frameElement.contentWindow) {
- doc = frameElement.contentWindow.document;
- } else if (frameElement.document) {
- doc = frameElement.document;
- } else {
- return null;
- }
- return doc;
+ });
+ }
+ });
}
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Fri Dec 10 20:40:08 2010
@@ -25,9 +25,9 @@ under the License.
<li>
<form id="createEmptyShoppingList" action="<@o...@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/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Dec 10 20:40:08 2010
@@ -63,9 +63,6 @@ under the License.
<set field="tabButtonItem" value="viewprofile"/>
<set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
<set field="partyId" from-field="parameters.partyId"/>
- <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"/>
</actions>
Propchange: ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 20:40:08 2010
@@ -1,2 +1,4 @@
/ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
+/ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957
+/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Fri Dec 10 20:40:08 2010
@@ -52,8 +52,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" />
<input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" />
<input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}" />
- <input type="text" size="25" name="thruDate" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> />
- <a href="javascript:call_cal(document.lineFormGrp${line}.thruDate, '${(productFeatureCatGrpAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
</form>
</td>
@@ -91,8 +91,7 @@ under the License.
<option value="${(productFeatureGroup.productFeatureGroupId)?if_exists}">${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addNewGroupForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td></tr>
@@ -132,8 +131,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" />
<input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" />
<input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}" />
- <input type="text" size="25" name="thruDate" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> />
- <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productFeatureCategoryAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
</form>
</td>
@@ -170,8 +169,7 @@ under the License.
<option value="${(productFeatureCategory.productFeatureCategoryId)?if_exists}">${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addNewCategoryForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td></tr>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl Fri Dec 10 20:40:08 2010
@@ -50,8 +50,8 @@ under the License.
<input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}" />
<input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}" />
<input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}" />
- <input type="text" size="25" name="thruDate" value="${(productCategoryRole. getTimestamp("thruDate"))?if_exists}" <#if hasExpired> style="color: red;"</#if> />
- <a href="javascript:call_cal(document.lineForm_update${line}.thruDate, '${(productCategoryRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryRole. getTimestamp('thruDate'))?if_exists}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
</form>
</td>
@@ -92,8 +92,8 @@ under the License.
<option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> selected="selected"</#if>>${(roleType.get("description",locale))?if_exists}</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Fri Dec 10 20:40:08 2010
@@ -53,8 +53,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)?if_exists}"/>
<input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
<input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)?if_exists}"/>
- <input type="text" size="25" name="thruDate" value="${(prodCatalogCategory.thruDate)?if_exists}" style="<#if (hasExpired) >color: red;</#if>"/>
- <a href="javascript:call_cal(document.lineForm_update${line}.thruDate, '${(prodCatalogCategory.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(prodCatalogCategory.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)?if_exists}"/>
<#-- the prodCatalogCategoryTypeId field is now part of the PK, so it can't be changed, must be re-created
<select name="prodCatalogCategoryTypeId" size="1">
@@ -111,8 +111,7 @@ under the License.
<option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option>
</#list>
</select>
- <input type="text" size="25" name="fromDate"/>
- <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}"/>
</form>
</td></tr>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Fri Dec 10 20:40:08 2010
@@ -84,8 +84,8 @@ under the License.
<input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}" />
<input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}" />
<input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}" />
- <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> />
- <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <#if hasExpired><#assign class="alert"></#if>
+ <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryMember.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}" />
<input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}" />
<br />
@@ -158,8 +158,8 @@ under the License.
<span class="label">${uiLabelMap.ProductProductId}</span>
<@htmlTemplate.lookupField formName="addProductCategoryMemberForm" name="productId" id="productId" fieldFormName="LookupProduct"/>
<br/>
- <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate" />
- <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.CommonFromDate}</span>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br />
<span class="label">${uiLabelMap.CommonComments}</span> <textarea name="comments" rows="2" cols="40"></textarea>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
@@ -183,8 +183,8 @@ under the License.
<span class="label">${uiLabelMap.ProductTargetProductCategory}</span>
<@htmlTemplate.lookupField formName="copyCategoryProductMembersForm" name="productCategoryIdTo" id="productCategoryIdTo" fieldFormName="LookupProductCategory"/>
<br />
- <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate" />
- <a href="javascript:call_cal(document.copyCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span>
+ <@htmlTemplate.renderDateTimeField name="validDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="validDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br />
<span class="label">${uiLabelMap.ProductIncludeSubCategories}?</span>
<select name="recurse">
@@ -209,8 +209,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
<input type="hidden" name="activeOnly" value="${activeOnly.toString()}" />
<div>
- <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span> <input type="text" size="20" name="thruDate" />
- <a href="javascript:call_cal(document.expireAllCategoryProductMembersForm.thruDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonExpireAll}" />
</div>
</form>
@@ -229,8 +229,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
<input type="hidden" name="activeOnly" value="${activeOnly.toString()}" />
<div>
- <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span> <input type="text" size="20" name="validDate" />
- <a href="javascript:call_cal(document.removeExpiredCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span>
+ <@htmlTemplate.renderDateTimeField name="validDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="validDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonRemoveExpired}" />
</div>
</form>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Fri Dec 10 20:40:08 2010
@@ -72,8 +72,7 @@ under the License.
<input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" />
<input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}" />
<input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}" />
- <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red"</#if> />
- <a href="javascript:call_cal(document.updateProductCategoryForm.thruDate${suffix}, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productCategoryRollup.thruDate!''}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" />
</td>
<td>
@@ -117,8 +116,8 @@ under the License.
<input type="hidden" name="productCategoryId" value="${productCategoryId}" />
<input type="hidden" name="showProductCategoryId" value="${productCategoryId}" />
<@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addParentForm" name="parentProductCategoryId" id="parentProductCategoryId" fieldFormName="LookupProductCategory"/>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addParentForm.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td></tr>
@@ -180,8 +179,8 @@ under the License.
<input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" />
<input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}" />
<input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}" />
- <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red;"</#if> />
- <a href="javascript:call_cal(document.updateProductCategoryToCategoryChild.thruDate${suffix}, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="" alert="" title="Thru Date" value="${productCategoryRollup.thruDate!''}" size="25" maxlength="50" id="thruDatefromDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+
<input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" />
</td>
<td>
@@ -211,7 +210,7 @@ under the License.
<input type="hidden" name="fromDate" value="${productCategoryRollup.fromDate}"/>
</form>
</#list>
- </#if>
+ </#if>
</div>
</div>
<div class="screenlet">
@@ -224,9 +223,8 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="addChildForm">
<input type="hidden" name="showProductCategoryId" value="${productCategoryId}" />
<input type="hidden" name="parentProductCategoryId" value="${productCategoryId}" />
- <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addChildForm" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/>
- <input type="text" size="25" name="fromDate" />
- <a href="javascript:call_cal(document.addChildForm.fromDate, null);"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="addChildForm" name="productCategoryId" id="productCategoryId" fieldFormName="LookupProductCategory"/>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</td></tr>