svn commit: r607295 - in /ofbiz/trunk/applications/product: webapp/catalog/feature/ widget/catalog/

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

svn commit: r607295 - in /ofbiz/trunk/applications/product: webapp/catalog/feature/ widget/catalog/

mrisaliti
Author: mrisaliti
Date: Fri Dec 28 09:29:17 2007
New Revision: 607295

URL: http://svn.apache.org/viewvc?rev=607295&view=rev
Log:
Product Features forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1544)

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl
    ofbiz/trunk/applications/product/webapp/catalog/feature/CreateFeatureCategory.ftl
    ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeature.ftl
    ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategories.ftl
    ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
    ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl
    ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl
    ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/BulkAddFeature.ftl Fri Dec 28 09:29:17 2007
@@ -16,37 +16,50 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
-<h1>${uiLabelMap.ProductAddProductFeatureInBulk} ${uiLabelMap.CommonFor} ${featureCategory.description}</h1>
-
-<table border="1" cellpadding='2' cellspacing='0'>
-  <form method='POST' action='<@ofbizUrl>BulkAddProductFeatures</@ofbizUrl>' name="selectAllForm">
-  <input type="hidden" name="_useRowSubmit" value="Y">
-  <input type="hidden" name="_checkGlobalScope" value="N">
-  <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}">
-  <tr class='viewOneTR1'>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductFeatureType}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductIdSeqNum}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductIdCode}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="Y" checked="checked" onclick="javascript:toggleAll(this, 'selectAllForm');"></div></td>
-  </tr>
-<#list 0..featureNum-1 as feature>
-  <tr valign="middle" class='viewOneTR1'>
-      <td><input type="text" class='inputBox' size='15' name="description_o_${feature_index}"></td>
-      <td><select name='productFeatureTypeId_o_${feature_index}' size="1" class='selectBox'>
-        <#list productFeatureTypes as productFeatureType>
-          <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)?if_exists}</option>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductAddProductFeatureInBulk} ${uiLabelMap.CommonFor} ${featureCategory.description}</h3>
+    </div>
+    <div class="screenlet-body">
+        <table cellspacing="0" class="basic-table">
+          <form method='POST' action='<@ofbizUrl>BulkAddProductFeatures</@ofbizUrl>' name="selectAllForm">
+          <input type="hidden" name="_useRowSubmit" value="Y">
+          <input type="hidden" name="_checkGlobalScope" value="N">
+          <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}">
+          <tr class="header-row">
+            <td><b>${uiLabelMap.CommonDescription}</b></td>
+            <td><b>${uiLabelMap.ProductFeatureType}</b></td>
+            <td><b>${uiLabelMap.ProductIdSeqNum}</b></td>
+            <td><b>${uiLabelMap.ProductIdCode}</b></td>
+            <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="Y" checked="checked" onclick="javascript:toggleAll(this, 'selectAllForm');"></td>
+          </tr>
+        <#assign rowClass = "2">
+        <#list 0..featureNum-1 as feature>
+          <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+              <td><input type="text" size='15' name="description_o_${feature_index}"></td>
+              <td><select name='productFeatureTypeId_o_${feature_index}' size="1">
+                  <#list productFeatureTypes as productFeatureType>
+                  <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)?if_exists}</option>
+                  </#list>
+                  </select>
+                  <input name='productFeatureCategoryId_o_${feature_index}' type="hidden" value="${productFeatureCategoryId}">
+              </td>
+              <td><input type="text" size='5' name="defaultSequenceNum_o_${feature_index}""></td>
+              <td><input type="text" size='5' name="idCode_o_${feature_index}"></td>
+              <td align="right"><input type="checkbox" name="_rowSubmit_o_${feature_index}" value="Y" checked="checked" onclick="javascript:checkToggle(this, 'selectAllForm');"></td>
+          </tr>
+          <#-- toggle the row color -->
+          <#if rowClass == "2">
+            <#assign rowClass = "1">
+          <#else>
+            <#assign rowClass = "2">
+          </#if>
         </#list>
-      </select></td>
-      <input name='productFeatureCategoryId_o_${feature_index}' type="hidden" value="${productFeatureCategoryId}">
-      <td><input type="text" class='inputBox' size='5' name="defaultSequenceNum_o_${feature_index}""></td>
-      <td><input type="text" class='inputBox' size='5' name="idCode_o_${feature_index}"></td>
-      <td align="right"><input type="checkbox" name="_rowSubmit_o_${feature_index}" value="Y" checked="checked" onclick="javascript:checkToggle(this, 'selectAllForm');"></td>
-  </tr>
+        <input type="hidden" name="_rowCount" value="${featureNum}">
+        <tr><td colspan="11" align="center"><input type="submit" value='${uiLabelMap.CommonCreate}'/></td></tr>
+        </form>
+        </table>
+    </div>
+</div>
+
 
-</#list>
-<input type="hidden" name="_rowCount" value="${featureNum}">
-<tr><td colspan="11" align="center"><input type="submit" value='${uiLabelMap.CommonCreate}'/></td></tr>
-</form>
-</table>

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/CreateFeatureCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/CreateFeatureCategory.ftl?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/CreateFeatureCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/CreateFeatureCategory.ftl Fri Dec 28 09:29:17 2007
@@ -17,17 +17,16 @@
 under the License.
 -->
 
-<form method="post" action="<@ofbizUrl>/CreateFeatureCategory</@ofbizUrl>" style="margin: 0;">
-  <h2>${uiLabelMap.ProductCreateAProductFeatureCategory}:</h2>
+<form method="post" action="<@ofbizUrl>/CreateFeatureCategory</@ofbizUrl>">
   <br/>
-  <table>
+  <table cellspacing="0" class="basic-table">
     <tr>
-      <td><div class="tabletext">${uiLabelMap.CommonDescription}:</div></td>
-      <td><input type="text" class="inputBox" size="30" name="description" value=""></td>
+      <td class="label">${uiLabelMap.CommonDescription}:</td>
+      <td><input type="text" size="30" name="description" value=""></td>
     </tr>
     <tr>
-      <td><div class="tabletext">${uiLabelMap.ProductParentCategory}:</div></td>
-      <td><select name="parentCategoryId" size="1" class="selectbox">
+      <td class="label">${uiLabelMap.ProductParentCategory}:</td>
+      <td><select name="parentCategoryId" size="1">
         <option value="">&nbsp;</option>
         <#list productFeatureCategories as productFeatureCategory>
           <option value="${productFeatureCategory.productFeatureCategoryId}">${productFeatureCategory.description?if_exists} [${productFeatureCategory.productFeatureCategoryId}]</option>
@@ -39,4 +38,4 @@
     </tr>
   </table>
 </form>
-<br/>
+<br/>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeature.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeature.ftl?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeature.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeature.ftl Fri Dec 28 09:29:17 2007
@@ -16,14 +16,24 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
-<hr/>
-<h1>${uiLabelMap.ProductSupplierSpecificFeatureInformation}</h1>
-<#if editSupplierFeaturesForm?has_content>
-${editSupplierFeaturesForm.renderFormString()}
-</#if>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductSupplierSpecificFeatureInformation}</h3>
+    </div>
+    <#if editSupplierFeaturesForm?has_content>
+        <div class="screenlet-body">
+            ${editSupplierFeaturesForm.renderFormString()}
+        </div>
+    </#if>
+</div>
 <br/>
-<h2>${uiLabelMap.ProductCreateInformationNewSupplier}</h2>
-<#if createSupplierFeatureForm?has_content>
-${createSupplierFeatureForm.renderFormString()}
-</#if>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductCreateInformationNewSupplier}</h3>
+    </div>
+    <#if createSupplierFeatureForm?has_content>
+        <div class="screenlet-body">
+            ${createSupplierFeatureForm.renderFormString()}
+        </div>
+    </#if>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategories.ftl?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategories.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategories.ftl Fri Dec 28 09:29:17 2007
@@ -17,36 +17,33 @@
 under the License.
 -->
 
-<h1>${uiLabelMap.ProductProductFeatureCategories}</h1>
-
 <br/>
 
-<form method="post" action="<@ofbizUrl>EditFeature</@ofbizUrl>" style="margin: 0;">
-  <h2>${uiLabelMap.ProductEditFeatureId} :</h2>
-  <input type="text" class="inputBox" size="12" name="productFeatureId" value=""/>
+<form method="post" action="<@ofbizUrl>EditFeature</@ofbizUrl>">
+  <input type="text" size="12" name="productFeatureId" value=""/>
   <input type="submit" value="${uiLabelMap.CommonEdit}"/>
 </form>
 
 <br/>
 
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonId}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductParentCategory}</b></div></td>
-    <td><div class="tabletext">&nbsp;</div></td>
-    <td><div class="tabletext">&nbsp;</div></td>
+<table cellspacing="0" class="basic-table">
+  <tr class="header-row">
+    <td><b>${uiLabelMap.CommonId}</b></td>
+    <td><b>${uiLabelMap.CommonDescription}</b></td>
+    <td><b>${uiLabelMap.ProductParentCategory}</b></td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
 
-
+<#assign rowClass = "2">
 <#list productFeatureCategories as productFeatureCategory>
-  <tr valign="middle">
+  <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
     <form method="post" action="<@ofbizUrl>UpdateFeatureCategory</@ofbizUrl>">
     <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategory.productFeatureCategoryId}">
     <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategory.productFeatureCategoryId}</@ofbizUrl>" class="buttontext">${productFeatureCategory.productFeatureCategoryId}</a></td>
-    <td><input type="text" class="inputBox" size="30" name="description" value="${productFeatureCategory.description?if_exists}"></td>
+    <td><input type="text" size="30" name="description" value="${productFeatureCategory.description?if_exists}"></td>
     <td>
-      <select name="parentCategoryId" size="1" class="selectBox">
+      <select name="parentCategoryId" size="1">
         ${productFeatureCategory}
         <#assign curProdFeatCat = productFeatureCategory.getRelatedOne("ParentProductFeatureCategory")?if_exists>
         <#if curProdFeatCat?has_content>
@@ -58,11 +55,15 @@
           </#list>
       </select>
     </td>
-    <td><INPUT type="submit" value="${uiLabelMap.CommonUpdate}"></td>
-    <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategory.productFeatureCategoryId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a></td>
+    <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
+    <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategory.productFeatureCategoryId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductProductFeatureMaintenance}</a></td>
     </form>
   </tr>
+  <#-- toggle the row color -->
+  <#if rowClass == "2">
+    <#assign rowClass = "1">
+  <#else>
+    <#assign rowClass = "2">
+  </#if>
 </#list>
-</table>
-<br/>
-
+</table>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Fri Dec 28 09:29:17 2007
@@ -16,101 +16,119 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
-<h1>${uiLabelMap.ProductEditFeaturesForFeatureCategory} "${(curProductFeatureCategory.description)?if_exists}"</h1>
-<a href="<@ofbizUrl>EditFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductCreateNewFeature}]</a>
-<br>
-<form action="<@ofbizUrl>QuickAddProductFeatures</@ofbizUrl>" method="post">
-  <div class="tabletext">
-    ${uiLabelMap.CommonAdd}
-    <input class="inputBox" name="featureNum" value="1" size="3">
-    ${uiLabelMap.ProductAddFeatureToCategory}
-    <input class="smallSubmit" type="submit" value="${uiLabelMap.CommonCreate}">
-  </div>
-  <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}">
-</form>
-<br/>
-<h2>${uiLabelMap.ProductProductFeatureMaintenance}</h2>
-<#if (listSize > 0)>
-    <#if productId?has_content>
-      <#assign productString = "&productId=" + productId>
-    </#if>
-    <table border="0" width="100%" cellpadding="2">
-        <tr>
-        <td align="right">
-            <span class="tabletext">
-            <b>
-            <#if (viewIndex > 0)>
-            <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductEditFeaturesForFeatureCategory} "${(curProductFeatureCategory.description)?if_exists}"</h3>
+    </div>
+    <div class="screenlet-body">
+        <a href="<@ofbizUrl>EditFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewFeature}</a>
+        <br>
+        <form action="<@ofbizUrl>QuickAddProductFeatures</@ofbizUrl>" method="post">
+          <div>
+            ${uiLabelMap.CommonAdd}
+            <input type="text" name="featureNum" value="1" size="3">
+            ${uiLabelMap.ProductAddFeatureToCategory}
+            <input class="smallSubmit" type="submit" value="${uiLabelMap.CommonCreate}">
+          </div>
+          <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}">
+        </form>
+        <br/>
+    </div>
+</div>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductProductFeatureMaintenance}</h3>
+    </div>
+    <div class="screenlet-body">
+        <#if (listSize > 0)>
+            <#if productId?has_content>
+              <#assign productString = "&productId=" + productId>
             </#if>
-            ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
-            <#if (listSize > highIndex)>
-            | <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
-            </#if>
-            </b>
-            </span>
-        </td>
-        </tr>
-    </table>
-</#if>
-<table border="1" cellpadding='2' cellspacing='0'>
-    <form method='POST' action='<@ofbizUrl>UpdateProductFeatureInCategory</@ofbizUrl>' name="selectAllForm">
-    <input type="hidden" name="_useRowSubmit" value="Y">
-    <input type="hidden" name="_checkGlobalScope" value="N">
-    <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}">
-  <tr class='viewOneTR1'>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonId}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductFeatureType}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductFeatureCategory}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductUnitOfMeasureId}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductQuantity}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductAmount}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductIdSeqNum}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductIdCode}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.ProductAbbrev}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div></td>
-  </tr>
-<#if (listSize > 0)>
-    <#assign rowCount = 0>
-<#list productFeatures as productFeature>
-  <#assign curProductFeatureType = productFeature.getRelatedOneCache("ProductFeatureType")>
-  <tr valign="middle" class='viewOneTR1'>
-      <input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}">
-      <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${productFeature.productFeatureId}</@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
-      <td><input type="text" class='inputBox' size='15' name="description_o_${rowCount}" value="${productFeature.description}"></td>
-      <td><select name='productFeatureTypeId_o_${rowCount}' size="1" class='selectBox'>
-        <#if productFeature.productFeatureTypeId?has_content>
-          <option value='${productFeature.productFeatureTypeId}'><#if curProductFeatureType?exists>${curProductFeatureType.get("description",locale)?if_exists}<#else> [${productFeature.productFeatureTypeId}]</#if></option>
-          <option value='${productFeature.productFeatureTypeId}'>---</option>
+            <table border="0" width="100%" cellpadding="2">
+                <tr>
+                <td align="right">
+                    <span class="label">
+                    <b>
+                    <#if (viewIndex > 0)>
+                    <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
+                    </#if>
+                    ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
+                    <#if (listSize > highIndex)>
+                    | <a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeatureCategoryId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${productString?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
+                    </#if>
+                    </b>
+                    </span>
+                </td>
+                </tr>
+            </table>
         </#if>
-        <#list productFeatureTypes as productFeatureType>
-          <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)?if_exists}</option>
-        </#list>
-      </select></td>
-      <td><select name='productFeatureCategoryId_o_${rowCount}' size="1" class='selectBox'>
-        <#if productFeature.productFeatureCategoryId?has_content>
-          <#assign curProdFeatCat = productFeature.getRelatedOne("ProductFeatureCategory")>
-          <option value='${productFeature.productFeatureCategoryId}'>${(curProdFeatCat.description)?if_exists} [${productFeature.productFeatureCategoryId}]</option>
-          <option value='${productFeature.productFeatureCategoryId}'>---</option>
+        <br/>
+        <table cellspacing="0" class="basic-table">
+            <form method='POST' action='<@ofbizUrl>UpdateProductFeatureInCategory</@ofbizUrl>' name="selectAllForm">
+            <input type="hidden" name="_useRowSubmit" value="Y">
+            <input type="hidden" name="_checkGlobalScope" value="N">
+            <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}">
+              <tr class="header-row">
+                <td><b>${uiLabelMap.CommonId}</b></td>
+                <td><b>${uiLabelMap.CommonDescription}</b></td>
+                <td><b>${uiLabelMap.ProductFeatureType}</b></td>
+                <td><b>${uiLabelMap.ProductFeatureCategory}</b></td>
+                <td><b>${uiLabelMap.ProductUnitOfMeasureId}</b></td>
+                <td><b>${uiLabelMap.ProductQuantity}</b></td>
+                <td><b>${uiLabelMap.ProductAmount}</b></td>
+                <td><b>${uiLabelMap.ProductIdSeqNum}</b></td>
+                <td><b>${uiLabelMap.ProductIdCode}</b></td>
+                <td><b>${uiLabelMap.ProductAbbrev}</b></td>
+                <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></td>
+             </tr>
+        <#if (listSize > 0)>
+            <#assign rowCount = 0>
+            <#assign rowClass = "2">
+            <#list productFeatures as productFeature>
+            <#assign curProductFeatureType = productFeature.getRelatedOneCache("ProductFeatureType")>
+            <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+              <input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}">
+              <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${productFeature.productFeatureId}</@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
+              <td><input type="text" size='15' name="description_o_${rowCount}" value="${productFeature.description}"></td>
+              <td><select name='productFeatureTypeId_o_${rowCount}' size="1">
+                <#if productFeature.productFeatureTypeId?has_content>
+                  <option value='${productFeature.productFeatureTypeId}'><#if curProductFeatureType?exists>${curProductFeatureType.get("description",locale)?if_exists}<#else> [${productFeature.productFeatureTypeId}]</#if></option>
+                  <option value='${productFeature.productFeatureTypeId}'>---</option>
+                </#if>
+                <#list productFeatureTypes as productFeatureType>
+                  <option value='${productFeatureType.productFeatureTypeId}'>${productFeatureType.get("description",locale)?if_exists}</option>
+                </#list>
+              </select></td>
+              <td><select name='productFeatureCategoryId_o_${rowCount}' size="1">
+                <#if productFeature.productFeatureCategoryId?has_content>
+                  <#assign curProdFeatCat = productFeature.getRelatedOne("ProductFeatureCategory")>
+                  <option value='${productFeature.productFeatureCategoryId}'>${(curProdFeatCat.description)?if_exists} [${productFeature.productFeatureCategoryId}]</option>
+                  <option value='${productFeature.productFeatureCategoryId}'>---</option>
+                </#if>
+                <#list productFeatureCategories as productFeatureCategory>
+                  <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.description} [${productFeatureCategory.productFeatureCategoryId}]</option>
+                </#list>
+              </select></td>
+              <td><input type="text" size='10' name="uomId_o_${rowCount}" value="${productFeature.uomId?if_exists}"></td>
+              <td><input type="text" size='5' name="numberSpecified_o_${rowCount}" value="${productFeature.numberSpecified?if_exists}"></td>
+              <td><input type="text" size='5' name="defaultAmount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}"></td>
+              <td><input type="text" size='5' name="defaultSequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}"></td>
+              <td><input type="text" size='5' name="idCode_o_${rowCount}" value="${productFeature.idCode?if_exists}"></td>
+              <td><input type="text" size='5' name="abbrev_o_${rowCount}" value="${productFeature.abbrev?if_exists}"></td>
+              <td align="right"><input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"></td>
+            </tr>
+            <#assign rowCount = rowCount + 1>
+            <#-- toggle the row color -->
+            <#if rowClass == "2">
+              <#assign rowClass = "1">
+            <#else>
+              <#assign rowClass = "2">
+            </#if>
+            </#list>
+            <input type="hidden" name="_rowCount" value="${rowCount}">
+            <tr><td colspan="11" align="center"><input type="submit" value='${uiLabelMap.CommonUpdate}'/></td></tr>
+            </form>
         </#if>
-        <#list productFeatureCategories as productFeatureCategory>
-          <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.description} [${productFeatureCategory.productFeatureCategoryId}]</option>
-        </#list>
-      </select></td>
-      <td><input type="text" class='inputBox' size='10' name="uomId_o_${rowCount}" value="${productFeature.uomId?if_exists}"></td>
-      <td><input type="text" class='inputBox' size='5' name="numberSpecified_o_${rowCount}" value="${productFeature.numberSpecified?if_exists}"></td>
-      <td><input type="text" class='inputBox' size='5' name="defaultAmount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}"></td>
-      <td><input type="text" class='inputBox' size='5' name="defaultSequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}"></td>
-      <td><input type="text" class='inputBox' size='5' name="idCode_o_${rowCount}" value="${productFeature.idCode?if_exists}"></td>
-      <td><input type="text" class='inputBox' size='5' name="abbrev_o_${rowCount}" value="${productFeature.abbrev?if_exists}"></td>
-      <td align="right"><input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"></td>
-  </tr>
-<#assign rowCount = rowCount + 1>
-</#list>
-<input type="hidden" name="_rowCount" value="${rowCount}">
-<tr><td colspan="11" align="center"><input type="submit" value='${uiLabelMap.CommonUpdate}'/></td></tr>
-</form>
-</#if>
-</table>
-<br/>
+        </table>
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl Fri Dec 28 09:29:17 2007
@@ -16,43 +16,58 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
-<h1>${uiLabelMap.ProductFeatureGroup}</h1>
-
-<br/>
-<table border="1" cellpadding='2' cellspacing='0'>
-  <tr>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonId}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div></td>
-    <td><div class="tabletext">&nbsp;</div></td>
-    <td><div class="tabletext">&nbsp;</div></td>
-  </tr>
-
-  <#list productFeatureGroups as productFeatureGroup>
-    <tr valign="middle">
-      <FORM method='POST' action='<@ofbizUrl>UpdateProductFeatureGroup</@ofbizUrl>'>
-        <input type='hidden' name="productFeatureGroupId" value="${productFeatureGroup.productFeatureGroupId}">
-        <td><a href='<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId}</@ofbizUrl>' class="buttontext">${productFeatureGroup.productFeatureGroupId}</a></td>
-        <td><input type='text' class='inputBox' size='30' name="description" value="${productFeatureGroup.description?if_exists}"></td>
-        <td><INPUT type="submit" value="${uiLabelMap.CommonUpdate}"></td>
-        <td><a href='<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId}</@ofbizUrl>' class="buttontext">[${uiLabelMap.CommonEdit}]</a></td>
-      </FORM>
-    </tr>
-  </#list>
-</table>
-<br/>
-
-<form method="post" action="<@ofbizUrl>CreateProductFeatureGroup</@ofbizUrl>" style='margin: 0;'>
-  <h2>${uiLabelMap.ProductCreateProductFeatureGroup}:</h2>
-  <br/>
-  <table>
-    <tr>
-      <td><div class='tabletext'>${uiLabelMap.CommonDescription}:</div></td>
-      <td><input type="text" class='inputBox' size='30' name='description' value=''></td>
-    </tr>
-    <tr>
-      <td colspan='2'><input type="submit" value="${uiLabelMap.CommonCreate}"></td>
-    </tr>
-  </table>
-</form>
-<br/>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleEditProductFeatureGroups}</h3>
+    </div>
+    <div class="screenlet-body">
+        <br/>
+        <table cellspacing="0" class="basic-table">
+          <tr class="header-row">
+            <td><b>${uiLabelMap.CommonId}</b></td>
+            <td><b>${uiLabelMap.CommonDescription}</b></td>
+            <td><b>&nbsp;</b></td>
+            <td><b>&nbsp;</b></td>
+          </tr>
+          <#assign rowClass = "2">
+          <#list productFeatureGroups as productFeatureGroup>
+            <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+              <form method='POST' action='<@ofbizUrl>UpdateProductFeatureGroup</@ofbizUrl>'>
+                <input type='hidden' name="productFeatureGroupId" value="${productFeatureGroup.productFeatureGroupId}">
+                <td><a href='<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId}</@ofbizUrl>' class="buttontext">${productFeatureGroup.productFeatureGroupId}</a></td>
+                <td><input type='text' size='30' name="description" value="${productFeatureGroup.description?if_exists}"></td>
+                <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
+                <td><a href='<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${productFeatureGroup.productFeatureGroupId}</@ofbizUrl>' class="buttontext">${uiLabelMap.ProductFeatureGroupAppls}</a></td>
+              </form>
+            </tr>
+            <#-- toggle the row color -->
+            <#if rowClass == "2">
+              <#assign rowClass = "1">
+            <#else>
+              <#assign rowClass = "2">
+            </#if>
+          </#list>
+        </table>
+        <br/>
+    </div>
+</div>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductCreateProductFeatureGroup}</h3>
+    </div>
+    <div class="screenlet-body">
+        <form method="post" action="<@ofbizUrl>CreateProductFeatureGroup</@ofbizUrl>">
+          <br/>
+          <table cellspacing="0" class="basic-table">
+            <tr>
+              <td class="label">${uiLabelMap.CommonDescription}:</td>
+              <td><input type="text" size='30' name='description' value=''></td>
+            </tr>
+            <tr>
+              <td colspan='2'><input type="submit" value="${uiLabelMap.CommonCreate}"></td>
+            </tr>
+          </table>
+        </form>
+        <br/>
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Fri Dec 28 09:29:17 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
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="EditProductFeature" type="single" target="updateProductFeature" title="" default-map-name="productFeature"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         
         <alt-target use-when="productFeature==null" target="createProductFeature"/>
         
@@ -32,7 +32,7 @@
         <!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
         <field use-when="productFeature==null&amp;&amp;productFeatureId==null" name="productFeatureId" title="${uiLabelMap.ProductFeatureId}"><ignored/></field>
 
-        <field name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}" widget-style="selectBox">
+        <field name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}">
             <drop-down>
                 <entity-options entity-name="ProductFeatureType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -40,7 +40,7 @@
             </drop-down>
         </field>
 
-        <field name="productFeatureCategoryId" title="${uiLabelMap.ProductFeatureCategory}" widget-style="selectBox">
+        <field name="productFeatureCategoryId" title="${uiLabelMap.ProductFeatureCategory}">
             <drop-down>
                 <entity-options entity-name="ProductFeatureCategory" description="${description} [${productFeatureCategoryId}]">
                     <entity-order-by field-name="description"/>
@@ -64,7 +64,7 @@
     </form>
 
     <form name="CreateSupplierProductFeature" type="single" target="createSupplierProductFeature" title="" default-map-name="productFeature"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createSupplierProductFeature" default-field-type="edit"/>
         <field name="partyId" title="${uiLabelMap.ProductSuppliers}">
             <drop-down allow-empty="false">
@@ -85,10 +85,10 @@
         <field name="submitForm" title="${uiLabelMap.CommonCreate}"><submit/></field>
     </form>
     <form name="EditSupplierProductFeatures" type="list" target="updateSupplierProductFeature" title="" list-name="supplierProductFeatures"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateSupplierProductFeature" default-field-type="display"/>
         <field name="productFeatureId"><hidden/></field>
-        <field name="partyId" title="${uiLabelMap.ProductSuppliers}" widget-style="tabletext">
+        <field name="partyId" title="${uiLabelMap.ProductSuppliers}">
             <display-entity entity-name="PartyGroup" description="${groupName}"/>
         </field>
 
@@ -106,9 +106,8 @@
         </field>
     </form>
 
-    <form name="ListFeatureTypes" list-name="featureTypes" target="" title="" type="list"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="EditFeatureTypes">
+    <form name="ListFeatureTypes" list-name="featureTypes" target="" title="" type="list" paginate-target="EditFeatureTypes"
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="ProductFeatureType" default-field-type="display"/>
         <field name="productFeatureTypeId"><hidden/></field>
         <field name="parentTypeId"><hidden/></field>
@@ -121,12 +120,12 @@
         </field>
     </form>
     <form name="EditFeatureType" type="single" target="updateProductFeatureType" title="" default-map-name="productFeatureType"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="productFeatureType==null" target="createProductFeatureType"/>
         <auto-fields-entity entity-name="ProductFeatureType"/>
         <field use-when="productFeatureType!=null" name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}"><display/></field>
         <field use-when="productFeatureType==null&amp;&amp;productFeatureTypeId!=null" name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}" tooltip="${uiLabelMap.ProductCouldNotFindProductFeatureType} [${productFeatureTypeId}]"><text size="20" maxlength="20"/></field>
-        <field name="parentTypeId" title="${uiLabelMap.ProductParentType}" widget-style="selectBox">
+        <field name="parentTypeId" title="${uiLabelMap.ProductParentType}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ProductFeatureType" key-field-name="productFeatureTypeId" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -137,7 +136,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListFeatureGroupAppls" type="multi" use-row-submit="false" list-name="productFeatureGroupAndAppls" target="UpdateProductFeatureGroupAppl?productFeatureGroupId=${productFeatureGroupId}" title=""
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productFeatureGroupId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
         <field name="productFeatureId" title="${uiLabelMap.CommonId}"><display/></field>
@@ -157,15 +156,15 @@
         </field>
     </form>
     <form name="QuickApplyFeatureToGroup" type="single" target="CreateProductFeatureGroupAppl" title=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="productFeatureGroupId"><hidden/></field>
         <field name="productFeatureId" title="${uiLabelMap.ProductFeatureId}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="ApplyFeatureCategoryToGroup" type="single" target="EditFeatureGroupAppls"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" title="">
+    <form name="ApplyFeatureCategoryToGroup" type="single" target="EditFeatureGroupAppls" title=""
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="productFeatureGroupId"><hidden/></field>
         <field name="productFeatureCategoryId">
             <drop-down>
@@ -177,7 +176,7 @@
         </field>
     </form>
     <form name="ApplyFeaturesFromCategoryToGroup" type="multi" use-row-submit="true" list-name="productFeatures" target="ApplyFeaturesFromCategoryToGroup?productFeatureGroupId=${productFeatureGroupId}" title=""
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productFeatureGroupId"><hidden/></field>
         <field name="productFeatureId" title="${uiLabelMap.CommonId}"><display/></field>
         <field name="productFeatureTypeId" title="${uiLabelMap.CommonType}">
@@ -191,5 +190,4 @@
           <submit/>
         </field>
     </form>
-</forms>
-
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl Fri Dec 28 09:29:17 2007
@@ -17,10 +17,14 @@
 under the License.
 -->
 
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
-<div class="tabContainer">
-  <a href="<@ofbizUrl>EditFeatureTypes</@ofbizUrl>" class="${selectedClassMap.FeatureType?default(unselectedClassName)}">${uiLabelMap.ProductFeatureType}</a>
-  <a href="<@ofbizUrl>EditFeatureCategories</@ofbizUrl>" class="${selectedClassMap.FeatureCategory?default(unselectedClassName)}">${uiLabelMap.ProductFeatureCategory}</a>
-  <a href="<@ofbizUrl>EditFeatureGroups</@ofbizUrl>" class="${selectedClassMap.FeatureGroup?default(unselectedClassName)}">${uiLabelMap.ProductFeatureGroup}</a>
+<#assign unselectedClassName = "">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}>
+<br/>
+<div class="button-bar tab-bar">
+    <ul>
+        <li><a href="<@ofbizUrl>EditFeatureTypes</@ofbizUrl>" class="${selectedClassMap.FeatureType?default(unselectedClassName)}">${uiLabelMap.ProductFeatureType}</a></li>
+        <li><a href="<@ofbizUrl>EditFeatureCategories</@ofbizUrl>" class="${selectedClassMap.FeatureCategory?default(unselectedClassName)}">${uiLabelMap.ProductFeatureCategory}</a></li>
+        <li><a href="<@ofbizUrl>EditFeatureGroups</@ofbizUrl>" class="${selectedClassMap.FeatureGroup?default(unselectedClassName)}">${uiLabelMap.ProductFeatureGroup}</a></li>
+    </ul>
 </div>
+<br/>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=607295&r1=607294&r2=607295&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Fri Dec 28 09:29:17 2007
@@ -59,7 +59,6 @@
     <screen name="EditFeature">
         <section>
             <actions>
-                <set field="title" value="Edit Feature"/>
                 <set field="titleProperty" value="PageTitleEditFeature"/>
                 <set field="headerItem" value="featurecats"/>
     
@@ -71,10 +70,20 @@
                 <!--<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">-->
                 <decorator-screen name="CommonFeatureDecorator">
                     <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.ProductEditFeature} : ${productFeature.description}</label>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductEditFeature} : ${productFeature.description}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditProductFeature" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="EditProductFeature" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
                         <platform-specific>
                             <html><html-template location="component://product/webapp/catalog/feature/EditFeature.ftl"/></html>
                         </platform-specific>
@@ -86,7 +95,6 @@
     <screen name="EditFeatureTypes">
         <section>
             <actions>
-                <set field="title" value="Edit Feature Types"/>
                 <set field="titleProperty" value="PageTitleEditFeatureTypes"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="tabButtonItem" value="FeatureType"/>
@@ -100,7 +108,20 @@
                         <container>
                             <link target="EditFeatureType" text="${uiLabelMap.ProductNewFeatureType}" style="buttontext"/>
                         </container>
-                        <include-form name="ListFeatureTypes" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditFeatureTypes}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="ListFeatureTypes" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -109,8 +130,7 @@
     <screen name="EditFeatureType">
         <section>
             <actions>
-                <set field="title" value="Edit Feature Type"/>
-                <set field="titleProperty" value="PageTitleEditFeature"/>
+                <set field="titleProperty" value="PageTitleEditFeatureType"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="tabButtonItem" value="FeatureType"/>
     
@@ -120,7 +140,20 @@
             <widgets>
                 <decorator-screen name="CommonFeatureDecorator">
                     <decorator-section name="body">
-                        <include-form name="EditFeatureType" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditFeatureType}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditFeatureType" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -129,7 +162,6 @@
     <screen name="EditFeatureCategories">
         <section>
             <actions>
-                <set field="title" value="Edit Feature Categories"/>
                 <set field="titleProperty" value="PageTitleEditProductFeatureCategories"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="tabButtonItem" value="FeatureCategory"/>
@@ -139,12 +171,38 @@
             <widgets>
                 <decorator-screen name="CommonFeatureDecorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/catalog/feature/CreateFeatureCategory.ftl"/></html>
-                        </platform-specific>
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/catalog/feature/EditFeatureCategories.ftl"/></html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductCreateAProductFeatureCategory}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <platform-specific>
+                                            <html><html-template location="component://product/webapp/catalog/feature/CreateFeatureCategory.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductEditFeatureId}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <platform-specific>
+                                            <html><html-template location="component://product/webapp/catalog/feature/EditFeatureCategories.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -153,7 +211,6 @@
     <screen name="EditFeatureCategoryFeatures">
         <section>
             <actions>
-                <set field="title" value="Edit Feature Category Features"/>
                 <set field="titleProperty" value="PageTitleEditFeatureCategoryFeatures"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="tabButtonItem" value="FeatureCategory"/>
@@ -176,7 +233,6 @@
     <screen name="EditFeatureGroups">
         <section>
             <actions>
-                <set field="title" value="Edit Feature Groups"/>
                 <set field="titleProperty" value="PageTitleEditProductFeatureGroups"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="tabButtonItem" value="FeatureGroup"/>
@@ -188,8 +244,7 @@
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/catalog/feature/EditFeatureGroups.ftl"/></html>
-                        </platform-specific>
-                    </decorator-section>
+                        </platform-specific>                    </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
@@ -197,7 +252,6 @@
     <screen name="EditFeatureGroupAppls">
         <section>
             <actions>
-                <set field="title" value="Product Feature Group Applications"/>
                 <set field="titleProperty" value="ProductEditFeatureGroupAppls"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="tabButtonItem" value="FeatureGroup"/>
@@ -220,19 +274,49 @@
             <widgets>
                 <decorator-screen name="CommonFeatureDecorator">
                     <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.${titleProperty}}</label>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductEditFeatureGroupAppls}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="ListFeatureGroupAppls" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="ListFeatureGroupAppls" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
-                        <container>
-                            <label style="head2">${uiLabelMap.ProductQuickApplyFeature}:</label>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductQuickApplyFeature}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="QuickApplyFeatureToGroup" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="QuickApplyFeatureToGroup" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
-                        <container>
-                            <label style="head2">${uiLabelMap.ProductApplyFeaturesFromCategory}:</label>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.ProductApplyFeaturesFromCategory}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="ApplyFeatureCategoryToGroup" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                                        <include-form name="ApplyFeaturesFromCategoryToGroup" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="ApplyFeatureCategoryToGroup" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
-                        <include-form name="ApplyFeaturesFromCategoryToGroup" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -241,7 +325,6 @@
     <screen name="QuickAddProductFeatures">
         <section>
             <actions>
-                <set field="title" value="Bulk Feature Category Features"/>
                 <set field="titleProperty" value="ProductAddProductFeatureInBulk"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="featureNum" from-field="parameters.featureNum" type="Integer"/>