svn commit: r1128865 [20/27] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1128865 [20/27] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml Sun May 29 11:02:09 2011 @@ -221,25 +221,64 @@ under the License. <Product productId="dropShip1" productTypeId="FINISHED_GOOD" internalName="DropShip from DemoSupplier" productName="DropShip from DemoSupplier" smallImageUrl="/images/products/dropShip1/small.jpg" mediumImageUrl="/images/products/dropShip1/medium.jpg" largeImageUrl="/images/products/dropShip1/large.jpg" isVirtual="N" isVariant="N" requirementMethodEnumId="PRODRQM_DS" billOfMaterialLevel="0" createdDate="2007-05-05 14:50:58.584" createdByUserLogin="admin" lastModifiedDate="2007-05-05 15:05:41.62" lastModifiedByUserLogin="admin" inShippingBox="N" lastUpdatedStamp="2007-05-06 15:02:03.466" lastUpdatedTxStamp="2007-05-06 15:02:02.465" createdStamp="2007-05-05 14:50:58.586" createdTxStamp="2007-05-05 14:50:58.21"/> <ProductCategoryMember productCategoryId="dropShip" productId="dropShip1" sequenceNum="1" fromDate="2001-05-13 12:00:00.0"/> <ProductPrice productId="dropShip1" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="13.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/> - <SupplierProduct productId="dropShip1" partyId="DemoSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="10.0" currencyUomId="USD" supplierProductName="Drop ship product from demo supplier" supplierProductId="dropShip1-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> + <SupplierProduct productId="dropShip1" partyId="DemoSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="10.0" currencyUomId="USD" supplierProductName="Drop ship product from demo supplier" supplierProductId="dropShip1-DS" canDropShip="Y" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> <Product productId="dropShip2" productTypeId="FINISHED_GOOD" internalName="DropShip from BigSupplier" productName="DropShip from BigSupplier" smallImageUrl="/images/products/dropShip2/small.jpg" mediumImageUrl="/images/products/dropShip2/medium.jpg" largeImageUrl="/images/products/dropShip2/large.jpg" isVirtual="N" isVariant="N" requirementMethodEnumId="PRODRQM_DS" billOfMaterialLevel="0" createdDate="2007-05-05 14:50:58.584" createdByUserLogin="admin" lastModifiedDate="2007-05-05 15:05:41.62" lastModifiedByUserLogin="admin" inShippingBox="N" lastUpdatedStamp="2007-05-06 15:02:03.466" lastUpdatedTxStamp="2007-05-06 15:02:02.465" createdStamp="2007-05-05 14:50:58.586" createdTxStamp="2007-05-05 14:50:58.21"/> <ProductCategoryMember productCategoryId="dropShip" productId="dropShip2" sequenceNum="1" fromDate="2001-05-13 12:00:00.0"/> <ProductPrice productId="dropShip2" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="15.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/> - <SupplierProduct productId="dropShip2" partyId="BigSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="12.0" currencyUomId="USD" supplierProductName="Drop ship product from big supplier" supplierProductId="dropShip2-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> + <SupplierProduct productId="dropShip2" partyId="BigSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="12.0" currencyUomId="USD" supplierProductName="Drop ship product from big supplier" supplierProductId="dropShip2-DS" canDropShip="Y" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> <Product productId="dropShip3" productTypeId="FINISHED_GOOD" internalName="DropShip from EuroSupplier" productName="DropShip from EuroSupplier" smallImageUrl="/images/products/dropShip3/small.jpg" mediumImageUrl="/images/products/dropShip3/medium.jpg" largeImageUrl="/images/products/dropShip3/large.jpg" isVirtual="N" isVariant="N" requirementMethodEnumId="PRODRQM_DS" billOfMaterialLevel="0" createdDate="2007-05-05 14:50:58.584" createdByUserLogin="admin" lastModifiedDate="2007-05-05 15:05:41.62" lastModifiedByUserLogin="admin" inShippingBox="N" lastUpdatedStamp="2007-05-06 15:02:03.466" lastUpdatedTxStamp="2007-05-06 15:02:02.465" createdStamp="2007-05-05 14:50:58.586" createdTxStamp="2007-05-05 14:50:58.21"/> <ProductCategoryMember productCategoryId="dropShip" productId="dropShip3" sequenceNum="1" fromDate="2001-05-13 12:00:00.0"/> <ProductPrice productId="dropShip3" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="EUR" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="14.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/> - <SupplierProduct productId="dropShip3" partyId="EuroSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="11.0" currencyUomId="EUR" supplierProductName="Drop ship product from Euro supplier" supplierProductId="dropShip3-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> + <SupplierProduct productId="dropShip3" partyId="EuroSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="11.0" currencyUomId="EUR" supplierProductName="Drop ship product from Euro supplier" supplierProductId="dropShip3-DS" canDropShip="Y" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> <ProductPrice productId="dropShip3" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="14.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/> - <SupplierProduct productId="dropShip3" partyId="EuroSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="11.0" currencyUomId="USD" supplierProductName="Drop ship product from Euro supplier" supplierProductId="dropShip3-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> + <SupplierProduct productId="dropShip3" partyId="EuroSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="11.0" currencyUomId="USD" supplierProductName="Drop ship product from Euro supplier" supplierProductId="dropShip3-DS" canDropShip="Y" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> <!-- order when product is sold --> <Product productId="orderWhenSold" productTypeId="FINISHED_GOOD" internalName="Order product from DemoSupplier when sold" productName="Order product from DemoSupplier when sold" smallImageUrl="/images/products/orderWhenSold/small.jpg" mediumImageUrl="/images/products/orderWhenSold/medium.jpg" largeImageUrl="/images/products/orderWhenSold/large.jpg" isVirtual="N" isVariant="N" requirementMethodEnumId="PRODRQM_AUTO" billOfMaterialLevel="0" createdDate="2007-05-05 14:50:58.584" createdByUserLogin="admin" inShippingBox="N"/> <ProductCategoryMember productCategoryId="dropShip" productId="orderWhenSold" sequenceNum="1" fromDate="2001-05-13 12:00:00.0"/> <ProductPrice productId="orderWhenSold" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="13.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/> - <SupplierProduct productId="orderWhenSold" partyId="DemoSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="10.0" currencyUomId="USD" supplierProductName="Drop ship product from demo supplier" supplierProductId="dropShip1-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> - + <SupplierProduct productId="orderWhenSold" partyId="DemoSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="10.0" currencyUomId="USD" supplierProductName="Drop ship product from demo supplier" supplierProductId="dropShip1-DS" canDropShip="Y" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/> + <!-- alternative URL --> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="dropShip-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRdropShip-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="dropShip1-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRdropShip1-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="dropShip2-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRdropShip2-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="dropShip3-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRdropShip3-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="orderWhenSold-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRorderWhenSold-ALT" localeString="en_US"/> + + <ElectronicText dataResourceId="DRdropShip-ALTEN" textData="dropship"/> + <ElectronicText dataResourceId="DRdropShip1-ALTEN" textData="dropship1"/> + <ElectronicText dataResourceId="DRdropShip2-ALTEN" textData="dropship2"/> + <ElectronicText dataResourceId="DRdropShip3-ALTEN" textData="dropship3"/> + <ElectronicText dataResourceId="DRorderWhenSold-ALT" textData="order-when-sold"/> + + <Content contentId="dropShip-ALT" contentTypeId="DOCUMENT" dataResourceId="dropShip-ALT" localeString="en"/> + <Content contentId="CdropShip-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRdropShip-ALTEN" localeString="en_US"/> + <Content contentId="dropShip1-ALT" contentTypeId="DOCUMENT" dataResourceId="dropShip1-ALT" localeString="en"/> + <Content contentId="CdropShip1-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRdropShip1-ALTEN" localeString="en_US"/> + <Content contentId="dropShip2-ALT" contentTypeId="DOCUMENT" dataResourceId="dropShip2-ALT" localeString="en"/> + <Content contentId="CdropShip2-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRdropShip2-ALTEN" localeString="en_US"/> + <Content contentId="dropShip3-ALT" contentTypeId="DOCUMENT" dataResourceId="dropShip3-ALT" localeString="en"/> + <Content contentId="CdropShip3-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRdropShip3-ALTEN" localeString="en_US"/> + <Content contentId="orderWhenSold-ALT" contentTypeId="DOCUMENT" dataResourceId="orderWhenSold-ALT" localeString="en"/> + <Content contentId="CorderWhenSold-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRorderWhenSold-ALT" localeString="en_US"/> + + <ContentAssoc contentId="dropShip-ALT" contentIdTo="CdropShip-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="dropShip1-ALT" contentIdTo="CdropShip1-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="dropShip2-ALT" contentIdTo="CdropShip2-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="dropShip3-ALT" contentIdTo="CdropShip3-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="orderWhenSold-ALT" contentIdTo="CorderWhenSold-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + + <ProductCategoryContent prodCatContentTypeId="ALTERNATIVE_URL" productCategoryId="dropShip" contentId="dropShip-ALT" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="dropShip1" contentId="dropShip1-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="dropShip2" contentId="dropShip2-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="dropShip3" contentId="dropShip3-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="orderWhenSold" contentId="orderWhenSold-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml Sun May 29 11:02:09 2011 @@ -51,6 +51,13 @@ under the License. </context-param> <filter> + <filter-name>CatalogUrlFilter</filter-name> + <display-name>CatalogUrlFilter</display-name> + <filter-class>org.ofbiz.product.category.CatalogUrlFilter</filter-class> + <init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param> + <init-param><param-name>redirectUrl</param-name><param-value>/control/main</param-value></init-param> + </filter> + <filter> <filter-name>ContextFilter</filter-name> <display-name>ContextFilter</display-name> <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class> @@ -72,6 +79,10 @@ under the License. </init-param> </filter> <filter-mapping> + <filter-name>CatalogUrlFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> <filter-name>ContextFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Sun May 29 11:02:09 2011 @@ -59,6 +59,13 @@ under the License. </context-param> <filter> + <filter-name>CatalogUrlFilter</filter-name> + <display-name>CatalogUrlFilter</display-name> + <filter-class>org.ofbiz.product.category.CatalogUrlFilter</filter-class> + <init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param> + <init-param><param-name>redirectUrl</param-name><param-value>/control/main</param-value></init-param> + </filter> + <filter> <filter-name>ContextFilter</filter-name> <display-name>ContextFilter</display-name> <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class> @@ -80,8 +87,12 @@ under the License. </init-param> </filter> <filter-mapping> + <filter-name>CatalogUrlFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> <filter-name>ContextFilter</filter-name> - <url-pattern>/*</url-pattern> + <url-pattern>/*</url-pattern> </filter-mapping> <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Sun May 29 11:02:09 2011 @@ -226,13 +226,13 @@ function setAlternateGwp(field) { <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists /> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg" /></#if> <#if smallImageUrl?string?has_content> - <a href="<@ofbizUrl>product?product_id=${parentProductId}</@ofbizUrl>"> + <a href="<@ofbizCatalogAltUrl productId=parentProductId/>"> <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Product Image" class="imageborder" /> </a> </#if> <#-- end code to display a small image of the product --> <#-- ${cartLineIndex} - --> - <a href="<@ofbizUrl>product?product_id=${parentProductId}</@ofbizUrl>" class="linktext">${cartLine.getProductId()} - + <a href="<@ofbizCatalogAltUrl productId=parentProductId/>" class="linktext">${cartLine.getProductId()} - ${cartLine.getName()?if_exists}</a> : ${cartLine.getDescription()?if_exists} <#-- For configurable products, the selected options are shown --> <#if cartLine.getConfigWrapper()?exists> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl Sun May 29 11:02:09 2011 @@ -46,12 +46,12 @@ under the License. <td> <div class="productsummary"> <div class="smallimage"> - <a href="/ecommerce/products/${productCategoryId}"> + <a href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId/>"> <span class="popup_link"><img alt="Small Image" src="${categoryImageUrl}"></span> </a> </div> <div class="productbuy"> - <a class="linktext" style="font-size:12px" href="/ecommerce/products/${productCategoryId}">${productCategory.categoryName!productCategoryId}</a> + <a class="linktext" style="font-size:12px" href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId/>">${productCategory.categoryName!productCategoryId}</a> </div> <div class="productinfo"> <ul> @@ -60,7 +60,7 @@ under the License. <#list productCategoryMembers as productCategoryMember> <#if (i > 2)> <#if productCategoryMembers[i]?has_content> - <a class="linktext" href="/ecommerce/products/${productCategoryId}"> + <a class="linktext" href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId/>"> <span>More...</span> </a> </#if> @@ -69,7 +69,7 @@ under the License. <#if productCategoryMember?has_content> <#assign product = delegator.findByPrimaryKey("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", productCategoryMember.productId))> <li class="browsecategorytext"> - <a class="linktext" href="/ecommerce/products/PROMOTIONS/${product.productId}"> + <a class="linktext" href="<@ofbizCatalogAltUrl productCategoryId="PROMOTIONS" productId="${product.productId}"/>"> ${product.productName!product.productId} </a> </li> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl Sun May 29 11:02:09 2011 @@ -36,11 +36,11 @@ under the License. <#if category?has_content> <li class="browsecategorytext"> <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists> - <a href="<@ofbizUrl>category/~category_id=${categoryId}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> - <a href="<@ofbizUrl>category/~category_id=${categoryId}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - <a href="<@ofbizUrl>category/~category_id=${categoryId}</@ofbizUrl>" class="browsecategorybutton">${category.description?if_exists}</a> + <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>" class="browsecategorybutton">${category.description?if_exists}</a> </#if> </li> </#if> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl Sun May 29 11:02:09 2011 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <#if miniProduct?exists> - <a href="<@ofbizUrl>product/~product_id=${miniProduct.productId}</@ofbizUrl>" class="linktext">${miniProductContentWrapper.get("PRODUCT_NAME")?default("No Name Available")}</a> + <a href="<@ofbizCatalogAltUrl productId=miniProduct.productId/>" class="linktext">${miniProductContentWrapper.get("PRODUCT_NAME")?default("No Name Available")}</a> <ul> <li>${miniProduct.productId} <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")> @@ -37,9 +37,9 @@ under the License. <#-- check to see if salesDiscontinuationDate has passed --> <li>${uiLabelMap.ProductNoLongerAvailable}</li> <#elseif miniProduct.isVirtual?default("N") == "Y"> - <li><a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#if>~product_id=${miniProduct.productId}</@ofbizUrl>" class="buttons"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseVariations}...</span></a></li> + <li><a href="<@ofbizCatalogAltUrl productCategoryId=requestParameters.category_id?exists productId=miniProduct.productId/>" class="buttons"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseVariations}...</span></a></li> <#elseif miniProduct.requireAmount?default("N") == "Y"> - <li><a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#if>~product_id=${miniProduct.productId}</@ofbizUrl>" class="buttons"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseAmount}...</span></a></li> + <li><a href="<@ofbizCatalogAltUrl productCategoryId=requestParameters.category_id?exists productId=miniProduct.productId/>" class="buttons"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseAmount}...</span></a></li> <#else> <li> <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="${miniProdFormName}" style="margin: 0;"> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sun May 29 11:02:09 2011 @@ -333,11 +333,11 @@ ${virtualVariantJavaScript?if_exists} <#if category?exists> <div id="paginationBox"> <#if previousProductId?exists> - <a href="<@ofbizUrl>product/~category_id=${categoryId?if_exists}/~product_id=${previousProductId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId?if_exists productId=previousProductId?if_exists/>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | </#if> - <a href="<@ofbizUrl>category/~category_id=${categoryId?if_exists}</@ofbizUrl>" class="linktext">${(category.categoryName)?default(category.description)?if_exists}</a> + <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId?if_exists/>" class="linktext">${(category.categoryName)?default(category.description)?if_exists}</a> <#if nextProductId?exists> - | <a href="<@ofbizUrl>product/~category_id=${categoryId?if_exists}/~product_id=${nextProductId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + | <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId?if_exists productId=nextProductId?if_exists/>" class="buttontext">${uiLabelMap.CommonNext}</a> </#if> </div> </#if> @@ -353,7 +353,7 @@ ${virtualVariantJavaScript?if_exists} <#assign productLargeImageUrl = firstLargeImage /> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl variant="200">${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a> <input type="hidden" id="originalImage" name="originalImage" value="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" /> </#if> <#if !productLargeImageUrl?string?has_content> @@ -379,7 +379,7 @@ ${virtualVariantJavaScript?if_exists} <#assign productLargeImageUrl = firstLargeImage /> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl variant="200">${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a> <input type="hidden" id="originalImage" name="originalImage" value="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" /> </#if> <#if !productLargeImageUrl?string?has_content> @@ -725,7 +725,7 @@ ${virtualVariantJavaScript?if_exists} <#if !imageUrl?string?has_content> <#assign imageUrl = "/images/defaultImage.jpg" /> </#if> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl variant="60">${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" width="60" height="60" alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" width="60" height="60" alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> </#if> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl Sun May 29 11:02:09 2011 @@ -54,7 +54,7 @@ under the License. <#else> <#assign parentCategoryId = ""/> </#if> - <a href="<@ofbizCatalogUrl currentCategoryId=category.productCategoryId previousCategoryId=parentCategoryId/>" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a> + <a href="<@ofbizCatalogAltUrl productCategoryId=category.productCategoryId previousCategoryId=parentCategoryId/>" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a> <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Sun May 29 11:02:09 2011 @@ -88,4 +88,11 @@ under the License. <#if metaKeywords?exists> <meta name="keywords" content="${metaKeywords}"/> </#if> + <#if webAnalyticsConfigs?has_content> + <script language="JavaScript" type="text/javascript"> + <#list webAnalyticsConfigs as webAnalyticsConfig> + ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)} + </#list> + </script> + </#if> </head> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml Sun May 29 11:02:09 2011 @@ -42,7 +42,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/> <script location="component://ecommerce/widget/EcommerceSetup.groovy"/> @@ -55,6 +55,10 @@ under the License. <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> <set field="headerTemplateLocation" from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]" default-value="component://ecommerce/webapp/ecommerce/includes/header.ftl"/> <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://ecommerce/webapp/ecommerce/includes/footer.ftl"/> + <entity-and list="webAnalyticsConfigs" entity-name="WebAnalyticsConfig"> + <field-map field-name="webSiteId"/> + <field-map field-name="isEnabled" value="Y"/> + </entity-and> </actions> <widgets> <section> @@ -251,7 +255,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/> <script location="component://ecommerce/widget/EcommerceSetup.groovy"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumForms.xml Sun May 29 11:02:09 2011 @@ -347,7 +347,7 @@ under the License. </drop-down> </field> <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> - <field name="mimeTypeId"> + <field name="mimeTypeId" encode-output="false"> <drop-down allow-empty="true"> <entity-options description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId"> <entity-order-by field-name="mimeTypeId"/> @@ -410,7 +410,7 @@ under the License. <list-options list-name="dataCategoryList" key-name="dataCategoryId" description="${categoryName}"/> </drop-down> </field> - <field name="mimeTypeId"> + <field name="mimeTypeId" encode-output="false"> <drop-down allow-empty="true"> <entity-options description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId"> <entity-order-by field-name="mimeTypeId"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java Sun May 29 11:02:09 2011 @@ -430,7 +430,7 @@ public class ProductsExportToGoogle { String link = webSiteUrl + "/" + webSiteMountPoint + "/control/product/~product_id=" + prod.getString("productId") + trackingCodeId + utmSource + utmMedium + utmTerm + utmContent + utmCampaign; String productName = null; String productDescription = null; - String productURL = null; + //String productURL = null; List<GenericValue> productAndInfos = delegator.findByAnd("ProductContentAndInfo", UtilMisc.toMap("productId", prod.getString("productId"), "localeString", localeString, "thruDate", null)); if (productAndInfos.size() > 0) { for (GenericValue productContentAndInfo : productAndInfos ) { @@ -440,9 +440,9 @@ public class ProductsExportToGoogle { productName = electronicText.getString("textData"); if ("LONG_DESCRIPTION".equals(productContentAndInfo.getString("productContentTypeId"))) productDescription = electronicText.getString("textData"); - if ("PRODUCT_URL".equals(productContentAndInfo.getString("productContentTypeId"))) - productURL = electronicText.getString("textData") + utmSource + utmMedium + utmTerm + utmContent + utmCampaign; - } + //if ("PRODUCT_URL".equals(productContentAndInfo.getString("productContentTypeId"))) + //productURL = electronicText.getString("textData") + utmSource + utmMedium + utmTerm + utmContent + utmCampaign; + } } else { productName = prod.getString("internalName"); productDescription = prod.getString("longDescription"); Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 29 11:02:09 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1096699 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1128853 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 29 11:02:09 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1096699 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1128853 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 29 11:02:09 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1096699 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1128853 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData.xml Sun May 29 11:02:09 2011 @@ -288,6 +288,7 @@ under the License. <li><a href="http://cwiki.apache.org/confluence/x/L4B2">Mailing Lists</a></li> <li><a href="https://issues.apache.org/jira/browse/OFBIZ">Issue Tracker (Jira)</a></li> <li><a href="http://cwiki.apache.org/confluence/x/BYB2">Source Repository (SVN)</a></li> + <li><a href="https://cwiki.apache.org/OFBIZ/ofbiz-tutorial-a-beginners-development-guide.html">Tutorial for beginners</a></li> <li><a href="http://fisheye6.cenqua.com/browse/ofbiz">Source Browse and Stats (Fisheye)</a></li> <li><a href="http://api.ofbiz.org/">API Reference (Javadoc)</a></li> <li><a href="http://cwiki.apache.org/confluence/display/OFBIZ">Documentation Site: Wiki</a></li> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml Sun May 29 11:02:09 2011 @@ -246,6 +246,7 @@ under the License. <li><a href="http://cwiki.apache.org/confluence/x/L4B2">Mailing Lists</a></li> <li><a href="https://issues.apache.org/jira/browse/OFBIZ">Gestion des bugs (Jira)</a></li> <li><a href="http://cwiki.apache.org/confluence/x/BYB2">Accès aux sources (SVN)</a></li> + <li><a href="https://cwiki.apache.org/OFBIZ/ofbiz-tutorial-a-beginners-development-guide.html">Tutoriel pour les débutants</a></li> <li><a href="http://fisheye6.cenqua.com/browse/ofbiz">Stats et code-source (Fisheye)</a></li> <li><a href="http://api.ofbiz.org/">API Reference (Javadoc)</a></li> <li><a href="http://cwiki.apache.org/confluence/display/OFBIZ">Site de documentation : Wiki</a></li> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_NL.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_NL.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_NL.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_NL.xml Sun May 29 11:02:09 2011 @@ -283,6 +283,7 @@ under the License. <li><a href="http://mail-archives.apache.org/mod_mbox/ofbiz-commits/">commits Mailing List</a></li> <li><a href="https://issues.apache.org/jira/browse/OFBIZ">Issue Tracker (Jira)</a></li> <li><a href="http://docs.ofbiz.org/x/mgM">Source Repository (SVN)</a></li> + <li><a href="https://cwiki.apache.org/OFBIZ/ofbiz-tutorial-a-beginners-development-guide.html">Tutorial for beginners</a></li> <li><a href="http://ofbiz.apache.org/documents.html">Main Documentation Page</a></li> <li><a href="http://docs.ofbiz.org/">Documentation (Confluence)</a></li> <li><a href="http://docs.ofbiz.org/display/OFBIZ">Doc Site: Wiki</a></li> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Sun May 29 11:02:09 2011 @@ -28,7 +28,7 @@ under the License. <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/> <title>${(uiLabelMap.OfbizTitle)!"OFBiz, The Apache Open For Business Project"}</title> <link rel="shortcut icon" href="/ofbiz/images/favicon.ico"> - <script language="javascript" src="/images/jquery/jquery-1.5.2.min.js" type="text/javascript"></script> + <script language="javascript" src="/images/jquery/jquery-1.6.1.min.js" type="text/javascript"></script> <script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script> <script language="javascript" src="/images/selectall.js" type="text/javascript"></script> <script language="javascript" src="/ofbiz/script/search.js" type="text/javascript"></script> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Sun May 29 11:02:09 2011 @@ -733,8 +733,10 @@ <value xml:lang="fr">Heures réelles</value> <value xml:lang="it">Ore attuali</value> <value xml:lang="nl">Werk. uren</value> + <value xml:lang="pt_BR">Horas efetivas</value> <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸£à¸´à¸</value> <value xml:lang="zh">å®é å·¥æ¶</value> + <value xml:lang="zh_TW">實éå·¥æ</value> </property> <property key="ProjectMgrActualTotal"> <value xml:lang="de">Ist-Stunden gesamt</value> @@ -1307,8 +1309,10 @@ <value xml:lang="fr">Heures planifiées</value> <value xml:lang="it">Ore pianificate</value> <value xml:lang="nl">Gepl. uren</value> + <value xml:lang="pt_BR">Horas planejadas</value> <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸µà¹à¸§à¸²à¸à¹à¸à¸</value> <value xml:lang="zh">已计åå·¥æ¶</value> + <value xml:lang="zh_TW">å·²è¨åå·¥æ</value> </property> <property key="ProjectMgrPrintableNote"> <value xml:lang="de">Druckbare Notiz</value> @@ -1362,8 +1366,10 @@ <value xml:lang="fr">Nom du projet</value> <value xml:lang="it">Nome progetto</value> <value xml:lang="nl">Naam</value> + <value xml:lang="pt_BR">Nome do projeto</value> <value xml:lang="th">à¸à¸·à¹à¸à¹à¸à¸£à¹à¸à¸</value> <value xml:lang="zh">项ç®å称</value> + <value xml:lang="zh_TW">å°æ¡å稱</value> </property> <property key="ProjectMgrProjectNoNotes"> <value xml:lang="de">Keine Notizen für dieses Projekt</value> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/build.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/build.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/build.xml Sun May 29 11:02:09 2011 @@ -40,7 +40,6 @@ under the License. <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/> <fileset dir="../../framework/common/build/lib" includes="*.jar"/> <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> - <fileset dir="../../specialpurpose/pos/build/lib" includes="*.jar"/> <!-- to be removed --> <fileset dir="../../applications/party/build/lib" includes="*.jar"/> <fileset dir="../../applications/product/build/lib" includes="*.jar"/> <fileset dir="../../applications/marketing/build/lib" includes="*.jar"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |