svn commit: r446923 - in /incubator/ofbiz/trunk: applications/ecommerce/webapp/
Locked
svn commit: r446923 - in /incubator/ofbiz/trunk: applications/ecommerce/webapp/
 
|
Author: jleroux
Date: Sat Sep 16 12:26:25 2006 New Revision: 446923 URL: http://svn.apache.org/viewvc?view=rev&rev=446923 Log: Links in screenlet headers use now style rather than class (please see https://issues.apache.org/jira/browse/OFBIZ-280 for more informations) Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newmsg.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl incubator/ofbiz/trunk/applications/pos/config/xpos.properties incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_fr.properties incubator/ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css incubator/ofbiz/trunk/framework/images/webapp/images/maincss.css Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl Sat Sep 16 12:26:25 2006 @@ -97,7 +97,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if ((sessionAttributes.lastViewedProducts)?has_content && sessionAttributes.lastViewedProducts?size > 0)> <#assign continueLink = "/product?product_id=" + sessionAttributes.lastViewedProducts.get(0)> <#else> @@ -134,7 +134,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <div class="lightbuttontextdisabled"> <#--<a href="<@ofbizUrl>main</@ofbizUrl>" class="lightbuttontext">[${uiLabelMap.EcommerceContinueShopping}]</a>--> <#if (shoppingCartSize > 0)> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl Sat Sep 16 12:26:25 2006 @@ -21,7 +21,7 @@ <#if (searchOptionsHistoryList?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(searchOptionsHistoryList?size-1)/></#if> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a> <#if (searchOptionsHistoryList?size > maxToShow)> <a href="<@ofbizUrl>advancedsearch</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonMore}]</a> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl Sat Sep 16 12:26:25 2006 @@ -21,7 +21,7 @@ <#if (lastViewedCategories?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedCategories?size-1)/></#if> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a> </div> <div class="boxhead">${uiLabelMap.EcommerceLastCategories}</div> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl Sat Sep 16 12:26:25 2006 @@ -21,7 +21,7 @@ <#if (lastViewedProducts?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedProducts?size-1)/></#if> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a> <#if (lastViewedProducts?size > maxToShow)> <a href="<@ofbizUrl>lastviewedproducts</@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonMore}]</a> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl Sat Sep 16 12:26:25 2006 @@ -25,7 +25,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if (communicationEvent.partyIdFrom?if_exists != (userLogin.partyId)?if_exists)> <a href="<@ofbizUrl>newmessage?communicationEventId=${communicationEvent.communicationEventId}</@ofbizUrl>" class="submenutext">${uiLabelMap.PartyReply}</a> </#if> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl Sat Sep 16 12:26:25 2006 @@ -42,7 +42,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if parameters.showSent?if_exists == "true"> <a href="<@ofbizUrl>messagelist</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewReceivedOnly}</a> <#else> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newmsg.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newmsg.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newmsg.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newmsg.ftl Sat Sep 16 12:26:25 2006 @@ -17,7 +17,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if showMessageLinks?default("false")?upper_case == "TRUE"> <a href="<@ofbizUrl>messagelist</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewList}</a> </#if> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sat Sep 16 12:26:25 2006 @@ -47,7 +47,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>editperson</@ofbizUrl>" class="submenutextright"> <#if person?exists>${uiLabelMap.CommonUpdate}<#else>${uiLabelMap.CommonCreate}</#if></a> </div> @@ -105,7 +105,7 @@ <#-- ============================================================= --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </div> <div class="boxhead"> ${uiLabelMap.PartyContactInformation}</div> @@ -226,7 +226,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>editcreditcard</@ofbizUrl>" class="submenutext">${uiLabelMap.PartyCreateNewCreditCard}</a><a href="<@ofbizUrl>editgiftcard</@ofbizUrl>" class="submenutext">${uiLabelMap.PartyCreateNewGiftCard}</a><a href="<@ofbizUrl>editeftaccount</@ofbizUrl>" class="submenutextright">${uiLabelMap.PartyCreateNewEftAccount}</a> </div> <div class="boxhead"> ${uiLabelMap.AccountingPaymentMethodInformation}</div> @@ -352,7 +352,7 @@ <#-- ============================================================= --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>changepassword</@ofbizUrl>" class="submenutextright">${uiLabelMap.PartyChangePassword}</a> </div> <div class="boxhead"> ${uiLabelMap.CommonUsername} & ${uiLabelMap.CommonPassword}</div> @@ -373,7 +373,7 @@ <input type="hidden" name="productStoreId" value="${productStoreId}"> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if profiledefs?has_content && profiledefs.defaultShipAddr?has_content && carrierShipMethods?has_content><a href="javascript:document.setdefaultshipmeth.submit();" class="submenutextright">${uiLabelMap.EcommerceSetDefault}</a></#if> </div> <div class="boxhead"> ${uiLabelMap.OrderDefaultShipmentMethod}</div> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl Sat Sep 16 12:26:25 2006 @@ -33,7 +33,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>editforuminfo?contentId=${contentId?if_exists}&nodeTrailCsv=${nodeTrailCsv?if_exists}&contentIdTo=${contentIdTo?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <div class="boxhead"> ${uiLabelMap.EcommerceContentInformation}</div> @@ -49,7 +49,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>editaddimage?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=IMAGE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <div class="boxhead"> ${uiLabelMap.EcommerceImageInformation}</div> @@ -65,7 +65,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=SUMMARY&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <div class="boxhead"> ${uiLabelMap.EcommerceSummaryInformation}</div> @@ -81,7 +81,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=ARTICLE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <div class="boxhead"> ${uiLabelMap.EcommerceArticleInformation}</div> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl Sat Sep 16 12:26:25 2006 @@ -31,7 +31,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if requestParameters.singleUsePayment?default("N") != "Y"> <div class="tabletext"> ${screens.render(anonymoustrailScreen)} Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl Sat Sep 16 12:26:25 2006 @@ -17,7 +17,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <div class="tabletext"> ${screens.render(anonymoustrailScreen)} </div> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl Sat Sep 16 12:26:25 2006 @@ -17,7 +17,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <div class="tabletext"> ${screens.render(anonymoustrailScreen)} </div> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl Sat Sep 16 12:26:25 2006 @@ -26,7 +26,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)?if_exists == "ORDER_COMPLETED"> <a href="<@ofbizUrl>makeReturn?orderId=${orderHeader.orderId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a> </#if> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl Sat Sep 16 12:26:25 2006 @@ -18,7 +18,7 @@ <div class="screenlet"> <div class="screenlet-header"> <#-- - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>main</@ofbizUrl>" class="lightbuttontext">[${uiLabelMap.OrderBackHome}]</a> </div> --> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Sat Sep 16 12:26:25 2006 @@ -21,7 +21,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if maySelectItems?default("N") == "Y"> <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddAlltoCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddCheckedToCart}</a><a href="<@ofbizUrl>createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a> </#if> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl Sat Sep 16 12:26:25 2006 @@ -17,7 +17,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if maySelectItems?default(false)> <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddAlltoCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutextright">${uiLabelMap.EcommerceAddCheckedToCart}</a> </#if> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl Sat Sep 16 12:26:25 2006 @@ -17,7 +17,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <div class="tabletext"> ${screens.render(anonymoustrailScreen)} </div> Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Sat Sep 16 12:26:25 2006 @@ -30,7 +30,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </div> <div class="boxhead"> ${uiLabelMap.EcommerceShoppingLists}</div> @@ -61,7 +61,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCreateCustRequestFromShoppingList}</a> <a href="<@ofbizUrl>createQuoteFromShoppingList?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCreateQuoteFromShoppingList}</a> <a href="javascript:document.updateList.submit();" class="submenutextright">${uiLabelMap.CommonSave}</a> @@ -149,7 +149,7 @@ <#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].monthBegin()> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="javascript:document.reorderinfo.submit();" class="submenutextright">${uiLabelMap.CommonSave}</a> </div> <div class="boxhead"> @@ -313,7 +313,7 @@ <#if childShoppingListDatas?has_content> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceAddChildListsToCart}</a> </div> <div class="boxhead"> ${uiLabelMap.EcommerceChildShoppingList} - ${shoppingList.listName}</div> @@ -358,7 +358,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceAddListToCart}</a> </div> <div class="boxhead"> ${uiLabelMap.EcommerceListItems} - ${shoppingList.listName}</div> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Sat Sep 16 12:26:25 2006 @@ -17,7 +17,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if maySelectItems?default(false)> <a href="javascript:document.addOrderToCartForm.add_all.value="true";document.addOrderToCartForm.submit()" class="lightbuttontext">${uiLabelMap.EcommerceAddAlltoCart}</a> <a href="javascript:document.addOrderToCartForm.add_all.value="false";document.addOrderToCartForm.submit()" class="lightbuttontext">${uiLabelMap.EcommerceAddCheckedtoCart}</a> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl Sat Sep 16 12:26:25 2006 @@ -18,7 +18,7 @@ <#if hasPermission> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if orderId?exists> <a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="submenutext">[${uiLabelMap.OrderViewOrder}]</a> </#if> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Sat Sep 16 12:26:25 2006 @@ -18,7 +18,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED"> <div class="tabletext"><a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCancelAllItems}</a><a href="<@ofbizUrl>orderview?${paramString}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderViewOrder}</a></div> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl Sat Sep 16 12:26:25 2006 @@ -24,7 +24,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING"> <div class="tabletext"><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&${paramString}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderApproveOrder}</a></div> </#if> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sat Sep 16 12:26:25 2006 @@ -18,7 +18,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED"> <div class="tabletext"> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Sat Sep 16 12:26:25 2006 @@ -16,7 +16,7 @@ --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if maySelectItems?default("N") == "Y"> <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddAlltoCart}</a> </#if> Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original) +++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Sat Sep 16 12:26:25 2006 @@ -40,7 +40,7 @@ <#assign extInfo = parameters.extInfo?default("N")> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <div class="tabletext"> <#if parameters.hideFields?default("N") == "Y"> <a href="<@ofbizUrl>findparty?hideFields=N${paramList}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonShowLookupFields}</a> Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl (original) +++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl Sat Sep 16 12:26:25 2006 @@ -28,7 +28,7 @@ <div class="screenlet"> <div class="screenlet-header"> <#if lookupPerson?has_content> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> <a href="<@ofbizUrl>editperson?partyId=${party.partyId}</@ofbizUrl>" class="submenutextright"> <#if lookupPerson?has_content>${uiLabelMap.CommonUpdate}</#if></a> @@ -38,7 +38,7 @@ </#if> <#if lookupGroup?has_content> <#assign lookupPartyType = party.getRelatedOneCache("PartyType")> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> <a href="<@ofbizUrl>editpartygroup?partyId=${party.partyId}</@ofbizUrl>" class="submenutextright"> <#if lookupGroup?has_content>${uiLabelMap.CommonUpdate}</#if></a> @@ -134,7 +134,7 @@ <#-- ============================================================= --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> <a href="<@ofbizUrl>editcontactmech?partyId=${party.partyId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </#if> @@ -255,7 +255,7 @@ <#-- Payment Info ============================================================= --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session)> <a href="<@ofbizUrl>editcreditcard?partyId=${party.partyId}</@ofbizUrl>" class="submenutext">${uiLabelMap.AccountingCreateNewCreditCard}</a> <a href="<@ofbizUrl>editgiftcard?partyId=${party.partyId}</@ofbizUrl>" class="submenutext">${uiLabelMap.AccountingCreateNewGiftCard}</a> @@ -420,7 +420,7 @@ <#-- UserLogins --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> <a href="<@ofbizUrl>createnewlogin?partyId=${party.partyId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </#if> @@ -469,7 +469,7 @@ <#-- Party Attributes --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> <a href="<@ofbizUrl>editPartyAttribute?partyId=${party.partyId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </#if> @@ -502,7 +502,7 @@ <#-- Visits --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <a href="<@ofbizUrl>showvisits?partyId=${partyId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonListAll}</a> </div> <div class="boxhead"> ${uiLabelMap.PartyLastVisit}</div> @@ -545,7 +545,7 @@ <#if isCustomer?exists> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> <#if savedCartListId?has_content> <#assign listParam = "&shoppingListId=" + savedCartListId> @@ -590,7 +590,7 @@ <#-- Party Notes --> <div class="screenlet"> <div class="screenlet-header"> - <div style="float: right;"> + <div class="boxlink"> <#if security.hasEntityPermission("PARTYMGR", "_NOTE", session)> <a href="<@ofbizUrl>AddPartyNote?partyId=${partyId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </#if> Modified: incubator/ofbiz/trunk/applications/pos/config/xpos.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/xpos.properties?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/xpos.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/xpos.properties Sat Sep 16 12:26:25 2006 @@ -1,3 +1,13 @@ +############################################################################### +# Copyright (c) 2001, 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### #Dynamically modified by OFBiz Framework (org.ofbiz.base.util : UtilProperties.setPropertyValue) # # Copyright 2001-2006 The Apache Software Foundation Modified: incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_fr.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_fr.properties?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_fr.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_fr.properties Sat Sep 16 12:26:25 2006 @@ -1,3 +1,13 @@ +############################################################################### +# Copyright (c) 2001, 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### CostComponentType.description.EST_STD_MAT_COST=Mat\u00e9riels estim\u00e9s CostComponentType.description.EST_STD_ROUTE_COST=Estimated Standard Route (fixed asset usage) Cost Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl Sat Sep 16 12:26:25 2006 @@ -48,7 +48,7 @@ </#if> <br/> - <div style="float: right;"> + <div class="boxlink"> <div class="tabletext"><b>${uiLabelMap.ProductVariantAdd}:</b></div> <form action="<@ofbizUrl>addVariantsToVirtual</@ofbizUrl>" method="post" style="margin: 0;" name="addVariantsToVirtual"> <input type="hidden" name="productId" value="${productId}"/> Modified: incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css (original) +++ incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css Sat Sep 16 12:26:25 2006 @@ -254,6 +254,10 @@ color: #FFFFFF; } +.boxlink { + float:right; +} + A.boxheadbutton { font-family: Verdana, Arial, Helvetica, sans-serif; margin: 0px; Modified: incubator/ofbiz/trunk/framework/images/webapp/images/maincss.css URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/images/webapp/images/maincss.css?view=diff&rev=446923&r1=446922&r2=446923 ============================================================================== --- incubator/ofbiz/trunk/framework/images/webapp/images/maincss.css (original) +++ incubator/ofbiz/trunk/framework/images/webapp/images/maincss.css Sat Sep 16 12:26:25 2006 @@ -143,6 +143,10 @@ color: #FFFFFF; } +.boxlink { + float:right; +} + DIV.boxtop { margin-top: 0; margin-right: auto; margin-bottom: 0; margin-left: auto; padding: 0; text-align: center; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |