You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/04/17 12:20:28 UTC
svn commit: r765933 - in /ofbiz/trunk/framework/common/webcommon/portal:
editPortalPage.ftl showPortalPage.ftl
Author: hansbak
Date: Fri Apr 17 10:20:28 2009
New Revision: 765933
URL: http://svn.apache.org/viewvc?rev=765933&view=rev
Log:
OFBIZ-2314
Modified:
ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=765933&r1=765932&r2=765933&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Fri Apr 17 10:20:28 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="<@o...@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/trunk/framework/common/webcommon/portal/showPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl?rev=765933&r1=765932&r2=765933&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl Fri Apr 17 10:20:28 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>
Re: svn commit: r765933 - in /ofbiz/trunk/framework/common/webcommon/portal: editPortalPage.ftl showPortalPage.ftl
Posted by Jacques Le Roux <ja...@les7arts.com>.
BTW I have backported to R9.04 at r765958. I got some weird things with 'svn:mergeinfo' but this does not seems to hurt (will see
later in case)
Jacques
From: "Ashish Vijaywargiya" <vi...@gmail.com>
> Hello Hans,
>
> It helps, if we provide few details in "Log" instead of including only Jira
> issue number. (Best Practice)
> If you are agree on my comment then we are good, if not then you can safely
> discard my comment.
>
> Thanks !
>
> --
> Ashish
>
>
> On Fri, Apr 17, 2009 at 3:50 PM, <ha...@apache.org> wrote:
>
>> Author: hansbak
>> Date: Fri Apr 17 10:20:28 2009
>> New Revision: 765933
>>
>> URL: http://svn.apache.org/viewvc?rev=765933&view=rev
>> Log:
>> OFBIZ-2314
>>
>> Modified:
>> ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
>> ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
>>
>> Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=765933&r1=765932&r2=765933&view=diff
>>
>> ==============================================================================
>> --- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
>> (original)
>> +++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Fri
>> Apr 17 10:20:28 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="<@o...@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/trunk/framework/common/webcommon/portal/showPortalPage.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl?rev=765933&r1=765932&r2=765933&view=diff
>>
>> ==============================================================================
>> --- ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
>> (original)
>> +++ ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl Fri
>> Apr 17 10:20:28 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>
>>
>>
>>
>
Re: svn commit: r765933 - in /ofbiz/trunk/framework/common/webcommon/portal:
editPortalPage.ftl showPortalPage.ftl
Posted by Ashish Vijaywargiya <vi...@gmail.com>.
Hello Hans,
It helps, if we provide few details in "Log" instead of including only Jira
issue number. (Best Practice)
If you are agree on my comment then we are good, if not then you can safely
discard my comment.
Thanks !
--
Ashish
On Fri, Apr 17, 2009 at 3:50 PM, <ha...@apache.org> wrote:
> Author: hansbak
> Date: Fri Apr 17 10:20:28 2009
> New Revision: 765933
>
> URL: http://svn.apache.org/viewvc?rev=765933&view=rev
> Log:
> OFBIZ-2314
>
> Modified:
> ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
> ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
>
> Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=765933&r1=765932&r2=765933&view=diff
>
> ==============================================================================
> --- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
> (original)
> +++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Fri
> Apr 17 10:20:28 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="<@o...@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/trunk/framework/common/webcommon/portal/showPortalPage.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl?rev=765933&r1=765932&r2=765933&view=diff
>
> ==============================================================================
> --- ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
> (original)
> +++ ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl Fri
> Apr 17 10:20:28 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>
>
>
>