svn commit: r606632 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mrisaliti
Date: Sun Dec 23 15:02:31 2007 New Revision: 606632 URL: http://svn.apache.org/viewvc?rev=606632&view=rev Log: Removed deprecated CSS style (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/CatalogScreens.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=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Sun Dec 23 15:02:31 2007 @@ -38,10 +38,10 @@ <!-- 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" header-row-style="header-row" default-table-style="basic-table"> + 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"> + <field name="prodCatContentTypeId"> <drop-down> <entity-options entity-name="ProductCategoryContentType" description="${description}"> <entity-order-by field-name="description"/> @@ -54,7 +54,7 @@ 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"> + <field name="prodCatContentTypeId"> <drop-down> <entity-options entity-name="ProductCategoryContentType" description="${description}"> <entity-order-by field-name="description"/> @@ -67,7 +67,7 @@ <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"> + <field name="contentId" title="${uiLabelMap.ProductContent}"> <display-entity entity-name="Content" description="${description}" also-hidden="true"> <sub-hyperlink target="EditCategoryContentContent?productCategoryId=${productCategoryId}&contentId=${contentId}&prodCatContentTypeId=${prodCatContentTypeId}&fromDate=${fromDate}" description="${contentId}" link-style="buttontext"/> </display-entity> @@ -102,14 +102,14 @@ <auto-fields-entity entity-name="ProductCategoryContent"/> <field use-when="content==null" name="contentId"><ignored/></field> - <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="categoryContentData" widget-style="tabletext"><display/></field> + <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="categoryContentData"><display/></field> <field name="fromDate" use-when="contentId==null" title="${uiLabelMap.CommonFromDate}*" ><date-time/></field> <field name="fromDate" use-when="contentId!=null" title="${uiLabelMap.CommonFromDate}" ><display/></field> - <field name="prodCatContentTypeId" widget-style="tabletext"><display-entity entity-name="ProductCategoryContentType" also-hidden="true"/></field> + <field name="prodCatContentTypeId"><display-entity entity-name="ProductCategoryContentType" also-hidden="true"/></field> <field name="description" map-name="content"><text size="40"/></field> <field name="localeString" map-name="content"><text size="40"/></field> - <field name="text" map-name="textDataMap" widget-style="textAreaBox"><textarea cols="80" rows="10"/></field> + <field name="text" map-name="textDataMap"><textarea cols="80" rows="10"/></field> <field name="textDataResourceId" map-name="textDataMap"><hidden/></field> <field name="useCountLimit"><hidden/></field> <field name="purchaseThruDate"><hidden/></field> 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=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl Sun Dec 23 15:02:31 2007 @@ -20,7 +20,7 @@ <#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <#assign unselectedClassName = ""> <#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}> - + <br/> <div class="button-bar tab-bar"> <ul> <li><a href="<@ofbizUrl>EditCategory?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategory?default(unselectedClassName)}">${uiLabelMap.ProductCategory}</a></li> 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=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Sun Dec 23 15:02:31 2007 @@ -26,12 +26,12 @@ <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductResultOfImageUpload}</h3> <#if !(clientFileName?has_content)> - <div class='tabletext'>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div> + <div>${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> + <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div> + <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div> + <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div> + <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div> </#if> </div> </div> @@ -49,7 +49,7 @@ <td align="right" class="label">${uiLabelMap.ProductProductCategoryId}</td> <td> </td> <td> - <input type="text" name="productCategoryId" size="20" maxlength="40" value="${productCategoryId}" class="inputBox"/> + <input type="text" name="productCategoryId" size="20" maxlength="40" value="${productCategoryId}"/> </td> </tr> <#else> @@ -63,7 +63,7 @@ <td align="right" class="label">${uiLabelMap.ProductProductCategoryId}</td> <td> </td> <td> - <input type="text" name="productCategoryId" size="20" maxlength="40" value="" class="inputBox"/> + <input type="text" name="productCategoryId" size="20" maxlength="40" value=""/> </td> </tr> </#if> @@ -87,7 +87,7 @@ <td width="26%" align="right" class="label">${uiLabelMap.ProductProductCategoryType}</td> <td> </td> <td width="74%"> - <select name="productCategoryTypeId" size="1" class="selectBox"> + <select name="productCategoryTypeId" size="1"> <#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> @@ -97,12 +97,12 @@ <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductName}</td> <td> </td> - <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60" class="inputBox"/></td> + <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductDescription}</td> <td> </td> - <td width="74%"><textarea class="textAreaBox" name="description" cols="60" rows="2"><#if productCategory?has_content>${(productCategory.description)?if_exists}</#if></textarea></td> + <td width="74%"><textarea 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"> @@ -113,13 +113,13 @@ </td> <td> </td> <td width="80%" colspan="4" valign="top"> - <input type="text" class="inputBox" name="categoryImageUrl" value="${(productCategory.categoryImageUrl)?default('')}" size="60" maxlength="255"/> + <input type="text" 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> + ${uiLabelMap.ProductInsertDefaultImageUrl}: + <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> @@ -133,13 +133,13 @@ </td> <td> </td> <td width="80%" colspan="4" valign="top"> - <input type="text" class="inputBox" name="linkOneImageUrl" value="${(productCategory.linkOneImageUrl)?default('')}" size="60" maxlength="255"/> + <input type="text" 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> + ${uiLabelMap.ProductInsertDefaultImageUrl}: + <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> @@ -153,13 +153,13 @@ </td> <td> </td> <td width="80%" colspan="4" valign="top"> - <input type="text" class="inputBox" name="linkTwoImageUrl" value="${(productCategory.linkTwoImageUrl)?default('')}" size="60" maxlength="255"/> + <input type="text" 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> + ${uiLabelMap.ProductInsertDefaultImageUrl}: + <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> @@ -168,21 +168,21 @@ <td width="26%" align="right" class="label">${uiLabelMap.ProductDetailScreen}</td> <td> </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} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> + <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250"/> + <br/><span class="tooltip">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> </td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductPrimaryParentCategory}</td> <td> </td> <td width="74%"> - <input type="text" class="inputBox" name="primaryParentCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/> + <input type="text" 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"> </td> - <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"/></td> + <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"/></td> </tr> </table> </form> @@ -203,7 +203,7 @@ <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId?if_exists}&upload_file_type=category</@ofbizUrl>" name="imageUploadForm"> <table cellspacing="0" class="basic-table"> <tr><td> - <input type="file" class="inputBox" size="50" name="fname"/> + <input type="file" 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}&upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl} @@ -224,10 +224,10 @@ <form action="/catalog/control/DuplicateProductCategory" method="post" style="margin: 0;"> <table cellspacing="0" class="basic-table"> <tr><td> - <span class="tabletext">${uiLabelMap.ProductDuplicateProductCategorySelected}:</span> + ${uiLabelMap.ProductDuplicateProductCategorySelected}: <input type=hidden name="oldProductCategoryId" value="${productCategoryId}"/> <div> - <input type="text" class="inputBox" size="20" maxlength="20" name="productCategoryId"/> <input type=submit class="smallSubmit" value="${uiLabelMap.CommonGo}"/> + <input type="text" size="20" maxlength="20" name="productCategoryId"/> <input type=submit class="smallSubmit" value="${uiLabelMap.CommonGo}"/> </div> <div> <b>${uiLabelMap.CommonDuplicate}:</b> 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=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl Sun Dec 23 15:02:31 2007 @@ -16,7 +16,6 @@ specific language governing permissions and limitations under the License. --> -<hr class="sepbar"/> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductOverrideSimpleFields}</h3> @@ -28,7 +27,7 @@ <td width="26%" align="right" class="label"><input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">${uiLabelMap.ProductProductCategoryType}</td> <td> </td> <td width="74%"> - <select name="productCategoryTypeId" size="1" class="selectBox"> + <select name="productCategoryTypeId" size="1"> <option value=""> </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> @@ -39,29 +38,29 @@ <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductName}</td> <td> </td> - <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60" class="inputBox"/></td> + <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductDescription}</td> <td> </td> <td width="74%" colspan="4" valign="top"> - <textarea class="textAreaBox" name="description" cols="60" rows="2">${(productCategory.description)?if_exists}</textarea> + <textarea 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> </td> <td width="74%" colspan="4" valign="top"> - <textarea class="textAreaBox" name="longDescription" cols="60" rows="7">${(productCategory.longDescription)?if_exists}</textarea> + <textarea 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> </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"> + <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250"> <br/> - <span class="tabletext">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> + <span class="tooltip">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> </td> </tr> <tr> @@ -72,5 +71,4 @@ </table> </form> </div> -</div> -<hr class="sepbar"/> \ No newline at end of file +</div> \ 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=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Sun Dec 23 15:02:31 2007 @@ -48,7 +48,7 @@ <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>> + <input type="text" size="25" name="thruDate" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" <#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> @@ -77,12 +77,12 @@ <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"> + <select name="productFeatureGroupId"> <#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"> + <input type="text" size="25" name="fromDate"> <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> @@ -100,7 +100,7 @@ <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 align="center"><b>${uiLabelMap.CommonThruDateTime}</b></td> <td><b> </b></td> </tr> <#assign line = 0> @@ -112,7 +112,7 @@ <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 <#if hasntStarted> style="color: red;"</#if>>${(productFeatureCategoryAppl.fromDate)?if_exists}</td> <td align="center"> <form method="post" action="<@ofbizUrl>updateProductFeatureCategoryAppl</@ofbizUrl>" name="lineForm${line}"> <#assign hasExpired = false> @@ -120,7 +120,7 @@ <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>> + <input type="text" size="25" name="thruDate" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" <#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> @@ -149,12 +149,12 @@ <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"> + <select name="productFeatureCategoryId"> <#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"> + <input type="text" size="25" name="fromDate"> <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> 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=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl Sun Dec 23 15:02:31 2007 @@ -41,7 +41,7 @@ <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 <#if hasntStarted> style="color: red;"</#if>>${(productCategoryRole.fromDate)?if_exists}</td> <td align="center"> <FORM method="post" action="<@ofbizUrl>updatePartyToCategory</@ofbizUrl>" name="lineForm${line}"> <#assign hasExpired = false> @@ -50,7 +50,7 @@ <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>> + <input type="text" size="25" name="thruDate" value="${(productCategoryRole. getTimestamp("thruDate"))?if_exists}" <#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> @@ -80,13 +80,13 @@ <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"> + <input type="text" size="20" maxlength="20" name="partyId" value=""> + <select name="roleTypeId" size="1"> <#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"> + <input type="text" size="25" name="fromDate"> <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> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Sun Dec 23 15:02:31 2007 @@ -44,7 +44,7 @@ </td> <#assign hasntStarted = false> <#if (prodCatalogCategory.getTimestamp("fromDate"))?exists && nowTimestamp.before(prodCatalogCategory.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> - <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(prodCatalogCategory.fromDate)?if_exists}</div></td> + <td <#if hasntStarted> style="color: red;"</#if>>${(prodCatalogCategory.fromDate)?if_exists}</td> <td align="center"> <form method="post" action="<@ofbizUrl>category_updateProductCategoryToProdCatalog</@ofbizUrl>" name="lineForm${line}"> <#assign hasExpired = false> @@ -53,11 +53,11 @@ <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)?if_exists}"/> <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/> <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)?if_exists}"/> - <input type="text" size="25" name="thruDate" value="${(prodCatalogCategory.thruDate)?if_exists}" class="inputBox" style="<#if (hasExpired) >color: red;</#if>"/> + <input type="text" size="25" name="thruDate" value="${(prodCatalogCategory.thruDate)?if_exists}" style="<#if (hasExpired) >color: red;</#if>"/> <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(prodCatalogCategory.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> - <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)?if_exists}" class="inputBox"/> + <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)?if_exists}"/> <#-- the prodCatalogCategoryTypeId field is now part of the PK, so it can't be changed, must be re-created - <select name="prodCatalogCategoryTypeId" size="1" class="selectBox"> + <select name="prodCatalogCategoryTypeId" size="1"> <#if (prodCatalogCategory.prodCatalogCategoryTypeId)?exists> <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"><#if curProdCatalogCategoryType?exists>${(curProdCatalogCategoryType.description)?if_exists}<#else> [${(prodCatalogCategory.prodCatalogCategoryTypeId)}]</#if></option> <option value="${prodCatalogCategory.prodCatalogCategoryTypeId}"></option> @@ -96,17 +96,17 @@ <tr><td> <form method="post" action="<@ofbizUrl>category_addProductCategoryToProdCatalog</@ofbizUrl>" style="margin: 0;" name="addNewForm"> <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"/> - <select name="prodCatalogId" class="selectBox"> + <select name="prodCatalogId"> <#list prodCatalogs as prodCatalog> <option value="${(prodCatalog.prodCatalogId)?if_exists}">${(prodCatalog.catalogName)?if_exists} [${(prodCatalog.prodCatalogId)?if_exists}]</option> </#list> </select> - <select name="prodCatalogCategoryTypeId" size="1" class="selectBox"> + <select name="prodCatalogCategoryTypeId" size="1"> <#list prodCatalogCategoryTypes as prodCatalogCategoryType> <option value="${(prodCatalogCategoryType.prodCatalogCategoryTypeId)?if_exists}">${(prodCatalogCategoryType.get("description",locale))?if_exists}</option> </#list> </select> - <input type="text" size="25" name="fromDate" class="inputBox"/> + <input type="text" size="25" name="fromDate"/> <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> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Sun Dec 23 15:02:31 2007 @@ -68,15 +68,15 @@ </#if> <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a> </td> - <td><div class="tabletext"<#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)?if_exists}</div></td> + <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)?if_exists}</td> <td align="center"> <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}"> <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}"> <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}"> - <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>> + <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if>> <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}" class="inputBox"> - <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}" class="inputBox"> + <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}"> + <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}"> <br/> <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea> </td> @@ -131,10 +131,10 @@ <form method="post" action="<@ofbizUrl>addCategoryProductMember</@ofbizUrl>" style="margin: 0;" name="addProductCategoryMemberForm"> <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> - <div class="tabletext"> - <span class="label">${uiLabelMap.ProductProductId}</span> <input type="text" size="20" name="productId" class="inputBox"> + <div> + <span class="label">${uiLabelMap.ProductProductId}</span> <input type="text" size="20" name="productId"> <a href="javascript:call_fieldlookup2(document.addProductCategoryMemberForm.productId, 'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"></a> - <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate" class="inputBox"> + <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate"> <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <br/> <span class="label">${uiLabelMap.CommonComments}</span> <textarea name="comments" rows="2" cols="40"></textarea> @@ -155,16 +155,16 @@ <form method="post" action="<@ofbizUrl>copyCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="copyCategoryProductMembersForm"> <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> - <div class="tabletext"> + <div> <span class="label">${uiLabelMap.ProductTargetProductCategory}</span> - <input type="text" class="inputBox" name="productCategoryIdTo" size="20" maxlength="20"/> + <input type="text" name="productCategoryIdTo" size="20" maxlength="20"/> <a href="javascript:call_fieldlookup2(document.copyCategoryProductMembersForm.productCategoryIdTo,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> <br/> - <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate" class="inputBox"> + <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate"> <a href="javascript:call_cal(document.copyCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <br/> <span class="label">${uiLabelMap.ProductIncludeSubCategories}?</span> - <select name="recurse" class="selectBox"> + <select name="recurse"> <option value="N">${uiLabelMap.CommonN}</option> <option value="Y">${uiLabelMap.CommonY}</option> </select> @@ -185,8 +185,8 @@ <form method="post" action="<@ofbizUrl>expireAllCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="expireAllCategoryProductMembersForm"> <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> - <div class="tabletext"> - <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span> <input type="text" size="20" name="thruDate" class="inputBox"> + <div> + <span class="label">${uiLabelMap.ProductOptionalExpirationDate}</span> <input type="text" size="20" name="thruDate"> <a href="javascript:call_cal(document.expireAllCategoryProductMembersForm.thruDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <input type="submit" value="${uiLabelMap.CommonExpireAll}"> </div> @@ -205,8 +205,8 @@ <form method="post" action="<@ofbizUrl>removeExpiredCategoryProductMembers</@ofbizUrl>" style="margin: 0;" name="removeExpiredCategoryProductMembersForm"> <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> - <div class="tabletext"> - <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span> <input type="text" size="20" name="validDate" class="inputBox"> + <div> + <span class="label">${uiLabelMap.ProductOptionalExpiredBeforeDate}</span> <input type="text" size="20" name="validDate"> <a href="javascript:call_cal(document.removeExpiredCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <input type="submit" value="${uiLabelMap.CommonRemoveExpired}"> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Sun Dec 23 15:02:31 2007 @@ -41,7 +41,7 @@ <#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td><#if curCategory?has_content><a href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if></td> - <td><div class="tabletext" <#if hasntStarted>style="color: red;"</#if>>${productCategoryRollup.fromDate}</div></td> + <td <#if hasntStarted>style="color: red;"</#if>>${productCategoryRollup.fromDate}</td> <td align="center"> <form method="post" action="<@ofbizUrl>updateProductCategoryToCategory</@ofbizUrl>" name="updateProductCategoryForm"> <input type="hidden" name="showProductCategoryId" value="${productCategoryId}"> @@ -49,9 +49,9 @@ <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}"> <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}"> <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}"> - <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" class="inputBox" <#if hasExpired>style="color: red"</#if>> + <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red"</#if>> <a href="javascript:call_cal(document.updateProductCategoryForm.thruDate${suffix}, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" class="inputBox"> + <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}"> </form> </td> <td> @@ -91,9 +91,9 @@ <form method="post" action="<@ofbizUrl>addProductCategoryToCategory</@ofbizUrl>" style="margin: 0;" name="addParentForm"> <input type="hidden" name="productCategoryId" value="${productCategoryId}"> <input type="hidden" name="showProductCategoryId" value="${productCategoryId}"> - <input type="text" class="inputBox" name="parentProductCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/> + <input type="text" name="parentProductCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/> <a href="javascript:call_fieldlookup2(document.addParentForm.parentProductCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - <input type="text" size="25" name="fromDate" class="inputBox"> + <input type="text" size="25" name="fromDate"> <a href="javascript:call_cal(document.addParentForm.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <input type="submit" value="${uiLabelMap.CommonAdd}"> </form> @@ -129,16 +129,16 @@ <#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td><#if curCategory?has_content><a href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if> - <td><div class="tabletext" <#if hasntStarted>style="color: red"</#if>>${productCategoryRollup.fromDate}</div></td> + <td <#if hasntStarted>style="color: red"</#if>>${productCategoryRollup.fromDate}</td> <td align="center"> <form method="post" action="<@ofbizUrl>updateProductCategoryToCategory</@ofbizUrl>" name="updateProductCategoryToCategoryChild"> <input type="hidden" name="showProductCategoryId" value="${productCategoryId}"> <input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}"> <input type="hidden" name="parentProductCategoryId${suffix}" value="${productCategoryRollup.parentProductCategoryId}"> <input type="hidden" name="fromDate${suffix}" value="${productCategoryRollup.fromDate}"> - <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" class="inputBox" <#if hasExpired>style="color: red;"</#if>> + <input type="text" size="25" name="thruDate${suffix}" value="${productCategoryRollup.thruDate?if_exists}" <#if hasExpired>style="color: red;"</#if>> <a href="javascript:call_cal(document.updateProductCategoryToCategoryChild.thruDate${suffix}, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}" class="inputBox"> + <input type="text" size="5" name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum?if_exists}"> </form> </td> <td> @@ -163,7 +163,7 @@ </#if> <#if parentProductCategoryRollups.size() == 0> <tr valign="middle"> - <td colspan="4"><div class="tabletext">${uiLabelMap.ProductNoChildCategoriesFound}.</div></td> + <td colspan="4">${uiLabelMap.ProductNoChildCategoriesFound}.</td> </tr> </#if> </table> @@ -179,9 +179,9 @@ <form method="post" action="<@ofbizUrl>addProductCategoryToCategory</@ofbizUrl>" style="margin: 0;" name="addChildForm"> <input type="hidden" name="showProductCategoryId" value="${productCategoryId}"> <input type="hidden" name="parentProductCategoryId" value="${productCategoryId}"> - <input type="text" class="inputBox" name="productCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/> + <input type="text" name="productCategoryId" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/> <a href="javascript:call_fieldlookup2(document.addChildForm.productCategoryId,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - <input type="text" size="25" name="fromDate" class="inputBox"> + <input type="text" size="25" name="fromDate"> <a href="javascript:call_cal(document.addChildForm.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <input type="submit" value="${uiLabelMap.CommonAdd}"> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl?rev=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl Sun Dec 23 15:02:31 2007 @@ -22,41 +22,37 @@ </#if> <div class="screenlet"> <div class="screenlet-title-bar"> - <table> - <tr> - <td style="head3"> - <b>${uiLabelMap.ProductCheckingForExistingProductInCategory} <#if (productCategory.description)?has_content>"${productCategory.description}"</#if> [${uiLabelMap.CommonId}:${productCategoryId?if_exists}]</b> - <#if productFeatureAndTypeDatas?has_content> - ${uiLabelMap.CommonWhere } - <#list productFeatureAndTypeDatas as productFeatureAndTypeData> - <#assign productFeatureType = productFeatureAndTypeData.productFeatureType> - <#assign productFeature = productFeatureAndTypeData.productFeature> - ${productFeatureType.description} = ${productFeature.description} - <#if productFeatureAndTypeData_has_next>,${uiLabelMap.CommonAnd} </#if> - </#list> - </#if> - </td> - </tr> - </table> + <h3> + <b>${uiLabelMap.ProductCheckingForExistingProductInCategory} <#if (productCategory.description)?has_content>"${productCategory.description}"</#if> [${uiLabelMap.CommonId}:${productCategoryId?if_exists}]</b> + <#if productFeatureAndTypeDatas?has_content> + ${uiLabelMap.CommonWhere } + <#list productFeatureAndTypeDatas as productFeatureAndTypeData> + <#assign productFeatureType = productFeatureAndTypeData.productFeatureType> + <#assign productFeature = productFeatureAndTypeData.productFeature> + ${productFeatureType.description} = ${productFeature.description} + <#if productFeatureAndTypeData_has_next>,${uiLabelMap.CommonAnd} </#if> + </#list> + </#if> + </h3> </div> <div class="screenlet-body"> <#if products?has_content> <table cellspacing="0" class="basic-table"> <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductInternalName}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductProductName}</div></td> + <td>${uiLabelMap.ProductInternalName}</td> + <td>${uiLabelMap.ProductProductName}</td> <td width="10%"> </td> </tr> <#list products as product> <tr> - <td><div class="tabletext">${product.internalName?default("-no internal name-")} [${product.productId}]</div></td> - <td><div class="tabletext">${product.productName?default("-no name-")} [${product.productId}]</div></td> + <td>${product.internalName?default("-no internal name-")} [${product.productId}]</td> + <td>${product.productName?default("-no name-")} [${product.productId}]</td> <td width="10%"><a href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductThisIsIt}]</a></td> </tr> </#list> </table> <#else> - <div class="head3"> ${uiLabelMap.ProductNoExistingProductsFound}.</div> + <h3> ${uiLabelMap.ProductNoExistingProductsFound}.</h3> </#if> </div> <br/> @@ -123,7 +119,7 @@ <tr> <td colspan="3"> <div> - ${uiLabelMap.ProductNewProductId}: <input type="text" name="productId" value="" class="inputBox"/> + ${uiLabelMap.ProductNewProductId}: <input type="text" name="productId" value=""/> <input type="submit" value="${uiLabelMap.ProductCreateNewProduct}" class="smallSubmit"/> </div> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl?rev=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl Sun Dec 23 15:02:31 2007 @@ -24,9 +24,7 @@ </#if> <div class="screenlet"> <div class="screenlet-title-bar"> - <table> - <tr><td style="head3"><b> </b></td></tr> - </table> + <h3><b> </b></h3> </div> <div class="screenlet-body"> <form name="createProductInCategoryCheckExistingForm" method="post" action="<@ofbizUrl>createProductInCategoryCheckExisting</@ofbizUrl>" style="margin: 0;"> @@ -40,7 +38,7 @@ <td width="15%">${productFeatureType.description}:</td> <td> <div> - <select class="selectBox" name="pft_${productFeatureTypeId}"> + <select name="pft_${productFeatureTypeId}"> <option value="">- ${uiLabelMap.CommonNone} -</option> <#list productFeatures as productFeature> <option value="${productFeature.productFeatureId}">${productFeature.description}</option> @@ -53,23 +51,23 @@ </#list> <tr> <td width="15%">${uiLabelMap.ProductInternalName}:</td> - <td><input type="text" name="internalName" size="30" maxlength="60" class="inputBox"/></td> + <td><input type="text" name="internalName" size="30" maxlength="60"/></td> </tr> <tr> <td width="15%">${uiLabelMap.ProductProductName}:</td> - <td><input type="text" name="productName" size="30" maxlength="60" class="inputBox"/></td> + <td><input type="text" name="productName" size="30" maxlength="60"/></td> </tr> <tr> <td width="15%">${uiLabelMap.ProductShortDescription}:</td> - <td><input type="text" name="description" size="60" maxlength="250" class="inputBox"/></td> + <td><input type="text" name="description" size="60" maxlength="250"/></td> </tr> <tr> <td width="15%">${uiLabelMap.ProductDefaultPrice}:</td> - <td><input type="text" name="defaultPrice" size="8" class="inputBox"/></td> + <td><input type="text" name="defaultPrice" size="8"/></td> </tr> <tr> <td width="15%">${uiLabelMap.ProductAverageCost}:</td> - <td><input type="text" name="averageCost" size="8" class="inputBox"/></td> + <td><input type="text" name="averageCost" size="8"/></td> </tr> <tr> <td colspan="3"> Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=606632&r1=606631&r2=606632&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Sun Dec 23 15:02:31 2007 @@ -37,9 +37,22 @@ <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container> - <label style="head1">${uiLabelMap.ProductCatalog}</label><label style="head2"> ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + <label style="head1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductCatalog}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="EditProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -72,11 +85,36 @@ <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container> - <label style="head1">${uiLabelMap.ProductCategories}</label><label style="head2"> ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + <label style="head1">${uiLabelMap.ProductCategories} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductCatalogCategories}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProdCatalogCategories" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductAddCatalogProdCat}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="addProductCategoryToProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="EditProdCatalogCategories" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - <label style="head2">${uiLabelMap.ProductAddCatalogProdCat}</label> - <include-form name="addProductCategoryToProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -105,10 +143,36 @@ <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container> - <label style="head1">${uiLabelMap.PartyParties}</label><label style="head2"> ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + <label style="head1">${uiLabelMap.PartyParties} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductCatalogParties}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="UpdateProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddProductCatalogParties}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="UpdateProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - <include-form name="AddProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -137,10 +201,36 @@ <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container> - <label style="head1">${uiLabelMap.ProductStores}</label><label style="head2"> ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + <label style="head1">${uiLabelMap.ProductStores} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductCatalogStores}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="UpdateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddProductCatalogStores}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="CreateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="UpdateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - <include-form name="CreateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -149,7 +239,6 @@ <screen name="FindProdCatalog"> <section> <actions> - <set field="title" value="Find Product Catalog"/> <set field="titleProperty" value="PageTitleEditFindProductCatalog"/> <set field="leftbarScreenName" value="leftbar"/> <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> @@ -159,7 +248,7 @@ </entity-condition> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> <!-- do check for CATALOG, _VIEW permission --> @@ -180,5 +269,4 @@ </widgets> </section> </screen> -</screens> - +</screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |