You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/03/26 22:56:30 UTC
svn commit: r1305581 [20/36] - in /ofbiz/branches/20111205EmailHandling: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/ac...
Modified: ofbiz/branches/20111205EmailHandling/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java Mon Mar 26 20:56:02 2012
@@ -58,26 +58,26 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsTrackConfirm] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsTrackConfirm] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String trackingSummary = (String) result.get("trackingSummary");
- Debug.log("[testUspsTrackConfirm] trackingSummary: " + trackingSummary, module);
+ Debug.logInfo("[testUspsTrackConfirm] trackingSummary: " + trackingSummary, module);
assertEquals("trackingSummary is correct",
"Your item was delivered at 8:10 am on June 1 in Wilmington DE 19801.", trackingSummary);
List<String> trackingDetailList = UtilGenerics.checkList(result.get("trackingDetailList"));
assertEquals("trackingDetailList has 3 elements", 3, trackingDetailList.size());
- Debug.log("[testUspsTrackConfirm] trackingDetailList[0]: " + trackingDetailList.get(0), module);
+ Debug.logInfo("[testUspsTrackConfirm] trackingDetailList[0]: " + trackingDetailList.get(0), module);
assertEquals("trackingDetailList element 0 is correct",
"May 30 11:07 am NOTICE LEFT WILMINGTON DE 19801.", trackingDetailList.get(0));
- Debug.log("[testUspsTrackConfirm] trackingDetailList[1]: " + trackingDetailList.get(1), module);
+ Debug.logInfo("[testUspsTrackConfirm] trackingDetailList[1]: " + trackingDetailList.get(1), module);
assertEquals("trackingDetailList element 0 is correct",
"May 30 10:08 am ARRIVAL AT UNIT WILMINGTON DE 19850.", trackingDetailList.get(1));
- Debug.log("[testUspsTrackConfirm] trackingDetailList[2]: " + trackingDetailList.get(2), module);
+ Debug.logInfo("[testUspsTrackConfirm] trackingDetailList[2]: " + trackingDetailList.get(2), module);
assertEquals("trackingDetailList element 0 is correct",
"May 29 9:55 am ACCEPT OR PICKUP EDGEWATER NJ 07020.", trackingDetailList.get(2));
}
@@ -92,27 +92,27 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsAddressValidation] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsAddressValidation] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String address1 = (String) result.get("address1");
- Debug.log("[testUspsAddressValidation] address1: " + address1, module);
+ Debug.logInfo("[testUspsAddressValidation] address1: " + address1, module);
assertEquals("address1 is correct", "6406 IVY LN", address1);
String city = (String) result.get("city");
- Debug.log("[testUspsAddressValidation] city: " + city, module);
+ Debug.logInfo("[testUspsAddressValidation] city: " + city, module);
assertEquals("city is correct", "GREENBELT", city);
String state = (String) result.get("state");
- Debug.log("[testUspsAddressValidation] state: " + state, module);
+ Debug.logInfo("[testUspsAddressValidation] state: " + state, module);
assertEquals("state is correct", "MD", state);
String zip5 = (String) result.get("zip5");
- Debug.log("[testUspsAddressValidation] zip5: " + zip5, module);
+ Debug.logInfo("[testUspsAddressValidation] zip5: " + zip5, module);
assertEquals("zip5 is correct", "20770", zip5);
String zip4 = (String) result.get("zip4");
- Debug.log("[testUspsAddressValidation] zip4: " + zip4, module);
+ Debug.logInfo("[testUspsAddressValidation] zip4: " + zip4, module);
assertEquals("zip4 is correct", "1440", zip4);
}
@@ -123,15 +123,15 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsCityStateLookup] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsCityStateLookup] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String city = (String) result.get("city");
- Debug.log("[testUspsCityStateLookup] city: " + city, module);
+ Debug.logInfo("[testUspsCityStateLookup] city: " + city, module);
assertEquals("city is correct", "BEVERLY HILLS", city);
String state = (String) result.get("state");
- Debug.log("[testUspsCityStateLookup] state: " + state, module);
+ Debug.logInfo("[testUspsCityStateLookup] state: " + state, module);
assertEquals("state is correct", "CA", state);
}
@@ -142,11 +142,11 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsPriorityMailStandard] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsPriorityMailStandard] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String days = (String) result.get("days");
- Debug.log("[testUspsPriorityMailStandard] days: " + days, module);
+ Debug.logInfo("[testUspsPriorityMailStandard] days: " + days, module);
assertEquals("days is correct", "1", days);
}
@@ -157,11 +157,11 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsPackageServicesStandard] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsPackageServicesStandard] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String days = (String) result.get("days");
- Debug.log("[testUspsPackageServicesStandard] days: " + days, module);
+ Debug.logInfo("[testUspsPackageServicesStandard] days: " + days, module);
assertEquals("days is correct", "2", days);
}
@@ -186,19 +186,19 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsDomesticRate] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsDomesticRate] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String postage = (String) result.get("postage");
- Debug.log("[testUspsDomesticRate] postage: " + postage, module);
+ Debug.logInfo("[testUspsDomesticRate] postage: " + postage, module);
assertEquals("postage is correct", "7.90", postage);
String restrictionCodes = (String) result.get("restrictionCodes");
- Debug.log("[testUspsDomesticRate] restrictionCodes: " + restrictionCodes, module);
+ Debug.logInfo("[testUspsDomesticRate] restrictionCodes: " + restrictionCodes, module);
assertEquals("restrictionCodes is correct", "B-B1-C-D-U", restrictionCodes);
String restrictionDesc = (String) result.get("restrictionDesc");
- Debug.log("[testUspsDomesticRate] restrictionDesc: " + restrictionDesc, module);
+ Debug.logInfo("[testUspsDomesticRate] restrictionDesc: " + restrictionDesc, module);
assertEquals("restrictionDesc is correct", "B. Form 2976-A", restrictionDesc.substring(0,14));
}
}
Modified: ofbiz/branches/20111205EmailHandling/applications/product/testdef/data/IssuanceTestData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/testdef/data/IssuanceTestData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/testdef/data/IssuanceTestData.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/testdef/data/IssuanceTestData.xml Mon Mar 26 20:56:02 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<entity-engine-xml>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy Mon Mar 26 20:56:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
productCategoryId = parameters.productCategoryId;
if (productCategoryId) {
productCategoryContents = delegator.findByAnd("ProductCategoryContent", ["productCategoryId" : productCategoryId]);
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy Mon Mar 26 20:56:02 2012
@@ -86,6 +86,9 @@ while (itr <= 5) {
}
}
if (!orderItemDetail.isEmpty()) {
+ if (orderItemDetail.amount) {
+ orderItemDetail.amount = orderItemDetail.amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+ }
topSellingProducts.add(orderItemDetail);
bestSellingProducts.remove(orderItemDetail);
}
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy Mon Mar 26 20:56:02 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
productId = parameters.productId;
if (productId) {
productContents = delegator.findByAnd("ProductContent", ["productId" : productId]);
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Mar 26 20:56:02 2012
@@ -800,6 +800,12 @@ under the License.
<response name="success" type="view" value="EditProductKeyword"/>
<response name="error" type="view" value="EditProductKeyword"/>
</request-map>
+ <request-map uri="updateProductKeyword">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateProductKeyword"/>
+ <response name="success" type="view" value="EditProductKeyword"/>
+ <response name="error" type="view" value="EditProductKeyword"/>
+ </request-map>
<request-map uri="deleteProductKeyword">
<security https="true" auth="true"/>
<event type="service" path="" invoke="deleteProductKeyword"/>
@@ -2056,7 +2062,7 @@ under the License.
</request-map>
<request-map uri="prepareCreateShipMeth">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/catalog/store/" invoke="prepareCreateShipMeth.groovy"/>
+ <event type="groovy" path="component://product/webapp/catalog/store/prepareCreateShipMeth.groovy"/>
<response name="success" type="view" value="EditProductStoreShipSetup"/>
<response name="error" type="view" value="EditProductStoreShipSetup"/>
</request-map>
@@ -2840,7 +2846,7 @@ under the License.
</request-map>
<request-map uri="checkAction">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/" invoke="checkAction.groovy"/>
+ <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/checkAction.groovy"/>
<response name="frame" type="request" value="ImageFrames"/>
<response name="watermark" type="request" value="ImageWatermarking"/>
<response name="crop" type="request" value="ImageCropping"/>
@@ -2849,7 +2855,7 @@ under the License.
</request-map>
<request-map uri="checkRejected">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/" invoke="checkRejected.groovy"/>
+ <event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/checkRejected.groovy"/>
<response name="approved" type="view" value="ImageApprove"/>
<response name="rejected" type="view" value="ListPeopleRejected"/>
</request-map>
@@ -2923,9 +2929,9 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="ImageResize"/>
</request-map>
- <request-map uri="resizeAllImageOfProduct">
+ <request-map uri="resizeImages">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="resizeAllImageOfProduct"/>
+ <event type="service" path="" invoke="resizeImages"/>
<response name="success" type="view" value="ImageResize"/>
<response name="error" type="view" value="ImageResize"/>
</request-map>
@@ -3042,6 +3048,19 @@ under the License.
<response name="success" type="view" value="ViewProductGroupOrder"/>
<response name="error" type="view" value="ViewProductGroupOrder"/>
</request-map>
+
+ <!-- ================ Product Tag Requests ================= -->
+ <request-map uri="EditProductTag">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditProductTag"/>
+ </request-map>
+
+ <request-map uri="updateProductTag">
+ <security https="true" auth="true"/>
+ <event type="service-multi" path="" invoke="updateProductKeyword"/>
+ <response name="success" type="request-redirect" value="EditProductTag"/>
+ <response name="error" type="view" value="EditProductTag"/>
+ </request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -3177,7 +3196,7 @@ under the License.
<view-map name="EditProductStoreFinAccountSettings" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFinAccountSettings"/>
<view-map name="EditProductStoreVendorPayments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorPayments"/>
<view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/>
- <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/StoreScreens.xml#ProductStoreFacilities" type="screen"/>
+ <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities" type="screen"/>
<view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/>
<view-map name="ListProductStoreFacilityFormOnly" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly" type="screen"/>
<view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/>
@@ -3206,6 +3225,8 @@ under the License.
<view-map name="ListShipmentMethodTypes" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListShipmentMethodTypes"/>
<view-map name="ListCarrierShipmentMethods" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListCarrierShipmentMethods"/>
+ <view-map name="EditProductTag" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductTag"/>
+
<!-- Lookup request mappings -->
<view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
<view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/category/EditCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/category/EditCategory.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/category/EditCategory.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/category/EditCategory.ftl Mon Mar 26 20:56:02 2012
@@ -96,15 +96,15 @@ function insertImageName(type,nameValue)
<td> </td>
<td width="74%">
<select name="productCategoryTypeId" size="1">
- <#assign selectedKey = "">
- <#list productCategoryTypes as productCategoryTypeData>
- <#if requestParameters.productCategoryTypeId?has_content>
- <#assign selectedKey = requestParameters.productCategoryTypeId>
- <#elseif (productCategory?has_content && productCategory.productCategoryTypeId?if_exists == productCategoryTypeData.productCategoryTypeId)>
- <#assign selectedKey = productCategory.productCategoryTypeId>
- </#if>
- <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId?if_exists>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
- </#list>
+ <#assign selectedKey = "">
+ <#list productCategoryTypes as productCategoryTypeData>
+ <#if requestParameters.productCategoryTypeId?has_content>
+ <#assign selectedKey = requestParameters.productCategoryTypeId>
+ <#elseif (productCategory?has_content && productCategory.productCategoryTypeId?if_exists == productCategoryTypeData.productCategoryTypeId)>
+ <#assign selectedKey = productCategory.productCategoryTypeId>
+ </#if>
+ <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId?if_exists>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
+ </#list>
</select>
</td>
</tr>
@@ -122,7 +122,7 @@ function insertImageName(type,nameValue)
<td width="20%" align="right" valign="top" class="label">
${uiLabelMap.ProductCategoryImageUrl}
<#if (productCategory.categoryImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@o...@ofbizContentUrl>" height="40" width="40" /></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
</#if>
</td>
<td> </td>
@@ -142,7 +142,7 @@ function insertImageName(type,nameValue)
<td width="20%" align="right" valign="top" class="label">
${uiLabelMap.ProductLinkOneImageUrl}
<#if (productCategory.linkOneImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@o...@ofbizContentUrl>" height="40" width="40" /></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
</#if>
</td>
<td> </td>
@@ -162,7 +162,7 @@ function insertImageName(type,nameValue)
<td width="20%" align="right" valign="top" class="label">
${uiLabelMap.ProductLinkTwoImageUrl}
<#if (productCategory.linkTwoImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@o...@ofbizContentUrl>" height="40" width="40" /></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
</#if>
</td>
<td> </td>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Mon Mar 26 20:56:02 2012
@@ -75,7 +75,7 @@ under the License.
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
<td>
<#if (product.smallImageUrl)?exists>
- <a href="<@o...@ofbizUrl>"><img alt="Small Image" src="<@o...@ofbizContentUrl>" height="40" width="40" align="middle" /></a>
+ <a href="<@o...@ofbizUrl>"><img alt="Small Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" align="middle" /></a>
</#if>
<a href="<@o...@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a>
</td>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Mon Mar 26 20:56:02 2012
@@ -115,7 +115,7 @@ function insertImageName(size,nameValue)
<td width="20%" align="right" valign="top" class="label">
${uiLabelMap.ProductSmallImage}
<#if (configItem.imageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@o...@ofbizContentUrl>" height="40" width="40" /></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall" /></a>
</#if>
</td>
<td> </td>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl Mon Mar 26 20:56:02 2012
@@ -28,7 +28,7 @@ under the License.
<td>
<select name="imageResize" >
<#list productFeatures as productFeature>
- <option value="${productFeature.productFeatureId?if_exists}">${productFeature.description?if_exists}</option>
+ <option value="${productFeature.abbrev?if_exists}">${productFeature.description?if_exists}</option>
</#list>
<option selected="" value="">Do not resize</option>
</select>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/ImageFrame.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/ImageFrame.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/ImageFrame.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/ImageFrame.ftl Mon Mar 26 20:56:02 2012
@@ -27,14 +27,14 @@ under the License.
var width = jQuery('td.image-src img').width();
var height = jQuery('td.image-src img').height();
jQuery('td.image-src img').css("width", 200);
- var dimention = width + " x " + height + " pixels";
- jQuery('td.dimention').text(dimention);
+ var dimension = width + " x " + height + " pixels";
+ jQuery('td.dimension').text(dimension);
var widthFrame = jQuery('td.image-fr img').width();
var heightFrame = jQuery('td.image-fr img').height();
jQuery('td.image-fr img').css("width", 200);
- var dimentionFrame = widthFrame + " x " + heightFrame + " pixels";
- jQuery('td.frameDimention').text(dimentionFrame);
+ var dimensionFrame = widthFrame + " x " + heightFrame + " pixels";
+ jQuery('td.frameDimension').text(dimensionFrame);
});
function setTargetWindows(target) {
if ((target == "upload") || (target == "choose")) {
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl Mon Mar 26 20:56:02 2012
@@ -90,7 +90,7 @@ under the License.
jQuery('#ImageWatermarking_previewCount').attr('value', next);
});
}
- function setImageDimention() {
+ function setImageDimension() {
var productId = jQuery('#ImageWatermarking_productId').val();
var imageName = jQuery('#ImageWatermarking_imageName').val();
var positionX = jQuery('#ImageWatermarking_positionX').val();
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/product/AddAdditionalImages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/product/AddAdditionalImages.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/product/AddAdditionalImages.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/product/AddAdditionalImages.ftl Mon Mar 26 20:56:02 2012
@@ -27,19 +27,19 @@ under the License.
<table>
<tbody>
<tr>
- <td><#if productAdditionalImage1?has_content><a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td>
+ <td><#if productAdditionalImage1?has_content><a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" /></a></#if></td>
<td><input id="additionalImageOne" type="file" size="20" name="additionalImageOne" /></td>
</tr>
<tr>
- <td><#if productAdditionalImage2?has_content><a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>" ><img src="<@o...@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td>
+ <td><#if productAdditionalImage2?has_content><a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>" ><img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" /></a></#if></td>
<td><input type="file" size="20" name="additionalImageTwo" /></td>
</tr>
<tr>
- <td><#if productAdditionalImage3?has_content><a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td>
+ <td><#if productAdditionalImage3?has_content><a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" /></a></#if></td>
<td><input type="file" size="20" name="additionalImageThree" /></td>
</tr>
<tr>
- <td><#if productAdditionalImage4?has_content><a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" height="50" width="50" alt="" /></a></#if></td>
+ <td><#if productAdditionalImage4?has_content><a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" /></a></#if></td>
<td><input type="file" size="20" name="additionalImageFour" /></td>
</tr>
<tr>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/product/EditProductContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/product/EditProductContent.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/product/EditProductContent.ftl Mon Mar 26 20:56:02 2012
@@ -74,7 +74,7 @@ under the License.
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductSmallImage}</b></div>
<#if (product.smallImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Small Image" src="<@o...@ofbizContentUrl>" height="40" width="40"/></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Small Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
<td> </td>
@@ -94,7 +94,7 @@ under the License.
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductMediumImage}</b></div>
<#if (product.mediumImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Medium Image" src="<@o...@ofbizContentUrl>" height="40" width="40"/></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Medium Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
<td> </td>
@@ -114,7 +114,7 @@ under the License.
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductLargeImage}</b></div>
<#if (product.largeImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Large Image" src="<@o...@ofbizContentUrl>" height="40" width="40"/></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Large Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
<td> </td>
@@ -134,7 +134,7 @@ under the License.
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductDetailImage}</b></div>
<#if (product.detailImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Detail Image" src="<@o...@ofbizContentUrl>" height="40" width="40"/></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Detail Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
<td> </td>
@@ -154,7 +154,7 @@ under the License.
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductOriginalImage}</b></div>
<#if (product.originalImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Original Image" src="<@o...@ofbizContentUrl>" height="40" width="40"/></a>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Original Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
<td> </td>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/reviews/pendingReviews.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/reviews/pendingReviews.ftl Mon Mar 26 20:56:02 2012
@@ -74,19 +74,21 @@ under the License.
${review.postedDateTime?if_exists}
</td>
<td>
- <#if postedPerson?has_content>
+ <#if review.userLoginId?has_content && postedPerson?has_content>
+ <td>
<#if postedPerson.firstName?has_content && postedPerson.lastName?has_content>
${postedPerson.firstName} ${postedPerson.lastName}
<#else>
${postedPerson.groupName}
</#if>
+ </td>
<#else>
<td></td>
</#if>
</td>
<td>
<select name='postedAnonymous_o_${rowCount}'>
- <option>${review.postedAnonymous?default("N")}</option>
+ <option value="${review.postedAnonymous?default("N")}">${review.postedAnonymous?default("N")}</option>
<option value="${review.postedAnonymous?default("N")}">----</option>
<option value="N">${uiLabelMap.CommonN}</option>
<option value="Y">${uiLabelMap.CommonY}</option>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Mon Mar 26 20:56:02 2012
@@ -57,7 +57,11 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>">
<div>
${keyword.enteredKeyword}
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDeleteAll}</a>
+ <form method="post" action="<@o...@ofbizUrl>" name="deleteKeywordThesaurus">
+ <input type="hidden" name="enteredKeyword" value="${keyword.enteredKeyword}" />
+ <input type="hidden" name="alternateKeyword" value="${keyword.alternateKeyword}" />
+ <input type="submit" value="${uiLabelMap.CommonDeleteAll}" />
+ </form>
</div>
<div>
<input type="hidden" name="enteredKeyword" value="${keyword.enteredKeyword}" />
@@ -70,7 +74,11 @@ under the License.
<td>
</#if>
<div>
- <a href="<@o...@ofbizUrl>" class="buttontext">X</a>
+ <form method="post" action="<@o...@ofbizUrl>" name="deleteKeywordThesaurus">
+ <input type="hidden" name="enteredKeyword" value="${keyword.enteredKeyword}" />
+ <input type="hidden" name="alternateKeyword" value="${keyword.alternateKeyword}" />
+ <input type="submit" value="X" />
+ </form>
${keyword.alternateKeyword} (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId?if_exists)})
</div>
<#-- toggle the row color -->
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy Mon Mar 26 20:56:02 2012
@@ -77,6 +77,14 @@ if (picklistBinId) {
}
}
+if (orderId && !picklistBinId) {
+ picklistBin = EntityUtil.getFirst(delegator.findByAnd("PicklistBin", [primaryOrderId : orderId]));
+ if (picklistBin) {
+ picklistBinId = picklistBin.picklistBinId;
+ verifyPickSession.setPicklistBinId(picklistBinId);
+ }
+}
+
context.orderId = orderId;
context.shipGroupSeqId = shipGroupSeqId;
context.picklistBinId = picklistBinId;
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/WEB-INF/controller.xml Mon Mar 26 20:56:02 2012
@@ -155,27 +155,27 @@ under the License.
</request-map>
<request-map uri="RenderInventoryReportHtml">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportHtml"/>
</request-map>
<request-map uri="RenderInventoryReportPDF">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportPDF"/>
</request-map>
<request-map uri="RenderInventoryReportExcel">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportExcel"/>
</request-map>
<request-map uri="RenderInventoryReportMSWord">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportMSWord"/>
</request-map>
<request-map uri="RenderInventoryReportPPT">
<security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/" invoke="InventoryItemReport.groovy"/>
+ <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
<response name="success" type="view" value="RenderInventoryReportPPT"/>
</request-map>
@@ -1352,10 +1352,7 @@ under the License.
<response name="success" type="request" value="json"/>
<response name="error" type="request" value="json"/>
</request-map>
- <request-map uri="Tracking">
- <security https="true" auth="true" />
- <response name="success" type="view" value="Tracking" />
- </request-map>
+
<!-- ================ Lookup Requests ================= -->
<request-map uri="LookupOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeaderAndShipInfo"/></request-map>
<request-map uri="LookupPurchaseOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupPurchaseOrderHeaderAndShipInfo"/></request-map>
@@ -1471,8 +1468,6 @@ under the License.
<view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
<view-map name="LookupInventoryItem" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupInventoryItem"/>
<view-map name="LookupContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContent"/>
-
- <view-map name="Tracking" page="component://product//widget/facility/TrackingScreens.xml#LookingForTracking" type="screen" />
<!-- Shipment Gateway Config -->
<view-map name="FindShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfig" type="screen"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/facility/EditFacility.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/facility/EditFacility.ftl Mon Mar 26 20:56:02 2012
@@ -18,7 +18,7 @@ under the License.
-->
<#if facility?exists && facilityId?has_content>
- <form action="<@o...@ofbizUrl>" name="EditFacilityForm" method="post">
+ <form action="<@o...@ofbizUrl>" name="EditFacilityForm" method="post" class="basic-form">
<input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
<table class="basic-table" cellspacing='0'>
<tr>
@@ -28,7 +28,7 @@ under the License.
</td>
</tr>
<#else>
- <form action="<@o...@ofbizUrl>" name="EditFacilityForm" method="post" style='margin: 0;'>
+ <form action="<@o...@ofbizUrl>" name="EditFacilityForm" method="post" class="basic-form">
<#if facilityId?exists>
<h3>${uiLabelMap.ProductCouldNotFindFacilityWithId} "${facilityId?if_exists}".</h3>
</#if>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Mon Mar 26 20:56:02 2012
@@ -17,12 +17,12 @@ specific language governing permissions
under the License.
-->
- <div class="button-bar">
- <a href="<@o...@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductNewFacility}</a>
- <a href="<@o...@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductNewFacilityLocation}</a>
+ <div class="button-bar button-style-1">
+ <a href="<@o...@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacility}</a>
+ <a href="<@o...@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacilityLocation}</a>
</div>
- <form action="<@o...@ofbizUrl>" method="get" name="findFacilityLocation">
+ <form action="<@o...@ofbizUrl>" method="get" name="findFacilityLocation" class="basic-form">
<#if (facilityId?exists)>
<input type="hidden" name="facilityId" value="${facilityId}" />
</#if>
@@ -74,7 +74,7 @@ under the License.
<#if foundLocations?exists>
<#-- TODO: Put this in a screenlet - make it look more like the party find screen -->
<br />
- <h1>${uiLabelMap.CommonFound}: ${foundLocations.size()} ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</h1>
+ <h3>${uiLabelMap.CommonFound}: ${foundLocations.size()} ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</h3>
<br />
<table class="basic-table hover-bar" cellspacing="0">
<tr class="header-row-2">
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/facility/inventory/receiveInventory.ftl Mon Mar 26 20:56:02 2012
@@ -19,12 +19,12 @@ under the License.
<script language="JavaScript" type="text/javascript">
function setNow(field) { eval('document.selectAllForm.' + field + '.value="${nowTimestamp}"'); }
</script>
-<h1>${title}</h1>
+<div class="page-title">${title}</div>
<#if invalidProductId?exists>
<div class="errorMessage">${invalidProductId}</div>
</#if>
- <div class="button-bar">
- <a href="<@o...@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductNewFacility}</a>
+ <div class="button-bar button-style-1">
+ <a href="<@o...@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacility}</a>
</div>
<#-- Receiving Results -->
<#if receivedItems?has_content>
@@ -92,8 +92,8 @@ under the License.
<td width="6%"> </td>
<td width="74%">
<b>${purchaseOrder.orderId}</b> / <b>${firstOrderItem.orderItemSeqId}</b>
- <#if 1 < purchaseOrderItemsSize>
- (${uiLabelMap.ProductMultipleOrderItemsProduct} - ${purchaseOrderItemsSize}:1 ${uiLabelMap.ProductItemProduct})
+ <#if 1 < purchaseOrderItems.size()>
+ (${uiLabelMap.ProductMultipleOrderItemsProduct} - ${purchaseOrderItems.size()}:1 ${uiLabelMap.ProductItemProduct})
<#else>
(${uiLabelMap.ProductSingleOrderItemProduct} - 1:1 ${uiLabelMap.ProductItemProduct})
</#if>
@@ -332,7 +332,7 @@ under the License.
<input type="hidden" name="_useRowSubmit" value="Y"/>
<#assign rowCount = 0/>
<table class="basic-table" cellspacing="0">
- <#if !purchaseOrderItems?exists || purchaseOrderItemsSize == 0>
+ <#if !purchaseOrderItems?exists || purchaseOrderItems.size() == 0>
<tr>
<td colspan="2">${uiLabelMap.ProductNoItemsPoReceive}.</td>
</tr>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CatalogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CatalogMenus.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CatalogMenus.xml Mon Mar 26 20:56:02 2012
@@ -271,29 +271,26 @@ under the License.
</menu-item>
</menu>
<menu name="ProductStoreSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
- <menu-item name="EditProductStore" title="${uiLabelMap.ProductNewProductStore}" widget-style="buttontext create">
- <link target="EditProductStore"/>
- </menu-item>
<menu-item name="Expand" title="${uiLabelMap.CommonExpandAll}">
<condition>
- <or>
- <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/>
- <if-compare operator="equals" value="EditProductStoreShipmentCostEstimates" field="tabButtonItem"/>
- </or>
+ <or>
+ <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/>
+ <if-compare operator="equals" value="EditProductStoreShipmentCostEstimates" field="tabButtonItem"/>
+ </or>
</condition>
<link target="javascript:expandAll(true);" url-mode="plain"/>
</menu-item>
<menu-item name="Collapse" title="${uiLabelMap.CommonCollapseAll}">
<condition>
- <or>
- <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/>
- <if-compare operator="equals" value="EditProductStoreShipmentCostEstimates" field="tabButtonItem"/>
- </or>
+ <or>
+ <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/>
+ <if-compare operator="equals" value="EditProductStoreShipmentCostEstimates" field="tabButtonItem"/>
+ </or>
</condition>
<link target="javascript:expandAll(false);" url-mode="plain"/>
</menu-item>
- </menu>
-
+ </menu>
+
<menu name="ProductStoreFacility" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="AddProductStoreFacility" title="${uiLabelMap.ProductAddFacility}">
<link target="javascript:ajaxUpdateArea('ProductStoreFacilityEditArea', 'editProductStoreFacility', 'productStoreId=${parameters.productStoreId}');"
@@ -467,7 +464,10 @@ under the License.
</menu-item>
<menu-item name="EditProductConfigs" title="${uiLabelMap.ProductConfigs}">
<condition>
- <if-compare field="product.productTypeId" operator="equals" value="AGGREGATED"/>
+ <or>
+ <if-compare field="product.productTypeId" operator="equals" value="AGGREGATED"/>
+ <if-compare field="product.productTypeId" operator="equals" value="AGGREGATED_SERVICE"/>
+ </or>
</condition>
<link target="EditProductConfigs">
<parameter param-name="productId"/>
@@ -542,6 +542,9 @@ under the License.
<parameter param-name="productId"/>
</link>
</menu-item>
+ <menu-item name="ProductTags" title="${uiLabelMap.ProductTags}">
+ <link target="EditProductTag"/>
+ </menu-item>
<menu-item name="ExpandAll" title="${uiLabelMap.CommonExpandAll}" widget-style="buttontext expand-all">
<condition>
<and>
@@ -584,9 +587,9 @@ under the License.
</link>
</menu-item>
</menu>
-
- <menu name="ImageManagementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="userTabButtonImage">
+ <menu name="ImageManagementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="userTabButtonImage" menu-container-style="button-bar button-style-2 no-clear">
<menu-item name="main" title="${uiLabelMap.CommonMain}">
<condition>
<if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/>
@@ -615,7 +618,7 @@ under the License.
<parameter param-name="productId"/>
</link>
</menu-item>
- <menu-item name="ImageApprove" title="${uiLabelMap.ImageManamentApprove}">
+ <menu-item name="ImageApprove" title="${uiLabelMap.ImageManagementApprove}">
<condition>
<or>
<if-has-permission permission="IMAGE_MANAGEMENT_APPROVE"/>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CommonScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CommonScreens.xml Mon Mar 26 20:56:02 2012
@@ -43,7 +43,6 @@ under the License.
<set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.13.custom.min.js" global="true"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
@@ -135,18 +134,11 @@ under the License.
<widgets>
<container>
<include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
<label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label>
</container>
<section>
- <condition>
- <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/>
- </condition>
<widgets>
- <container style="button-bar">
- <link target="javascript:expandAll(true);" text="${uiLabelMap.CommonExpandAll}" style="buttontext" url-mode="plain"/>
- <link target="javascript:expandAll(false);" text="${uiLabelMap.CommonCollapseAll}" style="buttontext" url-mode="plain"/>
- </container>
+ <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
</widgets>
</section>
</widgets>
@@ -156,7 +148,9 @@ under the License.
<if-compare operator="not-equals" value="EditProductStore" field="tabButtonItem"/>
</condition>
<widgets>
- <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <container style="button-bar button-style-2">
+ <link target="EditProductStore" text="${uiLabelMap.ProductNewProductStore}" style="buttontext create" url-mode="plain"/>
+ </container>
</widgets>
</section>
</fail-widgets>
@@ -319,7 +313,7 @@ under the License.
<screen name="categorytree">
<section>
<actions>
- <script location="component://product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy"></script>
+ <script location="component://product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy"/>
</actions>
<widgets>
<screenlet id="ProductBrowseCategoriesPanel" title="${uiLabelMap.ProductBrowseCatalogeAndCategories}" collapsible="true">
@@ -353,18 +347,17 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="ImageManagementDecorator">
<section>
<actions>
- <set field="headerItem" value="Imagemanagement"/><!-- this highlights the selected menu-item with name "main" -->
- <set field="userTabButtonMainAppBar" value="Imagemanagement"/>
+ <set field="headerItem" value="Imagemanagement"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="left-column">
<include-screen name="leftbar"/>
- </decorator-section>
+ </decorator-section>
<decorator-section name="body">
<section>
<condition>
@@ -372,20 +365,18 @@ under the License.
</condition>
<widgets>
<include-menu name="ImageManagementTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- <container style="h1">
- <label text=" "/>
- </container>
+ <decorator-section-include name="body"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
</fail-widgets>
</section>
- <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+
<screen name="listMiniproduct">
<section>
<actions>
@@ -401,4 +392,36 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="ProductStoreFacilities">
+ <section>
+ <actions>
+ <set field="productStoreId" from-field="parameters.productStoreId"/>
+ <entity-one entity-name="ProductStore" value-field="productStore"/>
+ <set field="tabButtonItem" value="EditProductStoreFacilities"/>
+ <set field="labelTitleProperty" value="ProductFacility"/>
+ <set field="headerItem" value="store"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="left-column">
+ <include-screen name="leftbar"/>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition><not><if-empty field="productStore"/></not></condition>
+ <widgets>
+ <container>
+ <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label>
+ </container>
+ <include-portal-page id="ProductStoreFacility"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/FeatureForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/FeatureForms.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/FeatureForms.xml Mon Mar 26 20:56:02 2012
@@ -315,7 +315,7 @@
</hyperlink>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
- <field name="update" title="${uiLabelMap.CommonUpdate}"><submit/></field>
+ <field name="update" title="${uiLabelMap.CommonUpdate}"><submit/></field>
</form>
<form name="CreateProductFeature" type="single" target="CreateFeatureCategory">
Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/FeatureScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/FeatureScreens.xml Mon Mar 26 20:56:02 2012
@@ -24,7 +24,7 @@
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="left-column">
+ <decorator-section name="left-column">
<include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
</decorator-section>
<decorator-section name="body">