Author: buscob
Date: Sun Jan 10 16:14:40 2010
New Revision: 897651
URL: http://svn.apache.org/viewvc?rev=897651&view=rev
Log:
Better HTML markup leaving in the FTL just the screenlet-body content
Modified:
ofbiz/trunk/applications/product/webapp/catalog/main.ftl
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
Modified: ofbiz/trunk/applications/product/webapp/catalog/main.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/main.ftl?rev=897651&r1=897650&r2=897651&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/main.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/main.ftl Sun Jan 10
16:14:40 2010
@@ -17,50 +17,43 @@
under the License.
-->
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <div
class='h3'>${uiLabelMap.ProductCatalogAdministrationMainPage}</div>
- </div>
- <div class="screenlet-body">
- <#if !sessionAttributes.userLogin?exists>
- <div class='label'> ${uiLabelMap.ProductGeneralMessage}.</div>
- </#if>
- <br/>
- <#if security.hasEntityPermission("CATALOG", "_VIEW", session)>
- <div
class="label">${uiLabelMap.ProductEditCatalogWithCatalogId}:</div>
- <form method="post" action="<@ofbizUrl>EditProdCatalog</@ofbizUrl>"
style="margin: 0;" name="EditProdCatalogForm">
- <input type="text" size="20" maxlength="20" name="prodCatalogId"
value=""/>
- <input type="submit" value=" ${uiLabelMap.ProductEditCatalog}"
class="smallSubmit"/>
- </form>
- <div class="label">${uiLabelMap.CommonOr}: <a
href="<@ofbizUrl>EditProdCatalog</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductCreateNewCatalog}</a></div>
- <br/>
- <div
class="label">${uiLabelMap.ProductEditCategoryWithCategoryId}:</div>
- <form method="post" action="<@ofbizUrl>EditCategory</@ofbizUrl>"
style="margin: 0;" name="EditCategoryForm">
- <input type="text" size="20" maxlength="20"
name="productCategoryId" value=""/>
- <a
href="javascript:call_fieldlookup2(document.EditCategoryForm.productCategoryId,'LookupProductCategory');"><img
src='/images/fieldlookup.gif' width='15' height='14' border='0'
alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
- <input type="submit" value="${uiLabelMap.ProductEditCategory}"
class="smallSubmit"/>
- </form>
- <div class="label">${uiLabelMap.CommonOr}: <a
href="<@ofbizUrl>EditCategory</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductCreateNewCategory}</a></div>
- <br/>
- <div
class="label">${uiLabelMap.ProductEditProductWithProductId}:</div>
- <form method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>"
style="margin: 0;" name="EditProductForm">
- <input type="text" size="20" maxlength="20" name="productId"
value=""/>
- <a
href="javascript:call_fieldlookup2(document.EditProductForm.productId,'LookupProduct');"><img
src='/images/fieldlookup.gif' width='15' height='14' border='0'
alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
- <input type="submit" value=" ${uiLabelMap.ProductEditProduct}"
class="smallSubmit"/>
- </form>
- <div class="label">${uiLabelMap.CommonOr}: <a
href="<@ofbizUrl>EditProduct</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></div>
- <br/>
- <div class="label">${uiLabelMap.CommonOr}: <a
href="<@ofbizUrl>CreateVirtualWithVariantsForm</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductQuickCreateVirtualFromVariants}</a></div>
- <br/>
- <div class="label">${uiLabelMap.ProductFindProductWithIdValue}:</div>
- <form method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>"
style="margin: 0;">
- <input type="text" size="20" maxlength="20" name="idValue"
value=""/>
- <input type="submit" value=" ${uiLabelMap.ProductFindProduct}"
class="smallSubmit"/>
- </form>
- <br/>
- <div><a href="<@ofbizUrl>UpdateAllKeywords</@ofbizUrl>"
class="buttontext">
${uiLabelMap.ProductAutoCreateKeywordsForAllProducts}</a></div>
- <div><a href="<@ofbizUrl>FastLoadCache</@ofbizUrl>"
class="buttontext"> ${uiLabelMap.ProductFastLoadCatalogIntoCache}</a></div>
- <br/>
- </#if>
- </div>
-</div>
+<#if !sessionAttributes.userLogin?exists>
+ <div class='label'> ${uiLabelMap.ProductGeneralMessage}.</div>
+</#if>
+<br/>
+<#if security.hasEntityPermission("CATALOG", "_VIEW", session)>
+ <div class="label">${uiLabelMap.ProductEditCatalogWithCatalogId}:</div>
+ <form method="post" action="<@ofbizUrl>EditProdCatalog</@ofbizUrl>"
style="margin: 0;" name="EditProdCatalogForm">
+ <input type="text" size="20" maxlength="20" name="prodCatalogId" value=""/>
+ <input type="submit" value=" ${uiLabelMap.ProductEditCatalog}"
class="smallSubmit"/>
+ </form>
+ <div class="label">${uiLabelMap.CommonOr}: <a
href="<@ofbizUrl>EditProdCatalog</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductCreateNewCatalog}</a></div>
+ <br/>
+ <div class="label">${uiLabelMap.ProductEditCategoryWithCategoryId}:</div>
+ <form method="post" action="<@ofbizUrl>EditCategory</@ofbizUrl>"
style="margin: 0;" name="EditCategoryForm">
+ <input type="text" size="20" maxlength="20" name="productCategoryId"
value=""/>
+ <a
href="javascript:call_fieldlookup2(document.EditCategoryForm.productCategoryId,'LookupProductCategory');"><img
src='/images/fieldlookup.gif' width='15' height='14' border='0'
alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+ <input type="submit" value="${uiLabelMap.ProductEditCategory}"
class="smallSubmit"/>
+ </form>
+ <div class="label">${uiLabelMap.CommonOr}: <a
href="<@ofbizUrl>EditCategory</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductCreateNewCategory}</a></div>
+ <br/>
+ <div class="label">${uiLabelMap.ProductEditProductWithProductId}:</div>
+ <form method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>"
style="margin: 0;" name="EditProductForm">
+ <input type="text" size="20" maxlength="20" name="productId" value=""/>
+ <a
href="javascript:call_fieldlookup2(document.EditProductForm.productId,'LookupProduct');"><img
src='/images/fieldlookup.gif' width='15' height='14' border='0'
alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
+ <input type="submit" value=" ${uiLabelMap.ProductEditProduct}"
class="smallSubmit"/>
+ </form>
+ <div class="label">${uiLabelMap.CommonOr}: <a
href="<@ofbizUrl>EditProduct</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></div>
+ <br/>
+ <div class="label">${uiLabelMap.CommonOr}: <a
href="<@ofbizUrl>CreateVirtualWithVariantsForm</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductQuickCreateVirtualFromVariants}</a></div>
+ <br/>
+ <div class="label">${uiLabelMap.ProductFindProductWithIdValue}:</div>
+ <form method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>"
style="margin: 0;">
+ <input type="text" size="20" maxlength="20" name="idValue" value=""/>
+ <input type="submit" value=" ${uiLabelMap.ProductFindProduct}"
class="smallSubmit"/>
+ </form>
+ <br/>
+ <div><a href="<@ofbizUrl>UpdateAllKeywords</@ofbizUrl>" class="buttontext">
${uiLabelMap.ProductAutoCreateKeywordsForAllProducts}</a></div>
+ <div><a href="<@ofbizUrl>FastLoadCache</@ofbizUrl>" class="buttontext">
${uiLabelMap.ProductFastLoadCatalogIntoCache}</a></div>
+ <br/>
+</#if>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=897651&r1=897650&r2=897651&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun Jan
10 16:14:40 2010
@@ -381,9 +381,11 @@
<include-screen name="leftbar"/>
</decorator-section>
<decorator-section name="body">
- <platform-specific>
- <html><html-template
location="component://product/webapp/catalog/main.ftl"/></html>
- </platform-specific>
+ <screenlet
title="${uiLabelMap.ProductCatalogAdministrationMainPage}">
+ <platform-specific>
+ <html><html-template
location="component://product/webapp/catalog/main.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
