You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2007/12/29 00:13:53 UTC
svn commit: r607355 [2/2] - in /ofbiz/trunk/applications/product: config/
webapp/catalog/promo/ widget/catalog/
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl Fri Dec 28 15:13:52 2007
@@ -16,59 +16,74 @@
specific language governing permissions and limitations
under the License.
-->
-
- <br/>
- <#if productPromoId?exists && productPromo?exists>
- <table border="1" cellpadding="2" cellspacing="0">
- <tr>
- <td><div class="tabletext"><b>${uiLabelMap.ProductStoreNameId}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonFromDateTime}</b></div></td>
- <td align="center"><div class="tabletext"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></div></td>
- <td><div class="tabletext"><b> </b></div></td>
- </tr>
- <#assign line = 0>
- <#list productStorePromoAppls as productStorePromoAppl>
- <#assign line = line + 1>
- <#assign productStore = productStorePromoAppl.getRelatedOne("ProductStore")>
- <tr valign="middle">
- <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productStore?exists>${(productStore.storeName)?if_exists}</#if>[${productStorePromoAppl.productStoreId}]</a></td>
- <#assign hasntStarted = false>
- <#if (productStorePromoAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productStorePromoAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
- <td><div class="tabletext" <#if hasntStarted>style="color: red;"</#if>>${productStorePromoAppl.fromDate?if_exists}</div></td>
- <td align="center">
- <#assign hasExpired = false>
- <#if (productStorePromoAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productStorePromoAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
- <form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
- <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}">
- <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}">
- <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}">
- <input type="text" size="20" name="thruDate" value="${(productStorePromoAppl.thruDate.toString())?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
- <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${nowTimestamp.toString()}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}" class="inputBox">
- <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
- </form>
- </td>
- <td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- [${uiLabelMap.CommonDelete}]</a>
- </td>
- </tr>
- </#list>
- </table>
- <br/>
- <form method="post" action="<@o...@ofbizUrl>" name="addProductPromoToCatalog" style="margin: 0;">
- <input type="hidden" name="productPromoId" value="${productPromoId}"/>
- <input type="hidden" name="tryEntity" value="true"/>
-
- <h2>${uiLabelMap.ProductAddStorePromo} :</h2>
- <br/>
- <select name="productStoreId" class="selectBox">
- <#list productStores as productStore>
- <option value="${(productStore.productStoreId)?if_exists}">${(productStore.storeName)?if_exists} [${(productStore.productStoreId)?if_exists}]</option>
- </#list>
- </select>
- <input type="text" size="20" name="fromDate" class="inputBox"/>
- <a href="javascript:call_cal(document.addProductPromoToCatalog.fromDate, '${nowTimestamp.toString()}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="${uiLabelMap.CommonAdd}"/>
- </form>
- </#if>
+<#if productPromoId?exists && productPromo?exists>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PageTitleEditProductPromoStores}</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td><b>${uiLabelMap.ProductStoreNameId}</b></td>
+ <td><b>${uiLabelMap.CommonFromDateTime}</b></td>
+ <td align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
+ <td><b> </b></td>
+ </tr>
+ <#assign line = 0>
+ <#assign rowClass = "2">
+ <#list productStorePromoAppls as productStorePromoAppl>
+ <#assign line = line + 1>
+ <#assign productStore = productStorePromoAppl.getRelatedOne("ProductStore")>
+ <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <td><a href="<@o...@ofbizUrl>" class="buttontext"><#if productStore?exists>${(productStore.storeName)?if_exists}</#if>[${productStorePromoAppl.productStoreId}]</a></td>
+ <#assign hasntStarted = false>
+ <#if (productStorePromoAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productStorePromoAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+ <td <#if hasntStarted>style="color: red;"</#if>>${productStorePromoAppl.fromDate?if_exists}</td>
+ <td align="center">
+ <#assign hasExpired = false>
+ <#if (productStorePromoAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productStorePromoAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
+ <form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
+ <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}">
+ <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}">
+ <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}">
+ <input type="text" size="20" name="thruDate" value="${(productStorePromoAppl.thruDate.toString())?if_exists}" <#if hasExpired>style="color: red;"</#if>>
+ <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${nowTimestamp.toString()}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}">
+ </form>
+ </td>
+ <td align="center">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
+ ${uiLabelMap.CommonDelete}</a>
+ </td>
+ </tr>
+ <#-- toggle the row color -->
+ <#if rowClass == "2">
+ <#assign rowClass = "1">
+ <#else>
+ <#assign rowClass = "2">
+ </#if>
+ </#list>
+ </table>
+ </div>
+ </div>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductAddStorePromo}</h3>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" action="<@o...@ofbizUrl>" name="addProductPromoToCatalog">
+ <input type="hidden" name="productPromoId" value="${productPromoId}"/>
+ <input type="hidden" name="tryEntity" value="true"/>
+ <select name="productStoreId">
+ <#list productStores as productStore>
+ <option value="${(productStore.productStoreId)?if_exists}">${(productStore.storeName)?if_exists} [${(productStore.productStoreId)?if_exists}]</option>
+ </#list>
+ </select>
+ <input type="text" size="20" name="fromDate"/>
+ <a href="javascript:call_cal(document.addProductPromoToCatalog.fromDate, '${nowTimestamp.toString()}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="submit" value="${uiLabelMap.CommonAdd}"/>
+ </form>
+ </div>
+ </div>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl?rev=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl Fri Dec 28 15:13:52 2007
@@ -17,35 +17,41 @@
under the License.
-->
<#if productPromoId?exists>
- <h3>${uiLabelMap.ProductPromotionUploadSetOfPromotionCodes}:</h3>
- <div class="tabletext">
- <form method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;">
- <input type="hidden" name="productPromoId" value="${productPromoId}"/>
- ${uiLabelMap.ProductPromoUserEntered}: <select name="userEntered" class="selectBox"><option>N</option><option>Y</option></select>
- ${uiLabelMap.ProductPromotionReqEmailOrParty}: <select name="requireEmailOrParty" class="selectBox"><option>N</option><option>Y</option></select>
- ${uiLabelMap.ProductPromotionUseLimits}:
- ${uiLabelMap.ProductPromotionPerCode}<input type="text" size="5" name="useLimitPerCode" class="inputBox">
- ${uiLabelMap.ProductPromotionPerCustomer}<input type="text" size="5" name="useLimitPerCustomer" class="inputBox">
- <div>
- <input type="file" size="40" name="uploadedFile" class="inputBox">
- <input type="submit" value="${uiLabelMap.CommonUpload}">
- </div>
- </form>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductPromotionUploadSetOfPromotionCodes}</h3>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data">
+ <input type="hidden" name="productPromoId" value="${productPromoId}"/>
+ <span class="label">${uiLabelMap.ProductPromoUserEntered}:</span></span><select name="userEntered"><option>N</option><option>Y</option></select>
+ <span class="label">${uiLabelMap.ProductPromotionReqEmailOrParty}:</span><select name="requireEmailOrParty"><option>N</option><option>Y</option></select>
+ <span class="label">${uiLabelMap.ProductPromotionUseLimits}:
+ ${uiLabelMap.ProductPromotionPerCode}</span><input type="text" size="5" name="useLimitPerCode">
+ <span class="label">${uiLabelMap.ProductPromotionPerCustomer}</span><input type="text" size="5" name="useLimitPerCustomer">
+ <div>
+ <input type="file" size="40" name="uploadedFile">
+ <input type="submit" value="${uiLabelMap.CommonUpload}">
+ </div>
+ </form>
+ </div>
</div>
<br/>
-
- <h3>${uiLabelMap.ProductPromotionAddSetOfPromotionCodes}:</h3>
- <div class="tabletext">
- <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="hidden" name="productPromoId" value="${productPromoId}"/>
- ${uiLabelMap.CommonQuantity}: <input type="text" size="5" name="quantity" class="inputBox">
- ${uiLabelMap.ProductPromoUserEntered}: <select name="userEntered" class="selectBox"><option>N</option><option>Y</option></select>
- ${uiLabelMap.ProductPromotionReqEmailOrParty}: <select name="requireEmailOrParty" class="selectBox"><option>N</option><option>Y</option></select>
- ${uiLabelMap.ProductPromotionUseLimits}:
- ${uiLabelMap.ProductPromotionPerCode}<input type="text" size="5" name="useLimitPerCode" class="inputBox">
- ${uiLabelMap.ProductPromotionPerCustomer}<input type="text" size="5" name="useLimitPerCustomer" class="inputBox">
- <input type="submit" value="${uiLabelMap.CommonAdd}">
- </form>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductPromotionAddSetOfPromotionCodes}</h3>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${productPromoId}"/>
+ <span class="label">${uiLabelMap.CommonQuantity}:</span><input type="text" size="5" name="quantity">
+ <span class="label">${uiLabelMap.ProductPromoUserEntered}:</span><select name="userEntered"><option>N</option><option>Y</option></select>
+ <span class="label">${uiLabelMap.ProductPromotionReqEmailOrParty}:</span><select name="requireEmailOrParty"><option>N</option><option>Y</option></select>
+ <span class="label">${uiLabelMap.ProductPromotionUseLimits}:
+ ${uiLabelMap.ProductPromotionPerCode}</span><input type="text" size="5" name="useLimitPerCode">
+ <span class="label">${uiLabelMap.ProductPromotionPerCustomer}</span><input type="text" size="5" name="useLimitPerCustomer">
+ <input type="submit" value="${uiLabelMap.CommonAdd}">
+ </form>
+ </div>
</div>
-</#if>
-
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml?rev=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml Fri Dec 28 15:13:52 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -20,7 +20,8 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="ListProductPromos" type="list" title="" list-name="productPromos">
+ <form name="ListProductPromos" type="list" title="" list-name="productPromos"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productPromoId" widget-style="buttontext">
<hyperlink target="EditProductPromo?productPromoId=${productPromoId}"
description="${productPromoId}" also-hidden="false"/>
@@ -30,11 +31,13 @@
<field name="requireCode"><display/></field>
<field name="createdDate"><display/></field>
</form>
- <form name="GoToProductPromoCode" type="single" target="EditProductPromoCode" title="">
+ <form name="GoToProductPromoCode" type="single" target="EditProductPromoCode" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="productPromoCodeId"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonEdit}"><submit button-type="button"/></field>
</form>
- <form name="EditProductPromo" type="single" target="updateProductPromo" title="" default-map-name="productPromo">
+ <form name="EditProductPromo" type="single" target="updateProductPromo" title="" default-map-name="productPromo"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="productPromo==null" target="createProductPromo"/>
<auto-fields-service service-name="updateProductPromo" map-name=""/>
@@ -64,7 +67,8 @@
<display description="[${productPromo.createdByUserLogin}] ${uiLabelMap.CommonOn} ${productPromo.createdDate}" also-hidden="false"/>
</field>
</form>
- <form name="EditProductPromoCode" type="single" target="updateProductPromoCode" title="" default-map-name="productPromoCode">
+ <form name="EditProductPromoCode" type="single" target="updateProductPromoCode" title="" default-map-name="productPromoCode"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="productPromoCode==null" target="createProductPromoCode"/>
<auto-fields-service service-name="updateProductPromoCode" map-name=""/>
@@ -97,7 +101,8 @@
</field>
</form>
- <form name="ListProductPromoCodes" type="list" title="" list-name="productPromoCodes">
+ <form name="ListProductPromoCodes" type="list" title="" list-name="productPromoCodes"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ProductPromoCode" default-field-type="display"/>
<field name="productPromoId"><hidden/></field>
<field name="productPromoCodeId" widget-style="buttontext">
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/PromoTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/PromoTabBar.ftl?rev=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/PromoTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/PromoTabBar.ftl Fri Dec 28 15:13:52 2007
@@ -17,14 +17,17 @@
under the License.
-->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
-
+<#assign unselectedClassName = "">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}>
<#if productPromoId?has_content>
- <div class='tabContainer'>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditProductPromo?default(unselectedClassName)}">${uiLabelMap.ProductPromotion}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditProductPromoRules?default(unselectedClassName)}">${uiLabelMap.ProductRules}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditProductPromoStores?default(unselectedClassName)}">${uiLabelMap.ProductStores}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.FindProductPromoCode?default(unselectedClassName)}">${uiLabelMap.ProductPromotionCode}</a>
+ <br/>
+ <div class="button-bar tab-bar">
+ <ul>
+ <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditProductPromo?default(unselectedClassName)}">${uiLabelMap.ProductPromotion}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditProductPromoRules?default(unselectedClassName)}">${uiLabelMap.ProductRules}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditProductPromoStores?default(unselectedClassName)}">${uiLabelMap.ProductStores}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="${selectedClassMap.FindProductPromoCode?default(unselectedClassName)}">${uiLabelMap.ProductPromotionCode}</a></li>
+ </ul>
</div>
+<br/>
</#if>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=607355&r1=607354&r2=607355&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Fri Dec 28 15:13:52 2007
@@ -79,20 +79,43 @@
<widgets>
<decorator-screen name="CommonPromoDecorator">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.ProductProductPromotionsList}</label>
- </container>
- <container>
- <link target="EditProductPromo" text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/>
- </container>
- <container>
- <label style="head3">${uiLabelMap.CommonView}</label>
- <link target="FindProductPromo" text="${uiLabelMap.CommonAll}" style="buttontext"/>
- <link target="FindProductPromo?userEntered=Y" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext"/>
- <link target="FindProductPromo?userEntered=N" text="${uiLabelMap.ProductPromotionImported}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditProductPromotionCode}"/>
+ </container>
+ </container>
+ <container>
+ <link target="EditProductPromo" text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/>
+ </container>
+ <container>
+ <label style="label">${uiLabelMap.CommonView}</label>
+ <link target="FindProductPromo" text="${uiLabelMap.CommonAll}" style="buttontext"/>
+ <link target="FindProductPromo?userEntered=Y" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext"/>
+ <link target="FindProductPromo?userEntered=N" text="${uiLabelMap.ProductPromotionImported}" style="buttontext"/>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="GoToProductPromoCode" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="GoToProductPromoCode" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
- <include-form name="ListProductPromos" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.ProductProductPromotionsList}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductPromos" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -112,7 +135,20 @@
<widgets>
<decorator-screen name="CommonPromoDecorator">
<decorator-section name="body">
- <include-form name="EditProductPromo" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditProductPromos}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditProductPromo" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -260,7 +296,20 @@
</container>
</fail-widgets>
</section>
- <include-form name="ListProductPromoCodes" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindProductPromotionCode}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListProductPromoCodes" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<platform-specific>
<html><html-template location="component://product/webapp/catalog/promo/FindProductPromoCode.ftl"/></html>
</platform-specific>
@@ -283,9 +332,22 @@
<decorator-screen name="CommonPromoDecorator">
<decorator-section name="body">
<container>
- <link target="EditProductPromoCode" text="[${uiLabelMap.ProductNewPromotionCode}]" style="buttontext"/>
+ <link target="EditProductPromoCode" text="${uiLabelMap.ProductNewPromotionCode}" style="buttontext"/>
</container>
- <include-form name="EditProductPromoCode" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditProductPromotionCode}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditProductPromoCode" location="component://product/webapp/catalog/promo/PromoForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<platform-specific>
<html><html-template location="component://product/webapp/catalog/promo/EditProductPromoCode.ftl"/></html>
</platform-specific>