Author: buscob
Date: Sun Jan 10 16:08:05 2010
New Revision: 897650
URL: http://svn.apache.org/viewvc?rev=897650&view=rev
Log:
Changed some FTL screenlet-title-bar titles to match with what is rendered by the screenlet
widget
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl
ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
(original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
Sun Jan 10 16:08:05 2010
@@ -23,7 +23,10 @@
<input name="glReconciliationId" type="hidden" value="${glReconciliationId}"/>
<div class="screenlet">
<div class="screenlet-title-bar">
- <span class="label">${uiLabelMap.AccountingCurrentBankReconciliation}</span>
+ <ul>
+ <li class="h3">${uiLabelMap.AccountingCurrentBankReconciliation}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<a href="<@ofbizUrl>EditFinAccountReconciliations?finAccountId=${finAccountId}&glReconciliationId=${glReconciliationId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonEdit}</a>
@@ -70,7 +73,10 @@
</div>
<div class="screenlet">
<div class="screenlet-title-bar">
- <span class="label">${uiLabelMap.AccountingPreviousBankReconciliation}</span>
+ <ul>
+ <li class="h3">${uiLabelMap.AccountingPreviousBankReconciliation}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<#if previousGlReconciliation?has_content>
@@ -112,7 +118,10 @@
</div>
<div class="screenlet">
<div class="screenlet-title-bar">
- <span class="label">${uiLabelMap.AccountingFinAcctTransAssociatedToGlReconciliation}</span>
+ <ul>
+ <li class="h3">${uiLabelMap.AccountingFinAcctTransAssociatedToGlReconciliation}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<#if finAccountTransList?has_content>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
(original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
Sun Jan 10 16:08:05 2010
@@ -136,7 +136,10 @@
</div>
<div class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.AccountingChildPeriods}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.AccountingChildPeriods}</li>
+ </ul>
+ <br class="clear"/>
</div>
<#if customTimePeriods?has_content>
<table class="basic-table" cellspacing="0">
@@ -230,7 +233,10 @@
</div>
<div class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.AccountingAddCustomTimePeriod}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.AccountingAddCustomTimePeriod}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<form method="post" action="<@ofbizUrl>createCustomTimePeriod</@ofbizUrl>"
name="createCustomTimePeriodForm">
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
Sun Jan 10 16:08:05 2010
@@ -26,7 +26,10 @@
</script>
<div class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.PageTitleFindInventoryEventPlan}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.PageTitleFindInventoryEventPlan}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<form method="post" name="lookupinventory" action="<@ofbizUrl>FindInventoryEventPlan</@ofbizUrl>">
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl Sun
Jan 10 16:08:05 2010
@@ -20,7 +20,10 @@
<#if techDataCalendar?has_content>
<div class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.ManufacturingUpdateCalendar}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.ManufacturingUpdateCalendar}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<a href="<@ofbizUrl>EditCalendar</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a>
@@ -29,7 +32,10 @@
<#else>
<div class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.ManufacturingCreateCalendar}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.ManufacturingCreateCalendar}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<a href="<@ofbizUrl>EditCalendar</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Sun Jan 10 16:08:05
2010
@@ -219,7 +219,10 @@
<br/>
<div class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyQuickAddList}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.PartyQuickAddList}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if
requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>">
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Sun Jan 10 16:08:05
2010
@@ -35,7 +35,7 @@
<#else>
<#assign createUrl = "createnew"/>
</#if>
-<div class="button-bar"><a href="<@ofbizUrl>${createUrl}</@ofbizUrl>"
class="smallSubmit">${uiLabelMap.CommonCreateNew}</a></div>
+<div class="button-bar"><a href="<@ofbizUrl>${createUrl}</@ofbizUrl>"
class="textbutton">${uiLabelMap.CommonCreateNew}</a></div>
<div class="screenlet">
<div class="screenlet-title-bar">
<#if partyList?has_content>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Sun Jan 10 16:08:05
2010
@@ -25,7 +25,10 @@
<#if hasUpdatePermission>
<div id="linkParty" class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyLink}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.PartyLink}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body" align="center">
<#if partyTo?has_content && partyFrom?has_content>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl Sun
Jan 10 16:08:05 2010
@@ -19,7 +19,10 @@
<div id="partyAVS" class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyAvsOver}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.PartyAvsOver}</li>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<span class="label">${uiLabelMap.PartyAvsString}</span>${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")}
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl Sun Jan
10 16:08:05 2010
@@ -18,7 +18,10 @@
-->
<div id="partyContent" class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyContent}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.PartyContent}</li>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
${screens.render("component://party/widget/partymgr/ProfileScreens.xml#ContentList")}
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl Sun
Jan 10 16:08:05 2010
@@ -20,7 +20,10 @@
<#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists>
<div id="totalOrders" class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyLoyaltyPoints}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.PartyLoyaltyPoints}</li>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
${uiLabelMap.PartyYouHave} ${totalSubRemainingAmount} ${uiLabelMap.PartyPointsFrom}
${totalOrders} ${uiLabelMap.PartyOrderInLast} ${monthsToInclude} ${uiLabelMap.CommonMonths}.
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl
Sun Jan 10 16:08:05 2010
@@ -19,7 +19,10 @@
<div id="serialized-inventory-summary" class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.ProductSerializedInventorySummary}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.ProductSerializedInventorySummary}</li>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
<table id="serialized-inventory" class="basic-table" cellspacing="0" cellpadding="2">
Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl?rev=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl Sun Jan 10
16:08:05 2010
@@ -18,7 +18,10 @@
-->
<div class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.ProductProductCatalogsList}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.ProductProductCatalogsList}</li>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
<table cellspacing="0" class="basic-table">
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=897650&r1=897649&r2=897650&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Sun Jan 10 16:08:05
2010
@@ -40,7 +40,10 @@
<#if ! productCategory?has_content>
<#if productCategoryId?has_content>
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.ProductCouldNotFindProductCategoryWithId} "${productCategoryId}".</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.ProductCouldNotFindProductCategoryWithId} "${productCategoryId}".</li>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
<form action="<@ofbizUrl>createProductCategory</@ofbizUrl>" method="post"
style="margin: 0;" name="productCategoryForm">
@@ -54,7 +57,10 @@
</tr>
<#else>
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.PageTitleCreateProductCategory}</h3>
+ <ul>
+ <li class="h3">${uiLabelMap.PageTitleCreateProductCategory}</li>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
<form action="<@ofbizUrl>createProductCategory</@ofbizUrl>" method="post"
style="margin: 0;" name="productCategoryForm">
|