svn commit: r675831 [2/2] - in /ofbiz/trunk: applications/accounting/widget
Locked
svn commit: r675831 [2/2] - in /ofbiz/trunk: applications/accounting/widget
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl Thu Jul 10 21:02:30 2008 @@ -21,11 +21,11 @@ <input type="hidden" name="quoteId" value="${quoteId}"/> <div> <span class="label">${uiLabelMap.OrderCopyQuote}</span> - ${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" class="checkBox" name="copyQuoteItems" value="Y" checked/> - ${uiLabelMap.OrderOrderQuoteAdjustments} <input type="checkbox" class="checkBox" name="copyQuoteAdjustments" value="Y" checked/> - ${uiLabelMap.OrderOrderQuoteRoles} <input type="checkbox" class="checkBox" name="copyQuoteRoles" value="Y" checked/> - ${uiLabelMap.OrderOrderQuoteAttributes} <input type="checkbox" class="checkBox" name="copyQuoteAttributes" value="Y" checked/> - ${uiLabelMap.OrderOrderQuoteCoefficients} <input type="checkbox" class="checkBox" name="copyQuoteCoefficients" value="Y" checked/> + ${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" name="copyQuoteItems" value="Y" checked/> + ${uiLabelMap.OrderOrderQuoteAdjustments} <input type="checkbox" name="copyQuoteAdjustments" value="Y" checked/> + ${uiLabelMap.OrderOrderQuoteRoles} <input type="checkbox" name="copyQuoteRoles" value="Y" checked/> + ${uiLabelMap.OrderOrderQuoteAttributes} <input type="checkbox" name="copyQuoteAttributes" value="Y" checked/> + ${uiLabelMap.OrderOrderQuoteCoefficients} <input type="checkbox" name="copyQuoteCoefficients" value="Y" checked/> </div> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCopy}"/> </form> 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=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl Thu Jul 10 21:02:30 2008 @@ -27,7 +27,7 @@ <FORM METHOD="post" NAME="orderreportform" ACTION="<@ofbizUrl>orderreportjasper.pdf</@ofbizUrl>" TARGET="OrderReport"> <Table> <TR> -<TD><div class="tableheadtext">From Date:</div></td> +<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'> @@ -35,7 +35,7 @@ </TD> </TR> <TR> -<TD><div class="tableheadtext">To Date:</div></td> +<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'> @@ -44,7 +44,7 @@ </TR> <#-- <tr> -<td><div class="tableheadtext">Report:</div></td> +<td><div>Report:</div></td> <td> <SELECT NAME="groupName" tabindex="14" CLASS="stateSelectBox"> <OPTION VALUE="orderStatus"></OPTION> @@ -65,7 +65,7 @@ <FORM METHOD="post" NAME="itemreportform" ACTION="<@ofbizUrl>orderitemreportjasper.pdf</@ofbizUrl>" TARGET="OrderReport"> <Table> <TR> -<TD><div class="tableheadtext">From Date:</div></td> +<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'> @@ -73,7 +73,7 @@ </TD> </TR> <TR> -<TD><div class="tableheadtext">To Date:</div></td> +<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'> @@ -82,7 +82,7 @@ </TR> <#-- <tr> -<td><div class="tableheadtext">Report:</div></td> +<td><div>Report:</div></td> <td> <SELECT NAME="groupName" tabindex="14" CLASS="stateSelectBox"> <OPTION VALUE="orderStatus"></OPTION> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl Thu Jul 10 21:02:30 2008 @@ -23,7 +23,7 @@ <input type="hidden" name="custRequestItemSeqId" value="${custRequestItem.custRequestItemSeqId}"/> <div> <span class="label">${uiLabelMap.OrderCopyCustRequestItem}</span> - ${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" class="checkBox" name="copyLinkedQuotes" value="Y"/> + ${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" name="copyLinkedQuotes" value="Y"/> </div> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCopy}"/> </form> 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=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl Thu Jul 10 21:02:30 2008 @@ -43,14 +43,14 @@ <td> <table width="100%" cellpadding="2" cellspacing="2" border="0"> <tr class="header-row"> - <td nowrap><div class="tableheadtext">WebSite</div></td> - <td nowrap><div class="tableheadtext">PayMethod Type</div></td> - <td nowrap><div class="tableheadtext">Auth Service</div></td> - <td nowrap><div class="tableheadtext">Re-Auth Service</td> - <td nowrap><div class="tableheadtext">Capture Service</div></td> - <td nowrap><div class="tableheadtext">Refund Service</td> - <td nowrap><div class="tableheadtext">Payment Config</div></td> - <td nowrap><div class="tableheadtext"> </div></td> + <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> </tr> <#if paymentSetups?has_content> <#list paymentSetups as paymentSetting> @@ -166,27 +166,27 @@ <tr> <td width="26%" align="right"><div class="tabletext">Processor Auth Service</div></td> <td> </td> - <td width="74%"><input type="text" class="inputBox" 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 class="tabletext">Processor Re-Auth Service</div></td> <td> </td> - <td width="74%"><input type="text" class="inputBox" 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 class="tabletext">Processor Capture Service</div></td> <td> </td> - <td width="74%"><input type="text" class="inputBox" 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 class="tabletext">Processor Refund Service</div></td> <td> </td> - <td width="74%"><input type="text" class="inputBox" 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 class="tabletext">Processor Properties URL</div></td> <td> </td> - <td width="74%"><input type="text" class="inputBox" 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> 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=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Thu Jul 10 21:02:30 2008 @@ -121,14 +121,14 @@ <h3>${uiLabelMap.OrderWorkflow}</h3> <table cellspacing="0" class="basic-table"> <tr class="header-row"> - <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderNumber}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonName}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderDate}</a></td> - <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>" class="tableheadbutton">Total</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>">${uiLabelMap.OrderOrderNumber}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>">${uiLabelMap.CommonName}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>">${uiLabelMap.OrderOrderDate}</a></td> + <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>">Total</a></td> <td width="1"> </td> - <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderStartdateTime}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonPriority}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonMyStatus}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>">${uiLabelMap.OrderStartdateTime}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>">${uiLabelMap.CommonPriority}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>">${uiLabelMap.CommonMyStatus}</a></td> </tr> <#assign alt_row = false> <#list partyTasks as task> @@ -187,16 +187,16 @@ <h3>${uiLabelMap.CommonWorkflowActivityUserRole}</h3> <table cellspacing="0" class="basic-table hover-bar"> <tr class="header-row"> - <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderNumber}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonName}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderDate}</a></td> - <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonTotal}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>">${uiLabelMap.OrderOrderNumber}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>">${uiLabelMap.CommonName}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>">${uiLabelMap.OrderOrderDate}</a></td> + <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>">${uiLabelMap.CommonTotal}</a></td> <td width="1"> </td> - <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonStartDateTime}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=wepaPartyId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyParty}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=roleTypeId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyRole}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonPriority}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonStatus}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>">${uiLabelMap.CommonStartDateTime}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=wepaPartyId</@ofbizUrl>">${uiLabelMap.PartyParty}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=roleTypeId</@ofbizUrl>">${uiLabelMap.PartyRole}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>">${uiLabelMap.CommonPriority}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>">${uiLabelMap.CommonStatus}</a></td> <td> </td> </tr> <#assign alt_row = false> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Thu Jul 10 21:02:30 2008 @@ -206,9 +206,9 @@ <input type="file" size="50" name="fname"/> <br/> <span> - <input class="radioButton" type="radio" name="upload_file_type_bogus" value="category" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl} - <input class="radioButton" type="radio" name="upload_file_type_bogus" value="linkOne" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl} - <input class="radioButton" type="radio" name="upload_file_type_bogus" value="linkTwo"onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkTwo</@ofbizUrl>");'/>${uiLabelMap.ProductLinkTwoImageUrl} + <input type="radio" name="upload_file_type_bogus" value="category" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl} + <input type="radio" name="upload_file_type_bogus" value="linkOne" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl} + <input type="radio" name="upload_file_type_bogus" value="linkTwo"onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkTwo</@ofbizUrl>");'/>${uiLabelMap.ProductLinkTwoImageUrl} </span> <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"/> </td></tr> @@ -231,14 +231,14 @@ </div> <div> <b>${uiLabelMap.CommonDuplicate}:</b> - ${uiLabelMap.ProductCategoryContent} <input type="checkbox" class="checkBox" name="duplicateContent" value="Y" checked /> - ${uiLabelMap.ProductCategoryRollupParentCategories} <input type="checkbox" class="checkBox" name="duplicateParentRollup" value="Y" checked /> - ${uiLabelMap.ProductCategoryRollupChildCategories} <input type="checkbox" class="checkBox" name="duplicateChildRollup" value="Y" /> - ${uiLabelMap.ProductProducts} <input type="checkbox" class="checkBox" name="duplicateMembers" value="Y" checked /> - ${uiLabelMap.ProductCatalogs} <input type="checkbox" class="checkBox" name="duplicateCatalogs" value="Y" checked /> - ${uiLabelMap.ProductFeatures} <input type="checkbox" class="checkBox" name="duplicateFeatures" value="Y" checked /> - ${uiLabelMap.PartyParties} <input type="checkbox" class="checkBox" name="duplicateRoles" value="Y" checked /> - ${uiLabelMap.ProductAttributes} <input type="checkbox" class="checkBox" name="duplicateAttributes" value="Y" checked /> + ${uiLabelMap.ProductCategoryContent} <input type="checkbox" name="duplicateContent" value="Y" checked /> + ${uiLabelMap.ProductCategoryRollupParentCategories} <input type="checkbox" name="duplicateParentRollup" value="Y" checked /> + ${uiLabelMap.ProductCategoryRollupChildCategories} <input type="checkbox" name="duplicateChildRollup" value="Y" /> + ${uiLabelMap.ProductProducts} <input type="checkbox" name="duplicateMembers" value="Y" checked /> + ${uiLabelMap.ProductCatalogs} <input type="checkbox" name="duplicateCatalogs" value="Y" checked /> + ${uiLabelMap.ProductFeatures} <input type="checkbox" name="duplicateFeatures" value="Y" checked /> + ${uiLabelMap.PartyParties} <input type="checkbox" name="duplicateRoles" value="Y" checked /> + ${uiLabelMap.ProductAttributes} <input type="checkbox" name="duplicateAttributes" value="Y" checked /> </div> </td></tr> </table> 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=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Thu Jul 10 21:02:30 2008 @@ -44,7 +44,7 @@ <#assign saleRule = productPriceRule.isSale?exists && productPriceRule.isSale == "Y"> <div> <span class="label"><b>${uiLabelMap.ProductNotifySale}</b></span> - <input type="radio" class="radioButton" name="isSale" value="Y" <#if saleRule>CHECKED</#if>>${uiLabelMap.CommonYes} + <input type="radio" name="isSale" value="Y" <#if saleRule>CHECKED</#if>>${uiLabelMap.CommonYes} <input type="radio" name="isSale" value="N" <#if !saleRule>CHECKED</#if>>${uiLabelMap.CommonNo} <input type="submit" value="${uiLabelMap.CommonUpdate}"> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl Thu Jul 10 21:02:30 2008 @@ -171,10 +171,10 @@ <input type="file" size="50" name="fname"> <td> </td> <td width="80%" colspan="4" valign="top"> - <input class="radioButton" type="radio" name="upload_file_type_bogus" value="small" checked onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>");'>${uiLabelMap.CommonSmall} - <input class="radioButton" type="radio" name="upload_file_type_bogus" value="medium" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=medium</@ofbizUrl>");'>${uiLabelMap.CommonMedium} - <input class="radioButton" type="radio" name="upload_file_type_bogus" value="large"onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=large</@ofbizUrl>");'>${uiLabelMap.CommonLarge} - <input class="radioButton" type="radio" name="upload_file_type_bogus" value="detail" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=detail</@ofbizUrl>");'>${uiLabelMap.CommonDetail} + <input type="radio" name="upload_file_type_bogus" value="small" checked onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>");'>${uiLabelMap.CommonSmall} + <input type="radio" name="upload_file_type_bogus" value="medium" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=medium</@ofbizUrl>");'>${uiLabelMap.CommonMedium} + <input type="radio" name="upload_file_type_bogus" value="large"onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=large</@ofbizUrl>");'>${uiLabelMap.CommonLarge} + <input type="radio" name="upload_file_type_bogus" value="detail" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=detail</@ofbizUrl>");'>${uiLabelMap.CommonDetail} <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Thu Jul 10 21:02:30 2008 @@ -309,7 +309,7 @@ <h3>${uiLabelMap.ProductReceivePurchaseOrder} #${purchaseOrder.orderId}</h3> <#if shipment?has_content> <h3>${uiLabelMap.ProductShipmentId} #${shipment.shipmentId}</h3> - <span class="tableheadtext">Set Shipment As Received</span> + <span>Set Shipment As Received</span> <input type="checkbox" name="forceShipmentReceived" value="Y"/> </#if> </td> 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=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Thu Jul 10 21:02:30 2008 @@ -167,7 +167,7 @@ <a href="<@ofbizUrl>upsShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a> <br/> ${uiLabelMap.ProductShipmentUpsResidential}: - <input type="checkbox" name="homeDeliveryType" class="checkBox" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}> + <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}> <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="<@ofbizUrl>upsShipmentAccept?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> <br/> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl Thu Jul 10 21:02:30 2008 @@ -24,16 +24,16 @@ </div> <div> <span class="label">${uiLabelMap.CommonDuplicate}</span> - ${uiLabelMap.FormFieldTitle_rate} <input type="checkbox" class="checkBox" name="duplicateWorkEffortAssignmentRates" value="Y" checked="checked"/> - ${uiLabelMap.WorkEffortAssoc} <input type="checkbox" class="checkBox" name="duplicateWorkEffortAssocs" value="Y" checked="checked"/> - ${uiLabelMap.ProductContent} <input type="checkbox" class="checkBox" name="duplicateWorkEffortContents" value="Y" checked="checked"/> - ${uiLabelMap.WorkEffortNotes} <input type="checkbox" class="checkBox" name="duplicateWorkEffortNotes" value="Y" checked="checked"/> + ${uiLabelMap.FormFieldTitle_rate} <input type="checkbox" name="duplicateWorkEffortAssignmentRates" value="Y" checked="checked"/> + ${uiLabelMap.WorkEffortAssoc} <input type="checkbox" name="duplicateWorkEffortAssocs" value="Y" checked="checked"/> + ${uiLabelMap.ProductContent} <input type="checkbox" name="duplicateWorkEffortContents" value="Y" checked="checked"/> + ${uiLabelMap.WorkEffortNotes} <input type="checkbox" name="duplicateWorkEffortNotes" value="Y" checked="checked"/> </div> <div> <span class="label">${uiLabelMap.CommonRemove}</span> - ${uiLabelMap.FormFieldTitle_rate} <input type="checkbox" class="checkBox" name="removeWorkEffortAssignmentRates" value="Y"/> - ${uiLabelMap.WorkEffortAssoc} <input type="checkbox" class="checkBox" name="removeWorkEffortAssocs" value="Y"/> - ${uiLabelMap.ProductContent} <input type="checkbox" class="checkBox" name="removeWorkEffortContents" value="Y"/> - ${uiLabelMap.WorkEffortNotes} <input type="checkbox" class="checkBox" name="removeWorkEffortNotes" value="Y"/> + ${uiLabelMap.FormFieldTitle_rate} <input type="checkbox" name="removeWorkEffortAssignmentRates" value="Y"/> + ${uiLabelMap.WorkEffortAssoc} <input type="checkbox" name="removeWorkEffortAssocs" value="Y"/> + ${uiLabelMap.ProductContent} <input type="checkbox" name="removeWorkEffortContents" value="Y"/> + ${uiLabelMap.WorkEffortNotes} <input type="checkbox" name="removeWorkEffortNotes" value="Y"/> </div> </form> \ No newline at end of file Modified: ofbiz/trunk/framework/common/webcommon/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/messages.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/messages.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/messages.ftl Thu Jul 10 21:02:30 2008 @@ -37,7 +37,7 @@ <#-- display the error messages --> <#if (errorMessage?has_content || errorMessageList?has_content)> - <div id="content-messages" class="errorMessage"> + <div class="content-messages errorMessage"> <p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p> <#if errorMessage?has_content> <p>${errorMessage}</p> @@ -52,7 +52,7 @@ <#-- display the event messages --> <#if (eventMessage?has_content || eventMessageList?has_content)> - <div id="content-messages" class="eventMessage"> + <div class="content-messages eventMessage"> <p>${uiLabelMap.CommonFollowingOccurred}:</p> <#if eventMessage?has_content> <p>${eventMessage}</p> Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/maincss.css (original) +++ ofbiz/trunk/framework/images/webapp/images/maincss.css Thu Jul 10 21:02:30 2008 @@ -78,8 +78,7 @@ margin: 0.2em; } -input[type="text"], input[type="password"], .inputBox { -/* inputBox is deprecated */ +input[type="text"], input[type="password"] { background-color: #ffffff; border: #999999 solid 0.1em; font-size: 1.1em; @@ -107,8 +106,7 @@ height: 1.6em; /* force ctrl to scale with text */ } -select, .selectBox { -/* selectBox is deprecated */ +select { background-color: #ffffff; border: #999999 solid 0.1em; font-size: 1.1em; @@ -131,15 +129,6 @@ font-weight: bold; } -/* <h> element colors deprecated */ -h1, .h1 { -color: #000099; -} - -h2, .h2, h3, .h3 { -color: #000000; -} - /* IE7 fix */ table { font-size: 1em; @@ -150,15 +139,13 @@ border: #999999 solid 0.1em; } -textarea, .textAreaBox { -/* textAreaBox is deprecated */ +textarea { background-color: #ffffff; border: #999999 solid 0.1em; font-size: 1.1em; } -th, th a, .tableheadtext { -/* tableheadtext is deprecated */ +th, th a { color: #000000; font-weight: bold; } @@ -188,61 +175,11 @@ text-decoration: none; } -.endcolumns { -/* deprecated - use .clear */ -clear: both; -height: 0; -visibility: hidden; -} - .info { color: #000000; font-style: normal; } -DIV.graybox { -/* deprecated */ -background-color: #CCCCCC; -border: 0.1em solid #000000; -font-weight: bold; -margin: 0.2em auto; -padding: 0.4em; -text-align: center; -width: auto; -} - -DIV.tabletexthidden { -/* deprecated */ -visibility: hidden; -} - -A.tabletext, DIV.tabletext, SPAN.tabletext, P.tabletext, .tabletext { -/* deprecated */ -} - -A.tabletext:hover { -/* deprecated */ -} - -.tabletextright { -/* deprecated */ -text-align: right; -} - -.tabletextcenter { -/* deprecated */ -text-align: center; -} - -.tablebuttontext { -/* deprecated */ -color: #1E3C66; -} - -.contenttext { -font-size: 1.1em; -} - .boxhead { color: #FFFFFF; font-size: 1.1em; @@ -323,49 +260,6 @@ padding-left: 0.5em; } -/* ===== Tab/Button Bar Styles ===== */ -.tabContainer { -/* deprecated */ -background-color: #FFFFFF; -margin-bottom: 1em; -padding-top: 0.4em; -} - -A.tabButton { -/* deprecated */ -background-color: #D4D0C8; -border: solid #000099 0.1em; -color: #000099; -line-height: 2em; -padding: 0.1em 0.5em 0.1em 0.5em; -white-space: nowrap; -} - -A.tabButton:hover { -background-color: #000099; -color: #FFFFFF; -} - -A.tabButtonSelected { -background-color: #000099; -border: solid #000099 0.1em; -color: #FFFFFF; -padding: 0.1em 0.5em 0.1em 0.5em; -white-space: nowrap; -} - -A.tabButtonSelected:hover { -color: #FFFFFF; -} - -A.tableheadbutton { -color: #000000; -} - -A.tableheadbutton:hover { -color: #ff0000; -} - .browsecategorytext { color: #000099; font-weight: bold; @@ -579,13 +473,11 @@ padding-left: 1em; } -hr, .sepbar { -/* .sepbar deprecated */ +hr { background-color: #999999; border: 0; height: 0.1em; margin: 0.5em 0 0.5em 0; -/*width: 100%;*/ } .eventMessage, .errorMessage { @@ -605,25 +497,7 @@ color: #ff0000; } -.viewOneTR1 { -background-color: #B4B0AA; -} - -.viewOneTR2 { -background-color: #D4D0C8; -} - -.radioButton { -background-color: #FFFFFF; -font-size: 1.1em; -} - -.checkBox { -background-color: #FFFFFF; -font-size: 1.1em; -} - -.mediumSubmit,.largeSubmit,.loginButton { +.mediumSubmit, .largeSubmit, .loginButton { background-color: #ffffff; border: #999999 solid 0.1em; color: #000099; @@ -747,12 +621,6 @@ height: 1%; } -.bothclear{ -/* deprecated - use .clear */ -clear: both; -height: 1%; -} - /* ==== Styles For Form Widgets === */ .formTableBordered { border: 0.1em solid #999999; @@ -901,6 +769,11 @@ margin-bottom: 0.5em; } +#column-container h1, +#column-container .h1 { +color: #000099; +} + #column-container .left { float: left; /* alt: position: absolute; top: 0px; left: 0px; */ @@ -982,7 +855,7 @@ color: #ff0000; } -#content-messages p { +.content-messages p { margin: 0.5em 0 0.5em 0; } @@ -1401,21 +1274,16 @@ /* ===== Button Bar Navigation Styles ===== */ /* ======================================== */ -/* tabContainer style deprecated - included here for -backward compatibility */ - .button-bar { margin-bottom: 1.0em; width: 100%; } -.button-bar ul, -.tabContainer ul { +.button-bar ul { display: inline; /* IE Fix */ } -.button-bar ul li, -.tabContainer ul li { +.button-bar ul li { float: left; font-weight: bold; padding: 0.1em 0.4em 0.1em 0.4em; @@ -1431,7 +1299,6 @@ } .button-bar ul a, -.tabContainer ul a, .button-bar a { padding: 0.1em 0.5em 0.1em 0.5em; white-space: nowrap; @@ -1457,8 +1324,7 @@ .button-style-1 a, .button-style-1 ul a, -a.button-style-1, -.tabContainer ul a { +a.button-style-1 { background-color: #D4D0C8; border: solid #000099 0.1em; color: #000099; @@ -1466,18 +1332,14 @@ .button-style-1 .selected, .button-style-1 ul .selected, -.button-style-1 ul .selected a, -.tabContainer ul .tabButtonSelected, -.tabContainer ul .tabButtonSelected a { -/* .tabButtonSelected deprecated - use .selected */ +.button-style-1 ul .selected a { background-color: #000099; color: #ffffff; } .button-style-1 a:hover, .button-style-1 ul a:hover, -a.button-style-1:hover, -.tabContainer ul a:hover { +a.button-style-1:hover { background-color: #000099; color: #ffffff; text-decoration: none; @@ -1615,10 +1477,8 @@ color: #000000; } -.basic-table .viewManyTR1, .basic-table .alternate-row { /* Alternating row style */ -/* .viewManyTR1 deprecated - use .alternate-row */ background-color: #eeeeee; } Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl (original) +++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl Thu Jul 10 21:02:30 2008 @@ -56,7 +56,7 @@ <span class="tabletext">Username </span> </td> <td align="left"> - <input type="text" class="inputBox" name="USERNAME" value="${username}" size="20"> + <input type="text" name="USERNAME" value="${username}" size="20"> </td> </tr> <tr> @@ -64,7 +64,7 @@ <span class="tabletext">Password </span> </td> <td align="left"> - <input type="password" class="inputBox" name="PASSWORD" value="" size="20"> + <input type="password" name="PASSWORD" value="" size="20"> </td> </tr> <tr> Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl (original) +++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl Thu Jul 10 21:02:30 2008 @@ -25,10 +25,10 @@ <table cellpadding="2" cellspacing="0" border="1"> <tr> - <td><div class="tableheadtext">ID</div></td> - <td><div class="tableheadtext">State</div></td> - <td><div class="tableheadtext">Priority</div></td> - <td><div class="tableheadtext">Steps</div></td> + <td><div>ID</div></td> + <td><div>State</div></td> + <td><div>Priority</div></td> + <td><div>Steps</div></td> <td> </td> <td> </td> <td> </td> Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl (original) +++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl Thu Jul 10 21:02:30 2008 @@ -23,8 +23,8 @@ <div class="tabletext"><b>Process :</b> ${process.name()} - ${process.description()?default("N/A")} [${process.key()}]</div> <table cellpadding="2" cellspacing="0" border="1"> <tr> - <td><div class="tableheadtext">Time</div></td> - <td><div class="tableheadtext">Event</div></td> + <td><div>Time</div></td> + <td><div>Event</div></td> </tr> <#list historyList as history> <#assign time = history.time_stamp().getTime()> Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl (original) +++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl Thu Jul 10 21:02:30 2008 @@ -22,11 +22,11 @@ <div> </div> <table cellpadding="2" cellspacing="0" border="1"> <tr> - <td><div class="tableheadtext">Name</div></td> - <td><div class="tableheadtext">Version</div></td> - <td><div class="tableheadtext">Access</div></td> - <td><div class="tableheadtext">Enabled</div></td> - <td><div class="tableheadtext">Running</div></td> + <td><div>Name</div></td> + <td><div>Version</div></td> + <td><div>Access</div></td> + <td><div>Enabled</div></td> + <td><div>Running</div></td> <td> </td> <td> </td> <td> </td> Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl (original) +++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl Thu Jul 10 21:02:30 2008 @@ -24,13 +24,13 @@ <table cellpadding="2" cellspacing="0" border="1"> <tr> - <td><div class="tableheadtext">ID</div></td> - <td><div class="tableheadtext">Name</div></td> - <td><div class="tableheadtext">Description</div></td> - <td><div class="tableheadtext">State</div></td> - <td><div class="tableheadtext">Last State</div></td> - <td><div class="tableheadtext">Priority</div></td> - <td><div class="tableheadtext">Assignments</div></td> + <td><div>ID</div></td> + <td><div>Name</div></td> + <td><div>Description</div></td> + <td><div>State</div></td> + <td><div>Last State</div></td> + <td><div>Priority</div></td> + <td><div>Assignments</div></td> </tr> <#list steps as step> Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl (original) +++ ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl Thu Jul 10 21:02:30 2008 @@ -23,9 +23,9 @@ <div class="tabletext">XPDL packages loaded into the repository.</div> <table cellpadding="2" cellspacing="0" border="1"> <tr> - <td><div class="tableheadtext">ID</div></td> - <td><div class="tableheadtext">Version</div></td> - <td><div class="tableheadtext">Is Open</div></td> + <td><div>ID</div></td> + <td><div>Version</div></td> + <td><div>Is Open</div></td> <td> </td> <td> </td> </tr> @@ -57,7 +57,7 @@ <h2>Upload XPDL</h2> <div> </div> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>repository?upload=xpdl</@ofbizUrl>" name="xpdlUploadForm"> - <input type="file" class="inputBox" size="50" name="fname"> + <input type="file" size="50" name="fname"> <div><hr></div> <input type="submit" class="smallSubmit" value="Upload"> </form> Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl (original) +++ ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl Thu Jul 10 21:02:30 2008 @@ -23,13 +23,13 @@ <table cellpadding="2" cellspacing="0" border="1"> <tr> - <td><div class="tableheadtext">Resource</div></td> - <td><div class="tableheadtext">Name</div></td> - <td><div class="tableheadtext">Activity</div></td> - <td><div class="tableheadtext">Accepted</div></td> - <td><div class="tableheadtext">Priority</div></td> - <td><div class="tableheadtext">State</div></td> - <td><div class="tableheadtext">State Change</div></td> + <td><div>Resource</div></td> + <td><div>Name</div></td> + <td><div>Activity</div></td> + <td><div>Accepted</div></td> + <td><div>Priority</div></td> + <td><div>State</div></td> + <td><div>State Change</div></td> <td> </td> </tr> <#assign formNumber = 0> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |