svn commit: r1128865 [8/27] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1128865 [8/27] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml Sun May 29 11:02:09 2011 @@ -24,17 +24,6 @@ <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <!-- do check for CATALOG, _VIEW permission --> - <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> - </condition> - <widgets> - <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> @@ -45,6 +34,7 @@ <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> + <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <decorator-section-include name="body"/> </widgets> <fail-widgets> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementForms.xml Sun May 29 11:02:09 2011 @@ -44,8 +44,8 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="drDataResourceName" title="Image Name"> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="${currentFormName}" description="${drDataResourceName}"> <parameter param-name="productId"/> <parameter param-name="contentId"/> @@ -55,7 +55,7 @@ under the License. <field name="contentId"><display/></field> <field name="dataResourceId"><display/></field> <field name="fromDate"><display/></field> - <field name="statusId" title="Status"> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> @@ -64,7 +64,7 @@ under the License. </form> <form name="ImageGallery" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageGallery"> - <field name="productId" title="${uiLabelMap.ChooseProductID}"><lookup target-form-name="LookupProduct"/></field> + <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> @@ -95,26 +95,26 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="Product Name [Product ID] - Category Name" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="statusProductId" title="Product Status" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="statusProductId" title="${uiLabelMap.ProductStatus}" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <radio no-current-selected-key="${checkRadio}"> - <option key="IM_APPROVED__${productId}" description="Approve"/> - <option key="IM_REJECTED__${productId}" description="Reject"/> - <option key="IM_PENDING__${productId}" description="Pending"/> + <option key="IM_APPROVED__${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/> + <option key="IM_REJECTED__${productId}" description="${uiLabelMap.FormFieldTitle_rejectButton}"/> + <option key="IM_PENDING__${productId}" description="${uiLabelMap.FormFieldTitle_pending}"/> </radio> </field> <field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" position="2" title="Image"><image width="100"/></field> - <field name="checkStatusId" position="2" title="Status"> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="checkStatusId" position="2" title="${uiLabelMap.CommonStatus}"> <radio no-current-selected-key="${checkRadio}"> - <option key="IM_APPROVED/${productId}" description="Approve"/> - <option key="IM_REJECTED/${productId}" description="Reject"/> - <option key="IM_PENDING/${productId}" description="Pending"/> + <option key="IM_APPROVED/${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/> + <option key="IM_REJECTED/${productId}" description="${uiLabelMap.FormFieldTitle_rejectButton}"/> + <option key="IM_PENDING/${productId}" description="${uiLabelMap.FormFieldTitle_pending}"/> </radio> </field> - <field name="drDataResourceName" position="2" title="Image Name"><display/></field> + <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> <field name="fromDate" position="2"><display/></field> @@ -150,11 +150,11 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="Product Name [Product ID] - Category Name" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="drObjectInfo" position="2" title="Image"><image width="100"/></field> - <field name="drDataResourceName" position="2" title="Image Name"><display/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> <field name="fromDate" position="2"><display/></field> @@ -163,7 +163,7 @@ under the License. </field> </form> - <form name="ImageRejected" type="multi" title="" list-name="productContentAndInfos" odd-row-style="alternate-row" default-table-style="basic-table" + <form name="ListPeopleRejected" type="multi" title="" list-name="productContentAndInfos" odd-row-style="alternate-row" default-table-style="basic-table" use-row-submit="true" separate-columns="true" target="addRejectedReasonImageManagement"> <row-actions> <entity-one entity-name="ContentDataResourceView" value-field="contentDataResourceView"> @@ -189,19 +189,19 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="Product Name [Product ID] - Category Name" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" position="2" title="Image"><image width="100"/></field> - <field name="drDataResourceName" position="2" title="Image Name"><display/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> <field name="fromDate" position="2"><display/></field> - <field name="statusId" position="2" title="Status"> + <field name="statusId" position="2" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> - <field name="description" position="2" title="Rejected Reason"> + <field name="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}"> <drop-down allow-empty="true"> <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> <entity-constraint name="enumTypeId" operator="equals" value="IMAGE_REJECT_REASON"/> @@ -214,7 +214,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListPeopleRejected" type="multi" title="" list-name="productContentAndInfos" odd-row-style="alternate-row" default-table-style="basic-table" + <form name="ImageRejected" type="multi" title="" list-name="productContentAndInfos" odd-row-style="alternate-row" default-table-style="basic-table" use-row-submit="true" separate-columns="true" target=""> <row-actions> <entity-one entity-name="ContentDataResourceView" value-field="contentDataResourceView"> @@ -244,27 +244,27 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="Product Name [Product ID] - Category Name" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="drObjectInfo" position="2" title="Image"><image width="100"/></field> - <field name="drDataResourceName" position="2" title="Image Name"><display/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> <field name="fromDate" position="2"><display/></field> <field name="thruDate" position="2"><display/></field> - <field name="statusId" position="2" title="Status"> + <field name="statusId" position="2" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> - <field name="rejectedBy" position="2" title="Rejected By"><display/></field> - <field name="description" position="2" title="Rejected Reason"><display/></field> + <field name="rejectedBy" position="2" title="${uiLabelMap.ImageManagementRejectedBy}"><display/></field> + <field name="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}"><display/></field> <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> </field> </form> <form name="ImageManage" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageManage"> - <field name="productId" title="${uiLabelMap.ChooseProductID}"><lookup target-form-name="LookupProduct"/></field> + <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> @@ -305,34 +305,50 @@ under the License. <field name="dataResourceId"><hidden/></field> <field name="fromDate"><hidden/></field> <field name="_rowSubmit" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="action" use-when="${groovy: return context.drMimeTypeId == 'image/jpeg';}" title="Action" event="onChange" action="javascript: + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="action" use-when="${groovy: return context.drMimeTypeId == 'image/jpeg';}" title="${uiLabelMap.ImageManagementAction}" event="onChange" action="javascript: document.ListImageManage.action='checkAction?productId=${productId}&contentId=${contentId}&dataResourceId=${dataResourceId}'; document.ListImageManage.submit();"> <drop-down allow-empty="true"> - <option key="frame" description="Frame"/> - <option key="watermark" description="Watermark"/> - <option key="crop" description="Crop"/> - <option key="rotate" description="Rotate"/> + <option key="frame" description="${uiLabelMap.ImageManagementFrame}"/> + <option key="watermark" description="${uiLabelMap.ImageManagementWatermark}"/> + <option key="crop" description="${uiLabelMap.ImageManagementCrop}"/> + <option key="rotate" description="${uiLabelMap.ImageManagementRotate}"/> </drop-down> </field> - <field name="description" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="Caption"><text/></field> - <field name="sequenceNum" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="Sort Order"><text maxlength="2" size="5"/></field> - <field name="drIsPublic" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="Enable"><check/></field> - <field name="defaultImage" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="Default Image" widget-style="buttontext"> - <hyperlink target="setDefaultImage" description="Set Default"> + <field name="description" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementCaption}"><text/></field> + <field name="sequenceNum" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementSortOrder}"><text maxlength="2" size="5"/></field> + <field name="drIsPublic" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.CommonEnable}"><check/></field> + <field name="defaultImage" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementDefaultImage}" widget-style="buttontext"> + <hyperlink target="setDefaultImage" description="${uiLabelMap.ImageManagementSetDefault}"> <parameter param-name="productId"/> <parameter param-name="contentId"/> <parameter param-name="contentIdTo"/> </hyperlink> </field> - <field name="drDataResourceName" title="Image Name"><display/></field> - <field name="statusId" title="Status"> + <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" id-name="description"> + <display description="${drDataResourceName}" > + <in-place-editor url="renameImage" cancel-control="button" saving-text="Updating..." text-between-controls=" "> + <simple-editor/> + <field-map field-name="productId" from-field="productId"/> + <field-map field-name="contentId" from-field="contentId"/> + </in-place-editor> + </display> + </field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> </field> + <field name="deleteButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext"> + <hyperlink target="removeImage" description="${uiLabelMap.CommonRemove}" also-hidden="false" confirmation-message="Do you want to remove this image?"> + <parameter param-name="productId" from-field="productId"/> + <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="productContentTypeId" from-field="productContentTypeId"/> + <parameter param-name="fromDate" from-field="fromDate"/> + </hyperlink> + </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> <sort-order> <sort-field name="drObjectInfo"/> @@ -392,22 +408,22 @@ under the License. <field name="checkFrame"><hidden value="T"/></field> <field name="frameURL"><hidden value="${parameters.checkFrame}"/></field> <field name="imageName"><hidden value="${contentDataResource.drDataResourceName}"/></field> - <field name="imageShare" use-when="imageURL != null" title="Image" widget-area-style="image-src"><image value="${imageURL}"/></field> - <field name="imageShare" use-when="imageURL == null" title="Image"><image value="/images/defaultImage.jpg" width="200"/></field> + <field name="imageShare" use-when="imageURL != null" title="${uiLabelMap.CommonImage}" widget-area-style="image-src"><image value="${imageURL}"/></field> + <field name="imageShare" use-when="imageURL == null" title="${uiLabelMap.CommonImage}"><image value="/images/defaultImage.jpg" width="200"/></field> <field name="imageDimention" widget-area-style="dimention"><display></display></field> - <field name="imageFrame" use-when="frameURL != null" title="Frame" widget-area-style="image-fr"><image value="${frameURL}"/></field> - <field name="imageFrame" use-when="frameURL == null" title="Frame" widget-area-style="image-fr"><image value="/images/defaultImage.jpg" width="200"/></field> + <field name="imageFrame" use-when="frameURL != null" title="${uiLabelMap.ImageManagementFrame}" widget-area-style="image-fr"><image value="${frameURL}"/></field> + <field name="imageFrame" use-when="frameURL == null" title="${uiLabelMap.ImageManagementFrame}" widget-area-style="image-fr"><image value="/images/defaultImage.jpg" width="200"/></field> <field name="frameDimention" use-when="frameURL != null" widget-area-style="frameDimention"><display></display></field> - <field name="uploadedFile" title="Upload New Frame" event="onClick" action="javascript:setUploadTarget('_self');"><file/></field> - <field name="uploadButton" title="Upload" widget-style="smallSubmit" event="onClick" action="javascript:document.ImageFrames.setAttribute('enctype', 'multipart/form-data');setTargetWindows('upload');document.ImageFrames.submit();"><submit button-type="button"/></field> - <field name="imageFrameContentId" title="Choose Exist Frame"><lookup target-form-name="LookupImageFrame"/></field> - <field name="confirmButton" title="Confirm" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('choose');document.ImageFrames.submit();"><submit button-type="button"/></field> - <field name="imageWidth" title="Image Width"><text/></field> - <field name="imageHeight" title="Image Height"><text/></field> - <field name="previewButton" title="Preview" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('new');"><submit button-type="button"/></field> - <field name="submitButton" title="Create" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('_self');"><submit button-type="button"/></field> + <field name="uploadedFile" title="${uiLabelMap.ImageManagementUploadNewFrame}" event="onClick" action="javascript:setUploadTarget('_self');"><file/></field> + <field name="uploadButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit" event="onClick" action="javascript:document.ImageFrames.setAttribute('enctype', 'multipart/form-data');setTargetWindows('upload');document.ImageFrames.submit();"><submit button-type="button"/></field> + <field name="imageFrameContentId" title="${uiLabelMap.ImageManagementChooseExistFrame}"><lookup target-form-name="LookupImageFrame"/></field> + <field name="confirmButton" title="${uiLabelMap.FormFieldTitle_confirmButton}" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('choose');document.ImageFrames.submit();"><submit button-type="button"/></field> + <field name="imageWidth" title="${uiLabelMap.ImageManagementImageWidth}"><text/></field> + <field name="imageHeight" title="${uiLabelMap.ImageManagementImageHeight}"><text/></field> + <field name="previewButton" title="${uiLabelMap.CommonPreview}" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('new');"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('_self');"><submit button-type="button"/></field> <field name="cancelButton" title=" " widget-style="buttontext" event="onClick" action="javascript:deletePreviewFrameImage();"> - <hyperlink target="ListImageManage" description="Cancel"> + <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}"> <parameter param-name="productId" from-field="parameters.productId"></parameter> </hyperlink> </field> @@ -433,10 +449,10 @@ under the License. <field name="positionY" widget-area-style="positionY"><hidden value="50.00"/></field> <field name="previewCount" widget-area-style="count"><hidden value="0"/></field> <field name="imageName"><hidden value="${contentDataResource.drDataResourceName}"/></field> - <field name="imageWatermark" use-when="imageURL != null" title="Image" widget-area-style="img-src"><image value="${imageURL}"/></field> - <field name="imageWatermark" use-when="imageURL == null" title="Image" widget-area-style="img-src-de"><image value="/images/defaultImage.jpg"/></field> + <field name="imageWatermark" use-when="imageURL != null" title="${uiLabelMap.CommonImage}" widget-area-style="img-src"><image value="${imageURL}"/></field> + <field name="imageWatermark" use-when="imageURL == null" title="${uiLabelMap.CommonImage}" widget-area-style="img-src-de"><image value="/images/defaultImage.jpg"/></field> <field name="" widget-style="h3"><display description="Click directly on the image to adjust the location of the watermark"></display></field> - <field name="imageOpacity" title="Opacity" widget-area-style="opacity"> + <field name="imageOpacity" title="${uiLabelMap.ImageManagementOpacity}" widget-area-style="opacity"> <drop-down no-current-selected-key="0.5"> <option key="0.1" description="10%"/> <option key="0.2" description="20%"/> @@ -450,9 +466,9 @@ under the License. <option key="1.0" description="100%"/> </drop-down> </field> - <field name="textWatermark" title="Text" widget-area-style="watermark_txt"><text default-value="DEFAULT"/></field> - <field name="previewButton" title=" " widget-style="buttontext" widget-area-style="preview"><hyperlink target="#" target-type="plain" description="Preview"></hyperlink></field> - <field name="colorWatermark" title="Text Color" widget-area-style="txt_color"> + <field name="textWatermark" title="${uiLabelMap.CommonText}" widget-area-style="watermark_txt"><text default-value="DEFAULT"/></field> + <field name="previewButton" title=" " widget-style="buttontext" widget-area-style="preview"><hyperlink target="#" target-type="plain" description="${uiLabelMap.CommonPreview}"></hyperlink></field> + <field name="colorWatermark" title="${uiLabelMap.ImageManagementTextColor}" widget-area-style="txt_color"> <drop-down allow-empty="true" no-current-selected-key="TEXT_BLACK"> <entity-options description="${description}" entity-name="ProductFeature" key-field-name="productFeatureId"> <entity-constraint name="productFeatureTypeId" value="COLOR"/> @@ -461,7 +477,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="sizeWatermark" title="Text Size" widget-area-style="txt_size"> + <field name="sizeWatermark" title="${uiLabelMap.ImageManagementTextSize}" widget-area-style="txt_size"> <drop-down allow-empty="true" no-current-selected-key="TEXT_MIDDLE"> <entity-options description="${description}" entity-name="ProductFeature" key-field-name="productFeatureId"> <entity-constraint name="productFeatureTypeId" value="SIZE"/> @@ -470,9 +486,9 @@ under the License. </entity-options> </drop-down> </field> - <field name="submitButton" title="Watermark" event="onClick" action="javascript:setImageDimention()" widget-style="smallSubmit" ><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" event="onClick" action="javascript:setImageDimention()" widget-style="smallSubmit" ><submit button-type="button"/></field> <field name="cancelButton" title=" " widget-style="buttontext" event="onClick" action="javascript:deletePreviewWatermarkImage();"> - <hyperlink target="ListImageManage" description="Cancel"> + <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}"> <parameter param-name="productId" from-field="parameters.productId"></parameter> </hyperlink> </field> @@ -493,8 +509,8 @@ under the License. <field name="imageY"><hidden/></field> <field name="imageW"><hidden/></field> <field name="imageH"><hidden/></field> - <field name="imageCropp" widget-area-style="cropbox" use-when="imageURL != null" title="Image" ><image value="${imageURL}"/></field> - <field name="imageCropp" use-when="imageURL == null" title="Image" ><image value="/images/defaultImage.jpg" width="200"/></field> + <field name="imageCropp" widget-area-style="cropbox" use-when="imageURL != null" title="${uiLabelMap.CommonImage}" ><image value="${imageURL}"/></field> + <field name="imageCropp" use-when="imageURL == null" title="${uiLabelMap.CommonImage}" ><image value="/images/defaultImage.jpg" width="200"/></field> </form> <form name="ImageRotating" type="single" target="RotateImage" title="" header-row-style="header-row" default-table-style="basic-table"> @@ -518,10 +534,10 @@ under the License. <field name="dataResourceId"><hidden/></field> <field name="angle"><hidden/></field> <field name="imageName"><hidden value="${contentDataResource.drDataResourceName}"/></field> - <field name="imageRotate" widget-area-style="cropbox" title="Image"><image value="${imageURL}" /></field> - <field name="submitButton" title="Submit" widget-style="smallSubmit" position="1"><submit button-type="button"/></field> + <field name="imageRotate" widget-area-style="cropbox" title="${uiLabelMap.CommonImage}"><image value="${imageURL}" /></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit" position="1"><submit button-type="button"/></field> <field name="cancelButton" title=" " widget-style="buttontext"> - <hyperlink target="ListImageManage" description="Cancel"> + <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}"> <parameter param-name="productId" from-field="parameters.productId"></parameter> </hyperlink> </field> @@ -548,16 +564,16 @@ under the License. <field name="imageThumbnail"><hidden/></field> <field name="seoURL"><hidden value="${parameters.seoUrl}"/></field> <field name="contentId"><hidden/></field> - <field name="imageShare" use-when="imageURL != null" title="Image"><image value="${imageURL}" width="200"/></field> - <field name="imageShare" use-when="imageURL == null" title="Image"><image value="/images/defaultImage.jpg" width="200"/></field> - <field name="link" title="Link" event="onClick" action="javascript:select();"><text/></field> - <field name="direct" title="Direct Link" event="onClick" action="javascript:select();"><text/></field> - <field name="forumCode" title="Forum Code" event="onClick" action="javascript:select();"><text></text></field> - <field name="forumThumbnail" title="Forum Thumbnail" event="onClick" action="javascript:select();"><text></text></field> - <field name="altForumCode" title="Alt Forum Code" event="onClick" action="javascript:select();"><text></text></field> - <field name="altForumThumbnail" title="Alt Forum Thumbnail" event="onClick" action="javascript:select();"><text></text></field> - <field name="html" title="HTML Code" event="onClick" action="javascript:select();"><text/></field> - <field name="htmlThumbnail" title="HTML Thumbnail" event="onClick" action="javascript:select();"><text/></field> + <field name="imageShare" use-when="imageURL != null" title="${uiLabelMap.CommonImage}"><image value="${imageURL}" width="200"/></field> + <field name="imageShare" use-when="imageURL == null" title="${uiLabelMap.CommonImage}"><image value="/images/defaultImage.jpg" width="200"/></field> + <field name="link" title="${uiLabelMap.CommonLink}" event="onClick" action="javascript:select();"><text/></field> + <field name="direct" title="${uiLabelMap.ImageManagementDirectLink}" event="onClick" action="javascript:select();"><text/></field> + <field name="forumCode" title="${uiLabelMap.ImageManagementForumCode}" event="onClick" action="javascript:select();"><text></text></field> + <field name="forumThumbnail" title="${uiLabelMap.ImageManagementForumThumbnail}" event="onClick" action="javascript:select();"><text></text></field> + <field name="altForumCode" title="${uiLabelMap.ImageManagementAltForumCode}" event="onClick" action="javascript:select();"><text></text></field> + <field name="altForumThumbnail" title="${uiLabelMap.ImageManagementAltForumThumbnail}" event="onClick" action="javascript:select();"><text></text></field> + <field name="html" title="${uiLabelMap.ImageManagementHTMLCode}" event="onClick" action="javascript:select();"><text/></field> + <field name="htmlThumbnail" title="${uiLabelMap.ImageManagementHTMLThumbnail}" event="onClick" action="javascript:select();"><text/></field> </form> <form name="ImageReplace" type="single" target="replaceImageToExistImage" title="" header-row-style="header-row" default-table-style="basic-table"> @@ -578,8 +594,8 @@ under the License. <field name="contentIdReplace"><hidden value="${parameters.contentIdReplace}"/></field> <field name="dataResourceNameExist"><hidden value="${contentDataResourceExist.drDataResourceName}"/></field> <field name="dataResourceNameReplace"><hidden value="${contentDataResourceReplace.drDataResourceName}"/></field> - <field name="imageExist" position="1" use-when="imageURLExist != null" title="Replacement Image"><image value="${imageURLExist}" width="200"/></field> - <field name="imageReplace" position="2" use-when="imageURLReplace != null&&imageURLExist != null" title="Image to Replace"><image value="${imageURLReplace}" width="200"/></field> + <field name="imageExist" position="1" use-when="imageURLExist != null" title="${uiLabelMap.ImageManagementReplacementImage}"><image value="${imageURLExist}" width="200"/></field> + <field name="imageReplace" position="2" use-when="imageURLReplace != null&&imageURLExist != null" title="${uiLabelMap.ImageManagementImageToReplace}"><image value="${imageURLReplace}" width="200"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -607,8 +623,8 @@ under the License. <set field="drObjectInfo" from-field="contentDataResourceViews[0].drObjectInfo"/> </row-actions> <field name="productId"><hidden/></field> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="drDataResourceName" title="Image Name"><display/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="fromDate"><display/></field> <field name="status"><display description="Uploaded"/></field> <field name="removeContent" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> @@ -645,14 +661,14 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="drDataResourceName" title="Image Name" widget-style="buttontext"> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/> </field> <field name="contentId"><display/></field> <field name="dataResourceId"><display/></field> <field name="fromDate"><display/></field> - <field name="statusId" title="Status"> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> @@ -661,7 +677,7 @@ under the License. </form> <form name="productImageReplace" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageReplace"> - <field name="productId" title="${uiLabelMap.ChooseProductID}"><lookup target-form-name="LookupProduct"/></field> + <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> @@ -696,14 +712,14 @@ under the License. <set field="ApprovedBy" value="${userLoginAndPartyDetails[0].firstName} ${userLoginAndPartyDetails[0].middleName} ${userLoginAndPartyDetails[0].lastName}"/> </row-actions> <field name="productId"><hidden/></field> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="drDataResourceName" title="Image Name"><display/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId"><display/></field> <field name="dataResourceId"><display/></field> - <field name="statusId" title="Status"> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> - <field name="purchaseFromDate" title="Approved Date"><display/></field> + <field name="purchaseFromDate" title="${uiLabelMap.ImageManamentApprovedDate}"><display/></field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> </field> @@ -733,8 +749,8 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="drDataResourceName" title="Image Name"> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="ListImageReplace" description="${drDataResourceName}"> <parameter param-name="productId"/> <parameter param-name="contentIdExist" from-field="contentId"/> @@ -742,7 +758,7 @@ under the License. </hyperlink> </field> <field name="fromDate"><display/></field> - <field name="statusId" title="Status"> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> @@ -774,8 +790,8 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="drDataResourceName" title="Image Name"> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="ListImageReplace" description="${drDataResourceName}"> <parameter param-name="productId"/> <parameter param-name="contentIdReplace" from-field="contentId"/> @@ -785,7 +801,7 @@ under the License. </hyperlink> </field> <field name="fromDate"><display/></field> - <field name="statusId" title="Status"> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> @@ -799,8 +815,8 @@ under the License. <condition-expr field-name="contentTypeId" value="IMAGE_FRAME"/> </entity-condition> </actions> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="drDataResourceName" title="Image Name" widget-style="buttontext"> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/> </field> <field name="contentId"><display/></field> @@ -813,56 +829,10 @@ under the License. </field>--> </form> - <form name="ImageRemove" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageRemove"> - <field name="productId" title="${uiLabelMap.ChooseProductID}"><lookup target-form-name="LookupProduct"/></field> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="ListImageRemove" 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="ProductContentAndInfo"> - <condition-list combine="and"> - <condition-expr field-name="productId" from-field="parameters.productId"/> - <condition-expr field-name="productContentTypeId" value="IMAGE"/> - </condition-list> - </entity-condition> - </actions> - <row-actions> - <entity-and entity-name="ContentAssoc" list="contentAssocs"> - <field-map field-name="contentId"/> - <field-map field-name="contentAssocTypeId" value="IMAGE_THUMBNAIL"/> - </entity-and> - <set field="contentIdTo" from-field="contentAssocs[0].contentIdTo"/> - <entity-and entity-name="ContentDataResourceView" list="contentDataResourceViews"> - <field-map field-name="contentId" from-field="contentIdTo"/> - </entity-and> - <set field="drObjectInfo" from-field="contentDataResourceViews[0].drObjectInfo"/> - <entity-and entity-name="ContentDataResourceView" list="origContentDataResourceViews"> - <field-map field-name="contentId"/> - </entity-and> - </row-actions> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <field name="drDataResourceName" title="Image Name"><display/></field> - <field name="contentId"><display/></field> - <field name="dataResourceId"><display/></field> - <field name="fromDate"><display/></field> - <field name="statusId" title="Status"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> - </field> - <field name="deleteButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext"> - <hyperlink target="removeImage" description="${uiLabelMap.CommonRemove}" also-hidden="false" confirmation-message="Do you want to remove this image?"> - <parameter param-name="productId" from-field="productId"/> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="productContentTypeId" from-field="productContentTypeId"/> - <parameter param-name="fromDate" from-field="fromDate"/> - </hyperlink> - </field> - </form> - <form name="ImageResize" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="resizeAllImageOfProduct"> - <field name="productId" title="${uiLabelMap.ChooseProductID}"><lookup target-form-name="LookupProduct"/></field> - <field name="size" title="Image Width"><text/></field> - <field name="submitButton" title="${uiLabelMap.Resize}" widget-style="smallSubmit"><submit button-type="button"/></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"> @@ -876,7 +846,7 @@ under the License. <order-by field-name="mapKey"/> </entity-condition> </actions> - <field name="mapKey" title="Size"><display/></field> + <field name="mapKey" title="${uiLabelMap.CommonSize}"><display/></field> <field name="deleteButton" title="${uiLabelMap.CommonRemove}" use-when="${groovy: return context.mapKey != '100';}" widget-style="buttontext"> <hyperlink target="removeImageBySize" description="${uiLabelMap.CommonRemove}" also-hidden="false" confirmation-message="Do you want to remove this size?"> <parameter param-name="productId" from-field="parameters.productId"/> @@ -884,52 +854,4 @@ under the License. </hyperlink> </field> </form> - - <form name="ImageRename" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageRename"> - <field name="productId" title="${uiLabelMap.ChooseProductID}"><lookup target-form-name="LookupProduct"/></field> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="ListImageRename" 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="ProductContentAndInfo"> - <condition-list combine="and"> - <condition-expr field-name="productId" from-field="parameters.productId"/> - <condition-expr field-name="productContentTypeId" value="IMAGE"/> - <!--<condition-expr field-name="statusId" from-field="statusForm"/>--> - </condition-list> - </entity-condition> - </actions> - <row-actions> - <entity-and entity-name="ContentAssoc" list="contentAssocs"> - <field-map field-name="contentId"/> - <field-map field-name="contentAssocTypeId" value="IMAGE_THUMBNAIL"/> - </entity-and> - <set field="contentIdTo" from-field="contentAssocs[0].contentIdTo"/> - <entity-and entity-name="ContentDataResourceView" list="contentDataResourceViews"> - <field-map field-name="contentId" from-field="contentIdTo"/> - </entity-and> - <set field="drObjectInfo" from-field="contentDataResourceViews[0].drObjectInfo"/> - <entity-and entity-name="ContentDataResourceView" list="origContentDataResourceViews"> - <field-map field-name="contentId"/> - </entity-and> - </row-actions> - <field name="drObjectInfo" title="Image"><image width="100"/></field> - <!--<field name="drDataResourceName" title="Image Name"><text/></field>--> - <field name="drDataResourceName" title="Image Name" id-name="description"> - <display description="${drDataResourceName}" > - <in-place-editor url="renameImage" cancel-control="button" saving-text="Updating..." text-between-controls=" "> - <simple-editor/> - <field-map field-name="productId" from-field="productId"/> - <field-map field-name="contentId" from-field="contentId"/> - </in-place-editor> - </display> - </field> - <field name="contentId"><display/></field> - <field name="dataResourceId"><display/></field> - <field name="fromDate"><display/></field> - <field name="statusId" title="Status"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> - </field> - </form> </forms> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementScreens.xml Sun May 29 11:02:09 2011 @@ -42,7 +42,7 @@ under the License. </widgets> <fail-widgets> <screenlet title="${uiLabelMap.ImageManagementApplication}"> - <container><label style="label" text="${uiLabelMap.WelcomeMessage}"/></container> + <container><label style="label" text="${uiLabelMap.ImageManagementWelcomeMessage}"/></container> </screenlet> </fail-widgets> </section> @@ -60,7 +60,7 @@ under the License. <widgets> <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.Gallery}"> + <screenlet title="${uiLabelMap.ImageManagementGallery}"> <include-form name="ImageGallery" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </decorator-section> @@ -105,7 +105,7 @@ under the License. <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <label style="h1">${uiLabelMap.Product} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label> - <screenlet title="${uiLabelMap.Gallery}"> + <screenlet title="${uiLabelMap.ImageManagementGallery}"> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageGallery.ftl"/></html> </platform-specific> @@ -140,7 +140,7 @@ under the License. <widgets> <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.Gallery}"> + <screenlet title="${uiLabelMap.ImageManagementGallery}"> <include-form name="ImageGallery" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </decorator-section> @@ -170,12 +170,12 @@ under the License. </or> </condition> <widgets> - <screenlet title="${uiLabelMap.Upload}"> + <screenlet title="${uiLabelMap.CommonUpload}"> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/AddMultipleImages.ftl"/></html> </platform-specific> </screenlet> - <screenlet title="${uiLabelMap.ImageUploadList}"> + <screenlet title="${uiLabelMap.ImageManagementImageUploadList}"> <include-form name="ListImageUpload" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -223,7 +223,7 @@ under the License. <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/showPeopleApprove.ftl"/></html> </platform-specific> - <screenlet title="${uiLabelMap.Approve}"> + <screenlet title="${uiLabelMap.ImageManamentApprove}"> <include-form name="ImageApprove" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -274,7 +274,7 @@ under the License. <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/showPeopleApprove.ftl"/></html> </platform-specific> - <screenlet title="${uiLabelMap.Approved}"> + <screenlet title="${uiLabelMap.CommonApproved}"> <include-form name="ListPeopleApproved" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -299,8 +299,7 @@ under the License. <condition-list combine="and"> <condition-expr field-name="statusId" value="IM_REJECTED"/> <condition-expr field-name="productContentTypeId" value="IMAGE"/> - <condition-expr field-name="createdByUserLogin" from-field="userLogin.userLoginId"/> - <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> + <condition-expr field-name="thruDate" operator="not-equals" from-field="nullField"/> </condition-list> <order-by field-name="productId"/> </entity-condition> @@ -319,7 +318,7 @@ under the License. </or> </condition> <widgets> - <screenlet title="${uiLabelMap.Rejected}"> + <screenlet title="${uiLabelMap.CommonRejected}"> <include-form name="ImageRejected" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -344,7 +343,8 @@ under the License. <condition-list combine="and"> <condition-expr field-name="statusId" value="IM_REJECTED"/> <condition-expr field-name="productContentTypeId" value="IMAGE"/> - <condition-expr field-name="thruDate" operator="not-equals" from-field="nullField"/> + <condition-expr field-name="createdByUserLogin" from-field="userLogin.userLoginId"/> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> </condition-list> <order-by field-name="productId"/> </entity-condition> @@ -367,7 +367,7 @@ under the License. <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/showPeopleApprove.ftl"/></html> </platform-specific> - <screenlet title="${uiLabelMap.Rejected}"> + <screenlet title="${uiLabelMap.CommonRejected}"> <include-form name="ListPeopleRejected" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -394,7 +394,7 @@ under the License. <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> </condition> <widgets> - <screenlet title="${uiLabelMap.Manage}"> + <screenlet title="${uiLabelMap.CommonManage}"> <include-form name="ImageManage" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -432,10 +432,10 @@ under the License. </condition> <widgets> <label style="h1">${uiLabelMap.Product} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label> - <screenlet title="${uiLabelMap.Manage}"> + <screenlet title="${uiLabelMap.CommonManage}"> <include-form name="ListImageManage" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> - <screenlet title="Default Image"> + <screenlet title="${uiLabelMap.ImageManagementDefaultImage}"> <include-form name="showDefaultImage" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -465,7 +465,7 @@ under the License. <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> </condition> <widgets> - <screenlet title="${uiLabelMap.Manage}"> + <screenlet title="${uiLabelMap.CommonManage}"> <include-form name="ImageManage" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -496,7 +496,7 @@ under the License. <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> </condition> <widgets> - <screenlet title="${uiLabelMap.ImageFrames}"> + <screenlet title="${uiLabelMap.ImageManagementImageFrames}"> <include-form name="ImageFrames" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageFrame.ftl"/></html> @@ -534,7 +534,7 @@ under the License. <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> </condition> <widgets> - <screenlet title="${uiLabelMap.ImageWatermarking}"> + <screenlet title="${uiLabelMap.ImageManagementImageWatermarking}"> <include-form name="ImageWatermarking" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageWatermark.ftl"/></html> @@ -566,7 +566,7 @@ under the License. <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> </condition> <widgets> - <screenlet title="${uiLabelMap.ImageCropping}"> + <screenlet title="${uiLabelMap.ImageManagementImageCropping}"> <include-form name="ImageCropping" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageCrop.ftl"/></html> @@ -598,7 +598,7 @@ under the License. <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> </condition> <widgets> - <screenlet title="${uiLabelMap.ImageRotating}"> + <screenlet title="${uiLabelMap.ImageManagementImageRotating}"> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageRotateButton.ftl"/></html> </platform-specific> @@ -623,13 +623,14 @@ under the License. <actions> <set field="userTabButtonImage" value="ImageGallery"/> <set field="currentFormName" value="ImageShare"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> <section> <widgets> - <screenlet title="${uiLabelMap.ShareImage}"> + <screenlet title="${uiLabelMap.ImageManagementShareImage}"> <include-form name="ImageShare" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageShare.ftl"/></html> @@ -656,7 +657,7 @@ under the License. <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> </condition> <widgets> - <screenlet title="${uiLabelMap.Replace}"> + <screenlet title="${uiLabelMap.ImageManagementReplace}"> <include-form name="productImageReplace" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -697,17 +698,17 @@ under the License. <widgets> <label style="h1">${uiLabelMap.Product} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label> <container style="lefthalf"> - <screenlet title="${uiLabelMap.ChooseReplacementImage}"> + <screenlet title="${uiLabelMap.ImageManagementChooseReplacementImage}"> <include-form name="ListImageExist" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </container> <container style="righthalf"> - <screenlet title="${uiLabelMap.ChooseImageToReplace}"> + <screenlet title="${uiLabelMap.ImageManagementChooseImageToReplace}"> <include-form name="ListImageReplace" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </container> <container style="clear"/> - <screenlet title="${uiLabelMap.Replace}"> + <screenlet title="${uiLabelMap.ImageManagementReplace}"> <include-form name="ImageReplace" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -737,7 +738,7 @@ under the License. <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> </condition> <widgets> - <screenlet title="${uiLabelMap.Replace}"> + <screenlet title="${uiLabelMap.ImageManagementReplace}"> <include-form name="productImageReplace" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -804,7 +805,7 @@ under the License. </or> </condition> <widgets> - <screenlet title="${uiLabelMap.RecentlyApproved}"> + <screenlet title="${uiLabelMap.ImageManagementRecentlyApproved}"> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageRecentlyApproved.ftl"/></html> </platform-specific> @@ -859,104 +860,6 @@ under the License. </section> </screen> - <screen name="ImageRemove"> - <section> - <actions> - <set field="userTabButtonImage" value="ImageRemove"/> - <set field="productId" from-field="parameters.productId"/> - </actions> - <widgets> - <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> - </condition> - <widgets> - <screenlet title="${uiLabelMap.CommonRemove}"> - <include-form name="ImageRemove" location="component://product/widget/catalog/ImageManagementForms.xml"/> - </screenlet> - </widgets> - <fail-widgets> - <label text="You do not have permission to access this page. ("IMAGE_MANAGEMENT_ADMIN" needed)"/> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="ListImageRemove"> - <section> - <condition> - <not><if-empty field="parameters.productId"/></not> - </condition> - <actions> - <set field="userTabButtonImage" value="ImageRemove"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one value-field="product" entity-name="Product"/> - </actions> - <widgets> - <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> - </condition> - <widgets> - <section> - <condition> - <not><if-empty field="product"/></not> - </condition> - <widgets> - <label style="h1">${uiLabelMap.Product} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label> - <screenlet title="${uiLabelMap.CommonRemove}"> - <include-form name="ListImageRemove" location="component://product/widget/catalog/ImageManagementForms.xml"/> - </screenlet> - </widgets> - <fail-widgets> - <label text="${uiLabelMap.ProductNoExistingProductsFound}"/> - </fail-widgets> - </section> - </widgets> - <fail-widgets> - <label text="You do not have permission to access this page. ("IMAGE_MANAGEMENT_ADMIN" needed)"/> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - <fail-widgets> - <section> - <actions> - <set field="userTabButtonImage" value="ImageRemove"/> - <!--<set field="errorMessage" value="There is no a selected product, please insert or select the product to view image(s)."/>--> - </actions> - <widgets> - <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> - </condition> - <widgets> - <screenlet title="${uiLabelMap.CommonRemove}"> - <include-form name="ImageRemove" location="component://product/widget/catalog/ImageManagementForms.xml"/> - </screenlet> - </widgets> - <fail-widgets> - <label text="You do not have permission to access this page. ("IMAGE_MANAGEMENT_ADMIN" needed)"/> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </fail-widgets> - </section> - </screen> - <screen name="ImageResize"> <section> <actions> @@ -984,7 +887,7 @@ under the License. <screenlet title="Size Existing In Product : ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]"> <include-form name="sizeListOfProduct" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> - <screenlet title="${uiLabelMap.Resize}"> + <screenlet title="${uiLabelMap.ImageManagementResize}"> <include-form name="ImageResize" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -997,103 +900,4 @@ under the License. </widgets> </section> </screen> - - <screen name="ImageRename"> - <section> - <actions> - <set field="userTabButtonImage" value="ImageRename"/> - <set field="productId" from-field="parameters.productId"/> - </actions> - <widgets> - <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> - </condition> - <widgets> - <screenlet title="${uiLabelMap.Rename}"> - <include-form name="ImageRename" location="component://product/widget/catalog/ImageManagementForms.xml"/> - </screenlet> - </widgets> - <fail-widgets> - <label text="You do not have permission to access this page. ("IMAGE_MANAGEMENT_ADMIN" needed)"/> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="ListImageRename"> - <section> - <condition> - <not><if-empty field="parameters.productId"/></not> - </condition> - <actions> - <set field="userTabButtonImage" value="ImageRename"/> - <!--<set field="statusForm" value="IM_PENDING"/>--> - <set field="productId" from-field="parameters.productId"/> - <entity-one value-field="product" entity-name="Product"/> - </actions> - <widgets> - <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> - </condition> - <widgets> - <section> - <condition> - <not><if-empty field="product"/></not> - </condition> - <widgets> - <label style="h1">${uiLabelMap.Product} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label> - <screenlet title="${uiLabelMap.Rename}"> - <include-form name="ListImageRename" location="component://product/widget/catalog/ImageManagementForms.xml"/> - </screenlet> - </widgets> - <fail-widgets> - <label text="${uiLabelMap.ProductNoExistingProductsFound}"/> - </fail-widgets> - </section> - </widgets> - <fail-widgets> - <label text="You do not have permission to access this page. ("IMAGE_MANAGEMENT_ADMIN" needed)"/> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - <fail-widgets> - <section> - <actions> - <set field="userTabButtonImage" value="ImageRename"/> - <!--<set field="errorMessage" value="There is no a selected product, please insert or select the product to view image(s)."/>--> - </actions> - <widgets> - <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/> - </condition> - <widgets> - <screenlet title="${uiLabelMap.Rename}"> - <include-form name="ImageRename" location="component://product/widget/catalog/ImageManagementForms.xml"/> - </screenlet> - </widgets> - <fail-widgets> - <label text="You do not have permission to access this page. ("IMAGE_MANAGEMENT_ADMIN" needed)"/> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </fail-widgets> - </section> - </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml Sun May 29 11:02:09 2011 @@ -92,17 +92,12 @@ </entity-options> </drop-down> </field> - <field use-when=""PRIP_QUANTITY".equals(inputParamEnumId) || "PRIP_LIST_PRICE".equals(inputParamEnumId)" - name="condValueInput" title="${uiLabelMap.ProductValue}"> - <text size="10" default-value="${condValue}"/> - </field> - <field - use-when="!"PRIP_QUANTITY".equals(inputParamEnumId) && !"PRIP_LIST_PRICE".equals(inputParamEnumId)" - name="condValue" title="${uiLabelMap.CommonEmptyHeader}"> - <drop-down allow-empty="false" current="selected"> - <list-options list-name="productPriceRulesCondValues" key-name="condValue"/> + <field name="condValueInput" title="${uiLabelMap.ProductValue}" entry-name="condValue"><text size="10"/></field> + <field name="condValue" title="${uiLabelMap.CommonEmptyHeader}"> + <drop-down allow-empty="false"> + <list-options list-name="productPriceRulesCondValues" key-name="condValue"/> </drop-down> - </field> + </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" widget-area-style="align-text"> <hyperlink target="deleteProductPriceCond" description="${uiLabelMap.CommonRemove}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |