You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2010/09/19 17:46:18 UTC
svn commit: r998686 - in /ofbiz/trunk/framework: common/webcommon/WEB-INF/
common/webcommon/portal/ common/widget/ webtools/webapp/webtools/WEB-INF/
webtools/widget/ widget/templates/
Author: buscob
Date: Sun Sep 19 15:46:17 2010
New Revision: 998686
URL: http://svn.apache.org/viewvc?rev=998686&view=rev
Log:
- Removed several ***Adm requests from webtools application. Used view-last/save-last-view pattern instead to have the same portlet handling requests usable from everywhere.
- Replaced AddPortlet request and view-map with addPortlet. This seems to be the standard we use.
- Portlet attributes are now edited using a dedicated screen. This is how it works in the new PortalPage widget. I used the same system in the actual PortalPage system also because it was too complicated to handle it in two different way. In any case it should not hurt.
- Removed a debug string in the PortalPageColumn renderer.
Modified:
ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
ofbiz/trunk/framework/common/webcommon/portal/portalPageHeader.ftl
ofbiz/trunk/framework/common/widget/PortalPageForms.xml
ofbiz/trunk/framework/common/widget/PortletEditForms.xml
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml
ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Sun Sep 19 15:46:17 2010
@@ -44,6 +44,12 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="editPortalPortletAttributes" save-last-view="true"/>
</request-map>
+ <request-map uri="setPortalPortletAttributes">
+ <security https="true" auth="true"/>
+ <event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
+ <response name="success" type="view-last" value="main"/>
+ <response name="error" type="request" value="main"/>
+ </request-map>
<!-- Portal page show requests -->
<request-map uri="showPortalPage">
<security https="true" auth="true"/>
@@ -55,9 +61,9 @@ under the License.
<event type="simple" invoke="copyIfRequiredSystemPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
<response name="success" type="view" value="ManagePortalPages"/>
</request-map>
- <request-map uri="AddPortlet">
+ <request-map uri="addPortlet">
<security https="true" auth="true"/>
- <response name="success" type="view" value="AddPortlet" save-last-view="true"/>
+ <response name="success" type="view" value="addPortlet" save-last-view="true"/>
</request-map>
<request-map uri="createPortalPagePortlet">
<security https="true" auth="true"/>
@@ -68,19 +74,19 @@ under the License.
<request-map uri="updatePortalPagePortlet">
<security https="true" auth="true"/>
<event type="service" invoke="updatePortalPagePortlet"/>
- <response name="success" type="request" value="ManagePortalPages"/>
- <response name="error" type="request" value="ManagePortalPages"/>
+ <response name="success" type="view-last" value="main" save-last-view="true"/>
+ <response name="error" type="request" value="main"/>
</request-map>
<request-map uri="updatePortalPagePortletSeq">
<security https="true" auth="true"/>
<event type="service" invoke="updatePortalPagePortletSeq"/>
- <response name="success" type="request" value="ManagePortalPages"/>
- <response name="error" type="request" value="ManagePortalPages"/>
+ <response name="success" type="view-last" value="main" save-last-view="true"/>
+ <response name="error" type="request" value="main"/>
</request-map>
<request-map uri="deletePortalPagePortlet">
<security https="true" auth="true"/>
<event type="service" invoke="deletePortalPagePortlet"/>
- <response name="success" type="view-last" value="main"/>
+ <response name="success" type="view-last" value="main" save-last-view="true"/>
<response name="error" type="request" value="main"/>
</request-map>
<request-map uri="movePortletToPortalPage">
@@ -112,28 +118,31 @@ under the License.
<response name="success" type="request" value="ManagePortalPages"/>
<response name="error" type="request" value="ManagePortalPages"/>
</request-map>
- <request-map uri="setPortalPortletAttributes">
- <security https="true" auth="true"/>
- <event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
- <response name="success" type="view-last" value="main"/>
- <response name="error" type="request" value="main"/>
- </request-map>
<request-map uri="addPortalPageColumn">
<security https="true" auth="true"/>
<event type="service" invoke="addPortalPageColumn"/>
- <response name="success" type="view-last" value="main"/>
+ <response name="success" type="view-last" value="main" save-last-view="true"/>
<response name="error" type="request" value="main"/>
</request-map>
<request-map uri="updatePortalPageColumn">
<security https="true" auth="true"/>
<event type="service" invoke="updatePortalPageColumn"/>
+ <response name="success" type="view-last" value="main" save-last-view="true"/>
+ <response name="error" type="request" value="main"/>
+ </request-map>
+ <!-- This request is the same as the above. It only does not save the last view.
+ This is necessary because in the new PortalPage widget the column size is set with a dedicated sceen and not with a combo.
+ When all PortalPages will be using the widget we could remove the above request. -->
+ <request-map uri="updatePortalPageColumnWidth">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePortalPageColumn"/>
<response name="success" type="view-last" value="main"/>
<response name="error" type="request" value="main"/>
</request-map>
<request-map uri="deletePortalPageColumn">
<security https="true" auth="false"/>
<event type="service" invoke="deletePortalPageColumn"/>
- <response name="success" type="view-last" value="main"/>
+ <response name="success" type="view-last" value="main" save-last-view="true"/>
<response name="error" type="request" value="main"/>
</request-map>
<request-map uri="updatePortalPageSeq">
@@ -153,7 +162,7 @@ under the License.
<view-map name="showPortletMainDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletMainDecorator"/>
<view-map name="showPortletSimpleDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletSimpleDecorator"/>
<view-map name="ManagePortalPages" type="screen" page="component://common/widget/PortalPageScreens.xml#ManagePortalPages"/>
- <view-map name="AddPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#AddPortlet"/>
+ <view-map name="addPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#AddPortlet"/>
<view-map name="editPortalPortletAttributes" type="screen" page="component://common/widget/PortalPageScreens.xml#EditPortalPortletAttributes"/>
<view-map name="editPortalPageColumnWidth" type="screen" page="component://common/widget/PortalPageScreens.xml#EditPortalPageColumnWidth"/>
</site-conf>
Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Sun Sep 19 15:46:17 2010
@@ -24,10 +24,10 @@ under the License.
<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_${line}"><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?if_exists}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li>
- <li id="add-portlet_${line}"><form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId?if_exists}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li>
+ <li id="delete-column_${line}"><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?if_exists}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li>
+ <li id="add-portlet_${line}"><form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId?if_exists}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li>
<li id="column-width_${line}">
- <form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="updatePortalPageColum_${portalPageColumn_index}">
+ <form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="updatePortalPageColum_${portalPageColumn_index}">
<input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/>
<input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/>
<input name="parentPortalPageId" value="${parameters.parentPortalPageId?if_exists}" type="hidden"/>
@@ -70,10 +70,10 @@ under the License.
</#list>
<ul>
<li class="title">Portlet : ${portlet.portletName?if_exists} [${portlet.portalPortletId}]</li>
- <li class="remove"><form method="post" action="<@o...@ofbizUrl>" name="removePP_${portlet_index}">${portletFields}</form><a href="javascript:document.removePP_${portlet_index}.submit()"> </a></li>
+ <li class="remove"><form method="post" action="<@o...@ofbizUrl>" name="removePP_${portlet_index}">${portletFields}</form><a href="javascript:document.removePP_${portlet_index}.submit()"> </a></li>
<#if (portlet.editFormName?has_content && portlet.editFormLocation?has_content)>
- <li class="edit"><form method="post" action="<@o...@ofbizUrl>" name="editPP_${portlet_index}">${portletFields}<input name="editAttributes" value="Y" type="hidden"/></form><a href="javascript:document.editPP_${portlet_index}.submit()"> </a></li>
+ <li class="edit"><form method="post" action="<@o...@ofbizUrl>" name="editPP_${portlet_index}">${portletFields}</form><a href="javascript:document.editPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if !firstInColumn>
@@ -83,10 +83,10 @@ under the License.
<li class="move-down"><form method="post" action="<@o...@ofbizUrl>" name="moveDownPP_${portlet_index}">${portletFields}<input name="mode" value="DOWN" type="hidden"/></form><a href="javascript:document.moveDownPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if portalPageColumn_has_next>
- <li class="move-right"><form method="post" action="<@o...@ofbizUrl>" name="moveRightPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index+1].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form><a href="javascript:document.moveRightPP_${portlet_index}.submit()"> </a></li>
+ <li class="move-right"><form method="post" action="<@o...@ofbizUrl>" name="moveRightPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index+1].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form><a href="javascript:document.moveRightPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if (portalPageColumn_index > 0)>
- <li class="move-left"><form method="post" action="<@o...@ofbizUrl>" name="moveLeftPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index-1].columnSeqId}" type="hidden"/><input name="mode" value="LEFT" type="hidden"/></form><a href="javascript:document.moveLeftPP_${portlet_index}.submit()"> </a></li>
+ <li class="move-left"><form method="post" action="<@o...@ofbizUrl>" name="moveLeftPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index-1].columnSeqId}" type="hidden"/><input name="mode" value="LEFT" type="hidden"/></form><a href="javascript:document.moveLeftPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if !firstInColumn>
<li class="move-top"><form method="post" action="<@o...@ofbizUrl>" name="moveTopPP_${portlet_index}">${portletFields}<input name="mode" value="TOP" type="hidden"/></form><a href="javascript:document.moveTopPP_${portlet_index}.submit()"> </a></li>
Modified: ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl Sun Sep 19 15:46:17 2010
@@ -40,7 +40,7 @@ under the License.
<tr>
<td>
<div class="h2">
- <form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a>
+ <form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a>
</div>
<div class="tabletext">
${portalPortlet.description?if_exists}
Modified: ofbiz/trunk/framework/common/webcommon/portal/portalPageHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/portalPageHeader.ftl?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/portalPageHeader.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/portalPageHeader.ftl Sun Sep 19 15:46:17 2010
@@ -40,7 +40,7 @@ under the License.
<#if configurePortalPage?has_content>
<li id="add-portlet">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddAPortlet}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddAPortlet}</a>
</li>
</#if>
Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Sun Sep 19 15:46:17 2010
@@ -102,10 +102,10 @@ under the License.
<field name="createButton"><submit button-type="button"/></field>
</form>
- <form name="PortletCategoryAndPortlet" type="list" list-name="portletCat" paginate-target="AddPortlet${Adm}" separate-columns="true"
+ <form name="PortletCategoryAndPortlet" type="list" list-name="portletCat" paginate-target="addPortlet" separate-columns="true"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="portletCategoryId" title="Category">
- <hyperlink description="${portletCategoryId}" target="AddPortlet${Adm}">
+ <hyperlink description="${portletCategoryId}" target="addPortlet">
<parameter param-name="portletCategoryId"/>
<parameter param-name="portalPortletId"/>
<parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
@@ -141,7 +141,7 @@ under the License.
</field>
</form>
- <form name="EditPortalPageColumnWidth" type="single" target="updatePortalPageColumn" default-map-name="portalPageColumn">
+ <form name="EditPortalPageColumnWidth" type="single" target="updatePortalPageColumnWidth" default-map-name="portalPageColumn">
<field name="portalPageId"><hidden/></field>
<field name="columnSeqId"><hidden/></field>
<field name="columnWidthPixels"><text/></field>
Modified: ofbiz/trunk/framework/common/widget/PortletEditForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortletEditForms.xml?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortletEditForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortletEditForms.xml Sun Sep 19 15:46:17 2010
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="CommonPortletEdit" type="single" target="setPortalPortletAttributes${Adm}" title="" default-map-name="attributeMap">
+ <form name="CommonPortletEdit" type="single" target="setPortalPortletAttributes" title="" default-map-name="attributeMap">
<actions>
<service service-name="getPortletAttributes">
<field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sun Sep 19 15:46:17 2010
@@ -555,54 +555,18 @@ under the License.
</request-map>
<!-- PortalPage detail administration, copy from portal-controller with response target change to EditPortalPage-->
- <request-map uri="addPortalPageColumnAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="addPortalPageColumn"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
- <request-map uri="deletePortalPageColumnAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="deletePortalPageColumn"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
- <request-map uri="updatePortalPageColumnAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="updatePortalPageColumn"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
<request-map uri="movePortletToPortalPageAdm">
<security https="true" auth="true"/>
<event type="service" invoke="movePortletToPortalPage"/>
<response name="success" type="view" value="EditPortalPage"/>
<response name="error" type="view" value="EditPortalPage"/>
</request-map>
- <request-map uri="deletePortalPagePortletAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="deletePortalPagePortlet"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
<request-map uri="updatePortalPagePortletSeqAdm">
<security https="true" auth="true"/>
<event type="service" invoke="updatePortalPagePortletSeq"/>
<response name="success" type="view" value="EditPortalPage"/>
<response name="error" type="view" value="EditPortalPage"/>
</request-map>
- <request-map uri="updatePortalPagePortletAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="updatePortalPagePortlet"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
- <request-map uri="createPortalPagePortletAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="createPortalPagePortlet"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
<request-map uri="setPortalPortletAttributesAdm">
<security https="true" auth="true"/>
<event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
Modified: ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml Sun Sep 19 15:46:17 2010
@@ -150,7 +150,7 @@ under the License.
<widgets>
<container id="portalContainerId">
<screenlet title="${uiLabelMap.CommonPortalEditPage}: ${portalPage.portalPageName} [${portalPage.portalPageId}]">
- <link target="addPortalPageColumnAdm" style="buttontext" text="${uiLabelMap.CommonAddColumn}">
+ <link target="addPortalPageColumn" style="buttontext" text="${uiLabelMap.CommonAddColumn}">
<parameter param-name="portalPageId" from-field="portalPage.portalPageId"/>
</link>
<platform-specific><html><html-template location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific>
Modified: ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=998686&r1=998685&r2=998686&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl Sun Sep 19 15:46:17 2010
@@ -186,7 +186,6 @@ ${menuString}
<#assign columnKeyFields = '<input name="portalPageId" value="' + portalPageId + '" type="hidden"/><input name="columnSeqId" value="' + columnSeqId + '" type="hidden"/>'>
<td style="vertical-align: top; <#if width?has_content> width:${width};</#if>" id="portalColumn_${columnSeqId}">
<#if editMode == "true">
- Column:${portalPageId}-${columnSeqId}
<div class="portal-column-config-title-bar">
<ul>
<li>
@@ -196,7 +195,7 @@ ${menuString}
<a class="buttontext" href="javascript:document.delColumn_${columnKey}.submit()" title="${delColumnHint}">${delColumnLabel}</a>
</li>
<li>
- <form method="post" action="AddPortlet" name="addPortlet_${columnKey}">
+ <form method="post" action="addPortlet" name="addPortlet_${columnKey}">
${columnKeyFields}
</form>
<a class="buttontext" href="javascript:document.addPortlet_${columnKey}.submit()" title="${addPortletHint}">${addPortletLabel}</a>