Author: jleroux
Date: Fri Apr 17 11:55:50 2009
New Revision: 765958
URL: http://svn.apache.org/viewvc?rev=765958&view=rev
Log:
Applied fix from trunk for revision: 765933
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
(props changed)
ofbiz/branches/release09.04/framework/common/webcommon/portal/editPortalPage.ftl
ofbiz/branches/release09.04/framework/common/webcommon/portal/showPortalPage.ftl
ofbiz/branches/release09.04/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.groovy
(props changed)
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
(props changed)
ofbiz/branches/release09.04/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
(props changed)
ofbiz/branches/release09.04/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy
(props changed)
ofbiz/branches/release09.04/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy
(props changed)
ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
(props changed)
ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
(props changed)
ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
(props changed)
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
svn:mergeinfo = /ofbiz/trunk:765933
Propchange:
ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
('svn:mergeinfo' removed)
Modified:
ofbiz/branches/release09.04/framework/common/webcommon/portal/editPortalPage.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/portal/editPortalPage.ftl?rev=765958&r1=765957&r2=765958&view=diff
==============================================================================
---
ofbiz/branches/release09.04/framework/common/webcommon/portal/editPortalPage.ftl
(original)
+++
ofbiz/branches/release09.04/framework/common/webcommon/portal/editPortalPage.ftl
Fri Apr 17 11:55:50 2009
@@ -20,7 +20,7 @@
<table width="100%">
<tr>
<#list portalPageColumnList?if_exists as portalPageColumn>
- <td class="manage-portal-column-toolbar" style="vertical-align: top;
<#if portalPageColumn.columnWidthPercentage?has_content>
${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
+ <td class="manage-portal-column-toolbar" style="vertical-align: top;
<#if portalPageColumn.columnWidthPercentage?has_content>
width:${portalPageColumn.columnWidthPercentage}%;</#if>">
<hr/>
<ul>
<li id="delete-column"><form method="post"
action="<@ofbizUrl>deletePortalPageColumn</@ofbizUrl>"
onSubmit="javascript:submitFormDisableSubmits(this)"
name="delPortalPageId_${portalPageColumn_index}"><input name="portalPageId"
value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId"
value="${portalPageColumn.columnSeqId}" type="hidden"/><input
name="parentPortalPageId" value="${parameters.parentPortalPageId}"
type="hidden"/></form><a class="buttontext"
href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li>
@@ -47,7 +47,7 @@
</tr>
<tr>
<#list portalPageColumnList?if_exists as portalPageColumn>
- <td style="vertical-align: top; <#if
portalPageColumn.columnWidthPercentage?has_content>
${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
+ <td style="vertical-align: top; <#if
portalPageColumn.columnWidthPercentage?has_content>
width:${portalPageColumn.columnWidthPercentage}%;</#if>">
<#assign firstInColumn = true/>
<#list portalPagePortletViewList as portlet>
<#if (!portlet.columnSeqId?has_content && portalPageColumn_index == 0)
|| (portlet.columnSeqId?if_exists == portalPageColumn.columnSeqId)>
Modified:
ofbiz/branches/release09.04/framework/common/webcommon/portal/showPortalPage.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/portal/showPortalPage.ftl?rev=765958&r1=765957&r2=765958&view=diff
==============================================================================
---
ofbiz/branches/release09.04/framework/common/webcommon/portal/showPortalPage.ftl
(original)
+++
ofbiz/branches/release09.04/framework/common/webcommon/portal/showPortalPage.ftl
Fri Apr 17 11:55:50 2009
@@ -21,7 +21,7 @@
<table width="100%">
<tr>
<#list portalPageColumns?if_exists as portalPageColumn>
- <td style="vertical-align: top; <#if
portalPageColumn.columnWidthPercentage?has_content>
${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
+ <td style="vertical-align: top; <#if
portalPageColumn.columnWidthPercentage?has_content>
width:${portalPageColumn.columnWidthPercentage}%;</#if>">
<#assign firstInColumn = true/>
<#list portalPagePortlets as portlet>
<#if (!portlet.columnSeqId?has_content && portalPageColumn_index == 0)
|| (portlet.columnSeqId?if_exists == portalPageColumn.columnSeqId)>
@@ -45,4 +45,4 @@
</table>
<#else/>
<h2>No portal page data found. You may not have the necessary seed or other
data for it.</h2>
-</#if>
\ No newline at end of file
+</#if>
Propchange:
ofbiz/branches/release09.04/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.groovy
('svn:mergeinfo' removed)
Propchange:
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
('svn:mergeinfo' removed)
Propchange:
ofbiz/branches/release09.04/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy
('svn:mergeinfo' removed)
Propchange:
ofbiz/branches/release09.04/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy
('svn:mergeinfo' removed)
Propchange:
ofbiz/branches/release09.04/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy
('svn:mergeinfo' removed)
Propchange:
ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
('svn:mergeinfo' removed)
Propchange:
ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
('svn:mergeinfo' removed)
Propchange:
ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
('svn:mergeinfo' removed)
