svn commit: r607495 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mrisaliti
Date: Sat Dec 29 16:32:41 2007 New Revision: 607495 URL: http://svn.apache.org/viewvc?rev=607495&view=rev Log: Product Configuration forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1544) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl ofbiz/trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Sat Dec 29 16:32:41 2007 @@ -456,6 +456,7 @@ ProductConditions=Conditions ProductConfigItem=Config Item ProductConfigItems=Configurations +ProductConfigItemsFound=Config Items Found ProductConfigOptions=Config Options ProductConfigs=Configurations ProductConfirmSelectedMoves=Confirm selected moves Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Sat Dec 29 16:32:41 2007 @@ -177,7 +177,7 @@ PageTitleEditSupplierProduct=Aggiorna Prodotto del Fornitore PageTitleEditVendorProduct=Aggiorna Fornitore Prodotto PageTitleEditProductWorkEffort=Aggiorna Impegno di Lavoro Prodotto -PageTitleFindConfigItems=Ricerca Righe Configurazione +PageTitleFindConfigItems=Ricerca Righe Configurazioni PageTitleFindFacility=Ricerca Stabilimento PageTitleFindFacilityGroup=Ricerca Gruppo Stabilimento PageTitleFindFacilityLocation=Ricerca Posizione Stabilimento @@ -447,6 +447,7 @@ ProductConditions=Condizioni ProductConfigItem=Riga Configurazione ProductConfigItems=Configurazioni +ProductConfigItemsFound=Righe Configurazioni Trovate ProductConfigOptions=Opzioni Configurazione ProductConfigs=Configurazioni ProductConfirmSelectedMoves=Conferma spostamenti selezionati 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=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Sat Dec 29 16:32:41 2007 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -21,7 +21,7 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="EditProductConfigItem" type="single" target="updateProductConfigItem" title="" default-map-name="configItem" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="configItem==null" target="createProductConfigItem"/> @@ -41,7 +41,7 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="EditConfigOption" type="list" target="updateProductConfigOption" title="" list-name="configOptionList" list-entry-name="configOption" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + odd-row-style="alternate-row" default-table-style="basic-table"> <auto-fields-service service-name="updateProductConfigOption" map-name="configOption"/> @@ -49,7 +49,7 @@ <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="CreateConfigOption" type="single" target="createProductConfigOption" title="" default-map-name="configOption" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="configOption!=null" target="updateProductConfigOption"/> <auto-fields-service service-name="createProductConfigOption"/> @@ -60,7 +60,7 @@ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="CreateProductConfigProduct" type="single" target="createProductConfigProduct" title="" default-map-name="productConfigProduct" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="productConfigProduct!=null" target="updateProductConfigProduct"/> <auto-fields-service service-name="createProductConfigProduct"/> @@ -76,7 +76,7 @@ <!-- ProdConfItemContent --> <form name="AddProductConfigItemContentAssoc" type="single" target="addContentToProductConfigItem" title="Add ProdConfItemContent (select Content Id, enter From Date):" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ProdConfItemContent"/> <field name="configItemId" title="${uiLabelMap.ProductConfigItemId}" map-name="productConfigItem"><hidden/></field> <field name="contentId" title="${uiLabelMap.ProductContentId}" ></field> @@ -92,7 +92,7 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="PrepareAddProductConfigItemContentAssoc" type="single" target="prepareAddContentToProductConfigItem" title="Add ProdConfItemContent (select Content Id, enter From Date):" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ProdConfItemContent"/> <field name="contentId"><ignored/></field> <field name="fromDate"><ignored/></field> @@ -109,7 +109,7 @@ <field name="submitButton" title="${uiLabelMap.ProductPrepareCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="UpdateProductConfigItemContentAssoc" type="list" target="updateContentToProductConfigItem" title="" list-name="productContentDatas" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + odd-row-style="alternate-row" default-table-style="basic-table"> <!-- each entry in the list will be a Map with the entries: productContent and content --> <auto-fields-service service-name="updateProductConfigItemContent" map-name="productContent"/> <field name="configItemId"><hidden/></field> @@ -131,7 +131,7 @@ </field> </form> <form name="EditProductConfigItemContentSimpleText" type="single" target="updateSimpleTextContentForProductConfigItem" title="Update Simple Text Content for Product" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="contentId==null" target="createSimpleTextContentForProductConfigItem"/> <auto-fields-entity entity-name="ProdConfItemContent" map-name="productContentData"/> <field name="fromDate" title="${uiLabelMap.CommonFromDate}" ></field> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl?rev=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl Sat Dec 29 16:32:41 2007 @@ -17,13 +17,17 @@ under the License. --> -<#assign unselectedClassName = "tabButton"> -<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> +<#assign unselectedClassName = ""> +<#assign selectedClassMap = {page.tabButtonItem?default("void") : "selected"}> <#if configItemId?has_content> - <div class='tabContainer'> - <a href="<@ofbizUrl>EditProductConfigItem?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigItem?default(unselectedClassName)}">${uiLabelMap.ProductConfigItem}</a> - <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigOptions?default(unselectedClassName)}">${uiLabelMap.ProductConfigOptions}</a> - <a href="<@ofbizUrl>EditProductConfigItemContent?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigItemContent?default(unselectedClassName)}">${uiLabelMap.ProductContent}</a> - </div> + <br/> + <div class="button-bar tab-bar"> + <ul> + <li><a href="<@ofbizUrl>EditProductConfigItem?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigItem?default(unselectedClassName)}">${uiLabelMap.ProductConfigItem}</a></li> + <li><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigOptions?default(unselectedClassName)}">${uiLabelMap.ProductConfigOptions}</a></li> + <li><a href="<@ofbizUrl>EditProductConfigItemContent?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigItemContent?default(unselectedClassName)}">${uiLabelMap.ProductContent}</a></li> + </ul> + <br/> + </div> </#if> 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=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Sat Dec 29 16:32:41 2007 @@ -28,12 +28,12 @@ <#if fileType?has_content> <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> <br/> </#if> @@ -41,89 +41,114 @@ <#if !(configItem?exists)> <h3>${uiLabelMap.ProductCouldNotFindProductConfigItem} "${configItemId}".</h3> <#else> - <table border="1" cellpadding="2" cellspacing="0" width="100%"> - <tr class="tableheadtext"> - <td>${uiLabelMap.ProductContent}</td> - <td>${uiLabelMap.ProductType}</td> - <td>${uiLabelMap.CommonFrom}</td> - <td>${uiLabelMap.CommonThru}</td> - <td> </td> - </tr> - <#list productContentList as entry> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td><b>${uiLabelMap.ProductContent}</b></td> + <td><b>${uiLabelMap.ProductType}</b></td> + <td><b>${uiLabelMap.CommonFrom}</b></td> + <td><b>${uiLabelMap.CommonThru}</b></td> + <td><b> </b></td> + <td><b> </b></td> + </tr> + <#assign rowClass = "2"> + <#list productContentList as entry> <#assign productContent=entry.productContent/> <#assign productContentType=productContent.getRelatedOneCache("ProdConfItemContentType")/> - <tr class="tabletext"> + <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td><a href="<@ofbizUrl>EditProductConfigItemContentContent?configItemId=${productContent.configItemId}&contentId=${productContent.contentId}&confItemContentTypeId=${productContent.confItemContentTypeId}&fromDate=${productContent.fromDate}</@ofbizUrl>" class="buttontext">${entry.content.description?default("[${uiLabelMap.ProductNoDescription}]")} [${entry.content.contentId}]</td> <td>${productContentType.description?default(productContent.confItemContentTypeId)}</td> <td>${productContent.fromDate?default("N/A")}</td> <td>${productContent.thruDate?default("N/A")}</td> - <td><a href="<@ofbizUrl>removeContentFromProductConfigItem?configItemId=${productContent.configItemId}&contentId=${productContent.contentId}&confItemContentTypeId=${productContent.confItemContentTypeId}&fromDate=${productContent.fromDate}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDelete}]</a></td> - <td><a href="/content/control/EditContent?contentId=${productContent.contentId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">[${uiLabelMap.ProductEditContent} ${entry.content.contentId}]</td> + <td><a href="<@ofbizUrl>removeContentFromProductConfigItem?configItemId=${productContent.configItemId}&contentId=${productContent.contentId}&confItemContentTypeId=${productContent.confItemContentTypeId}&fromDate=${productContent.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></td> + <td><a href="/content/control/EditContent?contentId=${productContent.contentId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.ProductEditContent} ${entry.content.contentId}</td> </tr> - </#list> + <#-- toggle the row color --> + <#if rowClass == "2"> + <#assign rowClass = "1"> + <#else> + <#assign rowClass = "2"> + </#if> + </#list> </table> - <h2>${uiLabelMap.ProductCreateNewProductConfigItemContent}</h2> + <br/> <#if configItemId?has_content && configItem?has_content> - ${prepareAddProductContentWrapper.renderFormString(context)} - </#if> - <h2>${uiLabelMap.ProductAddContentProductConfigItem}</h2> - <#if configItemId?has_content && configItem?has_content> - ${addProductContentWrapper.renderFormString(context)} - </#if> - - <hr class="sepbar"/> - - <h2>${uiLabelMap.ProductOverrideSimpleFields}</h2> - <form action="<@ofbizUrl>updateProductConfigItemContent</@ofbizUrl>" method="post" style="margin: 0;" name="productForm"> - <table border="0" cellpadding="2" cellspacing="0"> - <input type="hidden" name="configItemId" value="${configItemId?if_exists}"> - <tr> - <td width="20%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div></td> - <td> </td> - <td width="80%" colspan="4" valign="top"> - <textarea class="textAreaBox" name="description" cols="60" rows="2">${(configItem.description)?if_exists}</textarea> - </td> - </tr> - <tr> - <td width="20%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.ProductLongDescription}</b></div></td> - <td> </td> - <td width="80%" colspan="4" valign="top"> - <textarea class="textAreaBox" name="longDescription" cols="60" rows="7">${(configItem.longDescription)?if_exists}</textarea> - </td> - </tr> - <tr> - <td width="20%" align="right" valign="top"> - <div class="tabletext"><b>${uiLabelMap.ProductSmallImage}</b></div> - <#if (configItem.imageUrl)?exists> - <a href="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" height="40" width="40"></a> - </#if> - </td> - <td> </td> - <td width="80%" colspan="4" valign="top"> - <input type="text" class="inputBox" name="imageUrl" value="${(configItem.imageUrl)?default(imageNameSmall + '.jpg')}" size="60" maxlength="255"> - <#if configItemId?has_content> - <div> - <span class="tabletext">${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> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductCreateNewProductConfigItemContent}</h3> </div> - </#if> - </td> - </tr> - <tr> - <td colspan="2"> </td> - <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td> - <td colspan="3"> </td> - </tr> - </table> - </form> - - <hr class="sepbar"/> - - <h3>${uiLabelMap.ProductUploadImage}</h3> - <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadProductConfigItemImage?configItemId=${configItemId}&upload_file_type=small</@ofbizUrl>" name="imageUploadForm"> - <input type="file" class="inputBox" size="50" name="fname"> - <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"> - </form> + <div class="screenlet-body"> + ${prepareAddProductContentWrapper.renderFormString(context)} + </div> + </div> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductAddContentProductConfigItem}</h3> + </div> + <div class="screenlet-body"> + ${addProductContentWrapper.renderFormString(context)} + </div> + </div> + </#if> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductOverrideSimpleFields}</h3> + </div> + <div class="screenlet-body"> + <form action="<@ofbizUrl>updateProductConfigItemContent</@ofbizUrl>" method="post" style="margin: 0;" name="productForm"> + <table cellspacing="0" class="basic-table"> + <input type="hidden" name="configItemId" value="${configItemId?if_exists}"> + <tr> + <td width="20%" align="right" valign="top" class="label">${uiLabelMap.CommonDescription}</td> + <td> </td> + <td width="80%" colspan="4" valign="top"> + <textarea name="description" cols="60" rows="2">${(configItem.description)?if_exists}</textarea> + </td> + </tr> + <tr> + <td width="20%" align="right" valign="top" class="label">${uiLabelMap.ProductLongDescription}</td> + <td> </td> + <td width="80%" colspan="4" valign="top"> + <textarea name="longDescription" cols="60" rows="7">${(configItem.longDescription)?if_exists}</textarea> + </td> + </tr> + <tr> + <td width="20%" align="right" valign="top" class="label"> + ${uiLabelMap.ProductSmallImage} + <#if (configItem.imageUrl)?exists> + <a href="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" target="_blank"><img alt="Image" src="<@ofbizContentUrl>${configItem.imageUrl}</@ofbizContentUrl>" height="40" width="40"></a> + </#if> + </td> + <td> </td> + <td width="80%" colspan="4" valign="top"> + <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> + <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> + </div> + </#if> + </td> + </tr> + <tr> + <td colspan="2"> </td> + <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td> + <td colspan="3"> </td> + </tr> + </table> + </form> + </div> + </div> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductUploadImage}</h3> + </div> + <div class="screenlet-body"> + <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadProductConfigItemImage?configItemId=${configItemId}&upload_file_type=small</@ofbizUrl>" name="imageUploadForm"> + <input type="file" size="50" name="fname"> + <input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"> + </form> + </div> + </div> </#if> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl?rev=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl Sat Dec 29 16:32:41 2007 @@ -16,12 +16,11 @@ specific language governing permissions and limitations under the License. --> - <a href="<@ofbizUrl>EditProductConfigItemContent?configItemId=${configItemId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductProduct} ${uiLabelMap.ProductConfigItem} ${uiLabelMap.ProductContent} ${uiLabelMap.CommonList}]</a> - <#if contentId?has_content> - <a href="/content/control/gotoContent?contentId=${contentId}" class='buttontext' target='_blank'>[${uiLabelMap.ProductContent} ${uiLabelMap.CommonPage}]</a> - </#if> - <br/> - - <#if configItemId?has_content && productContent?has_content> - ${updateProductContentWrapper.renderFormString()} - </#if> +<a href="<@ofbizUrl>EditProductConfigItemContent?configItemId=${configItemId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductProduct} ${uiLabelMap.ProductConfigItem} ${uiLabelMap.ProductContent} ${uiLabelMap.CommonList}</a> +<#if contentId?has_content> + <a href="/content/control/gotoContent?contentId=${contentId}" class='buttontext' target='_blank'>${uiLabelMap.ProductContent} ${uiLabelMap.CommonPage}</a> +</#if> +<br/> +<#if configItemId?has_content && productContent?has_content> + ${updateProductContentWrapper.renderFormString()} +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl?rev=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl Sat Dec 29 16:32:41 2007 @@ -16,40 +16,37 @@ specific language governing permissions and limitations under the License. --> - - <table border="1" cellpadding='2' cellspacing='0'> - <tr> - <td><div class="tableheadtext">${uiLabelMap.CommonName}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonSequenceNum}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td> - <td><div class="tableheadtext"> </div></td> - <td><div class="tableheadtext"> </div></td> - <td><div class="tableheadtext"> </div></td> +<table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td><b>${uiLabelMap.CommonName}</b></td> + <td><b>${uiLabelMap.CommonSequenceNum}</b></td> + <td><b>${uiLabelMap.CommonDescription}</b></td> + <td><b> </b></td> + <td><b> </b></td> + <td><b> </b></td> </tr> + <#assign rowClass = "2"> <#list configOptionList as question> <form method="post" action="<@ofbizUrl>updateProductConfigOption</@ofbizUrl>"> <input type="hidden" name="configItemId" value="${question.configItemId}"> <input type="hidden" name="configOptionId" value="${question.configOptionId}"> - <tr valign="middle"> - <td><div class="tabletext">${question.configOptionId} - ${question.configOptionName?if_exists}</div></td> - <td><input type="text" name="sequenceNum" size="3" class="textBox" value="${question.sequenceNum?if_exists}"> - <td><div class="tabletext">${question.description?if_exists}</div></td> - <td><input type="submit" value="${uiLabelMap.CommonUpdate}"> - <td><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${question.configOptionId}#edit</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a> - <td><a href="<@ofbizUrl>deleteProductConfigOption?configItemId=${question.configItemId}&configOptionId=${question.configOptionId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a> + <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> + <td>${question.configOptionId} - ${question.configOptionName?if_exists}</td> + <td><input type="text" name="sequenceNum" size="3" value="${question.sequenceNum?if_exists}"></td> + <td>${question.description?if_exists}</td> + <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td> + <td><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${question.configOptionId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a></td> + <td><a href="<@ofbizUrl>deleteProductConfigOption?configItemId=${question.configItemId}&configOptionId=${question.configOptionId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a></td> </tr> </form> </#list> </table> <br/> - - <hr class="sepbar"> <a name="edit"/> <#-- new question / category --> - <#if configOptionId?has_content> <h2>${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigOptions}:</h2> - <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}#edit</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigOptions}]</a> + <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigOptions}</a> <#else> <h2>${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigOptions}</h2> </#if> @@ -57,26 +54,31 @@ <#if (configOption?has_content)> <br/> - <hr class="sepbar"> <h1>${uiLabelMap.ProductComponents} - <span class="head2">${uiLabelMap.CommonId}: ${configOption.configOptionId?if_exists} - ${configOption.description?if_exists}</h1> - <table border="1" cellpadding='2' cellspacing='0'> - <tr> - <td><div class="tableheadtext">${uiLabelMap.CommonSequenceNum}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductQuantity}</div></td> - <td><div class="tableheadtext"> </div></td> - <td><div class="tableheadtext"> </div></td> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.CommonSequenceNum}</td> + <td>${uiLabelMap.ProductProduct}</td> + <td>${uiLabelMap.ProductQuantity}</td> + <td> </div></td> + <td> </div></td> </tr> - + <#assign rowClass = "2"> <#list configProducts as component> <#assign product = component.getRelatedOne("ProductProduct")> - <tr valign="middle"> - <td><div class="tabletext">${component.sequenceNum?if_exists}</div></td> - <td><div class="tabletext">${component.productId?if_exists} - ${product.internalName?if_exists}</div></td> - <td><div class="tabletext">${component.quantity?if_exists}</div></td> - <td><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${component.configOptionId}&productId=${component.productId}#edit</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a> - <td><a href="<@ofbizUrl>deleteProductConfigProduct?configItemId=${requestParameters.configItemId}&configOptionId=${component.configOptionId}&productId=${component.productId}#edit</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a> + <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> + <td>${component.sequenceNum?if_exists}</td> + <td>${component.productId?if_exists} - ${product.internalName?if_exists}</td> + <td>${component.quantity?if_exists}</td> + <td><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${component.configOptionId}&productId=${component.productId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> + <td><a href="<@ofbizUrl>deleteProductConfigProduct?configItemId=${requestParameters.configItemId}&configOptionId=${component.configOptionId}&productId=${component.productId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> </tr> + <#-- toggle the row color --> + <#if rowClass == "2"> + <#assign rowClass = "1"> + <#else> + <#assign rowClass = "2"> + </#if> </#list> </table> @@ -84,7 +86,7 @@ <h2>${uiLabelMap.CommonAddA} ${uiLabelMap.ProductConfigs}:</h2> <#else> <h2>${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigs}:</h2> - <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${productConfigProduct.configOptionId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}]</a> + <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${productConfigProduct.configOptionId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}</a> </#if> ${sections.render("CreateConfigProductForm")} - </#if> + </#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl?rev=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl Sat Dec 29 16:32:41 2007 @@ -16,16 +16,10 @@ specific language governing permissions and limitations under the License. --> - <#if itemsList?exists> -<table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside"> - <tr> - <td width="100%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop"> - <tr> - <td width="50%"><div class="boxhead">${uiLabelMap.ProductConfigItem} ${uiLabelMap.CommonFound}</div></td> - <td width="50%"> - <div class="boxhead" align="right"> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <div class="boxhead-right"> <#if 0 < itemsList?size> <#if 0 < viewIndex> <a href="<@ofbizUrl>FindProductConfigItems?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> @@ -43,48 +37,47 @@ </#if> </div> - </td> - </tr> - </table> - <div class="tabletext"><a href="<@ofbizUrl>EditProductConfigItem</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigItem}]</a></div> - <br/> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="boxbottom"> - <tr> - <td align="left"><div class="tableheadtext">${uiLabelMap.ProductConfigItem}</div></td> - <td align="left"><div class="tableheadtext">${uiLabelMap.CommonType}</div></td> - <td align="left"><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td> - <td><div class="tableheadtext"> </div></td> - </tr> - <tr> - <td colspan="10"><hr class="sepbar"></td> - </tr> - <#if itemsList?has_content> - <#assign rowClass = "viewManyTR2"> - <#list itemsList[lowIndex..highIndex-1] as item> - <tr class="${rowClass}"> - <td><div class="tabletext">${item.configItemId} - ${item.configItemName?default("")}</div></td> - <td><div class="tabletext"> - <#if item.configItemTypeId?if_exists == "SINGLE">${uiLabelMap.ProductSingleChoice}<#else>${uiLabelMap.ProductMultiChoice}</#if> - </div></td> - <td><div class="tabletext">${item.description?default("No Description")}</div></td> - <td align="right"> - <a href="<@ofbizUrl>EditProductConfigItem?configItemId=${item.configItemId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> - </td> - </tr> - <#-- toggle the row color --> - <#if rowClass == "viewManyTR2"> - <#assign rowClass = "viewManyTR1"> - <#else> - <#assign rowClass = "viewManyTR2"> - </#if> - </#list> - <#else> - <tr> - <td colspan="4"><h3>${uiLabelMap.CommonNo} ${uiLabelMap.ProductConfigItems} ${uiLabelMap.CommonFound}.</h3></td> - </tr> - </#if> - </table> - </td> - </tr> -</table> -</#if> + <div class="boxhead-left"> + ${uiLabelMap.PageTitleFindConfigItems} + </div> + <div class="boxhead-fill"> </div> + </div> + <div class="screenlet-body"> + <a href="<@ofbizUrl>EditProductConfigItem</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigItem}</a> + <br/> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td align="left">${uiLabelMap.ProductConfigItem}</td> + <td align="left">${uiLabelMap.CommonType}</td> + <td align="left">${uiLabelMap.CommonDescription}</td> + <td> </td> + </tr> + <#if itemsList?has_content> + <#assign rowClass = "2"> + <#list itemsList[lowIndex..highIndex-1] as item> + <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> + <td>${item.configItemId} - ${item.configItemName?default("")}</td> + <td> + <#if item.configItemTypeId?if_exists == "SINGLE">${uiLabelMap.ProductSingleChoice}<#else>${uiLabelMap.ProductMultiChoice}</#if> + </td> + <td>${item.description?default("No Description")}</td> + <td align="right"> + <a href="<@ofbizUrl>EditProductConfigItem?configItemId=${item.configItemId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> + </td> + </tr> + <#-- toggle the row color --> + <#if rowClass == "2"> + <#assign rowClass = "1"> + <#else> + <#assign rowClass = "2"> + </#if> + </#list> + <#else> + <tr> + <td colspan="4"><h3>${uiLabelMap.CommonNo} ${uiLabelMap.ProductConfigItems} ${uiLabelMap.CommonFound}.</h3></td> + </tr> + </#if> + </table> + </div> + </div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=607495&r1=607494&r2=607495&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sat Dec 29 16:32:41 2007 @@ -95,7 +95,20 @@ <widgets> <decorator-screen name="CommonConfigDecorator"> <decorator-section name="body"> - <include-form name="EditProductConfigItem" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditConfigItem}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProductConfigItem" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -133,18 +146,31 @@ <widgets> <decorator-screen name="CommonConfigDecorator"> <decorator-section name="body"> - <platform-specific> - <html> - <html-template-decorator location="component://product/webapp/catalog/config/EditProductConfigOptions.ftl"> - <html-template-decorator-section name="CreateConfigOptionForm"> - <include-form name="CreateConfigOption" location="component://product/webapp/catalog/config/ConfigForms.xml"/> - </html-template-decorator-section> - <html-template-decorator-section name="CreateConfigProductForm"> - <include-form name="CreateProductConfigProduct" location="component://product/webapp/catalog/config/ConfigForms.xml"/> - </html-template-decorator-section> - </html-template-decorator> - </html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditConfigOptions}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html> + <html-template-decorator location="component://product/webapp/catalog/config/EditProductConfigOptions.ftl"> + <html-template-decorator-section name="CreateConfigOptionForm"> + <include-form name="CreateConfigOption" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + </html-template-decorator-section> + <html-template-decorator-section name="CreateConfigProductForm"> + <include-form name="CreateProductConfigProduct" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + </html-template-decorator-section> + </html-template-decorator> + </html> + </platform-specific> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |