Modified: ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl Wed Apr 7 21:15:53 2010 @@ -45,14 +45,14 @@ under the License. <td> <table width="100%" cellpadding="2" cellspacing="2" border="0"> <tr class="header-row"> - <td nowrap><div>WebSite</div></td> - <td nowrap><div>PayMethod Type</div></td> - <td nowrap><div>Auth Service</div></td> - <td nowrap><div>Re-Auth Service</td> - <td nowrap><div>Capture Service</div></td> - <td nowrap><div>Refund Service</td> - <td nowrap><div>Payment Config</div></td> - <td nowrap><div> </div></td> + <td nowrap="nowrap"><div>WebSite</div></td> + <td nowrap="nowrap"><div>PayMethod Type</div></td> + <td nowrap="nowrap"><div>Auth Service</div></td> + <td nowrap="nowrap"><div>Re-Auth Service</td> + <td nowrap="nowrap"><div>Capture Service</div></td> + <td nowrap="nowrap"><div>Refund Service</td> + <td nowrap="nowrap"><div>Payment Config</div></td> + <td nowrap="nowrap"><div> </div></td> </tr> <#if paymentSetups?has_content> <#list paymentSetups as paymentSetting> @@ -69,13 +69,13 @@ under the License. <td><div>${paymentSetting.paymentCaptureService?if_exists}</div></td> <td><div>${paymentSetting.paymentRefundService?if_exists}</div></td> <td><div>${paymentSetting.paymentConfiguration?if_exists}</div></td> - <td nowrap> + <td nowrap="nowrap"> <div> <#if security.hasEntityPermission("PAYPROC", "_UPDATE", session)> - <a href="<@ofbizUrl>paysetup?webSiteId=${paymentSetting.webSiteId?if_exists}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">Edit</a> + <a href="<@ofbizUrl>paysetup?webSiteId=${paymentSetting.webSiteId?if_exists}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">Edit</a> </#if> <#if security.hasEntityPermission("PAYPROC", "_DELETE", session)> - <a href="<@ofbizUrl>removeWebSitePaymentSetting?webSiteId=${paymentSetting.webSiteId?if_exists}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">Remove</a> + <a href="<@ofbizUrl>removeWebSitePaymentSetting?webSiteId=${paymentSetting.webSiteId?if_exists}&paymentMethodTypeId=${paymentSetting.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">Remove</a> </#if> </div> </td> @@ -133,7 +133,7 @@ under the License. <td> </td> <td width="74%"> <#if webSitePayment?has_content> - <input type='hidden' name='webSiteId' value='${webSitePayment.webSiteId}'> + <input type='hidden' name='webSiteId' value='${webSitePayment.webSiteId}' /> <div> <b>${webSitePayment.siteName}</b> (This cannot be changed without re-creating the setting.) </div> @@ -151,7 +151,7 @@ under the License. <td> </td> <td width="74%"> <#if webSitePayment?has_content> - <input type='hidden' name='paymentMethodTypeId' value='${webSitePayment.paymentMethodTypeId}'> + <input type='hidden' name='paymentMethodTypeId' value='${webSitePayment.paymentMethodTypeId}' /> <div> <b>${webSitePayment.description}</b> (This cannot be changed without re-creating the setting.) </div> @@ -168,31 +168,31 @@ under the License. <tr> <td width="26%" align="right"><div>Processor Auth Service</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentAuthService" value="${payInfo.paymentAuthService?if_exists}" size="30" maxlength="60"></td> + <td width="74%"><input type="text" name="paymentAuthService" value="${payInfo.paymentAuthService?if_exists}" size="30" maxlength="60" /></td> </tr> <tr> <td width="26%" align="right"><div>Processor Re-Auth Service</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentReAuthService" value="${payInfo.paymentReAuthService?if_exists}" size="30" maxlength="60"></td> + <td width="74%"><input type="text" name="paymentReAuthService" value="${payInfo.paymentReAuthService?if_exists}" size="30" maxlength="60" /></td> </tr> <tr> <td width="26%" align="right"><div>Processor Capture Service</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentCaptureService" value="${payInfo.paymentCaptureService?if_exists}" size="30" maxlength="60"></td> + <td width="74%"><input type="text" name="paymentCaptureService" value="${payInfo.paymentCaptureService?if_exists}" size="30" maxlength="60" /></td> </tr> <tr> <td width="26%" align="right"><div>Processor Refund Service</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentRefundService" value="${payInfo.paymentRefundService?if_exists}" size="30" maxlength="60"></td> + <td width="74%"><input type="text" name="paymentRefundService" value="${payInfo.paymentRefundService?if_exists}" size="30" maxlength="60" /></td> </tr> <tr> <td width="26%" align="right"><div>Processor Properties URL</div></td> <td> </td> - <td width="74%"><input type="text" name="paymentConfiguration" value="${payInfo.paymentConfiguration?if_exists}" size="30" maxlength="60"></td> + <td width="74%"><input type="text" name="paymentConfiguration" value="${payInfo.paymentConfiguration?if_exists}" size="30" maxlength="60" /></td> </tr> <tr> <td colspan='2'> </td> - <td colspan='1'><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> + <td colspan='1'><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td> </tr> </table> </form>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Wed Apr 7 21:15:53 2010 @@ -134,7 +134,7 @@ under the License. <#list partyTasks as task> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> - <#assign orderStr = "orderId=" + task.orderId + "&partyId=" + userLogin.partyId + "&roleTypeId=" + task.roleTypeId + "&workEffortId=" + task.workEffortId + "&fromDate=" + task.get("fromDate").toString()> + <#assign orderStr = "orderId=" + task.orderId + "&partyId=" + userLogin.partyId + "&roleTypeId=" + task.roleTypeId + "&workEffortId=" + task.workEffortId + "&fromDate=" + task.get("fromDate").toString()> <a href="<@ofbizUrl>orderview?${orderStr}</@ofbizUrl>" class="buttontext"> ${task.orderId} </a> @@ -202,24 +202,24 @@ under the License. <#assign alt_row = false> <#list roleTasks as task> <form method="get" name="F${task.workEffortId}"> - <input type="hidden" name="orderId" value="${task.orderId}"> - <input type="hidden" name="workEffortId" value="${task.workEffortId}"> - <input type="hidden" name="taskStatus" value="${task.currentStatusId}"> + <input type="hidden" name="orderId" value="${task.orderId}" /> + <input type="hidden" name="workEffortId" value="${task.workEffortId}" /> + <input type="hidden" name="taskStatus" value="${task.currentStatusId}" /> <#if task.statusId?exists && task.statusId == "CAL_SENT"> - <input type="hidden" name="partyId" value="${userLogin.partyId}"> - <input type="hidden" name="roleTypeId" value="${task.roleTypeId}"> - <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}"> + <input type="hidden" name="partyId" value="${userLogin.partyId}" /> + <input type="hidden" name="roleTypeId" value="${task.roleTypeId}" /> + <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}" /> <#else> - <input type="hidden" name="partyId" value="${userLogin.partyId}"> - <input type="hidden" name="roleTypeId" value="${task.roleTypeId}"> - <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}"> - <input type="hidden" name="fromPartyId" value="${task.wepaPartyId}"> - <input type="hidden" name="fromRoleTypeId" value="${task.roleTypeId}"> - <input type="hidden" name="fromFromDate" value="${task.get("fromDate").toString()}"> - <input type="hidden" name="toPartyId" value="${userLogin.partyId}"> - <input type="hidden" name="toRoleTypeId" value="${task.roleTypeId}"> - <input type="hidden" name="toFromDate" value="${now}"> - <input type="hidden" name="startActivity" value="true"> + <input type="hidden" name="partyId" value="${userLogin.partyId}" /> + <input type="hidden" name="roleTypeId" value="${task.roleTypeId}" /> + <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}" /> + <input type="hidden" name="fromPartyId" value="${task.wepaPartyId}" /> + <input type="hidden" name="fromRoleTypeId" value="${task.roleTypeId}" /> + <input type="hidden" name="fromFromDate" value="${task.get("fromDate").toString()}" /> + <input type="hidden" name="toPartyId" value="${userLogin.partyId}" /> + <input type="hidden" name="toRoleTypeId" value="${task.roleTypeId}" /> + <input type="hidden" name="toFromDate" value="${now}" /> + <input type="hidden" name="startActivity" value="true" /> </#if> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> @@ -264,9 +264,9 @@ under the License. </a> </td> <#if task.statusId?exists && task.statusId == "CAL_SENT"> - <td align="right"><input type="checkbox" name="delegate" value="true" checked></td> + <td align="right"><input type="checkbox" name="delegate" value="true" checked="checked" /></td> <#else> - <td align="right"><input type="checkbox" name="delegate" value="true"></td> + <td align="right"><input type="checkbox" name="delegate" value="true" /></td> </#if> </tr> </form>
