svn commit: r1044503 [5/15] - in /ofbiz/trunk: ./ applications/accounting/webapp
Locked
svn commit: r1044503 [5/15] - in /ofbiz/trunk: ./ applications/accounting/webapp
 
|
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl Fri Dec 10 20:40:08 2010 @@ -42,7 +42,8 @@ under the License. <form method="post" action="<@ofbizUrl>searchExpireFromCategory</@ofbizUrl>" name="searchExpireFromCategory"> <span class="label">${uiLabelMap.ProductExpireResultsFrom} ${uiLabelMap.ProductCategory}:</span> <@htmlTemplate.lookupField formName="searchExpireFromCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/> - <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate" /><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <span class="label">${uiLabelMap.CommonThru}</span> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="hidden" name="clearSearch" value="N" /> <input type="submit" value="${uiLabelMap.CommonExpire}" class="smallSubmit" /> <br /> @@ -55,7 +56,8 @@ under the License. <form method="post" action="<@ofbizUrl>searchAddToCategory</@ofbizUrl>" name="searchAddToCategory"> <span class="label">${uiLabelMap.ProductAddResultsTo} ${uiLabelMap.ProductCategory}:</span> <@htmlTemplate.lookupField formName="searchAddToCategory" name="SE_SEARCH_CATEGORY_ID" id="SE_SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/> - <span class="label">${uiLabelMap.CommonFrom}</span><input type="text" size="25" name="fromDate" /><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <span class="label">${uiLabelMap.CommonFrom}</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=""/> <input type="hidden" name="clearSearch" value="N" /> <input type="submit" value="${uiLabelMap.ProductAddToCategory}" class="smallSubmit" /> <br /> @@ -68,8 +70,10 @@ under the License. <form method="post" action="<@ofbizUrl>searchAddFeature</@ofbizUrl>" name="searchAddFeature"> <span class="label">${uiLabelMap.ProductAddFeatureToResults}:</span><br /> <span class="label">${uiLabelMap.ProductFeatureId}</span><input type="text" size="10" name="productFeatureId" value="" /> - <span class="label">${uiLabelMap.CommonFrom}</span><input type="tex"t size="25" name="fromDate" /><a href="javascript:call_cal(document.searchAddFeature.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> - <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate" /><a href="javascript:call_cal(document.searchAddFeature.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <span class="label">${uiLabelMap.CommonFrom}</span> + <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" 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=""/> + <span class="label">${uiLabelMap.CommonThru}</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=""/> <br /> <span class="label">${uiLabelMap.CommonAmount}</span><input type="text" size="5" name="amount" value="" /> <span class="label">${uiLabelMap.CommonSequence}</span><input type="text" size="5" name="sequenceNum" value="" /> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl Fri Dec 10 20:40:08 2010 @@ -24,11 +24,10 @@ under the License. document.forms["keywordsearchform"].elements["SEARCH_CATEGORY_ID"].value=document.forms["advancedsearchform"].elements["DUMMYCAT"].value; document.forms["advancedsearchform"].elements["SEARCH_CATEGORY_ID"].value=document.forms["advancedsearchform"].elements["DUMMYCAT"].value; } - function submitProductJump() { - productId = $('productJumpFormProductId').value; - $('productJumpFormProductId').value = productId.replace(" ",""); - $('productJumpForm').action = $('dummyPage').value; - $('productJumpForm').submit(); + function submitProductJump(that) { + jQuery('#productJumpForm input[name=productId]').val(jQuery('#productJumpForm input[name=productId]').val().replace(" ","")); + jQuery('#productJumpForm').attr('action', jQuery('#dummyPage').val()); + jQuery('#productJumpForm').submit(); } //]]> </script> @@ -63,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/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Fri Dec 10 20:40:08 2010 @@ -38,8 +38,8 @@ under the License. <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}" /> <input type="text" size="15" name="ruleName" value="${productPriceRule.ruleName}" /> <input type="text" size="15" name="description" value="${productPriceRule.description?if_exists}" /> - <input type="text" size="22" name="fromDate" value="${productPriceRule.fromDate?if_exists}" /><a href="javascript:call_cal(document.updateProductPriceRule.fromDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> - <input type="text" size="22" name="thruDate" value="${productPriceRule.thruDate?if_exists}" /><a href="javascript:call_cal(document.updateProductPriceRule.thruDate, null);"><img src='/images/cal.gif' 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="${productPriceRule.fromDate?if_exists}" 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=""/> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#assign saleRule = productPriceRule.isSale?exists && productPriceRule.isSale == "Y"> <div> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl Fri Dec 10 20:40:08 2010 @@ -84,8 +84,12 @@ under the License. </#list> </select> </td> - <td><input type="text" size="25" name="fromDate_o_${rowCount}" /><a href="javascript:call_cal(document.selectAllForm.fromDate_o_${rowCount}, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a></td> - <td><input type="text" size="25" name="thruDate_o_${rowCount}" /><a href="javascript:call_cal(document.selectAllForm.thruDate_o_${rowCount}, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a></td> + <td> + <@htmlTemplate.renderDateTimeField name="fromDate_o_${rowCount}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_o_${rowCount}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </td> + <td> + <@htmlTemplate.renderDateTimeField name="thruDate_o_${rowCount}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate_o_${rowCount}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </td> <td><input type="text" size="6" name="amount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}" /></td> <td><input type="text" size="5" name="sequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}" /></td> <td align="right"> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Fri Dec 10 20:40:08 2010 @@ -62,8 +62,7 @@ under the License. <td> </td> <td> <div> - <input type="text" name="FROM_DATE" size="25" maxlength="40" value="${fromDate?if_exists}" /> - <a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${fromDate?default(nowTimestampString)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" 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=""/> ${uiLabelMap.CommonSetNowEmpty} </div> </td> @@ -100,8 +99,8 @@ under the License. <td> </td> <td> <div> - <input type="text" name="FROM_DATE" size="25" maxlength="40" value="" /> - <a href="javascript:call_cal(document.editProductAssocForm.FROM_DATE, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + ${fromDate?if_exists} + <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate?if_exists}" 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=""/> ${uiLabelMap.CommonSetNowEmpty} </div> </td> @@ -142,8 +141,7 @@ under the License. <td> </td> <td width="74%"> <div> - <input type="text" name="THRU_DATE" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}"</#if> size="30" maxlength="30" /> - <a href="javascript:call_cal(document.editProductAssocForm.THRU_DATE, <#if useValues>'${productAssoc.thruDate?if_exists}'<#elseif (request.getParameter("THRU_DATE"))?exists>'${request.getParameter("THRU_DATE")}'<#else>'${nowTimestampString}'</#if>);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="THRU_DATE" event="" action="" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}"</#if> className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl Fri Dec 10 20:40:08 2010 @@ -64,8 +64,8 @@ under the License. <td> <#assign hasExpired = false> <#if (productFeatureAndAppl.getTimestamp("thruDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productFeatureAndAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> - <input type='text' size='25' name='thruDate_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.thruDate)?if_exists}' <#if hasExpired> style='color: red;'</#if> /> - <a href="javascript:call_cal(document.selectAllForm.thruDate_o_${productFeatureAndAppl_index}, '${(productFeatureAndAppl.thruDate)?default(nowTimestamp?string)}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> + <#if hasExpired><#assign class="alert"></#if> + <@htmlTemplate.renderDateTimeField name="thruDate_o_${productFeatureAndAppl_index}" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productFeatureAndAppl.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate_o_${productFeatureAndAppl_index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="text" size='6' name='amount_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.amount)?if_exists}' /> <input type="text" size='5' name='sequenceNum_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.sequenceNum)?if_exists}' /> <select name='productFeatureApplTypeId_o_${productFeatureAndAppl_index}' size="1"> @@ -92,7 +92,7 @@ under the License. <#assign rowClass = "2"> </#if> </#list> - + <tr> <td colspan="8" align="center"> <input type="hidden" name="_rowCount" value="${productFeatureAndAppls.size()}"/> @@ -167,10 +167,10 @@ under the License. </#list> </select> <br /> - <span class='label'>${uiLabelMap.CommonFrom} : </span><input type="text" size='25' name='fromDate'/> - <a href="javascript:call_cal(document.addFeatureByTypeIdCode.fromDate, '${nowTimestamp?string}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> - <span class='label'>${uiLabelMap.CommonThru} : </span><input type="text" size='25' name='thruDate'/> - <a href="javascript:call_cal(document.addFeatureByTypeIdCode.thruDate, '${nowTimestamp?string}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> + <span class='label'>${uiLabelMap.CommonFrom} : </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=""/> + <span class='label'>${uiLabelMap.CommonThru} : </span> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span class='label'>${uiLabelMap.CommonSequence} : </span><input type="text" size='5' name='sequenceNum'/> <input type="submit" value="${uiLabelMap.CommonAdd}"/> </form> @@ -197,10 +197,8 @@ under the License. </#list> </select> <br /> - <span class="label">${uiLabelMap.CommonFrom} : </span><input type="text" size="25" name="fromDate"/> - <a href="javascript:call_cal(document.addFeatureById.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> - <span class="label">${uiLabelMap.CommonThru} : </span><input type="text" size="25" name="thruDate"/> - <a href="javascript:call_cal(document.addFeatureById.thruDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> + <span class="label">${uiLabelMap.CommonFrom} : </span><@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" 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=""/> + <span class="label">${uiLabelMap.CommonThru} : </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=""/> <span class="label">${uiLabelMap.CommonSequence} : </span><input type="text" size="5" name="sequenceNum"/> <input type="submit" value="${uiLabelMap.CommonAdd}"/> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Fri Dec 10 20:40:08 2010 @@ -50,8 +50,8 @@ under the License. <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" /> <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" /> <input type="hidden" name="fromDate" value="${(productRole.getTimestamp("fromDate"))?if_exists}" /> - <input type="text" size="25" name="thruDate" value="${(productRole. getTimestamp("thruDate"))?if_exists}"<#if hasExpired> class="alert"</#if> /> - <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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="${(productRole.getTimestamp('thruDate'))?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> <td><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Fri Dec 10 20:40:08 2010 @@ -442,10 +442,7 @@ function doPublish() { <table cellspacing="0" class="basic-table"> <tr> <td> - <input type="text" size="25" name="fromDate"/> - <a href="javascript:call_cal(document.publish.fromDate,'${nowTimestampString}');"> - <img src="<@ofbizContentUrl>/images/cal.gif</@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="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="button" value="${uiLabelMap.ProductPublishAndView}" onclick="doPublish();"/> </td> </tr> @@ -458,10 +455,7 @@ function doPublish() { <table cellspacing="0" class="basic-table"> <tr> <td> - <input type="text" size="25" name="thruDate"/> - <a href="javascript:call_cal(document.unpublish.thruDate,'${nowTimestampString}');"> - <img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/> - </a> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="submit" value="${uiLabelMap.ProductRemoveFromSite}"/> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl Fri Dec 10 20:40:08 2010 @@ -46,8 +46,8 @@ under the License. <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}" /> <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}" /> <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}" /> - <input type="text" size="20" name="thruDate" value="${(productStorePromoAppl.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if> /> - <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${nowTimestamp}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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="${(productStorePromoAppl.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> @@ -84,8 +84,7 @@ under the License. <option value="${(productStore.productStoreId)?if_exists}">${(productStore.storeName)?if_exists} [${(productStore.productStoreId)?if_exists}]</option> </#list> </select> - <input type="text" size="20" name="fromDate"/> - <a href="javascript:call_cal(document.addProductPromoToCatalog.fromDate, '${nowTimestamp}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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="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.CommonAdd}"/> </form> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Fri Dec 10 20:40:08 2010 @@ -107,15 +107,13 @@ under the License. <tr> <td class="label">${uiLabelMap.CommonFromDate}</td> <td> - <input type="text" size="25" name="fromDate" /> - <a href="javascript:call_cal(document.addSurvey.fromDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@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="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 class="label">${uiLabelMap.CommonThruDate}</td> <td> - <input type="text" size="25" name="thruDate" /> - <a href="javascript:call_cal(document.addSurvey.thruDate, '${nowTimestampString}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> </tr> <tr> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl Fri Dec 10 20:40:08 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/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Fri Dec 10 20:40:08 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/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Fri Dec 10 20:40:08 2010 @@ -267,6 +267,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/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Fri Dec 10 20:40:08 2010 @@ -177,7 +177,7 @@ under the License. ${uiLabelMap.ProductShipmentUpsResidential}: <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")} /> <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> - <a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> + <a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipmentConfirmation}</a> <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> @@ -202,7 +202,7 @@ under the License. <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="EVENING")?string("selected=\"selected\"","")} value="EVENING">${uiLabelMap.ProductShipmentFedexHomeEvening}</option> <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="APPOINTMENT")?string("selected=\"selected\"","")} value="APPOINTMENT">${uiLabelMap.ProductShipmentFedexHomeAppointment}</option> </select> - <input type="text" size="25" name="homeDeliveryDate" value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.homeDeliveryDate, '${(shipmentRouteSegment.homeDeliveryDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="homeDeliveryDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}" size="25" maxlength="30" id="homeDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> <#else> <#-- Todo: implement closeout with Fedex --> @@ -230,11 +230,11 @@ under the License. <br /> <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber?if_exists}"/> <br /> - <input type="text" size="25" name="estimatedStartDate" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedStartDate, '${(shipmentRouteSegment.estimatedStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> - <input type="text" size="25" name="estimatedArrivalDate" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedArrivalDate, '${(shipmentRouteSegment.estimatedArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="estimatedArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}" size="25" maxlength="30" id="estimatedArrivalDate1" 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="25" name="actualStartDate" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualStartDate, '${(shipmentRouteSegment.actualStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> - <input type="text" size="25" name="actualArrivalDate" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualArrivalDate, '${(shipmentRouteSegment.actualArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}" size="25" maxlength="30" id="actualStartDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="actualArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}" size="25" maxlength="30" id="actualArrivalDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> </td> <td valign="top"> @@ -431,11 +431,11 @@ under the License. <br /> <input type="text" size="24" name="trackingIdNumber" value=""/> <br /> - <input type="text" size="25" name="estimatedStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> - <input type="text" size="25" name="estimatedArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="estimatedArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedArrivalDate3" 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="25" name="actualStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> - <input type="text" size="25" name="actualArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar' /></a> + <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualArrivalDate3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="actualArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualArrivalDate3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> <td valign="top"> <input type="text" size="5" name="billingWeight" value="${(shipmentRouteSegment.billingWeight)?if_exists}"/> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Fri Dec 10 20:40:08 2010 @@ -126,15 +126,13 @@ function lookupShipments() { <table cellspacing="0" class="basic-table"> <tr> <td> - <input type="text" size="25" name="minDate" value="${requestParameters.minDate?if_exists}" /> - <a href="javascript:call_cal(document.lookupShipmentForm.minDate, '${fromDateStr}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.minDate?if_exists}" 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> - <input type="text" size="25" name="maxDate" value="${requestParameters.maxDate?if_exists}" /> - <a href="javascript:call_cal(document.lookupShipmentForm.maxDate, '${thruDateStr}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> + <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.maxDate?if_exists}" 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/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Fri Dec 10 20:40:08 2010 @@ -109,15 +109,13 @@ under the License. <table class="basic-table" cellspacing="0"> <tr> <td nowrap="nowrap"> - <input type='text' size='25' name='fromDate' value='${requestParameters.fromDate?if_exists}'/> - <a href="javascript:call_cal(document.advToKeyWordSearchForm.fromDate,'${fromDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> - <span>${uiLabelMap.CommonFrom}</span> + <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate?if_exists}" 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=""/> + <span>${uiLabelMap.CommonFrom}</span> </td> </tr> <tr> <td nowrap="nowrap"> - <input type='text' size='25' name='thruDate' value='${requestParameters.thruDate?if_exists}'/> - <a href="javascript:call_cal(document.advToKeyWordSearchForm.thruDate,'${thruDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span>${uiLabelMap.CommonThru}</span> </td> </tr> Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Dec 10 20:40:08 2010 @@ -4942,6 +4942,10 @@ <value xml:lang="en">No States/Provinces exist: _NA_</value> <value xml:lang="fr">Aucun état ou province: _NA_</value> </property> + <property key="CommonNoStatesProvincesExists"> + <value xml:lang="en">No States/Provinces exist</value> + <value xml:lang="fr">Aucun état ou province</value> + </property> <property key="CommonNoTaskAssigned"> <value xml:lang="ar">Ùا Ù Ùا٠ØاÙÙØ© تستÙجب Ø¥Ùت٠ا٠ÙÙ </value> <value xml:lang="de">Zur Zeit sind keine Aufgabe vorhanden.</value> @@ -10629,4 +10633,24 @@ <value xml:lang="zh_CN">ä¸æ</value> <value xml:lang="zh_TW">ä¸æ</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/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Fri Dec 10 20:40:08 2010 @@ -259,13 +259,16 @@ under the License. <!-- origin Portlet --> <entity-one value-field="originPp" entity-name="PortalPagePortlet"> - <field-map field-name="portalPageId" value="${parameters.o_portalPageId}"/> - <field-map field-name="portalPortletId" value="${parameters.o_portalPortletId}"/> - <field-map field-name="portletSeqId" value="${parameters.o_portletSeqId}"/> + <field-map field-name="portalPageId" from-field="parameters.o_portalPageId"/> + <field-map field-name="portalPortletId" from-field="parameters.o_portalPortletId"/> + <field-map field-name="portletSeqId" from-field="parameters.o_portletSeqId"/> </entity-one> + <if-empty field="originPp"> + <return response-code="error"/> + </if-empty> <!-- destination Portlet --> - <if-compare operator="equals" field="parameters.mode" value="DRAGDROPBEFORE"> + <if-compare operator="equals" field="parameters.mode" value="BEFORE"> <entity-one value-field="destiPp" entity-name="PortalPagePortlet"> <field-map field-name="portalPageId" value="${parameters.d_portalPageId}"/> <field-map field-name="portalPortletId" value="${parameters.d_portalPortletId}"/> @@ -273,14 +276,16 @@ under the License. </entity-one> <entity-condition list="modifyPpList" entity-name="PortalPagePortlet"> - <condition-list combine="and"> - <condition-expr field-name="portalPageId" operator="equals" value="${parameters.o_portalPageId}"/> - <condition-expr field-name="sequenceNum" operator="greater-equals" value="${destiPp.sequenceNum}"/> - </condition-list> + <condition-list combine="and"> + <condition-expr field-name="columnSeqId" operator="equals" value="${parameters.destinationColumn}"/> + <condition-expr field-name="sequenceNum" operator="greater-equals" value="${destiPp.sequenceNum}"/> + </condition-list> </entity-condition> + + <set field="newSequenceNo" from-field="destiPp.sequenceNum"/> </if-compare> - <if-compare operator="equals" field="parameters.mode" value="DRAGDROPAFTER"> + <if-compare operator="equals" field="parameters.mode" value="AFTER"> <entity-one value-field="destiPp" entity-name="PortalPagePortlet"> <field-map field-name="portalPageId" value="${parameters.d_portalPageId}"/> <field-map field-name="portalPortletId" value="${parameters.d_portalPortletId}"/> @@ -288,49 +293,29 @@ under the License. </entity-one> <entity-condition list="modifyPpList" entity-name="PortalPagePortlet"> - <condition-list combine="and"> - <condition-expr field-name="portalPageId" operator="equals" value="${parameters.o_portalPageId}"/> - <condition-expr field-name="sequenceNum" operator="greater" value="${destiPp.sequenceNum}"/> - </condition-list> + <condition-list combine="and"> + <condition-expr field-name="columnSeqId" operator="equals" value="${parameters.destinationColumn}"/> + <condition-expr field-name="sequenceNum" operator="greater" value="${destiPp.sequenceNum}"/> + </condition-list> </entity-condition> + + <set field="newSequenceNo" value="${destiPp.sequenceNum + 1}"/> </if-compare> - <!-- Portlets to Modify --> - <if-compare operator="equals" field="parameters.mode" value="DRAGDROPBOTTOM"> - <entity-one value-field="pPColumn" entity-name="PortalPageColumn"> - <field-map field-name="columnSeqId" value="${parameters.destinationColumn}"/> - <field-map field-name="portalPageId" value="${parameters.o_portalPageId}"/> - </entity-one> - <entity-condition list="modifyPpList" entity-name="PortalPagePortlet"> - <condition-list combine="and"> - <condition-expr field-name="portalPageId" operator="equals" value="${parameters.o_portalPageId}" /> - <condition-expr field-name="columnSeqId" operator="equals" value="${pPColumn.columnSeqId}"/> - </condition-list> - <order-by field-name="-sequenceNum" /> - </entity-condition> - <if-not-empty field="modifyPpList"> - <first-from-list entry="destiPp" list="modifyPpList"/> - <entity-condition list="modifyPpList" entity-name="PortalPagePortlet"> - <condition-list combine="and"> - <condition-expr field-name="sequenceNum" operator="greater" value="${destiPp.sequenceNum}"/> - </condition-list> - </entity-condition> - <set field="destiPp.sequenceNum" value="${destiPp.sequenceNum + 1}" type="Long"/> - <else> - <clone-value new-value-field="destiPp" value-field="originPp"/> - <set field="destiPp.columnSeqId" value="${pPColumn.columnSeqId}"/> - </else> - </if-not-empty> + <if-compare operator="equals" field="parameters.mode" value="NEW"> + <set field="newSequenceNo" value="0"/> </if-compare> + + <!-- Modify the sequence id from the following portlets --> <if-not-empty field="modifyPpList"> <iterate entry="modifyPp" list="modifyPpList"> <set field="modifyPp.sequenceNum" value="${modifyPp.sequenceNum + 1}" type="Long"/> <store-value value-field="modifyPp"/> </iterate> </if-not-empty> - <!-- Origin Portlet Modify --> - <set field="originPp.sequenceNum" from-field="destiPp.sequenceNum"/> - <set field="originPp.columnSeqId" from-field="destiPp.columnSeqId"/> + <!-- Create a new db entry for the moved portlet --> + <set field="originPp.columnSeqId" from-field="parameters.destinationColumn"/> + <set field="originPp.sequenceNum" from-field="newSequenceNo" type="Long"/> <store-value value-field="originPp"/> </simple-method> <!-- --> Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy Fri Dec 10 20:40:08 2010 @@ -33,9 +33,14 @@ def entityName = context.entityName; def searchFields = context.searchFields; def displayFields = context.displayFields ?: searchFields; -def searchValueFieldName = parameters.searchValueField; +def searchValueFieldName = parameters.term; def fieldValue = null; -if (searchValueFieldName) fieldValue = parameters.get(searchValueFieldName); +if (searchValueFieldName) { + fieldValue = searchValueFieldName; +} else if (parameters.searchValueFieldName) { // This is to find the description of a lookup value on initialization. + fieldValue = parameters.get(parameters.searchValueFieldName); + context.description = "true"; +} def searchType = context.searchType; def displayFieldsSet = null; @@ -43,8 +48,12 @@ def displayFieldsSet = null; if (searchFields && fieldValue) { def searchFieldsList = StringUtil.toList(searchFields); displayFieldsSet = StringUtil.toSet(displayFields); - returnField = searchFieldsList[0]; //default to first element of searchFields - displayFieldsSet.add(returnField); //add it to select fields, in case it is missing + if (context.description && fieldValue instanceof java.lang.String) { + returnField = parameters.searchValueFieldName; + } else { + returnField = searchFieldsList[0]; //default to first element of searchFields + displayFieldsSet.add(returnField); //add it to select fields, in case it is missing + } context.returnField = returnField; context.displayFieldsSet = displayFieldsSet; if ("STARTS_WITH".equals(searchType)) { @@ -56,7 +65,7 @@ if (searchFields && fieldValue) { } searchFieldsList.each { fieldName -> if ("EQUALS".equals(searchType)) { - orExprs.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(returnField), EntityOperator.EQUALS, searchValue)); + orExprs.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(searchFieldsList[0]), EntityOperator.EQUALS, searchValue)); return;//in case of EQUALS, we search only a match for the returned field } else { orExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue(fieldName)), EntityOperator.LIKE, searchValue)); Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Fri Dec 10 20:40:08 2010 @@ -21,7 +21,7 @@ under the License. <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <description>Common ControlServlet Configuration File</description> - + <errorpage>/error/error.jsp</errorpage> <!-- event handlers --> @@ -180,7 +180,7 @@ under the License. <event type="java" path="org.ofbiz.common.CommonEvents" invoke="jsonResponseFromRequestAttributes"/> <response name="success" type="none"/> </request-map> - + <request-map uri="showHelp"> <security https="true" auth="true"/> <response name="success" type="view" value="showHelp"/> @@ -203,15 +203,22 @@ under the License. <response name="success" type="request" value="json"/> <response name="error" type="request" value="json"/> </request-map> - + <!-- Get states related to a country --> <request-map uri="getAssociatedStateList"> <security https="true" auth="false"/> <event type="service" invoke="getAssociatedStateList"/> <response name="success" type="request" value="json"/> <response name="error" type="request" value="json"/> - </request-map> + </request-map> + <request-map uri="getFileUploadProgressStatus"> + <security https="true" auth="true"/> + <event type="service" invoke="getFileUploadProgressStatus"/> + <response name="success" type="request" value="json"/> + <response name="error" type="request" value="json"/> + </request-map> + <!-- Check if an UomConversion exists --> <request-map uri="checkUomConversion"> <security https="true" auth="false"/> @@ -226,6 +233,7 @@ under the License. <response name="success" type="request" value="json"/> <response name="error" type="request" value="json"/> </request-map> + <!--========================== AJAX events =====================--> <!-- View Mappings --> Modified: ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl Fri Dec 10 20:40:08 2010 @@ -16,28 +16,49 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<ul> +<#if description?exists> <#if autocompleteOptions?exists> - <#assign displayReturnField = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.displayReturnField")> <#list autocompleteOptions as autocompleteOption> <#assign displayString = ""/> - <#assign returnField = ""/> - <#-- <#list autocompleteOption.keySet() as key> instead use the field order of display fields --> - <#list context.displayFieldsSet as key> + <#list displayFieldsSet as key> <#assign field = autocompleteOption.get(key)?if_exists> <#if field?has_content> - <#if (key == context.returnField)> - <#assign returnField = field/> - <#else> + <#if (key != context.returnField)> <#assign displayString = displayString + field + " "> </#if> </#if> </#list> + <#if (displayString?trim?has_content )>${displayString?trim}</#if> + </#list> + </#if> +<#else> +<script type="text/javascript"> + <#if autocompleteOptions?exists> + var autocomp = [ + <#assign displayReturnField = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.displayReturnField")> + <#list autocompleteOptions as autocompleteOption> + { + <#assign displayString = ""/> + <#assign returnField = ""/> + <#list displayFieldsSet as key> + <#assign field = autocompleteOption.get(key)?if_exists> + <#if field?has_content> + <#if (key == context.returnField)> + <#assign returnField = field/> + <#else> + <#assign displayString = displayString + field + " "> + </#if> + </#if> + </#list> <#if ("Y" == displayReturnField)> <#assign displayString = displayString + "[" + returnField + "]"> - </#if> - <li id="${returnField}"><#if (displayString?trim?has_content )>${displayString?trim}<#else>${returnField}</#if></li> + </#if> + "id": " ${returnField}", + "label": "<#if (displayString?trim?has_content )>${displayString?trim}<#else>${returnField}</#if>", + "value": "${returnField}" + }<#if autocompleteOption_has_next>,</#if> </#list> + ]; </#if> -</ul> +</script> +</#if> Modified: ofbiz/trunk/framework/common/webcommon/includes/commonMacros.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/commonMacros.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/commonMacros.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/commonMacros.ftl Fri Dec 10 20:40:08 2010 @@ -31,10 +31,10 @@ your template file: <#macro NullMacro></#macro> <#macro DateField formName="" fieldName="" fieldValue="" fieldClass=""> - <input type="text" name="${fieldName}"<#if fieldValue?has_content> value="${fieldValue}"</#if><#if fieldClass?has_content> class="${fieldClass}"</#if> maxlength="25" size="25"/> <#if javaScriptEnabled> - <a href="javascript:call_cal(document.${formName}.${fieldName},'${fieldValue}');"> - <img src="/images/cal.gif" width="16" height="16" border="0" alt="${uiLabelMap.CommonViewCalendar}" title="${uiLabelMap.CommonViewCalendar}"/></a> + <@htmlTemplate.renderDateTimeField name="${fieldName}" event="${event!}" action="${action!}" className="${fieldClass!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${fieldValue!''}" size="25" maxlength="30" id="${fieldName}1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#else> + <input type="text" name="${fieldName}"<#if fieldValue?has_content> value="${fieldValue}"</#if><#if fieldClass?has_content> class="${fieldClass}"</#if> maxlength="25" size="25"/> </#if> <span class="tooltip">${uiLabelMap.CommonFormatDateTime}</span> <#if fieldClass == "required"> Modified: ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl Fri Dec 10 20:40:08 2010 @@ -19,7 +19,7 @@ under the License. <#include "component://widget/templates/htmlFormMacroLibrary.ftl"/> -<#macro lookupField className="" alert="" name="" value="" size="20" maxlength="20" id="" event="" action="" disabled="" autocomplete="" descriptionFieldName="" formName="" fieldFormName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="" width="20" height="20" position="topleft" fadeBackground="true" clearText="" showDescription="" initiallyCollapsed=""> +<#macro lookupField className="" alert="" name="" value="" size="20" maxlength="20" id="" event="" action="" disabled="" autocomplete="" descriptionFieldName="" formName="" fieldFormName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="layer" width="" height="" position="topleft" fadeBackground="true" clearText="" showDescription="" initiallyCollapsed=""> <#if (!ajaxEnabled?has_content)> <#assign javascriptEnabled = Static["org.ofbiz.base.util.UtilHttp"].isJavaScriptEnabled(request) /> <#if (javascriptEnabled)> @@ -31,7 +31,7 @@ under the License. </#if> <#if (!ajaxUrl?has_content)> <#local ajaxUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, fieldFormName)/> - <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y&searchValueField=" + name /> + <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y" /> </#if> <#if (!showDescription?has_content)> <#local showDescription = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.lookup.showDescription", "N")> Modified: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl Fri Dec 10 20:40:08 2010 @@ -16,22 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<style type="text/css"> -.screenlet { -margin-left: 25%; -margin-right: 25%; -margin-top: 1em; -} -.basic-table tr td { -text-align: center; -} -.basic-table tr td a { -display: block; -} -</style> - -<div class="screenlet"> +<div class="lists screenlet"> <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.CommonLanguageTitle}</li> Modified: ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl Fri Dec 10 20:40:08 2010 @@ -16,21 +16,6 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<style type="text/css"> -.screenlet { -margin-left: 25%; -margin-right: 25%; -margin-top: 1em; -} -.basic-table tr td { -text-align: center; -} -.basic-table tr td a { -display: block; -} -</style> - <div class="screenlet"> <div class="screenlet-title-bar"> <ul> Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Fri Dec 10 20:40:08 2010 @@ -27,12 +27,8 @@ 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/jquery/jquery-1.4.2.min.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 --> @@ -79,11 +75,6 @@ under the License. if (obj_caller == null) obj_caller = window.opener; - var bkColor = "yellow"; - function setSourceColor(src){ - if(src != null) - src.style.backgroundColor = bkColor; - } // function passing selected value to calling window function set_multivalues(value) { obj_caller.target.value = value; Modified: ofbiz/trunk/framework/common/webcommon/includes/setCountryStatesEventJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/setCountryStatesEventJs.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/setCountryStatesEventJs.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/setCountryStatesEventJs.ftl Fri Dec 10 20:40:08 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', '', '', 'true', 'true'); }); getDependentDropdownValues('getAssociatedStateList', 'countryGeoId', '${dependentForm}_countryGeoId', '${dependentForm}_stateProvinceGeoId', 'stateList', 'geoId', 'geoName', '${selectedStateProvinceGeoId}', '', 'true', 'true'); } -}) +}); </script> Modified: ofbiz/trunk/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl Fri Dec 10 20:40:08 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}_${mainId}'), 'change', function() { - getDependentDropdownValues('${requestName}', '${paramKey}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}'); - }); - getDependentDropdownValues('${requestName}', '${paramKey}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '${selectedDependentOption}'); +jQuery(document).ready(function() { + if (jQuery('#${dependentForm}').length) { + jQuery("#${dependentForm}_${mainId}").change(function(e, data) { + getDependentDropdownValues('${requestName}', '${paramKey}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}'); + }); + getDependentDropdownValues('${requestName}', '${paramKey}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '${selectedDependentOption}'); } }) </script> \ No newline at end of file Modified: ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl Fri Dec 10 20:40:08 2010 @@ -1,10 +1,10 @@ <script type="text/javascript"> -document.observe('dom:loaded', function() { +jQuery(document).ready( function() { <#if 0 < productPriceConds.size()> <#list 0..productPriceConds.size()-1 as i> - if ($('EditProductPriceRulesCond_o_${i}')) { - Event.observe($('EditProductPriceRulesCond_inputParamEnumId_o_${i}'), 'change', function() { + if (document.getElementById('EditProductPriceRulesCond_o_${i}')) { + jQuery('#EditProductPriceRulesCond_inputParamEnumId_o_${i}').change( function() { <#if 'PRIP_QUANTITY' != productPriceConds[i].inputParamEnumId && 'PRIP_LIST_PRICE' != productPriceConds[i].inputParamEnumId> getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description'); </#if> @@ -13,11 +13,11 @@ document.observe('dom:loaded', function( getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}'); </#if> } - </#list> -</#if> - if ($('AddProductPriceRulesCond_o_0')) { - $('AddProductPriceRulesCond_condValueInput_o_0').hide(); - Event.observe($('AddProductPriceRulesCond_inputParamEnumId_o_0'), 'change', function() { + </#list> +</#if> + if (document.getElementById('AddProductPriceRulesCond_o_0')) { + jQuery('#AddProductPriceRulesCond_condValueInput_o_0').hide(); + jQuery('#AddProductPriceRulesCond_inputParamEnumId_o_0').change( function() { getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'AddProductPriceRulesCond_inputParamEnumId_o_0', 'AddProductPriceRulesCond_condValue_o_0', 'productPriceRulesCondValues', 'condValue_o_0', 'description', '', '', '', '', 'AddProductPriceRulesCond_condValueInput_o_0'); }); getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'AddProductPriceRulesCond_inputParamEnumId_o_0', 'AddProductPriceRulesCond_condValue_o_0', 'productPriceRulesCondValues', 'condValue_o_0', 'description', '', '', '', '', 'AddProductPriceRulesCond_condValueInput_o_0'); Modified: ofbiz/trunk/framework/common/webcommon/includes/timeDuration.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/timeDuration.ftl?rev=1044503&r1=1044502&r2=1044503&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/timeDuration.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/timeDuration.ftl Fri Dec 10 20:40:08 2010 @@ -33,7 +33,7 @@ under the License. duration += minutes == null ? 0 : minutes * 60000; duration += seconds == null ? 0 : seconds * 1000; duration += millis == null ? 0 : millis; - set_value(duration); + set_duration_value(duration); } </script> <form name="TimeDuration" action="javascript:setTimeDuration()"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |