You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/01/01 15:28:32 UTC
svn commit: r607851 - in /ofbiz/trunk/applications/product: webapp/catalog/
webapp/catalog/category/ webapp/catalog/config/ webapp/catalog/find/
webapp/catalog/lookup/ webapp/catalog/price/ webapp/catalog/product/
webapp/catalog/promo/ webapp/catalog/s...
Author: mrisaliti
Date: Tue Jan 1 06:28:30 2008
New Revision: 607851
URL: http://svn.apache.org/viewvc?rev=607851&view=rev
Log:
Various forms and Lookup screen (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1544)
Removed most of the CSS styles are now removed.
Modified:
ofbiz/trunk/applications/product/webapp/catalog/FastLoadCache.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl
ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl
ofbiz/trunk/applications/product/webapp/catalog/main.ftl
ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
Modified: ofbiz/trunk/applications/product/webapp/catalog/FastLoadCache.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/FastLoadCache.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/FastLoadCache.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/FastLoadCache.ftl Tue Jan 1 06:28:30 2008
@@ -23,7 +23,7 @@
</div>
<div class="screenlet-body">
<#list messageList as message>
- <div class="tabletext">${message}</div>
+ <div>${message}</div>
</#list>
</div>
</div>
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=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Tue Jan 1 06:28:30 2008
@@ -51,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}"
- header-row-style="header-row" default-table-style="basic-table">
+ odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productId"><hidden/></field>
<field name="productCategoryId" map-name="productCategory"><hidden/></field>
<field name="prodCatContentTypeId">
@@ -65,7 +65,7 @@
<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"
- header-row-style="header-row" default-table-style="basic-table">
+ odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productCategoryId"><hidden/></field>
<field name="contentId" title="${uiLabelMap.ProductContent}">
<display-entity entity-name="Content" description="${description}" also-hidden="true">
@@ -97,7 +97,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="EditCategoryContentSimpleText" type="single" default-map-name="categoryContent" target="updateSimpleTextContentForCategory" title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}">
+ <form name="EditCategoryContentSimpleText" type="single" default-map-name="categoryContent" target="updateSimpleTextContentForCategory" title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="content==null" target="createSimpleTextContentForCategory"/>
<auto-fields-entity entity-name="ProductCategoryContent"/>
@@ -118,7 +119,8 @@
<field use-when="content == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field use-when="content != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="CreateSimpleTextContentForAlternateLocale" type="single" target="createSimpleTextContentForAlternateLocaleInCategory" title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}">
+ <form name="CreateSimpleTextContentForAlternateLocale" type="single" target="createSimpleTextContentForAlternateLocaleInCategory" title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="productCategoryId"><hidden/></field>
<field name="mainContentId" entry-name="contentId"><hidden/></field>
<field name="localeString"><text/></field>
Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Tue Jan 1 06:28:30 2008
@@ -31,7 +31,7 @@
<field use-when="configItem!=null" name="configItemId" title="${uiLabelMap.ProductConfigItem}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductConfigItems}"><display/></field>
<field use-when="configItem==null&&configItemId!=null" name="configItemId" title="${uiLabelMap.ProductConfigItem}" tooltip="${uiLabelMap.ProductCouldNotFindProductConfigItemWithId} [${configItemId}]"><display description="" also-hidden="false"/></field>
<field use-when="configItem==null&&configItemId==null" name="configItemId" title="${uiLabelMap.ProductConfigItem}"><ignored/></field>
- <field name="configItemTypeId" title="${uiLabelMap.ProductConfigItem} ${uiLabelMap.CommonType}" widget-style="selectBox">
+ <field name="configItemTypeId" title="${uiLabelMap.ProductConfigItem} ${uiLabelMap.CommonType}">
<drop-down allow-empty="false">
<option key="SINGLE" description="${uiLabelMap.ProductSingleChoice}"/>
<option key="MULTIPLE" description="${uiLabelMap.ProductMultiChoice}"/>
@@ -80,7 +80,7 @@
<auto-fields-entity entity-name="ProdConfItemContent"/>
<field name="configItemId" title="${uiLabelMap.ProductConfigItemId}" map-name="productConfigItem"><hidden/></field>
<field name="contentId" title="${uiLabelMap.ProductContentId}" ></field>
- <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductConfigItemContentTypeId}" widget-style="selectBox">
+ <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductConfigItemContentTypeId}">
<drop-down>
<entity-options entity-name="ProdConfItemContentType" description="${description}">
<entity-order-by field-name="description"/>
@@ -98,7 +98,7 @@
<field name="fromDate"><ignored/></field>
<field name="thruDate"><ignored/></field>
<field name="configItemId" map-name="productConfigItem"><hidden/></field>
- <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductConfigItemContentTypeId}" widget-style="selectBox">
+ <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductConfigItemContentTypeId}">
<drop-down>
<entity-options entity-name="ProdConfItemContentType" description="${description}">
<entity-order-by field-name="description"/>
@@ -117,7 +117,7 @@
<hyperlink target="EditProductConfigItemContentContent?configItemId=${productContent.configItemId}&contentId=${productContent.contentId}"
description="${content.description} [${productContent.contentId}]"/>
</field>
- <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}" widget-style="selectBox">
+ <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}">
<drop-down>
<entity-options entity-name="ProdConfItemContentType" description="${description}">
<entity-order-by field-name="description"/>
@@ -140,7 +140,7 @@
<field name="localeString" title="${uiLabelMap.ProductLocaleString}" map-name="content"><text size="40"/></field>
<field use-when="contentId == null" name="contentId"><ignored/></field>
<field use-when="contentId != null" name="contentId" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" ><display/></field>
- <field name="text" title="${uiLabelMap.ProductText}" map-name="textData" widget-style="textAreaBox" ><textarea cols="60" rows="7"/></field>
+ <field name="text" title="${uiLabelMap.ProductText}" map-name="textData"><textarea cols="60" rows="7"/></field>
<field name="textDataResourceId" title="${uiLabelMap.ProductTextDataResourceId}" map-name="textData"><hidden/></field>
<field name="configItemId"><hidden/></field>
<field name="confItemContentTypeId"><hidden/></field>
Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Tue Jan 1 06:28:30 2008
@@ -123,7 +123,7 @@
<input type="text" name="imageUrl" value="${(configItem.imageUrl)?default(imageNameSmall + '.jpg')}" size="60" maxlength="255">
<#if configItemId?has_content>
<div>
- <span class="tabletext">${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
+ <span class="label">${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
<a href="javascript:insertImageName('small','${imageNameSmall}.jpg');" class="buttontext">.jpg</a>
<a href="javascript:insertImageName('small','${imageNameSmall}.gif');" class="buttontext">.gif</a>
<a href="javascript:insertImageName('small','');" class="buttontext">${uiLabelMap.CommonClear}</a>
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Tue Jan 1 06:28:30 2008
@@ -76,7 +76,7 @@
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
</#if>
<#if 0 < listSize?int>
- <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+ ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
</#if>
<#if highIndex?int < listSize?int>
| <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
@@ -123,7 +123,7 @@
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
</#if>
<#if 0 < listSize?int>
- <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+ ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
</#if>
<#if highIndex?int < listSize?int>
| <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl Tue Jan 1 06:28:30 2008
@@ -46,11 +46,11 @@
<div class="screenlet-body">
<div>
<form name="keywordsearchform" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <span class="label">${uiLabelMap.ProductKeywords}:</span><input type="text" class="inputBox" name="SEARCH_STRING" size="20" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}"/>
+ <span class="label">${uiLabelMap.ProductKeywords}:</span><input type="text"name="SEARCH_STRING" size="20" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}"/>
<span class="label">
${uiLabelMap.ProductCategoryId}:
</span>
- <input type="text" class="inputBox" name="SEARCH_CATEGORY_ID" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2(document.keywordsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+ <input type="text" name="SEARCH_CATEGORY_ID" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2(document.keywordsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
<span class="label">
${uiLabelMap.CommonNoContains}
</span>
@@ -72,7 +72,7 @@
<span class="label">
${uiLabelMap.ProductCategoryId}:
</span>
- <input type="text" class="inputBox" name="SEARCH_CATEGORY_ID" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2(document.advancedsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+ <input type="text" name="SEARCH_CATEGORY_ID" size="15" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/><a href="javascript:call_fieldlookup2(document.advancedsearchform.SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
<div>
<a href="javascript:document.advancedsearchform.submit()" class="buttontext">${uiLabelMap.ProductAdvancedSearch}</a>
</div>
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl Tue Jan 1 06:28:30 2008
@@ -73,7 +73,7 @@
<div style='margin-left: 10px;'>
<#if currentTopCategory?exists>
<#if curCategoryId?exists && curCategoryId == currentTopCategory.productCategoryId>
- <div class='tabletext' style='text-indent: -10px;'><b>- ${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]</b></div>
+ <div style='text-indent: -10px;'><b>- ${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]</b></div>
<#else>
<div class='browsecategorytext'>- <a href="<@o...@ofbizUrl>" class='browsecategorybutton'>${currentTopCategory.categoryName?default(currentTopCategory.description)?if_exists} [${currentTopCategory.productCategoryId}]</a></div>
</#if>
Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml Tue Jan 1 06:28:30 2008
@@ -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="lookupProduct" target="LookupProduct" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ header-row-style="header-row" default-table-style="basic-table">
<!-- <auto-fields-entity entity-name="Product" default-field-type="hidden" /> -->
<field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><text-find/></field>
@@ -44,9 +44,8 @@
<!-- NOTE DEJ20070829 not sure why this is here, but it doesn't seem applicable for a general product lookup, also doesn't handle case where isVariant is null <field name="isVariant"><hidden value="N"/></field> -->
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupProduct" list-name="listIt" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
- paginate-target="LookupProduct">
+ <form name="listLookupProduct" list-name="listIt" title="" type="list" paginate-target="LookupProduct"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -65,12 +64,11 @@
</form>
<form name="lookupVirtualProduct" extends="lookupProduct" default-map-name= "inputFields" target="LookupVirtualProduct" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ header-row-style="header-row" default-table-style="basic-table">
<field name="isVirtual"><hidden value="Y"/></field>
</form>
<form name="listLookupVirtualProduct" list-name="listIt" title="" type="list" extends="listLookupProduct"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
- paginate-target="LookupVirtualProduct">
+ paginate-target="LookupVirtualProduct" odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -86,7 +84,7 @@
</form>
<form name="lookupProductAndPrice" target="LookupProductAndPrice" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ header-row-style="header-row" default-table-style="basic-table">
<!-- <auto-fields-entity entity-name="Product" default-field-type="hidden" /> -->
<field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
@@ -132,8 +130,7 @@
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupProductAndPrice" list-name="listIt" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
- paginate-target="LookupProductAndPrice">
+ paginate-target="LookupProductAndPrice" odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -146,7 +143,7 @@
</field>
<field name="productId" title="${uiLabelMap.ProductProductId}" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")"><display/></field>
-->
- <field name="productId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <field name="productId" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
</field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -155,13 +152,13 @@
<field name="price" title="${uiLabelMap.ProductPrice}"><display/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
- <field name="searchVariants" title="" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
+ <field name="searchVariants" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
<hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/>
</field>
</form>
<form name="lookupProductCategory" target="LookupProductCategory" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ProductCategory" default-field-type="find" />
<field name="productCategoryTypeId">
<drop-down allow-empty="true">
@@ -180,8 +177,7 @@
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupProductCategory" list-name="listIt" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
- paginate-target="LookupProductCategory">
+ paginate-target="LookupProductCategory" odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -201,7 +197,7 @@
</form>
<form name="lookupProductFeature" target="LookupProductFeature" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ProductFeature" default-field-type="find" />
<field name="productFeatureTypeId">
<drop-down allow-empty="true">
@@ -221,9 +217,8 @@
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupProductFeature" list-name="listIt" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
- paginate-target="LookupProductFeature">
+ <form name="listLookupProductFeature" list-name="listIt" title="" type="list" paginate-target="LookupProductFeature"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -237,7 +232,7 @@
</form>
<form name="LookupProductStore" target="LookupProductStore" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ header-row-style="header-row" default-table-style="basic-table">
<!-- <auto-fields-entity entity-name="ProductStore" default-field-type="find"/> -->
<field name="productStoreId"><text-find/></field>
@@ -249,8 +244,7 @@
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupProductStore" list-name="listIt" target="" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
- paginate-target="LookupProductStore">
+ paginate-target="LookupProductStore" odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -260,7 +254,7 @@
<!-- <auto-fields-entity entity-name="ProductStore" default-field-type="display"/> -->
- <field name="productStoreId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <field name="productStoreId" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${productStoreId}" target="javascript:set_value('${productStoreId}')"/>
</field>
<field name="primaryStoreGroupId"><display/></field>
Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl Tue Jan 1 06:28:30 2008
@@ -16,21 +16,18 @@
specific language governing permissions and limitations
under the License.
-->
-
<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-
<br/>
-<div class="tabletext">[${product.productId}] ${product.internalName}</div>
+<div class="label">[${product.productId}] ${product.internalName}</div>
<br/>
<#if searchFeatures?has_content>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table cellspacing="0" class="basic-table">
<form method="post" action="<@o...@ofbizUrl>" name="selectAllForm">
<input type="hidden" name="productId" value="${product.productId}">
<#list searchFeatures as searchFeature>
<tr>
- <td><div class="tabletext"><b>${searchFeature.featureType}</b></div></td>
- <td><div class="tabletext">
- <select name="${searchFeature.featureType}" class="selectBox">
+ <td class="label"><b>${searchFeature.featureType}</b></td>
+ <td><select name="${searchFeature.featureType}">
<#assign features = searchFeature.features>
<option value=""></option>
<#list features as feature>
@@ -41,7 +38,6 @@
</#if>
</#list>
</select>
- </div>
</td>
</tr>
</#list>
@@ -56,27 +52,27 @@
</#if>
<br/>
<#if variantProducts?exists>
- <table border="1" cellpadding="2" cellspacing="0">
- <tr>
- <th> </th>
- <th><div class="tabletext">${uiLabelMap.ProductBrandName}</div></th>
- <th><div class="tabletext">${uiLabelMap.ProductInternalName}</div></th>
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td><b>${uiLabelMap.ProductProductId}</b></td>
+ <td><b>${uiLabelMap.ProductBrandName}</b></td>
+ <td><b>${uiLabelMap.ProductInternalName}</b></td>
</tr>
<#list variantProducts as variant>
<tr>
<td><a class="buttontext" href="javascript:set_value('${variant.productId}')">${variant.productId}</a></td>
- <td><div class="tabletext">${variant.brandName?if_exists}</div></td>
- <td><div class="tabletext">${variant.internalName?if_exists}</div></td>
+ <td>${variant.brandName?if_exists}</td>
+ <td>${variant.internalName?if_exists}</td>
</tr>
</#list>
</table>
</#if>
<#if productFeatureIds?exists>
- <table border="1" cellpadding="2" cellspacing="0">
+ <table cellspacing="0" class="basic-table">
<form method="post" action="<@o...@ofbizUrl>" name="createNewVariant">
<input type="hidden" name="productId" value="${product.productId}">
<input type="hidden" name="productFeatureIds" value="${productFeatureIds}">
- <input type="text" name="productVariantId" value="${productVariantId}" class="inputBox">
+ <input type="text" name="productVariantId" value="${productVariantId}">
<input type="submit" value="${uiLabelMap.ProductQuickAddVariants}" class="smallSubmit">
</form>
</table>
Modified: ofbiz/trunk/applications/product/webapp/catalog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/main.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/main.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/main.ftl Tue Jan 1 06:28:30 2008
@@ -29,21 +29,21 @@
<#if security.hasEntityPermission("CATALOG", "_VIEW", session)>
<div class="label">${uiLabelMap.ProductEditCatalogWithCatalogId}:</div>
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="text" size="20" maxlength="20" name="prodCatalogId" class="inputBox" value=""/>
+ <input type="text" size="20" maxlength="20" name="prodCatalogId" value=""/>
<input type="submit" value=" ${uiLabelMap.ProductEditCatalog}" class="smallSubmit"/>
</form>
<div class="label">${uiLabelMap.CommonOr}: <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCatalog}</a></div>
<br/>
<div class="label">${uiLabelMap.ProductEditCategoryWithCategoryId}:</div>
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="text" size="20" maxlength="20" name="productCategoryId" class="inputBox" value=""/>
+ <input type="text" size="20" maxlength="20" name="productCategoryId" value=""/>
<input type="submit" value="${uiLabelMap.ProductEditCategory}" class="smallSubmit"/>
</form>
<div class="label">${uiLabelMap.CommonOr}: <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCategory}</a></div>
<br/>
<div class="label">${uiLabelMap.ProductEditProductWithProductId}:</div>
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="text" size="20" maxlength="20" name="productId" class="inputBox" value=""/>
+ <input type="text" size="20" maxlength="20" name="productId" value=""/>
<input type="submit" value=" ${uiLabelMap.ProductEditProduct}" class="smallSubmit"/>
</form>
<div class="label">${uiLabelMap.CommonOr}: <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></div>
@@ -52,7 +52,7 @@
<br/>
<div class="label">${uiLabelMap.ProductFindProductWithIdValue}:</div>
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="text" size="20" maxlength="20" name="idValue" class="inputBox" value=""/>
+ <input type="text" size="20" maxlength="20" name="idValue" value=""/>
<input type="submit" value=" ${uiLabelMap.ProductFindProduct}" class="smallSubmit"/>
</form>
<br/>
Modified: ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Tue Jan 1 06:28:30 2008
@@ -74,7 +74,7 @@
<#-- if cur seq id is a number and is greater than max, set new max for input box prefill below -->
<#assign curCondSeqId = productPriceCond.productPriceCondSeqId?number>
<#if (curCondSeqId >= maxCondSeqId)><#assign maxCondSeqId = curCondSeqId + 1></#if>
- <td><div class="tabletext"><b>${productPriceCond.productPriceCondSeqId}</b></div></td>
+ <td><b>${productPriceCond.productPriceCondSeqId}</b></td>
<td align="left">
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productPriceRuleId" value="${productPriceCond.productPriceRuleId}"/>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Tue Jan 1 06:28:30 2008
@@ -683,11 +683,11 @@
</display-entity>
</field>
<field name="supplierProductId"><display/></field>
- <field name="minimumOrderQuantity" title="${uiLabelMap.ProductMinimumOrderQuantity}" widget-area-style="tabletextright"
+ <field name="minimumOrderQuantity" title="${uiLabelMap.ProductMinimumOrderQuantity}"
header-link="EditProductSuppliers?productId=${productId}&orderBy=minimumOrderQuantity" header-link-style="buttontext">
<display/>
</field>
- <field name="supplierPrefOrderId" widget-area-style="tabletextright"
+ <field name="supplierPrefOrderId"
header-link="EditProductSuppliers?productId=${productId}&orderBy=supplierPrefOrderId" header-link-style="buttontext">
<display-entity entity-name="SupplierPrefOrder"/>
</field>
@@ -695,7 +695,7 @@
<field name="availableThruDate" title="${uiLabelMap.ProductAvailableThruDate}" red-when="before-now"><display/></field>
<field name="quantityUomId"><display-entity entity-name="Uom" key-field-name="uomId"/></field>
<field name="supplierCommissionPerc"><display/></field>
- <field name="lastPrice" widget-area-style="tabletextright"
+ <field name="lastPrice"
header-link="EditProductSuppliers?productId=${productId}&orderBy=lastPrice" header-link-style="buttontext">
<display type="currency" currency="${currencyUomId}"/>
</field>
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl Tue Jan 1 06:28:30 2008
@@ -38,7 +38,7 @@
<form method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;">
<input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/>
<input type="hidden" name="productPromoId" value="${productPromoId}"/>
- <input type="file" size="40" name="uploadedFile" class="inputBox">
+ <input type="file" size="40" name="uploadedFile">
<input type="submit" value="${uiLabelMap.CommonUpload}">
</form>
</div>
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Tue Jan 1 06:28:30 2008
@@ -365,7 +365,7 @@
<input type="hidden" name="productPromoRuleId" value="_NA_">
<input type="hidden" name="productPromoActionSeqId" value="_NA_">
<input type="hidden" name="productPromoCondSeqId" value="_NA_">
- <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20"/>
+ <input type="text" name="productCategoryId" size="20" maxlength="20"/>
<a href="javascript:call_fieldlookup2(document.createProductPromoCategoryPromotions.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
<select name="productPromoApplEnumId">
<#list productPromoApplEnums as productPromoApplEnum>
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml Tue Jan 1 06:28:30 2008
@@ -46,24 +46,24 @@
<!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
<field use-when="productPromo==null&&productPromoId==null" name="productPromoId" title="${uiLabelMap.ProductPromotion}"><ignored/></field>
- <field name="promoText" title="${uiLabelMap.ProductPromoText}" widget-style="textAreaBox"><textarea cols="70" rows="5"/></field>
- <field name="userEntered" title="${uiLabelMap.ProductPromoUserEntered}" widget-style="selectBox">
+ <field name="promoText" title="${uiLabelMap.ProductPromoText}"><textarea cols="70" rows="5"/></field>
+ <field name="userEntered" title="${uiLabelMap.ProductPromoUserEntered}">
<drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
- <field name="showToCustomer" title="${uiLabelMap.ProductPromoShowToCustomer}" widget-style="selectBox">
+ <field name="showToCustomer" title="${uiLabelMap.ProductPromoShowToCustomer}">
<drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
- <field name="requireCode" title="${uiLabelMap.ProductPromotionReqCode}" widget-style="selectBox">
+ <field name="requireCode" title="${uiLabelMap.ProductPromotionReqCode}">
<drop-down allow-empty="false" no-current-selected-key="N"><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
</field>
<field name="overrideOrgPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field use-when="productPromo!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:" widget-style="tabletext">
+ <field use-when="productPromo!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:">
<display description="[${productPromo.lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${productPromo.lastModifiedDate}" also-hidden="false"/>
</field>
- <field use-when="productPromo!=null" name="createdByText" title="${uiLabelMap.ProductLastCreatedBy}:" widget-style="tabletext">
+ <field use-when="productPromo!=null" name="createdByText" title="${uiLabelMap.ProductLastCreatedBy}:">
<display description="[${productPromo.createdByUserLogin}] ${uiLabelMap.CommonOn} ${productPromo.createdDate}" also-hidden="false"/>
</field>
</form>
@@ -72,7 +72,7 @@
<alt-target use-when="productPromoCode==null" target="createProductPromoCode"/>
<auto-fields-service service-name="updateProductPromoCode" map-name=""/>
- <field name="productPromoId" widget-style="selectBox">
+ <field name="productPromoId">
<drop-down>
<entity-options entity-name="ProductPromo" description="[${productPromoId}] ${promoName}">
<entity-order-by field-name="productPromoId"/>
@@ -84,19 +84,19 @@
<!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
<field use-when="productPromoCode==null&&productPromoCodeId==null" name="productPromoCodeId" tooltip="${uiLabelMap.ProductPromoCodeBlank}"><text/></field>
- <field name="userEntered" widget-style="selectBox">
+ <field name="userEntered">
<drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
- <field name="requireEmailOrParty" widget-style="selectBox">
+ <field name="requireEmailOrParty">
<drop-down allow-empty="false" no-current-selected-key="N"><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field use-when="productPromoCode!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:" widget-style="tabletext">
+ <field use-when="productPromoCode!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:">
<display description="[${productPromoCode.lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${productPromoCode.lastModifiedDate}" also-hidden="false"/>
</field>
- <field use-when="productPromoCode!=null" name="createdByText" title="${uiLabelMap.ProductCreatedBy}:" widget-style="tabletext">
+ <field use-when="productPromoCode!=null" name="createdByText" title="${uiLabelMap.ProductCreatedBy}:">
<display description="[${productPromoCode.createdByUserLogin}] ${uiLabelMap.CommonOn} ${productPromoCode.createdDate}" also-hidden="false"/>
</field>
</form>
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl Tue Jan 1 06:28:30 2008
@@ -73,7 +73,7 @@
<tr>
<td class="label">${uiLabelMap.PartyRoleType}</td>
<td>
- <select class="selectBox" name="roleTypeId">
+ <select name="roleTypeId">
<#list roleTypes as roleType>
<option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option>
</#list>
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl Tue Jan 1 06:28:30 2008
@@ -58,7 +58,7 @@
<form name="addWebSite" action="<@o...@ofbizUrl>" method="post">
<input type="hidden" name="viewProductStoreId" value="${productStoreId}">
<input type="hidden" name="productStoreId" value="${productStoreId}">
- <select class="selectBox" name="webSiteId">
+ <select name="webSiteId">
<#list webSites as webSite>
<option value="${webSite.webSiteId}">${webSite.siteName} [${webSite.webSiteId}]</option>
</#list>
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Tue Jan 1 06:28:30 2008
@@ -124,7 +124,7 @@
</field>
<!--
- <field name="useQuickAdd" widget-style="selectBox" title="${uiLabelMap.ProductUseQuickAdd}">
+ <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}">
<drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
-->
@@ -318,7 +318,7 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createProductStoreCatalog"/>
<field name="productStoreId" map-name="productStore"><hidden/></field>
- <field name="prodCatalogId" title="${uiLabelMap.ProductCatalog}" widget-style="selectBox">
+ <field name="prodCatalogId" title="${uiLabelMap.ProductCatalog}">
<drop-down>
<entity-options entity-name="ProdCatalog" description="${catalogName}">
<entity-order-by field-name="catalogName"/>
@@ -331,12 +331,12 @@
odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-service service-name="updateProductStoreCatalog"/>
<field name="productStoreId"><hidden/></field>
- <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}" widget-style="tabletext">
+ <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}">
<display-entity entity-name="ProdCatalog" description="${catalogName}" also-hidden="true">
<sub-hyperlink target="EditProdCatalog?prodCatalogId=${prodCatalogId}" description="${prodCatalogId}" link-style="buttontext"/>
</display-entity>
</field>
- <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
@@ -349,7 +349,7 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createProductStoreEmailSetting"/>
<field name="productStoreId" map-name="productStore"><hidden/></field>
- <field name="emailType" title="${uiLabelMap.CommonEmailType}" widget-style="selectBox">
+ <field name="emailType" title="${uiLabelMap.CommonEmailType}">
<drop-down>
<entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
<entity-constraint name="enumTypeId" value="PRDS_EMAIL"/>
@@ -367,7 +367,7 @@
odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-service service-name="updateProductStoreEmailSetting"/>
<field name="productStoreId"><hidden/></field>
- <field name="emailType" title="${uiLabelMap.CommonEmailType}" widget-style="tabletext">
+ <field name="emailType" title="${uiLabelMap.CommonEmailType}">
<display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}" cache="true" also-hidden="true"/>
</field>
<field name="bodyScreenLocation" title="${uiLabelMap.ProductBodyScreenLocation}"></field>
@@ -385,7 +385,7 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createProductStoreKeywordOvrd"/>
<field name="productStoreId" map-name="productStore"><hidden/></field>
- <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetTypeEnumId}" widget-style="selectBox">
+ <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetTypeEnumId}">
<drop-down>
<entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
<entity-constraint name="enumTypeId" value="KWOVRD_TRGT_TYPE"/>
@@ -401,7 +401,7 @@
<field name="productStoreId"><hidden/></field>
<field name="keyword" title="${uiLabelMap.ProductKeyword}"><display description="${keyword}"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display description="${fromDate}"/></field>
- <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetType}" widget-style="selectBox">
+ <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetType}">
<drop-down>
<entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
<entity-constraint name="enumTypeId" value="KWOVRD_TRGT_TYPE"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Tue Jan 1 06:28:30 2008
@@ -37,8 +37,21 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="lookupProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleLookupProduct}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="lookupProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -61,8 +74,21 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="lookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleLookupProductVirtual}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="lookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -87,9 +113,22 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://product/webapp/catalog/lookup/LookupVariantProduct.ftl"/></html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleLookupProductVariant}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/catalog/lookup/LookupVariantProduct.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -113,8 +152,21 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="lookupProductAndPrice" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupProductAndPrice" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleLookupProductPrice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="lookupProductAndPrice" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupProductAndPrice" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -137,8 +189,21 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="lookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- <include-form name="listLookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleLookupProductCategory}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="lookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <include-form name="listLookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -161,8 +226,21 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="lookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- <include-form name="listLookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleLookupProductFeature}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="lookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <include-form name="listLookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -189,8 +267,21 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="LookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
- <include-form name="listLookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleLookupProductStore}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="LookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <include-form name="listLookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=607851&r1=607850&r2=607851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Tue Jan 1 06:28:30 2008
@@ -26,14 +26,14 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="Subscription" default-field-type="find"/>
- <field name="subscriptionResourceId" widget-style="selectBox">
+ <field name="subscriptionResourceId">
<drop-down allow-empty="true">
<entity-options entity-name="SubscriptionResource" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}" widget-style="selectBox">
+ <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}">
<drop-down allow-empty="true">
<entity-options entity-name="SubscriptionType" description="${description}">
<entity-order-by field-name="description"/>
@@ -42,7 +42,7 @@
</field>
<field name="originatedFromPartyId"><lookup target-form-name="LookupPartyName"/></field>
- <field name="originatedFromRoleTypeId" widget-style="selectBox">
+ <field name="originatedFromRoleTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
@@ -51,7 +51,7 @@
</field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
- <field name="roleTypeId" widget-style="selectBox">
+ <field name="roleTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="RoleType" description="${description}">
<entity-order-by field-name="description"/>
@@ -129,18 +129,18 @@
<alt-target use-when="subscription==null" target="createSubscription"/>
<auto-fields-service service-name="updateSubscription"/>
- <field use-when="subscription!=null" name="subscriptionId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field use-when="subscription!=null" name="subscriptionId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="subscription==null&&subscriptionId==null" name="subscriptionId"><ignored/></field>
- <field use-when="subscription==null&&subscriptionId!=null" name="subscriptionId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${subscriptionId}]" also-hidden="false"/></field>
+ <field use-when="subscription==null&&subscriptionId!=null" name="subscriptionId"><display description="${uiLabelMap.CommonCannotBeFound}: [${subscriptionId}]" also-hidden="false"/></field>
- <field name="subscriptionResourceId" widget-style="selectBox">
+ <field name="subscriptionResourceId">
<drop-down allow-empty="false">
<entity-options entity-name="SubscriptionResource" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}" widget-style="selectBox">
+ <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}">
<drop-down allow-empty="true">
<entity-options entity-name="SubscriptionType" description="${description}">
<entity-order-by field-name="description"/>
@@ -153,7 +153,7 @@
<sub-hyperlink target="/partymgr/control/viewprofile?partyId=${subscription.originatedFromPartyId}" target-type="inter-app" description="${subscription.originatedFromPartyId}" link-style="buttontext"/>
</lookup>
</field>
- <field name="originatedFromRoleTypeId" widget-style="selectBox">
+ <field name="originatedFromRoleTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
@@ -166,7 +166,7 @@
<sub-hyperlink target="/partymgr/control/viewprofile?partyId=${subscription.partyId}" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext"/>
</lookup>
</field>
- <field name="roleTypeId" widget-style="selectBox">
+ <field name="roleTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="RoleType" description="${description}">
<entity-order-by field-name="description"/>
@@ -179,7 +179,7 @@
<sub-hyperlink target="/partymgr/control/viewprofile?partyId=${subscription.partyNeedId}" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext"/>
</lookup>
</field>
- <field name="needTypeId" widget-style="selectBox">
+ <field name="needTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="NeedType" description="${description}">
<entity-order-by field-name="description"/>
@@ -240,15 +240,15 @@
<alt-target use-when="subscriptionResource==null" target="createSubscriptionResource"/>
<auto-fields-service service-name="updateSubscriptionResource"/>
- <field use-when="subscriptionResource!=null" name="subscriptionResourceId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field use-when="subscriptionResource!=null" name="subscriptionResourceId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="subscriptionResource==null&&subscriptionResourceId==null" name="subscriptionResourceId"><ignored/></field>
- <field use-when="subscriptionResource==null&&subscriptionResourceId!=null" name="subscriptionResourceId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${subscriptionResourceId}]" also-hidden="false"/></field>
+ <field use-when="subscriptionResource==null&&subscriptionResourceId!=null" name="subscriptionResourceId"><display description="${uiLabelMap.CommonCannotBeFound}: [${subscriptionResourceId}]" also-hidden="false"/></field>
<field name="parentResourceId"><ignored/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"/>
<field name="contentId"><lookup target-form-name="LookupContent"/></field>
- <field name="webSiteId" widget-style="selectBox">
+ <field name="webSiteId">
<drop-down allow-empty="true">
<entity-options entity-name="WebSite" description="${siteName} [${webSiteId}]">
<entity-order-by field-name="siteName"/>
@@ -272,8 +272,8 @@
<auto-fields-service service-name="updateProductSubscriptionResource"/>
<field name="subscriptionResourceId"><hidden/></field>
- <field name="productId" widget-style="tabletext"><display/></field>
- <field name="useTimeUomId" widget-style="selectBox">
+ <field name="productId"><display/></field>
+ <field name="useTimeUomId">
<drop-down>
<entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
@@ -281,7 +281,7 @@
</entity-options>
</drop-down>
</field>
- <field name="useRoleTypeId" widget-style="selectBox">
+ <field name="useRoleTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
@@ -301,7 +301,7 @@
<field name="subscriptionResourceId"><hidden/></field>
<field name="productId"><lookup target-form-name="LookupProduct"/></field>
- <field name="useTimeUomId" widget-style="selectBox">
+ <field name="useTimeUomId">
<drop-down allow-empty="false">
<entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
@@ -309,7 +309,7 @@
</entity-options>
</drop-down>
</field>
- <field name="useRoleTypeId" widget-style="selectBox">
+ <field name="useRoleTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>