svn commit: r606465 [1/3] - in /ofbiz/trunk/applications/product: webapp/catalog/category/ 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: r606465 [1/3] - in /ofbiz/trunk/applications/product: webapp/catalog/category/ widget/catalog/

mrisaliti
Author: mrisaliti
Date: Sat Dec 22 08:26:13 2007
New Revision: 606465

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

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl
    ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl
    ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Sat Dec 22 08:26:13 2007
@@ -20,27 +20,25 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="CreateProductCategoryAttribute" type="single" target="createProductCategoryAttribute" title=""
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+    <form name="CreateProductCategoryAttribute" header-row-style="header-row" default-table-style="basic-table" type="single" target="createProductCategoryAttribute" title="">
         <auto-fields-service service-name="createProductCategoryAttribute" default-field-type="edit"/>
         <field name="productCategoryId"><display/></field>
         <field name="submitForm" title="${uiLabelMap.CommonCreate}"><submit/></field>
     </form>
-    <form name="EditProductCategoryAttributes" type="list" target="updateProductCategoryAttribute" title="" list-name="categoryAttributes"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+    <form name="EditProductCategoryAttributes" odd-row-style="alternate-row" default-table-style="basic-table" type="list" target="updateProductCategoryAttribute" title="" list-name="categoryAttributes">
         <auto-fields-service service-name="updateProductCategoryAttribute" default-field-type="display"/>
         <field name="productCategoryId"><hidden/></field>
         <field name="attrValue"><text size="60"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteProductCategoryAttribute?productCategoryId=${productCategoryId}&amp;attrName=${attrName}"
-                description="[${uiLabelMap.CommonDelete}]"/>
+                description="${uiLabelMap.CommonDelete}"/>
         </field>
     </form>
 
     <!-- Product Category Content Forms  -->
     <form name="AddCategoryContentAssoc" type="single" target="addContentToCategory" title="${uiLabelMap.ProductAddProductCategoryContentFromDate}"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="ProductCategoryContent"/>
         <field name="productCategoryId" map-name="productCategory"><hidden/></field>
         <field name="prodCatContentTypeId" widget-style="selectBox">
@@ -53,7 +51,7 @@
         <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}"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="productId"><hidden/></field>
         <field name="productCategoryId" map-name="productCategory"><hidden/></field>
         <field name="prodCatContentTypeId" widget-style="selectBox">
@@ -66,7 +64,8 @@
         <!-- <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">
+    <form name="UpdateCategoryContentAssoc" type="list" target="updateContentToCategory" title="" list-name="productCategoryContentList"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="productCategoryId"><hidden/></field>
         <field name="contentId" title="${uiLabelMap.ProductContent}" widget-style="tabletext">
             <display-entity entity-name="Content" description="${description}" also-hidden="true">
@@ -129,8 +128,8 @@
 
     
     <!-- ProductCategoryLink Forms-->
-    <form name="ListProductCategoryLinks" type="list"  list-name="productCategoryLinks"  target="updateProductCategoryLink" separate-columns="true"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+    <form name="ListProductCategoryLinks" type="list" list-name="productCategoryLinks" target="updateProductCategoryLink" separate-columns="true"
+        title="" odd-row-style="alternate-row" default-table-style="basic-table">
         <actions>
             <entity-condition entity-name="ProductCategoryLink">
                 <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
@@ -140,8 +139,8 @@
         <auto-fields-service service-name="updateProductCategoryLink"/>
         
         <field name="productCategoryId"><hidden/></field>
-        <field name="linkSeqId" widget-style="tabletext"><display/></field>
-        <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field>
+        <field name="linkSeqId"><display/></field>
+        <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="titleText"><text size="20" maxlength="250"/></field>
         <field name="comments"><text size="20" maxlength="250"/></field>
@@ -152,20 +151,20 @@
         <field name="detailSubScreen"><ignored/></field>
         <field name="imageUrl"><ignored/></field>
         <field name="imageTwoUrl"><ignored/></field>      
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}">
             <hyperlink target="deleteProductCategoryLink?productCategoryId=${productCategoryId}&amp;linkSeqId=${linkSeqId}&amp;fromDate=${fromDate}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></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"
-        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="productCategoryLink != null" target="updateProductCategoryLink"/>
         <auto-fields-service service-name="createProductCategoryLink"/>
         <field name="productCategoryId"><hidden/></field>
         <field name="linkSeqId" use-when="productCategoryLink==null"><ignored/></field>
-        <field name="linkSeqId" use-when="productCategoryLink!=null" widget-style="tabletext"><display/></field>
-        <field use-when="productCategoryLink != null" name="fromDate" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+        <field name="linkSeqId" use-when="productCategoryLink!=null"><display/></field>
+        <field use-when="productCategoryLink != null" name="fromDate" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field use-when="productCategoryLink == null" name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="sequenceNum" title="${uiLabelMap.CommonSequence}"><text maxlength="5" size="5"/></field>
@@ -183,8 +182,8 @@
             </drop-down>
         </field>
         <field name="detailSubScreen" tooltip="example: component://ecommerce/widget/CatalogScreens.xml#categorydetail"><text size="60" maxlength="255"/></field>
-        <field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="clearFormButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="productCategoryLink!=null" widget-style="buttontext"><hyperlink target="EditProductCategoryLinks?productCategoryId=${productCategoryId}" target-type="intra-app" description="Clear Form"/></field>
+        <field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+        <field name="clearFormButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="productCategoryLink!=null"><hyperlink target="EditProductCategoryLinks?productCategoryId=${productCategoryId}" target-type="intra-app" description="Clear Form"/></field>
     </form>
 </forms>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl Sat Dec 22 08:26:13 2007
@@ -18,18 +18,21 @@
 -->
 
 <#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign unselectedClassName = "">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}>
 
-    <div class="tabContainer">
-        <a href="<@ofbizUrl>EditCategory?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategory?default(unselectedClassName)}">${uiLabelMap.ProductCategory}</a>
-        <a href="<@ofbizUrl>EditCategoryContent?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryContent?default(unselectedClassName)}">${uiLabelMap.ProductCategoryContent}</a>
-        <a href="<@ofbizUrl>EditCategoryRollup?showProductCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryRollup?default(unselectedClassName)}">${uiLabelMap.ProductRollupShort}</a>
-        <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryProducts?default(unselectedClassName)}">${uiLabelMap.ProductProducts}</a>
-        <a href="<@ofbizUrl>EditCategoryProdCatalogs?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryProdCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a>
-        <a href="<@ofbizUrl>EditCategoryFeatureCats?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryFeatureCats?default(unselectedClassName)}">${uiLabelMap.ProductFeatureCats}</a>
-        <a href="<@ofbizUrl>EditCategoryParties?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryParties?default(unselectedClassName)}">${uiLabelMap.PartyParties}</a>
-        <a href="<@ofbizUrl>EditCategoryAttributes?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryAttributes?default(unselectedClassName)}">${uiLabelMap.ProductAttributes}</a>
-        <a href="<@ofbizUrl>EditProductCategoryLinks?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditProductCategoryLinks?default(unselectedClassName)}">${uiLabelMap.ProductCategoryLinks}</a>
+    <div class="button-bar tab-bar">
+        <ul>
+            <li><a href="<@ofbizUrl>EditCategory?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategory?default(unselectedClassName)}">${uiLabelMap.ProductCategory}</a></li>
+            <li><a href="<@ofbizUrl>EditCategoryContent?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryContent?default(unselectedClassName)}">${uiLabelMap.ProductCategoryContent}</a></li>
+            <li><a href="<@ofbizUrl>EditCategoryRollup?showProductCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryRollup?default(unselectedClassName)}">${uiLabelMap.ProductRollupShort}</a></li>
+            <li><a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryProducts?default(unselectedClassName)}">${uiLabelMap.ProductProducts}</a></li>
+            <li><a href="<@ofbizUrl>EditCategoryProdCatalogs?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryProdCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a></li>
+            <li><a href="<@ofbizUrl>EditCategoryFeatureCats?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryFeatureCats?default(unselectedClassName)}">${uiLabelMap.ProductFeatureCats}</a></li>
+            <li><a href="<@ofbizUrl>EditCategoryParties?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryParties?default(unselectedClassName)}">${uiLabelMap.PartyParties}</a></li>
+            <li><a href="<@ofbizUrl>EditCategoryAttributes?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryAttributes?default(unselectedClassName)}">${uiLabelMap.ProductAttributes}</a></li>
+            <li><a href="<@ofbizUrl>EditProductCategoryLinks?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditProductCategoryLinks?default(unselectedClassName)}">${uiLabelMap.ProductCategoryLinks}</a></li>
+        </ul>
+        <br/>
     </div>
     

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Sat Dec 22 08:26:13 2007
@@ -21,208 +21,228 @@
   eval('document.productCategoryForm.' + type + 'ImageUrl.value=nameValue;');
 };
 </script>
-    <#if fileType?has_content>
-        <h3>${uiLabelMap.ProductResultOfImageUpload}</h3>
-        <#if !(clientFileName?has_content)>
-            <div class='tabletext'>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
-        <#else>
-            <div class='tabletext'>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div>
-            <div class='tabletext'>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div>
-            <div class='tabletext'>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div>
-            <div class='tabletext'>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div>
-        </#if>
-    <br/>
-    </#if>
-
-
-<br/>
-
+<#if fileType?has_content>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductResultOfImageUpload}</h3>
+            <#if !(clientFileName?has_content)>
+                <div class='tabletext'>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
+            <#else>
+                <div class='tabletext'>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div>
+                <div class='tabletext'>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div>
+                <div class='tabletext'>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div>
+                <div class='tabletext'>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div>
+            </#if>
+        </div>        
+    </div>
+</#if>
+<div class="screenlet">
 <#if ! productCategory?has_content>
-  <#if productCategoryId?has_content>
-    <h3>${uiLabelMap.ProductCouldNotFindProductCategoryWithId} "${productCategoryId}".</h3>
-    <form action="<@ofbizUrl>createProductCategory</@ofbizUrl>" method="post" style="margin: 0;" name="productCategoryForm">
-    <table border="0" cellpadding="2" cellspacing="0">
-    <tr>
-      <td align="right"><div class="tabletext">${uiLabelMap.ProductProductCategoryId}</div></td>
-      <td>&nbsp;</td>
-      <td>
-        <input type="text" name="productCategoryId" size="20" maxlength="40" value="${productCategoryId}" class="inputBox"/>
-      </td>
-    </tr>
-  <#else>
-    <form action="<@ofbizUrl>createProductCategory</@ofbizUrl>" method="post" style="margin: 0;" name="productCategoryForm">
-    <table border="0" cellpadding="2" cellspacing="0">
-    <tr>
-      <td align="right"><div class="tabletext">${uiLabelMap.ProductProductCategoryId}</div></td>
-      <td>&nbsp;</td>
-      <td>
-        <input type="text" name="productCategoryId" size="20" maxlength="40" value="" class="inputBox"/>
-      </td>
-    </tr>
-  </#if>
+    <#if productCategoryId?has_content>    
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductCouldNotFindProductCategoryWithId} "${productCategoryId}".</h3>
+        </div>
+        <div class="screenlet-body">
+            <form action="<@ofbizUrl>createProductCategory</@ofbizUrl>" method="post" style="margin: 0;" name="productCategoryForm">
+                <table cellspacing="0" class="basic-table">
+                    <tr>
+                        <td align="right" class="label">${uiLabelMap.ProductProductCategoryId}</td>
+                        <td>&nbsp;</td>
+                        <td>
+                            <input type="text" name="productCategoryId" size="20" maxlength="40" value="${productCategoryId}" class="inputBox"/>
+                        </td>
+                    </tr>
+    <#else>
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.PageTitleCreateProductCategory}</h3>
+        </div>
+        <div class="screenlet-body">
+            <form action="<@ofbizUrl>createProductCategory</@ofbizUrl>" method="post" style="margin: 0;" name="productCategoryForm">
+                <table cellspacing="0" class="basic-table">
+                    <tr>
+                        <td align="right" class="label">${uiLabelMap.ProductProductCategoryId}</td>
+                        <td>&nbsp;</td>
+                        <td>
+                            <input type="text" name="productCategoryId" size="20" maxlength="40" value="" class="inputBox"/>
+                        </td>
+                    </tr>
+    </#if>
 <#else>
-  <form action="<@ofbizUrl>updateProductCategory</@ofbizUrl>" method="post" style="margin: 0;" name="productCategoryForm">
-  <input type="hidden" name="productCategoryId" value="${productCategoryId}"/>
-  <table border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <td align="right"><div class="tabletext">${uiLabelMap.ProductProductCategoryId}</div></td>
-    <td>&nbsp;</td>
-    <td>
-      <b>${productCategoryId}</b> (${uiLabelMap.ProductNotModificationRecrationCategory}.)
-    </td>
-  </tr>
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleEditProductCategories}</h3>
+    </div>
+    <div class="screenlet-body">
+        <form action="<@ofbizUrl>updateProductCategory</@ofbizUrl>" method="post" style="margin: 0;" name="productCategoryForm">
+            <input type="hidden" name="productCategoryId" value="${productCategoryId}"/>
+            <table cellspacing="0" class="basic-table">
+                <tr>
+                    <td align="right" class="label">${uiLabelMap.ProductProductCategoryId}</td>
+                    <td>&nbsp;</td>
+                    <td>
+                      <b>${productCategoryId}</b> (${uiLabelMap.ProductNotModificationRecrationCategory}.)
+                    </td>
+                </tr>
 </#if>
-  <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductProductCategoryType}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%">
-      <select name="productCategoryTypeId" size="1" class="selectBox">
-        <#list productCategoryTypes as productCategoryTypeData>
-          <option <#if ((productCategory?has_content) && (productCategory.productCategoryTypeId==productCategoryTypeData.productCategoryTypeId)) || (productCategoryTypeData.productCategoryTypeId=="CATALOG_CATEGORY")>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
-       </#list>
-      </select>
-    </td>
-  </tr>
-  <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductName}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60" class="inputBox"/></td>
-  </tr>
-  <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductDescription}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%"><textarea class="textAreaBox" name="description" cols="60" rows="2"><#if productCategory?has_content>${(productCategory.description)?if_exists}</#if></textarea></td>
-  </tr>
-<#--
-  <tr>
-    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ProductLongDescription}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%"><textarea cols="60" rows="3" name="longDescription" maxlength="2000" class="textAreaBox"><#if productCategory?has_content>${productCategory.longDescription?if_exists}</#if></textarea></td>
-  </tr>
--->
-        <tr>
-            <td width="20%" align="right" valign="top">
-                <div class="tabletext">${uiLabelMap.ProductCategoryImageUrl}</div>
-                <#if (productCategory.categoryImageUrl)?exists>
-                    <a href="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a>
-                </#if>
-            </td>
-            <td>&nbsp;</td>
-            <td width="80%" colspan="4" valign="top">
-            <input type="text" class="inputBox" name="categoryImageUrl" value="${(productCategory.categoryImageUrl)?default('')}" size="60" maxlength="255"/>
-            <#if productCategory?has_content>
-                <div>
-                <span class="tabletext">${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
-                <a href="javascript:insertImageName('category','${imageNameCategory}.jpg');" class="buttontext">[.jpg]</a>
-                <a href="javascript:insertImageName('category','${imageNameCategory}.gif');" class="buttontext">[.gif]</a>
-                <a href="javascript:insertImageName('category','');" class="buttontext">[${uiLabelMap.CommonClear}]</a>
-                </div>
-            </#if>
-            </td>
-        </tr>
-        <tr>
-            <td width="20%" align="right" valign="top">
-                <div class="tabletext">${uiLabelMap.ProductLinkOneImageUrl}</div>
-                <#if (productCategory.linkOneImageUrl)?exists>
-                    <a href="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a>
-                </#if>
-            </td>
-            <td>&nbsp;</td>
-            <td width="80%" colspan="4" valign="top">
-            <input type="text" class="inputBox" name="linkOneImageUrl" value="${(productCategory.linkOneImageUrl)?default('')}" size="60" maxlength="255"/>
-            <#if productCategory?has_content>
-                <div>
-                <span class="tabletext">${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
-                <a href="javascript:insertImageName('linkOne','${imageNameLinkOne}.jpg');" class="buttontext">[.jpg]</a>
-                <a href="javascript:insertImageName('linkOne','${imageNameLinkOne}.gif');" class="buttontext">[.gif]</a>
-                <a href="javascript:insertImageName('linkOne','');" class="buttontext">[${uiLabelMap.CommonClear}]</a>
-                </div>
-            </#if>
-            </td>
-        </tr>
-        <tr>
-            <td width="20%" align="right" valign="top">
-                <div class="tabletext">${uiLabelMap.ProductLinkTwoImageUrl}</div>
-                <#if (productCategory.linkTwoImageUrl)?exists>
-                    <a href="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a>
-                </#if>
-            </td>
-            <td>&nbsp;</td>
-            <td width="80%" colspan="4" valign="top">
-            <input type="text" class="inputBox" name="linkTwoImageUrl" value="${(productCategory.linkTwoImageUrl)?default('')}" size="60" maxlength="255"/>
-            <#if productCategory?has_content>
-                <div>
-                <span class="tabletext">${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
-                <a href="javascript:insertImageName('linkTwo','${imageNameLinkTwo}.jpg');" class="buttontext">[.jpg]</a>
-                <a href="javascript:insertImageName('linkTwo','${imageNameLinkTwo}.gif');" class="buttontext">[.gif]</a>
-                <a href="javascript:insertImageName('linkTwo','');" class="buttontext">[${uiLabelMap.CommonClear}]</a>
-                </div>
-            </#if>
-            </td>
-       </tr>
-
-  <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductDetailScreen}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%">
-        <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250" class="inputBox"/>
-        <br/><span class="tabletext">${uiLabelMap.ProductDefaultsTo} &quot;categorydetail&quot;, ${uiLabelMap.ProductDetailScreenMessage}: &quot;component://ecommerce/widget/CatalogScreens.xml#categorydetail&quot;</span>
-    </td>
-  </tr>
-
-  <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductPrimaryParentCategory}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%">
-      <input type="text" class="inputBox" name="primaryParentCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
-      <a href="javascript:call_fieldlookup2(document.productCategoryForm.primaryParentCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-    <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"/></td>
-  </tr>
-</table>
-</form>
-<br/>
-  <#if productCategoryId?has_content>
-    <hr class="sepbar"/>
-
+                <tr>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductProductCategoryType}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%">
+                        <select name="productCategoryTypeId" size="1" class="selectBox">
+                        <#list productCategoryTypes as productCategoryTypeData>
+                        <option <#if ((productCategory?has_content) && (productCategory.productCategoryTypeId==productCategoryTypeData.productCategoryTypeId)) || (productCategoryTypeData.productCategoryTypeId=="CATALOG_CATEGORY")>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
+                        </#list>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductName}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60" class="inputBox"/></td>
+                </tr>
+                <tr>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductDescription}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%"><textarea class="textAreaBox" name="description" cols="60" rows="2"><#if productCategory?has_content>${(productCategory.description)?if_exists}</#if></textarea></td>
+                </tr>
+                <tr>
+                    <td width="20%" align="right" valign="top" class="label">
+                        ${uiLabelMap.ProductCategoryImageUrl}
+                        <#if (productCategory.categoryImageUrl)?exists>
+                            <a href="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a>
+                        </#if>
+                    </td>
+                    <td>&nbsp;</td>
+                    <td width="80%" colspan="4" valign="top">
+                        <input type="text" class="inputBox" name="categoryImageUrl" value="${(productCategory.categoryImageUrl)?default('')}" size="60" maxlength="255"/>
+                        <#if productCategory?has_content>
+                            <div>
+                            <span class="tabletext">${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
+                            <a href="javascript:insertImageName('category','${imageNameCategory}.jpg');" class="buttontext">[.jpg]</a>
+                            <a href="javascript:insertImageName('category','${imageNameCategory}.gif');" class="buttontext">[.gif]</a>
+                            <a href="javascript:insertImageName('category','');" class="buttontext">[${uiLabelMap.CommonClear}]</a>
+                            </div>
+                        </#if>
+                    </td>
+                </tr>
+                <tr>
+                    <td width="20%" align="right" valign="top" class="label">
+                        ${uiLabelMap.ProductLinkOneImageUrl}
+                        <#if (productCategory.linkOneImageUrl)?exists>
+                            <a href="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a>
+                        </#if>
+                    </td>
+                    <td>&nbsp;</td>
+                    <td width="80%" colspan="4" valign="top">
+                        <input type="text" class="inputBox" name="linkOneImageUrl" value="${(productCategory.linkOneImageUrl)?default('')}" size="60" maxlength="255"/>
+                        <#if productCategory?has_content>
+                            <div>
+                                <span class="tabletext">${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
+                                <a href="javascript:insertImageName('linkOne','${imageNameLinkOne}.jpg');" class="buttontext">[.jpg]</a>
+                                <a href="javascript:insertImageName('linkOne','${imageNameLinkOne}.gif');" class="buttontext">[.gif]</a>
+                                <a href="javascript:insertImageName('linkOne','');" class="buttontext">[${uiLabelMap.CommonClear}]</a>
+                            </div>
+                        </#if>
+                    </td>
+                </tr>
+                <tr>
+                    <td width="20%" align="right" valign="top" class="label">
+                        ${uiLabelMap.ProductLinkTwoImageUrl}
+                        <#if (productCategory.linkTwoImageUrl)?exists>
+                            <a href="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" height="40" width="40"></a>
+                        </#if>
+                    </td>
+                    <td>&nbsp;</td>
+                    <td width="80%" colspan="4" valign="top">
+                        <input type="text" class="inputBox" name="linkTwoImageUrl" value="${(productCategory.linkTwoImageUrl)?default('')}" size="60" maxlength="255"/>
+                        <#if productCategory?has_content>
+                            <div>
+                                <span class="tabletext">${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
+                                <a href="javascript:insertImageName('linkTwo','${imageNameLinkTwo}.jpg');" class="buttontext">[.jpg]</a>
+                                <a href="javascript:insertImageName('linkTwo','${imageNameLinkTwo}.gif');" class="buttontext">[.gif]</a>
+                                <a href="javascript:insertImageName('linkTwo','');" class="buttontext">[${uiLabelMap.CommonClear}]</a>
+                            </div>
+                        </#if>
+                    </td>
+                </tr>
+                <tr>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductDetailScreen}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%">
+                        <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250" class="inputBox"/>
+                        <br/><span class="tabletext">${uiLabelMap.ProductDefaultsTo} &quot;categorydetail&quot;, ${uiLabelMap.ProductDetailScreenMessage}: &quot;component://ecommerce/widget/CatalogScreens.xml#categorydetail&quot;</span>
+                    </td>
+                </tr>
+                <tr>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductPrimaryParentCategory}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%">
+                        <input type="text" class="inputBox" name="primaryParentCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
+                        <a href="javascript:call_fieldlookup2(document.productCategoryForm.primaryParentCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2">&nbsp;</td>
+                    <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"/></td>
+                </tr>
+            </table>
+        </form>
+    </div>
+</div>
+<#if productCategoryId?has_content>
     <script language="JavaScript" type="text/javascript">
         function setUploadUrl(newUrl) {
         var toExec = 'document.imageUploadForm.action="' + newUrl + '";';
         eval(toExec);
         };
     </script>
-    <h3>${uiLabelMap.CategoryUploadImage}</h3>
-    <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId?if_exists}&amp;upload_file_type=category</@ofbizUrl>" name="imageUploadForm">
-        <input type="file" class="inputBox" size="50" name="fname"/>
-        <br/>
-        <span class="tabletext">
-            <input class="radioButton" type="radio" name="upload_file_type_bogus" value="category" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&amp;upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl}
-            <input class="radioButton" type="radio" name="upload_file_type_bogus" value="linkOne" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&amp;upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl}
-            <input class="radioButton" type="radio" name="upload_file_type_bogus" value="linkTwo"onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&amp;upload_file_type=linkTwo</@ofbizUrl>");'/>${uiLabelMap.ProductLinkTwoImageUrl}
-        </span>
-        <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"/>
-    </form>
-    <hr/>
-    <h2>${uiLabelMap.ProductDuplicateProductCategory}</h2>
-    <form action="/catalog/control/DuplicateProductCategory" method="post" style="margin: 0;">
-        <span class="tabletext">${uiLabelMap.ProductDuplicateProductCategorySelected}:</span>
-        <input type=hidden name="oldProductCategoryId" value="${productCategoryId}"/>
-        <div>
-            <input type="text" class="inputBox" size="20" maxlength="20" name="productCategoryId"/>&nbsp;<input type=submit class="smallSubmit" value="${uiLabelMap.CommonGo}"/>
-        </div>
-        <div class="tabletext">
-            <b>${uiLabelMap.CommonDuplicate}:</b>
-            ${uiLabelMap.ProductCategoryContent}&nbsp;<input type="checkbox" class="checkBox" name="duplicateContent" value="Y" checked />
-            ${uiLabelMap.ProductCategoryRollupParentCategories}&nbsp;<input type="checkbox" class="checkBox" name="duplicateParentRollup" value="Y" checked />
-            ${uiLabelMap.ProductCategoryRollupChildCategories}&nbsp;<input type="checkbox" class="checkBox" name="duplicateChildRollup" value="Y" />
-            ${uiLabelMap.ProductProducts}&nbsp;<input type="checkbox" class="checkBox" name="duplicateMembers" value="Y" checked />
-            ${uiLabelMap.ProductCatalogs}&nbsp;<input type="checkbox" class="checkBox" name="duplicateCatalogs" value="Y" checked />
-            ${uiLabelMap.ProductFeatures}&nbsp;<input type="checkbox" class="checkBox" name="duplicateFeatures" value="Y" checked />
-            ${uiLabelMap.PartyParties}&nbsp;<input type="checkbox" class="checkBox" name="duplicateRoles" value="Y" checked />
-            ${uiLabelMap.ProductAttributes}&nbsp;<input type="checkbox" class="checkBox" name="duplicateAttributes" value="Y" checked />
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.CategoryUploadImage}</h3>
+        </div>
+        <div class="screenlet-body">    
+            <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId?if_exists}&amp;upload_file_type=category</@ofbizUrl>" name="imageUploadForm">
+                <table cellspacing="0" class="basic-table">
+                    <tr><td>
+                        <input type="file" class="inputBox" size="50" name="fname"/>
+                        <br/>
+                        <span>
+                            <input class="radioButton" type="radio" name="upload_file_type_bogus" value="category" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&amp;upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl}
+                            <input class="radioButton" type="radio" name="upload_file_type_bogus" value="linkOne" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&amp;upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl}
+                            <input class="radioButton" type="radio" name="upload_file_type_bogus" value="linkTwo"onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&amp;upload_file_type=linkTwo</@ofbizUrl>");'/>${uiLabelMap.ProductLinkTwoImageUrl}
+                        </span>
+                        <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"/>
+                    </td></tr>
+                </table>
+            </form>
+        </div>
+    </div>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductDuplicateProductCategory}</h3>
+        </div>
+        <div class="screenlet-body">  
+            <form action="/catalog/control/DuplicateProductCategory" method="post" style="margin: 0;">
+                <table cellspacing="0" class="basic-table">                
+                    <tr><td>
+                        <span class="tabletext">${uiLabelMap.ProductDuplicateProductCategorySelected}:</span>
+                        <input type=hidden name="oldProductCategoryId" value="${productCategoryId}"/>
+                        <div>
+                            <input type="text" class="inputBox" size="20" maxlength="20" name="productCategoryId"/>&nbsp;<input type=submit class="smallSubmit" value="${uiLabelMap.CommonGo}"/>
+                        </div>
+                        <div>
+                            <b>${uiLabelMap.CommonDuplicate}:</b>
+                            ${uiLabelMap.ProductCategoryContent}&nbsp;<input type="checkbox" class="checkBox" name="duplicateContent" value="Y" checked />
+                            ${uiLabelMap.ProductCategoryRollupParentCategories}&nbsp;<input type="checkbox" class="checkBox" name="duplicateParentRollup" value="Y" checked />
+                            ${uiLabelMap.ProductCategoryRollupChildCategories}&nbsp;<input type="checkbox" class="checkBox" name="duplicateChildRollup" value="Y" />
+                            ${uiLabelMap.ProductProducts}&nbsp;<input type="checkbox" class="checkBox" name="duplicateMembers" value="Y" checked />
+                            ${uiLabelMap.ProductCatalogs}&nbsp;<input type="checkbox" class="checkBox" name="duplicateCatalogs" value="Y" checked />
+                            ${uiLabelMap.ProductFeatures}&nbsp;<input type="checkbox" class="checkBox" name="duplicateFeatures" value="Y" checked />
+                            ${uiLabelMap.PartyParties}&nbsp;<input type="checkbox" class="checkBox" name="duplicateRoles" value="Y" checked />
+                            ${uiLabelMap.ProductAttributes}&nbsp;<input type="checkbox" class="checkBox" name="duplicateAttributes" value="Y" checked />
+                        </div>
+                    </td></tr>
+                </table>
+            </form>
         </div>
-    </form>
-  </#if>
+    </div>
+</#if>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl Sat Dec 22 08:26:13 2007
@@ -16,59 +16,61 @@
 specific language governing permissions and limitations
 under the License.
 -->
-    
-<hr class="sepbar"/>
-
-<h2>${uiLabelMap.ProductOverrideSimpleFields}</h2>
-<form action="<@ofbizUrl>updateCategoryContent</@ofbizUrl>" method="post" style="margin: 0;" name="categoryForm">
-<table border="0" cellpadding="2" cellspacing="0">
-<input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
-    <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductProductCategoryType}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%">
-      <select name="productCategoryTypeId" size="1" class="selectBox">
-        <option value="">&nbsp;</option>
-        <#list productCategoryTypes as productCategoryTypeData>
-          <option <#if productCategory?has_content><#if productCategory.productCategoryTypeId==productCategoryTypeData.productCategoryTypeId> selected</#if></#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
-       </#list>
-      </select>
-    </td>
-  </tr>    
-        
-  <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductName}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60" class="inputBox"/></td>
-  </tr>
-  <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductDescription}</div></td>
-    <td>&nbsp;</td>
-    <td width="80%" colspan="4" valign="top">
-        <textarea class="textAreaBox" name="description" cols="60" rows="2">${(productCategory.description)?if_exists}</textarea>
-    </td>
-  </tr>
-  <tr>
-    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ProductLongDescription}</div></td>
-    <td>&nbsp;</td>
-    <td width="80%" colspan="4" valign="top">
-       <textarea class="textAreaBox" name="longDescription" cols="60" rows="7">${(productCategory.longDescription)?if_exists}</textarea>
-    </td>
-  </tr>
-  <tr>
-    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductDetailScreen}</div></td>
-    <td>&nbsp;</td>
-    <td width="74%">
-        <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250" class="inputBox">
-        <br/><span class="tabletext">${uiLabelMap.ProductDefaultsTo} &quot;categorydetail&quot;, ${uiLabelMap.ProductDetailScreenMessage}: &quot;component://ecommerce/widget/CatalogScreens.xml#categorydetail&quot;</span>
-    </td>
-  </tr>
-
-<tr>
-    <td colspan="2">&nbsp;</td>
-    <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td>
-    <td colspan="3">&nbsp;</td>
-</tr>
-</table>
-</form>
 <hr class="sepbar"/>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.ProductOverrideSimpleFields}</h3>
+    </div>
+    <div class="screenlet-body">        
+        <form action="<@ofbizUrl>updateCategoryContent</@ofbizUrl>" method="post" style="margin: 0;" name="categoryForm">
+            <table cellspacing="0" class="basic-table">
+                <tr>
+                    <td width="26%" align="right" class="label"><input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">${uiLabelMap.ProductProductCategoryType}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%">
+                        <select name="productCategoryTypeId" size="1" class="selectBox">
+                        <option value="">&nbsp;</option>
+                        <#list productCategoryTypes as productCategoryTypeData>
+                            <option <#if productCategory?has_content><#if productCategory.productCategoryTypeId==productCategoryTypeData.productCategoryTypeId> selected</#if></#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option>
+                        </#list>
+                        </select>
+                    </td>
+                </tr>            
+                <tr>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductName}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60" class="inputBox"/></td>
+                </tr>
+                <tr>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductDescription}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%" colspan="4" valign="top">
+                        <textarea class="textAreaBox" name="description" cols="60" rows="2">${(productCategory.description)?if_exists}</textarea>
+                    </td>
+                </tr>
+                <tr>
+                    <td width="26%" align="right" valign="top" class="label">${uiLabelMap.ProductLongDescription}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%" colspan="4" valign="top">
+                        <textarea class="textAreaBox" name="longDescription" cols="60" rows="7">${(productCategory.longDescription)?if_exists}</textarea>
+                    </td>
+                </tr>
+                <tr>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductDetailScreen}</td>
+                    <td>&nbsp;</td>
+                    <td width="74%">
+                        <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250" class="inputBox">
+                        <br/>
+                        <span class="tabletext">${uiLabelMap.ProductDefaultsTo} &quot;categorydetail&quot;, ${uiLabelMap.ProductDetailScreenMessage}: &quot;component://ecommerce/widget/CatalogScreens.xml#categorydetail&quot;</span>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2">&nbsp;</td>
+                    <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td>
+                    <td colspan="3">&nbsp;</td>
+                </tr>
+            </table>
+        </form>
+    </div>
+</div>
+<hr class="sepbar"/>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Sat Dec 22 08:26:13 2007
@@ -18,105 +18,148 @@
 -->
 <a href="<@ofbizUrl>attachProductFeaturesToCategory?productCategoryId=${productCategoryId?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductFeatureCategoryAttach}]</a>
 <#if productCategoryId?exists && productCategory?exists>    
-    <#-- Feature Groups -->
-    <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductFeatureGroup}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.CommonFromDateTime}</b></div></td>
-        <td align="center"><div class="tabletext"><b>${uiLabelMap.CommonThruDateTime}</b></div></td>
-        <td><div class="tabletext"><b>&nbsp;</b></div></td>
-    </tr>
-    <#assign line = 0>
-    <#list productFeatureCatGrpAppls as productFeatureCatGrpAppl>
-    <#assign line = line + 1>
-    <#assign productFeatureGroup = (productFeatureCatGrpAppl.getRelatedOne("ProductFeatureGroup"))?default(null)>
-    <tr valign="middle">
-        <td><a href="<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}</@ofbizUrl>" class="buttontext"><#if productFeatureGroup?exists>${(productFeatureGroup.description)?if_exists}</#if> [${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}]</a></td>
-        <#assign hasntStarted = false>
-        <#if (productFeatureCatGrpAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productFeatureCatGrpAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-        <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(productFeatureCatGrpAppl.fromDate)?if_exists}</div></td>
-        <td align="center">
-            <FORM method="post" action="<@ofbizUrl>updateProductFeatureCatGrpAppl</@ofbizUrl>" name="lineFormGrp${line}">
-                <#assign hasExpired = false>
-                <#if (productFeatureCatGrpAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCatGrpAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
-                <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}">
-                <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}">
-                <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}">
-                <input type="text" size="25" name="thruDate" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
-                <a href="javascript:call_cal(document.lineFormGrp${line}.thruDate, '${(productFeatureCatGrpAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-                <INPUT type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
-            </FORM>
-        </td>
-        <td align="center">
-        <a href="<@ofbizUrl>removeProductFeatureCatGrpAppl?productFeatureGroupId=${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}&productCategoryId=${(productFeatureCatGrpAppl.productCategoryId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productFeatureCatGrpAppl.getTimestamp("fromDate").toString())}</@ofbizUrl>" class="buttontext">
-        [${uiLabelMap.CommonDelete}]</a>
-        </td>
-    </tr>
-    </#list>
-    </table>
-    <form method="post" action="<@ofbizUrl>createProductFeatureCatGrpAppl</@ofbizUrl>" style="margin: 0;" name="addNewGroupForm">
-    <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
-    
-    <h2>${uiLabelMap.ProductApplyFeatureGroupFromCategory}:</h2>
-    <select name="productFeatureGroupId" class="selectBox">
-    <#list productFeatureGroups as productFeatureGroup>
-        <option value="${(productFeatureGroup.productFeatureGroupId)?if_exists}">${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option>
-    </#list>
-    </select>
-    <input type="text" size="25" name="fromDate" class="inputBox">
-    <a href="javascript:call_cal(document.addNewGroupForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-    <input type="submit" value="${uiLabelMap.CommonAdd}">
-    </form>
-    <br/>
-    <br/>
-
-    <#-- Feature Categories -->
-    <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductFeatureCategory}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.CommonFromDateTime}</b></div></td>
-        <td align="center"><div class="tabletext"><b>${uiLabelMap.CommonThruDateTime}</b></div></td>
-        <td><div class="tabletext"><b>&nbsp;</b></div></td>
-    </tr>
-    <#assign line = 0>
-    <#list productFeatureCategoryAppls as productFeatureCategoryAppl>
-    <#assign line = line + 1>
-    <#assign productFeatureCategory = (productFeatureCategoryAppl.getRelatedOne("ProductFeatureCategory"))?default(null)>
-    <tr valign="middle">
-        <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}</@ofbizUrl>" class="buttontext"><#if productFeatureCategory?exists>${(productFeatureCategory.description)?if_exists}</#if> [${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}]</a></td>
-        <#assign hasntStarted = false>
-        <#if (productFeatureCategoryAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productFeatureCategoryAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-        <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(productFeatureCategoryAppl.fromDate)?if_exists}</div></td>
-        <td align="center">
-            <FORM method="post" action="<@ofbizUrl>updateProductFeatureCategoryAppl</@ofbizUrl>" name="lineForm${line}">
-                <#assign hasExpired = false>
-                <#if (productFeatureCategoryAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCategoryAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
-                <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}">
-                <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}">
-                <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}">
-                <input type="text" size="25" name="thruDate" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
-                <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productFeatureCategoryAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-                <INPUT type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
-            </FORM>
-        </td>
-        <td align="center">
-        <a href="<@ofbizUrl>removeProductFeatureCategoryAppl?productFeatureCategoryId=${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}&productCategoryId=${(productFeatureCategoryAppl.productCategoryId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productFeatureCategoryAppl.getTimestamp("fromDate").toString())}</@ofbizUrl>" class="buttontext">
-        [${uiLabelMap.CommonDelete}]</a>
-        </td>
-    </tr>
-    </#list>
-    </table>
-    <form method="post" action="<@ofbizUrl>createProductFeatureCategoryAppl</@ofbizUrl>" style="margin: 0;" name="addNewCategoryForm">
-    <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
-    
-    <h2>${uiLabelMap.ProductApplyFeatureGroupToCategory}:</h2>
-    <select name="productFeatureCategoryId" class="selectBox">
-    <#list productFeatureCategories as productFeatureCategory>
-        <option value="${(productFeatureCategory.productFeatureCategoryId)?if_exists}">${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option>
-    </#list>
-    </select>
-    <input type="text" size="25" name="fromDate" class="inputBox">
-    <a href="javascript:call_cal(document.addNewCategoryForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-    <input type="submit" value="${uiLabelMap.CommonAdd}">
-    </form>
-</#if>    
+    <div class="screenlet-title-bar">
+        <h3>${uiLabelMap.PageTitleEditCategoryFeatureCategories}</h3>
+    </div>
+    <div class="screenlet">
+        <div class="screenlet-body">
+            <#-- Feature Groups -->
+            <table cellspacing="0" class="basic-table">
+                <tr class="header-row">
+                    <td><b>${uiLabelMap.ProductFeatureGroup}</b></td>
+                    <td><b>${uiLabelMap.CommonFromDateTime}</b></td>
+                    <td align="center"><b>${uiLabelMap.CommonThruDateTime}</b></td>
+                    <td><b>&nbsp;</b></div></td>
+                </tr>
+                <#assign line = 0>
+                <#assign rowClass = "2">
+                <#list productFeatureCatGrpAppls as productFeatureCatGrpAppl>
+                <#assign line = line + 1>
+                <#assign productFeatureGroup = (productFeatureCatGrpAppl.getRelatedOne("ProductFeatureGroup"))?default(null)>
+                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                    <td><a href="<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}</@ofbizUrl>" class="buttontext"><#if productFeatureGroup?exists>${(productFeatureGroup.description)?if_exists}</#if> [${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}]</a></td>
+                    <#assign hasntStarted = false>
+                    <#if (productFeatureCatGrpAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productFeatureCatGrpAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+                    <td><div <#if hasntStarted><div style="color: red;"/></#if>${(productFeatureCatGrpAppl.fromDate)?if_exists}</div></td>
+                    <td align="center">
+                        <form method="post" action="<@ofbizUrl>updateProductFeatureCatGrpAppl</@ofbizUrl>" name="lineFormGrp${line}">
+                            <#assign hasExpired = false>
+                            <#if (productFeatureCatGrpAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCatGrpAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
+                            <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}">
+                            <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}">
+                            <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}">
+                            <input type="text" size="25" name="thruDate" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
+                            <a href="javascript:call_cal(document.lineFormGrp${line}.thruDate, '${(productFeatureCatGrpAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                            <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
+                        </form>
+                    </td>
+                    <td align="center">
+                        <a href="<@ofbizUrl>removeProductFeatureCatGrpAppl?productFeatureGroupId=${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}&productCategoryId=${(productFeatureCatGrpAppl.productCategoryId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productFeatureCatGrpAppl.getTimestamp("fromDate").toString())}</@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.ProductApplyFeatureGroupFromCategory}</h3>
+        </div>
+        <div class="screenlet-body">
+            <table cellspacing="0" class="basic-table">
+                <tr><td>
+                    <form method="post" action="<@ofbizUrl>createProductFeatureCatGrpAppl</@ofbizUrl>" style="margin: 0;" name="addNewGroupForm">
+                    <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
+                    <select name="productFeatureGroupId" class="selectBox">
+                    <#list productFeatureGroups as productFeatureGroup>
+                        <option value="${(productFeatureGroup.productFeatureGroupId)?if_exists}">${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option>
+                    </#list>
+                    </select>
+                    <input type="text" size="25" name="fromDate" class="inputBox">
+                    <a href="javascript:call_cal(document.addNewGroupForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                    <input type="submit" value="${uiLabelMap.CommonAdd}">
+                    </form>
+                </td></tr>
+            </table>
+        </div>
+    </div>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.ProductApplyFeatureGroupFromCategory}</h3>
+        </div>
+        <div class="screenlet-body">
+            <#-- Feature Categories -->
+            <table cellspacing="0" class="basic-table">
+                <tr class="header-row">    
+                    <td><b>${uiLabelMap.ProductFeatureCategory}</b></td>
+                    <td><b>${uiLabelMap.CommonFromDateTime}</b></td>
+                    <td align="center"><div class="tabletext"><b>${uiLabelMap.CommonThruDateTime}</b></td>
+                    <td><b>&nbsp;</b></td>
+                </tr>
+                <#assign line = 0>
+                <#assign rowClass = "2">
+                <#list productFeatureCategoryAppls as productFeatureCategoryAppl>
+                <#assign line = line + 1>
+                <#assign productFeatureCategory = (productFeatureCategoryAppl.getRelatedOne("ProductFeatureCategory"))?default(null)>
+                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                    <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}</@ofbizUrl>" class="buttontext"><#if productFeatureCategory?exists>${(productFeatureCategory.description)?if_exists}</#if> [${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}]</a></td>
+                    <#assign hasntStarted = false>
+                    <#if (productFeatureCategoryAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productFeatureCategoryAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+                    <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(productFeatureCategoryAppl.fromDate)?if_exists}</div></td>
+                    <td align="center">
+                        <form method="post" action="<@ofbizUrl>updateProductFeatureCategoryAppl</@ofbizUrl>" name="lineForm${line}">
+                            <#assign hasExpired = false>
+                            <#if (productFeatureCategoryAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCategoryAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
+                            <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}">
+                            <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}">
+                            <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}">
+                            <input type="text" size="25" name="thruDate" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>>
+                            <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productFeatureCategoryAppl.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                            <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
+                        </form>
+                    </td>
+                    <td align="center">
+                    <a href="<@ofbizUrl>removeProductFeatureCategoryAppl?productFeatureCategoryId=${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}&productCategoryId=${(productFeatureCategoryAppl.productCategoryId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productFeatureCategoryAppl.getTimestamp("fromDate").toString())}</@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.ProductApplyFeatureGroupToCategory}</h3>
+        </div>
+        <div class="screenlet-body">
+            <table cellspacing="0" class="basic-table">
+                <tr><td>
+                    <form method="post" action="<@ofbizUrl>createProductFeatureCategoryAppl</@ofbizUrl>" style="margin: 0;" name="addNewCategoryForm">
+                        <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
+                        <select name="productFeatureCategoryId" class="selectBox">
+                        <#list productFeatureCategories as productFeatureCategory>
+                            <option value="${(productFeatureCategory.productFeatureCategoryId)?if_exists}">${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option>
+                        </#list>
+                        </select>
+                        <input type="text" size="25" name="fromDate" class="inputBox">
+                        <a href="javascript:call_cal(document.addNewCategoryForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                        <input type="submit" value="${uiLabelMap.CommonAdd}">
+                    </form>
+                </td></tr>
+            </table>
+        </div>
+    </div>    
+</#if>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=606465&r1=606464&r2=606465&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl Sat Dec 22 08:26:13 2007
@@ -18,58 +18,81 @@
 -->
 
 <#if productCategoryId?exists && productCategory?exists>    
-    <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-    <td><div class="tabletext"><b>${uiLabelMap.PartyPartyId}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.PartyRole}</b></div></td>
-    <td><div class="tabletext"><b>${uiLabelMap.CommonFromDateTime}</b></div></td>
-    <td align="center"><div class="tabletext"><b>${uiLabelMap.CommonThruDateTime}</b></div></td>
-    <td><div class="tabletext"><b>&nbsp;</b></div></td>
-    </tr>
-    <#assign line = 0>
-    <#list productCategoryRoles as productCategoryRole>
-    <#assign line = line + 1>
-    <#assign curRoleType = productCategoryRole.getRelatedOneCache("RoleType")>
-    <tr valign="middle">
-    <td><a href="/partymgr/control/viewprofile?party_id=${(productCategoryRole.partyId)?if_exists}" target="_blank" class="buttontext">[${(productCategoryRole.partyId)?if_exists}]</a></td>
-    <td><div class="tabletext">${(curRoleType.get("description",locale))?if_exists}</div></td>
-    <#assign hasntStarted = false>
-    <#if (productCategoryRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productCategoryRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-    <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(productCategoryRole.fromDate)?if_exists}</div></td>
-    <td align="center">
-        <FORM method="post" action="<@ofbizUrl>updatePartyToCategory</@ofbizUrl>" name="lineForm${line}">
-            <#assign hasExpired = false>
-            <#if (productCategoryRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productCategoryRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
-            <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}">
-            <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}">
-            <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}">
-            <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}">
-            <input type="text" size="25" name="thruDate" value="${(productCategoryRole. getTimestamp("thruDate"))?if_exists}" class="inputBox" <#if hasExpired> style="color: red;"</#if>>
-            <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productCategoryRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-            <INPUT type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
-        </FORM>
-    </td>
-    <td align="center">
-        <a href="<@ofbizUrl>removePartyFromCategory?productCategoryId=${(productCategoryRole.productCategoryId)?if_exists}&partyId=${(productCategoryRole.partyId)?if_exists}&roleTypeId=${(productCategoryRole.roleTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productCategoryRole.getTimestamp("fromDate").toString())}</@ofbizUrl>" class="buttontext">
-        [${uiLabelMap.CommonDelete}]</a>
-    </td>
-    </tr>
-    </#list>
-    </table>
-    <br/>
-    <form method="post" action="<@ofbizUrl>addPartyToCategory</@ofbizUrl>" style="margin: 0;" name="addNewForm">
-    <input type="hidden" name="productCategoryId" value="${productCategoryId}">
-    
-    <h2>${uiLabelMap.ProductAssociatePartyToCategory}:</h2>
-    <br/>
-    <input type="text" class="inputBox" size="20" maxlength="20" name="partyId" value="">
-    <select name="roleTypeId" size="1" class="selectBox">
-    <#list roleTypes as roleType>
-        <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> ${uiLabelMap.ProductSelected}</#if>>${(roleType.get("description",locale))?if_exists}</option>
-    </#list>
-    </select>
-    <input type="text" size="25" name="fromDate" class="inputBox">
-    <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-    <input type="submit" value="${uiLabelMap.CommonAdd}">
-    </form>
-</#if>
+    <div class="screenlet">
+        <div class="screenlet-title-bar">
+            <h3>${uiLabelMap.PageTitleEditCategoryParties}</h3>
+        </div>
+        <div class="screenlet-body">
+            <table cellspacing="0" class="basic-table">
+            <tr class="header-row">
+            <td>${uiLabelMap.PartyPartyId}</td>
+            <td>${uiLabelMap.PartyRole}</td>
+            <td>${uiLabelMap.CommonFromDateTime}</td>
+            <td align="center">${uiLabelMap.CommonThruDateTime}</td>
+            <td>&nbsp;</td>
+            </tr>
+            <#assign line = 0>
+            <#assign rowClass = "2">
+            <#list productCategoryRoles as productCategoryRole>
+            <#assign line = line + 1>
+            <#assign curRoleType = productCategoryRole.getRelatedOneCache("RoleType")>
+            <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+            <td><a href="/partymgr/control/viewprofile?party_id=${(productCategoryRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productCategoryRole.partyId)?if_exists}</a></td>
+            <td>${(curRoleType.get("description",locale))?if_exists}</td>
+            <#assign hasntStarted = false>
+            <#if (productCategoryRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productCategoryRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+            <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(productCategoryRole.fromDate)?if_exists}</div></td>
+            <td align="center">
+                <FORM method="post" action="<@ofbizUrl>updatePartyToCategory</@ofbizUrl>" name="lineForm${line}">
+                    <#assign hasExpired = false>
+                    <#if (productCategoryRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productCategoryRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
+                    <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}">
+                    <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}">
+                    <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}">
+                    <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}">
+                    <input type="text" size="25" name="thruDate" value="${(productCategoryRole. getTimestamp("thruDate"))?if_exists}" class="inputBox" <#if hasExpired> style="color: red;"</#if>>
+                    <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productCategoryRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                    <INPUT type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
+                </FORM>
+            </td>
+            <td align="center">
+                <a href="<@ofbizUrl>removePartyFromCategory?productCategoryId=${(productCategoryRole.productCategoryId)?if_exists}&partyId=${(productCategoryRole.partyId)?if_exists}&roleTypeId=${(productCategoryRole.roleTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productCategoryRole.getTimestamp("fromDate").toString())}</@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.ProductAssociatePartyToCategory}</h3>
+        </div>
+        <div class="screenlet-body">
+            <table cellspacing="0" class="basic-table">
+                <tr>
+                    <td>
+                        <form method="post" action="<@ofbizUrl>addPartyToCategory</@ofbizUrl>" style="margin: 0;" name="addNewForm">
+                            <input type="hidden" name="productCategoryId" value="${productCategoryId}">
+                            <input type="text" class="inputBox" size="20" maxlength="20" name="partyId" value="">
+                            <select name="roleTypeId" size="1" class="selectBox">
+                            <#list roleTypes as roleType>
+                                <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> ${uiLabelMap.ProductSelected}</#if>>${(roleType.get("description",locale))?if_exists}</option>
+                            </#list>
+                            </select>
+                            <input type="text" size="25" name="fromDate" class="inputBox">
+                            <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                            <input type="submit" value="${uiLabelMap.CommonAdd}">
+                        </form>
+                    </td>
+                </tr>
+            </table>
+        </div>
+    </div>
+</#if>
\ No newline at end of file