You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/05/29 13:02:24 UTC
svn commit: r1128865 [7/27] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/config/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org/...
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml Sun May 29 11:02:09 2011
@@ -556,6 +556,10 @@ under the License.
<response name="success" type="request-redirect" value="EditProductPrices"><redirect-parameter name="productId"/></response>
<response name="error" type="view" value="EditProductPrices"/>
</request-map>
+ <request-map uri="ProductPriceHistory">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ProductPriceHistory"/>
+ </request-map>
<request-map uri="deleteProductPrice">
<security https="true" auth="true"/>
<event type="service" path="" invoke="deleteProductPrice"/>
@@ -620,6 +624,18 @@ under the License.
<response name="success" type="view" value="EditCategoryContent"/>
<response name="error" type="view" value="EditCategoryContentContent"/>
</request-map>
+ <request-map uri="createRelatedUrlContentForCategory">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createRelatedUrlContentForCategory"/>
+ <response name="success" type="view" value="EditCategoryContent"/>
+ <response name="error" type="view" value="EditCategoryContentContent"/>
+ </request-map>
+ <request-map uri="updateRelatedUrlContentForCategory">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateRelatedUrlContentForCategory"/>
+ <response name="success" type="view" value="EditCategoryContent"/>
+ <response name="error" type="view" value="EditCategoryContentContent"/>
+ </request-map>
<!-- ================ Product Content Requests ================= -->
<request-map uri="EditProductContent">
@@ -1368,15 +1384,20 @@ under the License.
</request-map>
<!-- ================ ProdCatalog Requests ================= -->
- <request-map uri="FindProdCatalog">
+ <request-map uri="FindCatalog">
<security https="true" auth="true"/>
- <response name="success" type="view" value="FindProdCatalog"/>
+ <response name="success" type="view" value="FindCatalog"/>
</request-map>
<request-map uri="EditProdCatalog">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditProdCatalog"/>
</request-map>
+ <request-map uri="CreateSeoProdCatalog">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createMissingCategoryAndProductAltUrls"/>
+ <response name="success" type="request-redirect" value="EditProdCatalog"/>
+ </request-map>
<request-map uri="createProdCatalog">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createProdCatalog"/>
@@ -2803,8 +2824,8 @@ under the License.
<request-map uri="removeImage">
<security https="true" auth="true"/>
<event type="service" path="" invoke="removeProductContentAndImageFile"/>
- <response name="success" type="view" value="ListImageRemove"/>
- <response name="error" type="view" value="ListImageRemove"/>
+ <response name="success" type="view" value="ListImageManage"/>
+ <response name="error" type="view" value="ListImageManage"/>
</request-map>
<request-map uri="createWatermarkImage">
<security https="true" auth="true"/>
@@ -2893,7 +2914,7 @@ under the License.
<security https="true" auth="true"/>
<event type="groovy" path="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/" invoke="checkRejected.groovy"/>
<response name="approved" type="view" value="ImageApprove"/>
- <response name="rejected" type="view" value="ImageRejected"/>
+ <response name="rejected" type="view" value="ListPeopleRejected"/>
</request-map>
<request-map uri="ListImageReplace">
<security https="true" auth="true"/>
@@ -2961,14 +2982,6 @@ under the License.
<response name="success" type="view" value="ListImageManage"/>
<response name="error" type="view" value="ImageWatermarking"/>
</request-map>
- <request-map uri="ImageRemove">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ImageRemove"/>
- </request-map>
- <request-map uri="ListImageRemove">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListImageRemove"/>
- </request-map>
<request-map uri="ImageResize">
<security https="true" auth="true"/>
<response name="success" type="view" value="ImageResize"/>
@@ -2985,19 +2998,11 @@ under the License.
<response name="success" type="view" value="ImageResize"/>
<response name="error" type="view" value="ImageResize"/>
</request-map>
- <request-map uri="ImageRename">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ImageRename"/>
- </request-map>
- <request-map uri="ListImageRename">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListImageRename"/>
- </request-map>
<request-map uri="renameImage">
<security https="true" auth="true"/>
<event type="service" path="" invoke="renameImage"/>
- <response name="success" type="view" value="ListImageRename"/>
- <response name="error" type="view" value="ListImageRename"/>
+ <response name="success" type="view" value="ListImageManage"/>
+ <response name="error" type="view" value="ListImageManage"/>
</request-map>
<!-- ================ Lookup Requests ================= -->
@@ -3079,6 +3084,12 @@ under the License.
<view-map name="exportproducts" type="screen" page="component://product/widget/catalog/FindScreens.xml#exportproducts"/>
<view-map name="FindProductById" type="screen" page="component://product/widget/catalog/FindScreens.xml#FindProductById"/>
+ <view-map name="FindCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindCatalog"/>
+ <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/>
+ <view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/>
+ <view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/>
+ <view-map name="EditProdCatalogParties" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogParties"/>
+
<view-map name="FindCategory" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#FindCategory"/>
<view-map name="EditCategory" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#EditCategory"/>
<view-map name="EditCategoryContent" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#EditCategoryContent"/>
@@ -3101,6 +3112,7 @@ under the License.
<view-map name="EditProductParties" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductParties"/>
<view-map name="showFixedAssetProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#showFixedAssetProduct"/>
<view-map name="newFixedAssetProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#newFixedAssetProduct"/>
+ <view-map name="ProductPriceHistory" type="screen" page="component://product/widget/catalog/ProductScreens.xml#ProductPriceHistory"/>
<view-map name="ProductBarCode.pdf" type="screenfop" page="component://product/widget/catalog/ProductScreens.xml#ProductBarCode.fo" content-type="application/pdf" encoding="none"/>
<view-map name="EditProductContent" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductContent"/>
@@ -3156,12 +3168,6 @@ under the License.
<view-map name="ListFeaturePrice" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#ListFeaturePrice"/>
<view-map name="CreateFeature" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#CreateFeature"/>
- <view-map name="FindProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindProdCatalog"/>
- <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/>
- <view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/>
- <view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/>
- <view-map name="EditProdCatalogParties" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogParties"/>
-
<view-map name="FindProductPromo" type="screen" page="component://product/widget/catalog/PromoScreens.xml#FindProductPromo"/>
<view-map name="EditProductPromo" type="screen" page="component://product/widget/catalog/PromoScreens.xml#EditProductPromo"/>
<view-map name="EditProductPromoRules" type="screen" page="component://product/widget/catalog/PromoScreens.xml#EditProductPromoRules"/>
@@ -3270,10 +3276,6 @@ under the License.
<view-map name="AutomaticResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#AutomaticResize"/>
<view-map name="ListAutomaticResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListAutomaticResize"/>
<view-map name="LookupImageFrame" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#LookupImageFrame"/>
- <view-map name="ImageRemove" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageRemove"/>
- <view-map name="ListImageRemove" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListImageRemove"/>
<view-map name="ImageResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageResize"/>
- <view-map name="ImageRename" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageRename"/>
- <view-map name="ListImageRename" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListImageRename"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl Sun May 29 11:02:09 2011
@@ -25,6 +25,8 @@ function insertImageName(type,nameValue)
<div class="screenlet">
<div class="screenlet-title-bar">
<h3>${uiLabelMap.ProductResultOfImageUpload}</h3>
+ </div>
+ <div class="screenlet-body">
<#if !(clientFileName?has_content)>
<div>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
<#else>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl Sun May 29 11:02:09 2011
@@ -16,9 +16,10 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
+
<form id="addMultipleImagesForm" name="addMultipleImagesForm" method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data">
<br/>
-<div class="label">Product ID / SKU <@htmlTemplate.lookupField name="productId" id="productId" formName="addMultipleImagesForm" fieldFormName="LookupProduct"/></div>
+<div class="label">${uiLabelMap.ProductProductId} <@htmlTemplate.lookupField name="productId" id="productId" formName="addMultipleImagesForm" fieldFormName="LookupProduct"/></div>
<br/>
<br/>
<table>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl Sun May 29 11:02:09 2011
@@ -35,9 +35,9 @@ var imageName = jQuery('#ImageCropping_i
var productId = jQuery('#ImageCropping_productId').val();
if (imageName != "") {
- jQuery('#ImageCropping tr').append("<td class='label'><span>Preview</span></td><td><div style='width:100px;height:100px;overflow:hidden;'><img src='"+imageUrl+"' id='preview' /></div></td>");
- jQuery('#ImageCropping tbody').append("<tr><td><input type='submit' value='Crop' name='submitButton' class='smallSubmit'/></td></tr>");
- jQuery('#ImageCropping tbody').append("<tr><td><a class='buttontext' title=' ' href='/catalog/control/ListImageManage?productId="+productId+"'>Cancel</a></td></tr>");
+ jQuery('#ImageCropping tr').append("<td class='label'><span>${uiLabelMap.CommonPreview}</span></td><td><div style='width:100px;height:100px;overflow:hidden;'><img src='"+imageUrl+"' id='preview' /></div></td>");
+ jQuery('#ImageCropping tbody').append("<tr><td><input type='submit' value='${uiLabelMap.CommonSubmit}' name='submitButton' class='smallSubmit'/></td></tr>");
+ jQuery('#ImageCropping tbody').append("<tr><td><a class='buttontext' title=' ' href='/catalog/control/ListImageManage?productId="+productId+"'>${uiLabelMap.CommonCancel}</a></td></tr>");
}
function showPreview(coords){
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl Sun May 29 11:02:09 2011
@@ -36,8 +36,8 @@ under the License.
<td align="center"><a href="<@o...@ofbizContentUrl>" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td>
</tr>
<tr valign="middle">
- <#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">Share</a></td> -->
- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productImage.contentId}&dataResourceId=${productImage.dataResourceId}','' ,500,500);" class="buttontext">Share</a></td>
+ <#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> -->
+ <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productImage.contentId}&dataResourceId=${productImage.dataResourceId}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td>
</tr>
<br/>
</tbody>
@@ -55,8 +55,8 @@ under the License.
<td align="center"><a href="<@o...@ofbizContentUrl>" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td>
</tr>
<tr valign="middle">
- <#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">Share</a></td> -->
- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productImage.contentId}&dataResourceId=${productImage.dataResourceId}','' ,500,500);" class="buttontext">Share</a></td>
+ <#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> -->
+ <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productImage.contentId}&dataResourceId=${productImage.dataResourceId}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td>
</tr>
<br/>
</tbody>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageShare.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageShare.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageShare.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageShare.ftl Sun May 29 11:02:09 2011
@@ -31,10 +31,12 @@ $(document).ready(function(){
form.altForumCode.setAttribute('readOnly','readonly');
if (contentURL != "") {
+ var pathImageUrlEcommerce = contentURL + imageUrl;
var pathImageUrl = contentURL + imageUrl;
var pathImageThumbnailUrl = contentURL + imageThumbUrl;
}
else {
+ var pathImageUrlEcommerce = "http://localhost:8080" + imageUrl;
var pathImageUrl = "http://" + host + imageUrl;
var pathImageThumbnailUrl = "http://"+ host + imageThumbUrl;
}
@@ -42,7 +44,7 @@ $(document).ready(function(){
if (form.contentId.value != "") {
pathImageUrl = $('#ImageShare_direct').html(pathImageUrl).text();
pathImageThumbnailUrl = $('#ImageShare_direct').html(pathImageThumbnailUrl).text();
- form.link.value = "http://" + host + form.seoURL.value;
+ form.link.value = pathImageUrlEcommerce;
form.direct.value = pathImageUrl;
form.html.value = "<a target='_blank' title='Image' href='" + pathImageUrl + "'><img src='" + pathImageUrl + "' border='0'/></a>Uploaded with <a target='_blank' href='http://images.ofbiz.com'>ofbiz.com</a>";
form.forumCode.value = "[URL=" + pathImageUrl + "/][IMG]" + pathImageUrl + "[/IMG][/URL]Uploaded with [URL=http://images.ofbiz.com]ofbiz.com[/URL]";
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl Sun May 29 11:02:09 2011
@@ -18,18 +18,14 @@ under the License.
-->
<script type="text/javascript">
jQuery(document).ready( function() {
-
<#if 0 < productPriceConds.size()>
<#list 0..productPriceConds.size()-1 as i>
if (document.getElementById('EditProductPriceRulesCond_o_${i}')) {
+ jQuery('#EditProductPriceRulesCond_condValueInput_o_${i}').hide();
jQuery('#EditProductPriceRulesCond_inputParamEnumId_o_${i}').change( function() {
- <#if 'PRIP_QUANTITY' != productPriceConds[i].inputParamEnumId && 'PRIP_LIST_PRICE' != productPriceConds[i].inputParamEnumId>
- getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description');
- </#if>
- });
- <#if 'PRIP_QUANTITY' != productPriceConds[i].inputParamEnumId && 'PRIP_LIST_PRICE' != productPriceConds[i].inputParamEnumId>
- getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}');
- </#if>
+ getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
+ });
+ getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
}
</#list>
</#if>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Sun May 29 11:02:09 2011
@@ -33,8 +33,11 @@ under the License.
<#list productPromoRules as productPromoRule>
<#assign productPromoConds = productPromoRule.getRelated("ProductPromoCond")>
<#assign productPromoActions = productPromoRule.getRelated("ProductPromoAction")>
+ <#if productPromoRule_index != 0>
+ <tr><td colspan="3"><hr /></td></tr>
+ </#if>
<tr valign="middle" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
- <td class="label"><b>${(productPromoRule.productPromoRuleId)?if_exists}</b></td>
+ <td class="label"><b> ${uiLabelMap.ProductRule} ${(productPromoRule.productPromoRuleId)?if_exists}</b></td>
<td>
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" />
@@ -53,8 +56,9 @@ under the License.
</#if>
</td>
</tr>
+ <tr><td><hr /></td><td colspan="2"></td></tr>
<tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
- <td align="right" class="label">${uiLabelMap.ProductConditions}</td>
+ <td align="right" class="label">${uiLabelMap.ProductConditionsForRule} ${(productPromoRule.productPromoRuleId)?if_exists} :</td>
<td colspan="2">
<table cellspacing="0" class="basic-table">
<#assign maxCondSeqId = 1>
@@ -68,8 +72,9 @@ under the License.
<#assign maxCondSeqId = curCondSeqId + 1>
</#if>
</#if>
- <td class="label"><b>${(productPromoCond.productPromoCondSeqId)?if_exists}</b></td>
+ <td></td>
<td>
+ <b>${uiLabelMap.ProductCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}</b>
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}"/>
<input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}"/>
@@ -98,6 +103,7 @@ under the License.
<option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option>
</#list>
</select>
+ <label>${uiLabelMap.ProductConditionValue}:</label>
<input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)?if_exists}" />
<#assign otherValue = productPromoCond.otherValue?if_exists>
<label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)?if_exists}"</#if> />
@@ -122,9 +128,16 @@ under the License.
</select>
<input type="submit" value="${uiLabelMap.CommonUpdate}" />
</form>
+ <form name="deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}" />
+ <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}" />
+ <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}" />
+ <a href="javascript:document.deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
<#-- ======================= Categories ======================== -->
- <div class="label">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductCategories}:</div>
+ <div class="label">${uiLabelMap.ProductConditionsCategoriesForCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}:</div>
<#assign condProductPromoCategories = productPromoCond.getRelated("ProductPromoCategory")>
+ <#if condProductPromoCategories?has_content>
<#list condProductPromoCategories as condProductPromoCategory>
<#assign condProductCategory = condProductPromoCategory.getRelatedOneCache("ProductCategory")>
<#assign condApplEnumeration = condProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
@@ -144,6 +157,9 @@ under the License.
</form>
</div>
</#list>
+ <#else>
+ <div>${uiLabelMap.ProductNoConditionCategories}</div>
+ </#if>
<div>
<form method="post" action="<@o...@ofbizUrl>" name="createProductPromoCategoryConditions">
<input type="hidden" name="productPromoId" value="${productPromoId}" />
@@ -161,12 +177,13 @@ under the License.
<option value="Y">${uiLabelMap.CommonY}</option>
</select>
${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_"/>*
- <input type="submit" value="${uiLabelMap.CommonAdd}" />
+ <input type="submit" value="${uiLabelMap.ProductAddConditionCategory}" />
</form>
</div>
<#-- ======================= Products ======================== -->
- <div class="label">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductProducts}:</div>
+ <div class="label">${uiLabelMap.ProductConditionsProductsForCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}:</div>
<#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct")>
+ <#if condProductPromoProducts?has_content>
<#list condProductPromoProducts as condProductPromoProduct>
<#assign condProduct = condProductPromoProduct.getRelatedOneCache("Product")?if_exists>
<#assign condApplEnumeration = condProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
@@ -183,6 +200,9 @@ under the License.
</form>
</div>
</#list>
+ <#else>
+ <div>${uiLabelMap.ProductNoConditionProducts}</div>
+ </#if>
<div>
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productPromoId" value="${productPromoId}" />
@@ -195,18 +215,11 @@ under the License.
<option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
</#list>
</select>
- <input type="submit" value="${uiLabelMap.CommonAdd}" />
+ <input type="submit" value="${uiLabelMap.ProductAddConditionProducts}" />
</form>
</div>
</td>
- <td align="center">
- <form name="deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}" />
- <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}" />
- <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}" />
- <a href="javascript:document.deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
- </form>
- </td>
+ <td></td>
</tr>
<#-- toggle the row color -->
<#if condClass == "2">
@@ -231,8 +244,9 @@ under the License.
<option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option>
</#list>
</select>
+ <label>${uiLabelMap.ProductConditionValue}:</label>
<input type="text" size="25" name="condValue" />
- ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" /><br />
+ ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" />
<label>${uiLabelMap.OrderSelectShippingMethod}:</label>
<select name = "carrierShipmentMethod">
<option value = "">--${uiLabelMap.OrderSelectShippingMethod}--</option>
@@ -241,23 +255,25 @@ under the License.
<option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option>
</#list>
</select>
- <input type="submit" value="${uiLabelMap.CommonCreate}" />
+ <input type="submit" value="${uiLabelMap.ProductCreateCondition}" />
</form>
</td>
</tr>
</table>
</td>
</tr>
+ <tr><td><hr /></td><td colspan="2"></td></tr>
<tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
- <td align="right" class="label">${uiLabelMap.ProductActions} :</td>
+ <td align="right" class="label">${uiLabelMap.ProductActionForRule} ${(productPromoRule.productPromoRuleId)?if_exists} :</td>
<td colspan="2">
<table cellspacing="0" class="basic-table">
<#assign actionClass = "2">
<#list productPromoActions as productPromoAction>
<tr class="row-level-two<#if actionClass == "1"> alternate-row</#if>">
- <td class="label"><b>${(productPromoAction.productPromoActionSeqId)?if_exists}</b></td>
+ <td></td>
<td>
<div>
+ <b> ${uiLabelMap.ProductAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}</b>
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" />
<input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" />
@@ -294,10 +310,17 @@ under the License.
</select>
<input type="submit" value="${uiLabelMap.CommonUpdate}" />
</form>
+ <form name="deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" />
+ <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" />
+ <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" />
+ <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</div>
<#-- ======================= Categories ======================== -->
- <div class="label">${uiLabelMap.ProductActions} ${uiLabelMap.ProductCategories}:</div>
+ <div class="label">${uiLabelMap.ProductActionsCategoriesForAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}:</div>
<#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory")>
+ <#if actionProductPromoCategories?has_content>
<#list actionProductPromoCategories as actionProductPromoCategory>
<#assign actionProductCategory = actionProductPromoCategory.getRelatedOneCache("ProductCategory")>
<#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
@@ -317,6 +340,10 @@ under the License.
</form>
</div>
</#list>
+ <#else>
+ <div>${uiLabelMap.ProductNoActionCategories}</div>
+ </#if>
+ <br />
<div>
<form method="post" action="<@o...@ofbizUrl>" name="createProductPromoCategoryActions">
<input type="hidden" name="productPromoId" value="${productPromoId}" />
@@ -334,12 +361,13 @@ under the License.
<option value="Y">${uiLabelMap.CommonY}</option>
</select>
${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_"/>*
- <input type="submit" value="${uiLabelMap.CommonAdd}" />
+ <input type="submit" value="${uiLabelMap.ProductAddActionCategory}" />
</form>
</div>
<#-- ======================= Products ======================== -->
- <div class="label">${uiLabelMap.ProductActions} ${uiLabelMap.ProductProducts}:</div>
+ <div class="label">${uiLabelMap.ProductActionsProductsForAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}:</div>
<#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct")>
+ <#if actionProductPromoProducts?has_content>
<#list actionProductPromoProducts as actionProductPromoProduct>
<#assign actionProduct = actionProductPromoProduct.getRelatedOneCache("Product")?if_exists>
<#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOneCache("ApplEnumeration")>
@@ -356,6 +384,9 @@ under the License.
</form>
</div>
</#list>
+ <#else>
+ <div>${uiLabelMap.ProductNoActionProducts}</div>
+ </#if>
<div>
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productPromoId" value="${productPromoId}" />
@@ -368,18 +399,11 @@ under the License.
<option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option>
</#list>
</select>
- <input type="submit" value="${uiLabelMap.CommonAdd}" />
+ <input type="submit" value="${uiLabelMap.ProductAddActionProducts}" />
</form>
</div>
</td>
- <td align="center">
- <form name="deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" />
- <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" />
- <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" />
- <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
- </form>
- </td>
+ <td></td>
</tr>
<#-- toggle the row color -->
<#if actionClass == "2">
@@ -411,7 +435,7 @@ under the License.
<option value="N">${uiLabelMap.CommonN}</option>
<option value="Y">${uiLabelMap.CommonY}</option>
</select>
- <input type="submit" value="${uiLabelMap.CommonCreate}" />
+ <input type="submit" value="${uiLabelMap.ProductCreateAction}" />
</form>
</div>
</td>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml Sun May 29 11:02:09 2011
@@ -19,8 +19,9 @@ under the License.
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
<menu name="CatalogAppBar" title="${uiLabelMap.ProductCatalogManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="products" title="${uiLabelMap.ProductProducts}"><link target="FindProduct"/></menu-item>
+ <menu-item name="catalogs" title="${uiLabelMap.ProductCatalogs}"><link target="FindCatalog"/></menu-item>
<menu-item name="categories" title="${uiLabelMap.ProductCategories}"><link target="FindCategory"/></menu-item>
+ <menu-item name="products" title="${uiLabelMap.ProductProducts}"><link target="FindProduct"/></menu-item>
<menu-item name="featurecats" title="${uiLabelMap.ProductFeatureCats}"><link target="EditFeatureCategories"/></menu-item>
<menu-item name="promos" title="${uiLabelMap.ProductPromos}"><link target="FindProductPromo"/></menu-item>
<menu-item name="pricerules" title="${uiLabelMap.ProductPriceRules}"><link target="FindProductPriceRules"/></menu-item>
@@ -74,7 +75,7 @@ under the License.
</menu-item>
<menu-item name="EditCategoryRollup" title="${uiLabelMap.ProductRollup}">
<link target="EditCategoryRollup">
- <parameter param-name="showProductCategoryId" from-field="productCategoryId"/>
+ <parameter param-name="productCategoryId"/>
</link>
</menu-item>
<menu-item name="EditCategoryProducts" title="${uiLabelMap.ProductProducts}">
@@ -109,6 +110,36 @@ under the License.
</menu-item>
</menu>
+ <menu name="CategorySubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="EditCategory" title="${uiLabelMap.ProductNewCategory}" widget-style="buttontext create">
+ <link target="EditCategory"/>
+ </menu-item>
+ <menu-item name="createProductInCategoryStart" title="${uiLabelMap.ProductCreateProductInCategory}" widget-style="buttontext create">
+ <condition>
+ <not><if-empty field="productCategory"/></not>
+ </condition>
+ <link target="createProductInCategoryStart">
+ <parameter param-name="prodCatalogId"/>
+ </link>
+ </menu-item>
+ <menu-item name="AdvancedSearch" title="${uiLabelMap.ProductSearchInCategory}" widget-style="buttontext search">
+ <condition>
+ <not><if-empty field="productCategory"/></not>
+ </condition>
+ <link target="advancedsearch">
+ <parameter param-name="SEARCH_CATEGORY_ID" from-field="productCategoryId"/>
+ </link>
+ </menu-item>
+ <menu-item name="ProductCategoryPage" title="${uiLabelMap.ProductCategoryPage}" widget-style="buttontext website">
+ <condition>
+ <not><if-empty field="productCategory"/></not>
+ </condition>
+ <link target="/ecommerce/control/category" url-mode="plain">
+ <parameter param-name="category_id" from-field="productCategoryId"/>
+ </link>
+ </menu-item>
+ </menu>
+
<menu name="ProductStoreTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="EditProductStore" title="${uiLabelMap.ProductStore}">
<link target="EditProductStore">
@@ -228,6 +259,20 @@ under the License.
</menu-item>
</menu>
+ <menu name="CatalogSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="EditProductCatalog" title="${uiLabelMap.ProductNewProdCatalog}" widget-style="buttontext create">
+ <link target="EditProdCatalog"/>
+ </menu-item>
+ <menu-item name="CreateSeo" title="${uiLabelMap.ProductCatalogSeoCreate}">
+ <condition>
+ <not><if-empty field="prodCatalog"/></not>
+ </condition>
+ <link target="CreateSeoProdCatalog">
+ <parameter param-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
+ </link>
+ </menu-item>
+ </menu>
+
<menu name="PriceRulesButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="FindRules" title="${uiLabelMap.CommonAdd}/${uiLabelMap.ProductFindRule}">
<link target="FindProductPriceRules"/>
@@ -433,6 +478,54 @@ under the License.
</menu-item>
</menu>
+ <menu name="ProductSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="EditProduct" title="${uiLabelMap.ProductNewProduct}" widget-style="buttontext create">
+ <link target="EditProduct"/>
+ </menu-item>
+ <menu-item name="CreateVirtualWithVariantsForm" title="${uiLabelMap.ProductNewVirtualProduct}" widget-style="buttontext create">
+ <condition>
+ <not><if-empty field="product"/></not>
+ </condition>
+ <link target="CreateVirtualWithVariantsForm">
+ <parameter param-name="product_id" from-field="productId"/>
+ </link>
+ </menu-item>
+ <menu-item name="ProductProductPage" title="${uiLabelMap.ProductProductPage}">
+ <condition>
+ <not><if-empty field="product"/></not>
+ </condition>
+ <link target="/ecommerce/control/product" url-mode="inter-app">
+ <parameter param-name="product_id" from-field="productId"/>
+ </link>
+ </menu-item>
+ <menu-item name="ProductBarCode" title="${uiLabelMap.ProductProductPage}">
+ <condition>
+ <not><if-empty field="product"/></not>
+ </condition>
+ <link target="ProductBarCode.pdf" target-window="_blank">
+ <parameter param-name="productId"/>
+ </link>
+ </menu-item>
+ <menu-item name="ExpandAll" title="${uiLabelMap.CommonExpandAll}" widget-style="buttontext expand-all">
+ <condition>
+ <and>
+ <not><if-empty field="product"/></not>
+ <if-compare operator="equals" value="EditProduct" field="tabButtonItem"/>
+ </and>
+ </condition>
+ <link target="javascript:expandAll(true);" url-mode="plain"/>
+ </menu-item>
+ <menu-item name="CollapseAll" title="${uiLabelMap.CommonCollapseAll}" widget-style="buttontext collapse-all">
+ <condition>
+ <and>
+ <not><if-empty field="product"/></not>
+ <if-compare operator="equals" value="EditProduct" field="tabButtonItem"/>
+ </and>
+ </condition>
+ <link target="javascript:expandAll(false);" url-mode="plain"/>
+ </menu-item>
+ </menu>
+
<menu name="ConfigItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="EditProductConfigItem" title="${uiLabelMap.ProductConfigItem}">
<link target="EditProductConfigItem">
@@ -476,18 +569,18 @@ under the License.
</menu>
<menu name="ImageManagementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="userTabButtonImage">
- <menu-item name="main" title="${uiLabelMap.Main}">
+ <menu-item name="main" title="${uiLabelMap.CommonMain}">
<condition>
<if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/>
</condition>
<link target="Imagemanagement"/>
</menu-item>
- <menu-item name="ImageGallery" title="${uiLabelMap.Gallery}">
+ <menu-item name="ImageGallery" title="${uiLabelMap.ImageManagementGallery}">
<link target="ListImageGallery">
<parameter param-name="productId"/>
</link>
</menu-item>
- <menu-item name="ImageUpload" title="${uiLabelMap.ImageUpload}">
+ <menu-item name="ImageUpload" title="${uiLabelMap.CommonUpload}">
<condition>
<or>
<if-has-permission permission="IMAGE_MANAGEMENT_UPLOAD"/>
@@ -496,7 +589,7 @@ under the License.
</condition>
<link target="ImageUpload"/>
</menu-item>
- <menu-item name="ImageManage" title="${uiLabelMap.Manage}">
+ <menu-item name="ImageManage" title="${uiLabelMap.CommonManage}">
<condition>
<if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/>
</condition>
@@ -504,7 +597,7 @@ under the License.
<parameter param-name="productId"/>
</link>
</menu-item>
- <menu-item name="ImageApprove" title="${uiLabelMap.ImageApprove}">
+ <menu-item name="ImageApprove" title="${uiLabelMap.ImageManamentApprove}">
<condition>
<or>
<if-has-permission permission="IMAGE_MANAGEMENT_APPROVE"/>
@@ -513,7 +606,7 @@ under the License.
</condition>
<link target="ImageApprove"/>
</menu-item>
- <menu-item name="ImageRejected" title="${uiLabelMap.ImageRejected}">
+ <menu-item name="ImageRejected" title="${uiLabelMap.CommonRejected}">
<condition>
<or>
<if-has-permission permission="IMAGE_MANAGEMENT_APPROVE"/>
@@ -522,7 +615,7 @@ under the License.
</condition>
<link target="ImageRejected"/>
</menu-item>
- <menu-item name="ImageRecentlyApproved" title="${uiLabelMap.ImageRecentlyApproved}">
+ <menu-item name="ImageRecentlyApproved" title="${uiLabelMap.ImageManagementRecentlyApproved}">
<condition>
<or>
<if-has-permission permission="IMAGE_MANAGEMENT_APPROVE"/>
@@ -531,7 +624,7 @@ under the License.
</condition>
<link target="ImageRecentlyApproved"/>
</menu-item>
- <menu-item name="ImageReplace" title="${uiLabelMap.Replace}">
+ <menu-item name="ImageReplace" title="${uiLabelMap.ImageManagementReplace}">
<condition>
<if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/>
</condition>
@@ -539,15 +632,7 @@ under the License.
<parameter param-name="productId"/>
</link>
</menu-item>
- <menu-item name="ImageRename" title="${uiLabelMap.Rename}">
- <condition>
- <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/>
- </condition>
- <link target="ListImageRename">
- <parameter param-name="productId"/>
- </link>
- </menu-item>
- <menu-item name="ImageResize" title="${uiLabelMap.Resize}">
+ <menu-item name="ImageResize" title="${uiLabelMap.ImageManagementResize}">
<condition>
<if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/>
</condition>
@@ -555,13 +640,5 @@ under the License.
<parameter param-name="productId"/>
</link>
</menu-item>
- <menu-item name="ImageRemove" title="${uiLabelMap.Remove}">
- <condition>
- <if-has-permission permission="IMAGE_MANAGEMENT_ADMIN"/>
- </condition>
- <link target="ListImageRemove">
- <parameter param-name="productId"/>
- </link>
- </menu-item>
</menu>
</menus>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml Sun May 29 11:02:09 2011
@@ -20,22 +20,48 @@ under the License.
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="FindCatalog">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindCatalog"/>
+ <set field="headerItem" value="catalogs"/>
+ <set field="tabButtonItem" value="FindCatalog"/>
+ <set field="labelTitleProperty" value="ProductCatalog"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditProdCatalog">
<section>
<actions>
<set field="titleProperty" value="PageTitleEditProductCatalog"/>
<set field="headerItem" value="catalog"/>
<set field="tabButtonItem" value="ProductCatalog"/>
-
- <set field="prodCatalogId" from-field="parameters.prodCatalogId"/>
<entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
</actions>
<widgets>
<decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
- </container>
<screenlet title="${uiLabelMap.PageTitleEditProductCatalog}">
<label style="h3">${uiLabelMap.ProductCatalogEmptyWarning}</label>
<include-form name="EditProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
@@ -51,12 +77,8 @@ under the License.
<set field="titleProperty" value="PageTitleEditProductCatalogCategories"/>
<set field="headerItem" value="catalog"/>
<set field="tabButtonItem" value="ProductCategories"/>
-
- <set field="prodCatalogId" from-field="parameters.prodCatalogId"/>
- <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
-
<entity-and entity-name="ProdCatalogCategory" list="prodCatalogCategories">
- <field-map field-name="prodCatalogId"/>
+ <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
<order-by field-name="prodCatalogCategoryTypeId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="productCategoryId"/>
@@ -68,9 +90,6 @@ under the License.
<widgets>
<decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="h1">${uiLabelMap.ProductCategories} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
- </container>
<screenlet title="${uiLabelMap.PageTitleEditProductCatalogCategories}">
<include-form name="EditProdCatalogCategories" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
</screenlet>
@@ -88,12 +107,8 @@ under the License.
<set field="titleProperty" value="PageTitleEditProductCatalogParties"/>
<set field="headerItem" value="catalog"/>
<set field="tabButtonItem" value="PartyParties"/>
-
- <set field="prodCatalogId" from-field="parameters.prodCatalogId"/>
- <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
-
<entity-and entity-name="ProdCatalogRole" list="prodCatalogRoleList">
- <field-map field-name="prodCatalogId"/>
+ <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="partyId"/>
</entity-and>
@@ -101,9 +116,6 @@ under the License.
<widgets>
<decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="h1">${uiLabelMap.PartyParties} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
- </container>
<screenlet title="${uiLabelMap.PageTitleEditProductCatalogParties}">
<include-form name="UpdateProdCatalogToParty" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
</screenlet>
@@ -121,12 +133,8 @@ under the License.
<set field="titleProperty" value="PageTitleEditProductCatalogStores"/>
<set field="headerItem" value="catalog"/>
<set field="tabButtonItem" value="ProductStores"/>
-
- <set field="prodCatalogId" from-field="parameters.prodCatalogId"/>
- <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
-
<entity-and entity-name="ProductStoreCatalog" list="productStoreCatalogList">
- <field-map field-name="prodCatalogId"/>
+ <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="productStoreId"/>
</entity-and>
@@ -134,9 +142,6 @@ under the License.
<widgets>
<decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="h1">${uiLabelMap.ProductStores} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
- </container>
<screenlet title="${uiLabelMap.PageTitleEditProductCatalogStores}">
<include-form name="UpdateProductStoreCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
</screenlet>
@@ -148,35 +153,4 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="FindProdCatalog">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleFindProductCatalog"/>
-
- <entity-condition entity-name="ProdCatalog" list="prodCatalogs">
- <order-by field-name="catalogName"/>
- </entity-condition>
- </actions>
- <widgets>
- <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <!-- do check for CATALOG, _VIEW permission -->
- <condition>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
- </condition>
- <widgets>
- <screenlet title="${uiLabelMap.ProductProductCatalogsList}">
- <include-form name="ListProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
- </screenlet>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml Sun May 29 11:02:09 2011
@@ -55,6 +55,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
<form name="PrepareAddCategoryContentAssoc" type="single" target="prepareAddContentToCategory" title="${uiLabelMap.ProductAddProductCategoryContentFromDate}"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productId"><hidden/></field>
@@ -69,6 +70,7 @@ under the License.
<!-- <field name="description"><text size="40"/></field> -->
<field name="submitButton" title="${uiLabelMap.ProductPrepareCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
<form name="UpdateCategoryContentAssoc" type="list" target="updateContentToCategory" title="" list-name="productCategoryContentList"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productCategoryId"><hidden/></field>
@@ -113,6 +115,7 @@ under the License.
</hyperlink>
</field>
</form>
+
<form name="EditCategoryContentSimpleText" type="single" default-map-name="categoryContent" target="updateSimpleTextContentForCategory" title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="content==null" target="createSimpleTextContentForCategory"/>
@@ -135,6 +138,7 @@ under the License.
<field use-when="content == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field use-when="content != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
<form name="CreateSimpleTextContentForAlternateLocale" type="single" target="createSimpleTextContentForAlternateLocaleInCategory" title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}"
header-row-style="header-row" default-table-style="basic-table">
<field name="productCategoryId"><hidden/></field>
@@ -144,7 +148,6 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
</form>
-
<!-- ProductCategoryLink Forms-->
<form name="ListProductCategoryLinks" type="list" list-name="productCategoryLinks" target="updateProductCategoryLink" separate-columns="true"
title="" odd-row-style="alternate-row" default-table-style="basic-table">
@@ -178,6 +181,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
+
<form name="AddProductCategoryLink" type="single" target="createProductCategoryLink" title="" default-map-name="productCategoryLink"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="productCategoryLink != null" target="updateProductCategoryLink"/>
@@ -207,6 +211,7 @@ under the License.
</hyperlink>
</field>
</form>
+
<form name="ListTopCategory" type="list" list-name="noParentCategories" odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productCategoryId" widget-style="buttontext">
<hyperlink target="EditCategory" description="${productCategoryId}" also-hidden="false">
@@ -216,7 +221,7 @@ under the License.
</field>
<field name="description"><display/></field>
</form>
-
+
<form name="FindCategory" type="single" target="FindCategory" title="" default-map-name="category"
header-row-style="header-row" default-table-style="basic-table">
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
@@ -250,8 +255,8 @@ under the License.
<field name="categoryName" sort-field="true"><display/></field>
<field name="description" sort-field="true"><display/></field>
</form>
-
- <form name="EditCategoryContentSEO" type="single" target="updateContentSEOForCategory" title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"
+
+ <form name="EditCategoryContentSEO" type="single" target="updateContentSEOForCategory" title="${uiLabelMap.ProductUpdateSEOContentCategory}"
header-row-style="header-row" default-table-style="basic-table">
<field name="title" title="${uiLabelMap.PageTitle}"><text size="40"/></field>
<field name="metaKeyword" title="${uiLabelMap.MetaKeywords}"><textarea cols="60" rows="5"/></field>
@@ -260,4 +265,29 @@ under the License.
<field name="prodCatContentTypeId"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
+ <form name="EditCategoryContentRelatedUrl" type="single" target="updateRelatedUrlContentForCategory" title="${uiLabelMap.ProductUpdateRelatedURLContentCategory}"
+ header-row-style="header-row" default-table-style="basic-table">
+ <alt-target use-when="content==null" target="createRelatedUrlContentForCategory"/>
+ <auto-fields-entity entity-name="ProductCategoryContent"/>
+ <field use-when="content==null" name="contentId"><ignored/></field>
+ <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="categoryContentData"><display/></field>
+ <field name="fromDate" use-when="contentId==null" title="${uiLabelMap.CommonFromDate}*" ><date-time/></field>
+ <field name="fromDate" use-when="contentId!=null" title="${uiLabelMap.CommonFromDate}" ><display/></field>
+ <field name="dataResourceId"><hidden/></field>
+ <field name="prodCatContentTypeId"><display-entity entity-name="ProductCategoryContentType" also-hidden="true"/></field>
+ <field name="title" title="${uiLabelMap.CommonTitle}"><text size="50"></text></field>
+ <field name="description" title="${uiLabelMap.FormFieldTitle_description}"><textarea cols="50" rows="2"/></field>
+ <field name="url"><textarea cols="50" rows="2"/></field>
+ <field name="localeString">
+ <lookup target-form-name="LookupLocale"></lookup>
+ </field>
+ <field name="purchaseFromDate"><hidden/></field>
+ <field name="purchaseThruDate"><hidden/></field>
+ <field name="useCountLimit"><hidden/></field>
+ <field name="useDaysLimit"><hidden/></field>
+ <field name="productCategoryId"><hidden/></field>
+ <field use-when="content == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field use-when="content != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
</forms>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml Sun May 29 11:02:09 2011
@@ -24,50 +24,45 @@ under the License.
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="pre-body">
- <section>
- <!-- do check for CATALOG, _VIEW permission -->
- <condition>
- <and>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
- <not><if-empty field="productCategoryId"/></not>
- </and>
- </condition>
- <widgets>
- <include-menu name="CategoryTabBar" 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>
<decorator-section name="body">
<section>
- <!-- do check for CATALOG, _VIEW permission -->
<condition>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
+ <or>
+ <if-has-permission permission="CATALOG" action="_ADMIN"/>
+ <if-has-permission permission="CATALOG" action="_CREATE"/>
+ <if-has-permission permission="CATALOG" action="_UPDATE"/>
+ <if-has-permission permission="CATALOG" action="_VIEW"/>
+ </or>
</condition>
+ <actions>
+ <set field="productCategoryId" from-field="parameters.productCategoryId"/>
+ <entity-one entity-name="ProductCategory" value-field="productCategory"/>
+ </actions>
<widgets>
<section>
- <condition><not><if-empty field="productCategoryId"/></not></condition>
+ <condition>
+ <not><if-empty field="productCategory"/></not>
+ </condition>
<widgets>
+ <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
<container>
<label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}] ${${extraFunctionName}}</label>
</container>
-
- <container style="button-bar">
- <link target="EditCategory" text="${uiLabelMap.ProductNewCategory}" style="buttontext create"/>
- <link target="createProductInCategoryStart" text="${uiLabelMap.ProductCreateProductInCategory}" style="buttontext create">
- <parameter param-name="productCategoryId"/>
- </link>
- <link target="advancedsearch" text="${uiLabelMap.ProductSearchInCategory}" style="buttontext search">
- <parameter param-name="SEARCH_CATEGORY_ID" from-field="productCategoryId"/>
- </link>
- <link target="/ecommerce/control/category" url-mode="plain" text="${uiLabelMap.ProductCategoryPage}" style="buttontext website">
- <parameter param-name="category_id" from-field="productCategoryId"/>
- </link>
- </container>
</widgets>
+ <fail-widgets>
+ <section>
+ <condition>
+ <if-compare operator="not-equals" value="EditCategory" field="tabButtonItem"/>
+ </condition>
+ <widgets>
+ <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </fail-widgets>
</section>
<decorator-section-include name="body"/>
</widgets>
@@ -95,18 +90,6 @@ under the License.
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
- <container style="button-bar">
- <link target="EditCategory" text="${uiLabelMap.ProductNewCategory}" style="buttontext create"/>
- <link target="createProductInCategoryStart" text="${uiLabelMap.ProductCreateProductInCategory}" style="buttontext create">
- <parameter param-name="productCategoryId"/>
- </link>
- <link target="advancedsearch" text="${uiLabelMap.ProductSearchInCategory}" style="buttontext search">
- <parameter param-name="SEARCH_CATEGORY_ID" from-field="productCategoryId"/>
- </link>
- <link target="/ecommerce/control/category" url-mode="plain" text="${uiLabelMap.ProductCategoryPage}" style="buttontext website">
- <parameter param-name="category_id" from-field="productCategoryId"/>
- </link>
- </container>
</decorator-section>
<decorator-section name="search-options">
<include-form name="FindCategory" location="component://product/widget/catalog/CategoryForms.xml"/>
@@ -206,6 +189,7 @@ under the License.
<set field="textDataMap.textDataResourceId" from-field="content.dataResourceId"/>
<set field="contentId" from-field="content.contentId"/>
+ <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy"/>
<script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy"/>
</actions>
<widgets>
@@ -219,22 +203,8 @@ under the License.
</link>
</widgets>
</section>
- <screenlet title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}">
- <section>
- <condition>
- <or>
- <if-compare operator="equals" value="PAGE_TITLE" field="parameters.prodCatContentTypeId"/>
- <if-compare operator="equals" value="META_KEYWORD" field="parameters.prodCatContentTypeId"/>
- <if-compare operator="equals" value="META_DESCRIPTION" field="parameters.prodCatContentTypeId"/>
- </or>
- </condition>
- <widgets>
- <include-form name="EditCategoryContentSEO" location="component://product/widget/catalog/CategoryForms.xml"/>
- </widgets>
- <fail-widgets>
- <include-form name="EditCategoryContentSimpleText" location="component://product/widget/catalog/CategoryForms.xml"/>
- </fail-widgets>
- </section>
+ <screenlet title="${contentFormTitle}">
+ <include-form name="${contentFormName}" location="component://product/widget/catalog/CategoryForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductListAssociatedContentInfos}">
<include-form name="ListAssociatedContentInfos" location="component://product/widget/catalog/ProductForms.xml"/>
@@ -254,7 +224,7 @@ under the License.
<set field="headerItem" value="categories"/>
<set field="tabButtonItem" value="EditCategoryRollup"/>
<set field="labelTitleProperty" value="ProductRollup"/>
- <set field="productCategoryId" from-field="parameters.showProductCategoryId"/>
+ <set field="productCategoryId" from-field="parameters.productCategoryId"/>
<entity-condition entity-name="ProductCategoryRollup" list="currentProductCategoryRollups">
<condition-expr field-name="productCategoryId" from-field="productCategoryId"/>
@@ -502,6 +472,7 @@ under the License.
<include-form name="ListProductCategoryLinks" location="component://product/widget/catalog/CategoryForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleCreateProductCategoryLink}">
+ <label style="h3">>>>>>This function is depreciated and replaced by the function under the tab "Content" with the content type "Related URL"</label>
<include-form name="AddProductCategoryLink" location="component://product/widget/catalog/CategoryForms.xml"/>
</screenlet>
</decorator-section>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml Sun May 29 11:02:09 2011
@@ -43,7 +43,7 @@ under the License.
<set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
@@ -55,34 +55,44 @@ under the License.
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="pre-body">
- <section>
- <!-- do check for CATALOG, _VIEW permission -->
- <condition>
- <and>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
- <not><if-empty field="prodCatalogId"/></not>
- </and>
- </condition>
- <widgets>
- <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- </widgets>
- </section>
- </decorator-section>
<decorator-section name="left-column">
<include-screen name="leftbar"/>
</decorator-section>
<decorator-section name="body">
<section>
- <!-- do check for CATALOG, _VIEW permission -->
<condition>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
+ <or>
+ <if-has-permission permission="CATALOG" action="_ADMIN"/>
+ <if-has-permission permission="CATALOG" action="_CREATE"/>
+ <if-has-permission permission="CATALOG" action="_UPDATE"/>
+ <if-has-permission permission="CATALOG" action="_VIEW"/>
+ </or>
</condition>
+ <actions>
+ <set field="prodCatalogId" from-field="parameters.prodCatalogId"/>
+ <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
+ </actions>
<widgets>
- <container style="button-bar">
- <link target="EditProdCatalog" text="${uiLabelMap.ProductNewProdCatalog}" style="buttontext create"/>
- </container>
-
+ <section>
+ <condition>
+ <not><if-empty field="prodCatalog"/></not>
+ </condition>
+ <widgets>
+ <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu name="CatalogSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label>
+ </widgets>
+ <fail-widgets>
+ <section>
+ <condition>
+ <if-compare operator="not-equals" value="ProductCatalog" field="tabButtonItem"/>
+ </condition>
+ <widgets>
+ <include-menu name="CatalogSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </widgets>
+ </section>
+ </fail-widgets>
+ </section>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>