svn commit: r1233198 - in /ofbiz/trunk/applications/product: config/ data/ script/org/ofbiz/product/imagemanagement/ servicedef/ src/org/ofbiz/product/imagemanagement/ webapp/catalog/WEB-INF/ webapp/catalog/imagemanagement/ widget/catalog/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1233198 - in /ofbiz/trunk/applications/product: config/ data/ script/org/ofbiz/product/imagemanagement/ servicedef/ src/org/ofbiz/product/imagemanagement/ webapp/catalog/WEB-INF/ webapp/catalog/imagemanagement/ widget/catalog/

hansbak-2
Author: hansbak
Date: Thu Jan 19 06:30:46 2012
New Revision: 1233198

URL: http://svn.apache.org/viewvc?rev=1233198&view=rev
Log:
improve imagemenagement: add an option to resize already uploaded images

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/data/ProductTypeData.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml
    ofbiz/trunk/applications/product/servicedef/services.xml
    ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl
    ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
    ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Jan 19 06:30:46 2012
@@ -5848,6 +5848,9 @@
         <value xml:lang="en">Choose Replacement Image</value>
         <value xml:lang="th">เลือกรูปภาพที่จะแทนที่</value>
     </property>
+    <property key="ImageManagementCreateNewThumbnailSize">
+        <value xml:lang="en">Create New Thumbnail Size</value>
+    </property>
     <property key="ImageManagementCrop">
         <value xml:lang="en">Crop</value>
         <value xml:lang="th">ตัดรูปภาพ</value>
@@ -5950,6 +5953,10 @@
         <value xml:lang="en">Resize</value>
         <value xml:lang="th">เปลี่ยนขนาด</value>
     </property>
+    <property key="ImageManagementResizeAllImages">
+        <value xml:lang="en">Resize All Images</value>
+        <value xml:lang="th">เปลี่ยนขนาดรูปภาพทั้งหมด</value>
+    </property>
     <property key="ImageManagementRotate">
         <value xml:lang="en">Rotate</value>
         <value xml:lang="th">หมุนรูปภาพ</value>
@@ -5977,6 +5984,9 @@
         <value xml:lang="en">Text Size</value>
         <value xml:lang="th">ขนาดตัวอักษร</value>
     </property>
+    <property key="ImageManagementThumbnailSizeExistingInProduct">
+        <value xml:lang="en">Thumbnail Size Existing In Product</value>
+    </property>
     <property key="ImageManagementUploadNewFrame">
         <value xml:lang="en">Upload New Frame</value>
         <value xml:lang="th">อัพโหลดกรอกรูปภาพใหม่</value>

Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Thu Jan 19 06:30:46 2012
@@ -623,14 +623,14 @@ under the License.
     <ProductFeatureCategory productFeatureCategoryId="IMAGE" description="Image"/>
     <ProductFeatureCategory productFeatureCategoryId="TEXT" description="Text"/>
     
-    <ProductFeature productFeatureId="IMAGE_AVATAR" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="100 X 75 (avatar)" defaultSequenceNum="1"/>
-    <ProductFeature productFeatureId="IMAGE_THUMBNAIL" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="150 X 112 (thumbnail)" defaultSequenceNum="2"/>
-    <ProductFeature productFeatureId="IMAGE_WEBSITE" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="320 X 240 (for websites and email)" defaultSequenceNum="3"/>
-    <ProductFeature productFeatureId="IMAGE_BOARD" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="640 X 480 (for message boards)" defaultSequenceNum="4"/>
-    <ProductFeature productFeatureId="IMAGE_MONITOR15" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="800 X 600 (15-inch monitor)" defaultSequenceNum="5"/>
-    <ProductFeature productFeatureId="IMAGE_MONITOR17" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="1024 X 768 (17-inch monitor)" defaultSequenceNum="6"/>
-    <ProductFeature productFeatureId="IMAGE_MONITOR19" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="1280 X 1024 (19-inch monitor)" defaultSequenceNum="7"/>
-    <ProductFeature productFeatureId="IMAGE_MONITOR21" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="1600 X 1200 (21-inch monitor)" defaultSequenceNum="8"/>
+    <ProductFeature productFeatureId="IMAGE_AVATAR" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="100 X 75 (avatar)" abbrev="100x75" defaultSequenceNum="1"/>
+    <ProductFeature productFeatureId="IMAGE_THUMBNAIL" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="150 X 112 (thumbnail)" abbrev="150x112" defaultSequenceNum="2"/>
+    <ProductFeature productFeatureId="IMAGE_WEBSITE" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="320 X 240 (for websites and email)" abbrev="320x240" defaultSequenceNum="3"/>
+    <ProductFeature productFeatureId="IMAGE_BOARD" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="640 X 480 (for message boards)" abbrev="640x480" defaultSequenceNum="4"/>
+    <ProductFeature productFeatureId="IMAGE_MONITOR15" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="800 X 600 (15-inch monitor)" abbrev="800x600" defaultSequenceNum="5"/>
+    <ProductFeature productFeatureId="IMAGE_MONITOR17" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="1024 X 768 (17-inch monitor)" abbrev="1024x768" defaultSequenceNum="6"/>
+    <ProductFeature productFeatureId="IMAGE_MONITOR19" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="1280 X 1024 (19-inch monitor)" abbrev="1280x1024" defaultSequenceNum="7"/>
+    <ProductFeature productFeatureId="IMAGE_MONITOR21" productFeatureTypeId="SIZE" productFeatureCategoryId="IMAGE" description="1600 X 1200 (21-inch monitor)" abbrev="1600x1200" defaultSequenceNum="8"/>
     
     <ProductFeature productFeatureId="TEXT_SMALL" productFeatureTypeId="SIZE" productFeatureCategoryId="TEXT" description="Small" defaultSequenceNum="1"/>
     <ProductFeature productFeatureId="TEXT_MIDDLE" productFeatureTypeId="SIZE" productFeatureCategoryId="TEXT" description="Middle" defaultSequenceNum="2"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml Thu Jan 19 06:30:46 2012
@@ -383,24 +383,39 @@ under the License.
         </iterate>
     </simple-method>
     
-    <simple-method method-name="resizeAllImageOfProduct" short-description="Resize All Image Of Product">
-        <set field="removeImageBySizeMap.productId" from-field="parameters.productId"/>
-        <set field="removeImageBySizeMap.mapKey" from-field="parameters.size"/>
-        <call-service service-name="removeImageBySize" in-map-name="removeImageBySizeMap"/>
-        
-        <entity-and entity-name="ProductContentAndInfo" list="productContentAndInfos">
-            <field-map field-name="productId" from-field="parameters.productId"/>
-            <field-map field-name="productContentTypeId" value="IMAGE"/>
-            <!--<field-map field-name="statusId" value="IM_APPROVED"/>-->
-        </entity-and>
-        <iterate list="productContentAndInfos" entry="productContentAndInfo">
-            <set field="resizeImageMap.productId" from-field="productContentAndInfo.productId"/>
-            <set field="resizeImageMap.contentId" from-field="productContentAndInfo.contentId"/>
-            <set field="resizeImageMap.dataResourceName" from-field="productContentAndInfo.drDataResourceName"/>
-            <set field="resizeImageMap.drObjectInfo" from-field="productContentAndInfo.drObjectInfo"/>
-            <set field="resizeImageMap.resizeWidth" from-field="parameters.size"/>
-            <call-service service-name="resizeImageOfProduct" in-map-name="resizeImageMap"/>
-        </iterate>
+    <simple-method method-name="resizeImages" short-description="Resize Images">
+        <if-compare field="parameters.resizeOption" operator="equals" value="resizeAllImages">
+            <entity-and entity-name="ProductContentAndInfo" list="productContentAndInfos">
+                <field-map field-name="productId" from-field="parameters.productId"/>
+                <field-map field-name="productContentTypeId" value="IMAGE"/>
+                <!--<field-map field-name="statusId" value="IM_APPROVED"/>-->
+            </entity-and>
+            <iterate list="productContentAndInfos" entry="productContentAndInfo">
+                <set field="resizeImageMap.productId" from-field="productContentAndInfo.productId"/>
+                <set field="resizeImageMap.dataResourceName" from-field="productContentAndInfo.drDataResourceName"/>
+                <set field="resizeImageMap.resizeWidth" from-field="parameters.size"/>
+                <call-service service-name="resizeImageOfProduct" in-map-name="resizeImageMap"/>
+            </iterate>
+        </if-compare>
+        <if-compare field="parameters.resizeOption" operator="equals" value="createNewThumbnail">
+            <set field="removeImageBySizeMap.productId" from-field="parameters.productId"/>
+            <set field="removeImageBySizeMap.mapKey" from-field="parameters.size"/>
+            <call-service service-name="removeImageBySize" in-map-name="removeImageBySizeMap"/>
+            
+            <entity-and entity-name="ProductContentAndInfo" list="productContentAndInfos">
+                <field-map field-name="productId" from-field="parameters.productId"/>
+                <field-map field-name="productContentTypeId" value="IMAGE"/>
+                <!--<field-map field-name="statusId" value="IM_APPROVED"/>-->
+            </entity-and>
+            <iterate list="productContentAndInfos" entry="productContentAndInfo">
+                <set field="createNewImageThumbnailMap.productId" from-field="productContentAndInfo.productId"/>
+                <set field="createNewImageThumbnailMap.contentId" from-field="productContentAndInfo.contentId"/>
+                <set field="createNewImageThumbnailMap.dataResourceName" from-field="productContentAndInfo.drDataResourceName"/>
+                <set field="createNewImageThumbnailMap.drObjectInfo" from-field="productContentAndInfo.drObjectInfo"/>
+                <set field="createNewImageThumbnailMap.sizeWidth" from-field="parameters.size"/>
+                <call-service service-name="createNewImageThumbnail" in-map-name="createNewImageThumbnailMap"/>
+            </iterate>
+        </if-compare>
     </simple-method>
     
     <simple-method method-name="removeImageBySize" short-description="Remove Image By Size">

Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Thu Jan 19 06:30:46 2012
@@ -1544,9 +1544,10 @@ under the License.
         <attribute name="partyId" mode="IN" type="String" optional="false"/>
     </service>
     
-    <service name="resizeAllImageOfProduct" engine="simple"
-        location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="resizeAllImageOfProduct" auth="true">
-        <description>Resize All Image Of Product.</description>
+    <service name="resizeImages" engine="simple"
+        location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="resizeImages" auth="true">
+        <description>Resize Images.</description>
+        <attribute name="resizeOption" mode="IN" type="String" optional="false"/>
         <attribute name="productId" mode="IN" type="String" optional="false"/>
         <attribute name="size" mode="IN" type="String" optional="false"/>
     </service>
@@ -1555,10 +1556,18 @@ under the License.
         location="org.ofbiz.product.imagemanagement.ImageManagementServices" invoke="resizeImageOfProduct" auth="true">
         <description>Resize Image Of Product.</description>
         <attribute name="productId" mode="IN" type="String" optional="false"/>
+        <attribute name="dataResourceName" mode="IN" type="String" optional="false"/>
+        <attribute name="resizeWidth" mode="IN" type="String" optional="false"/>
+    </service>
+    
+    <service name="createNewImageThumbnail" engine="java"
+        location="org.ofbiz.product.imagemanagement.ImageManagementServices" invoke="createNewImageThumbnail" auth="true">
+        <description>Create New Image Thumbnail.</description>
+        <attribute name="productId" mode="IN" type="String" optional="false"/>
         <attribute name="contentId" mode="IN" type="String" optional="false"/>
         <attribute name="dataResourceName" mode="IN" type="String" optional="false"/>
         <attribute name="drObjectInfo" mode="IN" type="String" optional="false"/>
-        <attribute name="resizeWidth" mode="IN" type="String" optional="false"/>
+        <attribute name="sizeWidth" mode="IN" type="String" optional="false"/>
     </service>
     
     <service name="removeImageBySize" engine="simple"

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java Thu Jan 19 06:30:46 2012
@@ -112,29 +112,7 @@ public class ImageManagementServices {
             
             String sizeType = null;
             if (UtilValidate.isNotEmpty(imageResize)) {
-                if (imageResize.equals("IMAGE_AVATAR")) {
-                    sizeType = "100x75";
-                } else if (imageResize.equals("IMAGE_THUMBNAIL")) {
-                    sizeType = "150x112";
-                }    
-                else if (imageResize.equals("IMAGE_WEBSITE")) {
-                    sizeType = "320x240";
-                }
-                else if (imageResize.equals("IMAGE_BOARD")) {
-                    sizeType = "640x480";
-                }
-                else if (imageResize.equals("IMAGE_MONITOR15")) {
-                    sizeType = "800x600";
-                }
-                else if (imageResize.equals("IMAGE_MONITOR17")) {
-                    sizeType = "1024x768";
-                }
-                else if (imageResize.equals("IMAGE_MONITOR19")) {
-                    sizeType = "1280x1024";
-                }
-                else if (imageResize.equals("IMAGE_MONITOR21")) {
-                    sizeType = "1600x1200";
-                }
+                sizeType = imageResize;
             }
             
             Map<String, Object> contentCtx = FastMap.newInstance();
@@ -843,7 +821,7 @@ public class ImageManagementServices {
         return result;
     }
     
-    public static Map<String, Object> resizeImageOfProduct(DispatchContext dctx, Map<String, ? extends Object> context) {
+    public static Map<String, Object> createNewImageThumbnail(DispatchContext dctx, Map<String, ? extends Object> context) {
         LocalDispatcher dispatcher = dctx.getDispatcher();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.management.path"), context);
@@ -851,7 +829,7 @@ public class ImageManagementServices {
         String productId = (String) context.get("productId");
         String contentId = (String) context.get("contentId");
         String dataResourceName = (String) context.get("dataResourceName");
-        String width = (String) context.get("resizeWidth");
+        String width = (String) context.get("sizeWidth");
         String imageType = ".jpg";
         int resizeWidth = Integer.parseInt(width);
         int resizeHeight = resizeWidth;
@@ -903,6 +881,30 @@ public class ImageManagementServices {
             Debug.logError(e, module);
             return ServiceUtil.returnError(e.getMessage());
         }
+        String successMsg = "Create new thumbnail size successful";
+        return ServiceUtil.returnSuccess(successMsg);
+    }
+    
+    public static Map<String, Object> resizeImageOfProduct(DispatchContext dctx, Map<String, ? extends Object> context) {
+        String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.management.path"), context);
+        String productId = (String) context.get("productId");
+        String dataResourceName = (String) context.get("dataResourceName");
+        String width = (String) context.get("resizeWidth");
+        int resizeWidth = Integer.parseInt(width);
+        int resizeHeight = resizeWidth;
+        
+        try {
+            BufferedImage bufImg = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + dataResourceName));
+            double imgHeight = bufImg.getHeight();
+            double imgWidth = bufImg.getWidth();
+            String filenameToUse = dataResourceName;
+            String mimeType = dataResourceName.substring(dataResourceName.length() - 3, dataResourceName.length());
+            Map<String, Object> resultResize = ImageManagementServices.resizeImage(bufImg, imgHeight, imgWidth, resizeHeight, resizeWidth);
+            ImageIO.write((RenderedImage) resultResize.get("bufferedImage"), mimeType, new File(imageServerPath + "/" + productId + "/" + filenameToUse));
+        } catch (Exception e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
         String successMsg = "Resize images successful";
         return ServiceUtil.returnSuccess(successMsg);
     }

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu Jan 19 06:30:46 2012
@@ -2907,9 +2907,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>

Modified: ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl Thu Jan 19 06:30:46 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/trunk/applications/product/widget/catalog/ImageManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml Thu Jan 19 06:30:46 2012
@@ -362,7 +362,7 @@ under the License.
         </sort-order>
     </form>
     
-    <form name="showDefaultImage" type="single" title="" header-row-style="header-row" default-table-style="basic-table">
+    <form name="ShowDefaultImage" type="single" title="" header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <entity-and entity-name="ProductContentAndInfo" list="productContentAndInfos">
                 <field-map field-name="productId" from-field="parameters.productId"/>
@@ -676,7 +676,7 @@ under the License.
         </field>
     </form>
     
-    <form name="productImageReplace" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageReplace">
+    <form name="ProductImageReplace" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageReplace">
         <field name="productId" title="${uiLabelMap.ImageManagementChooseProductID}"><lookup target-form-name="LookupProduct"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -829,13 +829,19 @@ under the License.
         </field>-->
     </form>
     
-    <form name="ImageResize" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="resizeAllImageOfProduct">
+    <form name="ImageResize" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="resizeImages">
+        <field name="resizeOption">
+            <drop-down >
+                <option key="resizeAllImages" description="Resize All Images"/>
+                <option key="createNewThumbnail" description="Create New Thumbnail Size"/>
+            </drop-down>
+        </field>
         <field name="productId" title="${uiLabelMap.ImageManagementChooseProductID}"><lookup target-form-name="LookupProduct"/></field>
         <field name="size" title="${uiLabelMap.ImageManagementImageWidth}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     
-    <form name="sizeListOfProduct" type="list" title="" odd-row-style="alternate-row" default-table-style="basic-table" use-row-submit="true" separate-columns="true">
+    <form name="SizeListOfProduct" type="list" title="" odd-row-style="alternate-row" default-table-style="basic-table" use-row-submit="true" separate-columns="true">
         <actions>
             <entity-condition entity-name="ContentAssoc">
                 <condition-list combine="and">

Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml?rev=1233198&r1=1233197&r2=1233198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml Thu Jan 19 06:30:46 2012
@@ -435,7 +435,7 @@ under the License.
                                             <include-form name="ListImageManage" location="component://product/widget/catalog/ImageManagementForms.xml"/>
                                         </screenlet>
                                         <screenlet title="${uiLabelMap.ImageManagementDefaultImage}">
-                                            <include-form name="showDefaultImage" location="component://product/widget/catalog/ImageManagementForms.xml"/>
+                                            <include-form name="ShowDefaultImage" location="component://product/widget/catalog/ImageManagementForms.xml"/>
                                         </screenlet>
                                     </widgets>
                                     <fail-widgets>
@@ -657,7 +657,7 @@ under the License.
                             </condition>
                             <widgets>
                                 <screenlet title="${uiLabelMap.ImageManagementReplace}">
-                                    <include-form name="productImageReplace" location="component://product/widget/catalog/ImageManagementForms.xml"/>
+                                    <include-form name="ProductImageReplace" location="component://product/widget/catalog/ImageManagementForms.xml"/>
                                 </screenlet>
                             </widgets>
                             <fail-widgets>
@@ -883,8 +883,8 @@ under the License.
                             </condition>
                             <widgets>
                                 <!--<label style="h1">${uiLabelMap.Product} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label>-->
-                                <screenlet title="Size Existing In Product : ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]">
-                                    <include-form name="sizeListOfProduct" location="component://product/widget/catalog/ImageManagementForms.xml"/>
+                                <screenlet title="${uiLabelMap.ImageManagementThumbnailSizeExistingInProduct} : ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]">
+                                    <include-form name="SizeListOfProduct" location="component://product/widget/catalog/ImageManagementForms.xml"/>
                                 </screenlet>
                                 <screenlet title="${uiLabelMap.ImageManagementResize}">
                                     <include-form name="ImageResize" location="component://product/widget/catalog/ImageManagementForms.xml"/>