You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2010/05/09 15:20:18 UTC
svn commit: r942534 - in /ofbiz/branches/release10.04: ./
framework/common/config/ framework/webtools/config/
framework/webtools/data/ framework/webtools/webapp/webtools/
framework/webtools/webapp/webtools/WEB-INF/ framework/webtools/widget/
specialpur...
Author: erwan
Date: Sun May 9 13:20:18 2010
New Revision: 942534
URL: http://svn.apache.org/viewvc?rev=942534&view=rev
Log:
Applied fix from trunk for revision: 942406
Following a discussion on dev list, moving portal administration to webtools instead of myPortal (http://ofbiz.135035.n4.nabble.com/erwan-contributions-td2122600.html#a2122600)
Added:
ofbiz/branches/release10.04/framework/webtools/widget/PortalAdmForms.xml
- copied unchanged from r942406, ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml
ofbiz/branches/release10.04/framework/webtools/widget/PortalAdmScreens.xml
- copied unchanged from r942406, ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml
ofbiz/branches/release10.04/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/branches/release10.04/framework/webtools/data/WebtoolsSecurityData.xml
ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/branches/release10.04/framework/webtools/webapp/webtools/main.ftl
ofbiz/branches/release10.04/framework/webtools/widget/Menus.xml
ofbiz/branches/release10.04/specialpurpose/myportal/config/MyPortalUiLabels.xml
ofbiz/branches/release10.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalMenus.xml
ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 9 13:20:18 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941177,941199,941261,941440,941600,941999,942084
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941177,941199,941261,941440,941600,941999,942084,942406
Modified: ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml Sun May 9 13:20:18 2010
@@ -261,6 +261,10 @@
<value xml:lang="zh">æ°å»º</value>
<value xml:lang="zh_CN">æ·»å æ°ç</value>
</property>
+ <property key="CommonAddPortletToPage">
+ <value xml:lang="en">Add a portlet to portal page</value>
+ <value xml:lang="fr">Ajouter une portlet à la page</value>
+ </property>
<property key="CommonAddProblem">
<value xml:lang="ar">Ù
Ø´Ù٠أثÙاء اÙإضاÙØ©</value>
<value xml:lang="de">Problem hinzufügen</value>
Modified: ofbiz/branches/release10.04/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/config/WebtoolsUiLabels.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/branches/release10.04/framework/webtools/config/WebtoolsUiLabels.xml Sun May 9 13:20:18 2010
@@ -304,6 +304,10 @@
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸²à¸</value>
<value xml:lang="zh">æ¥æ¾ä»»å¡</value>
</property>
+ <property key="PageTitleFindPortalPage">
+ <value xml:lang="en">Find Portal page</value>
+ <value xml:lang="fr">Rech. page portail</value>
+ </property>
<property key="PageTitleFindUtilCache">
<value xml:lang="de">Cache Wartungsseite</value>
<value xml:lang="en">Cache Maintenance Page</value>
@@ -464,6 +468,10 @@
<value xml:lang="th">à¸à¸¹à¹à¸à¸¹à¹à¸¥à¸£à¸°à¸à¸</value>
<value xml:lang="zh">管ç</value>
</property>
+ <property key="WebtoolsAdminPortalPage">
+ <value xml:lang="en">Portal page Admin.</value>
+ <value xml:lang="fr">Admin. Page portail</value>
+ </property>
<property key="WebtoolsAll">
<value xml:lang="de">Alle</value>
<value xml:lang="en">All</value>
Modified: ofbiz/branches/release10.04/framework/webtools/data/WebtoolsSecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/data/WebtoolsSecurityData.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/data/WebtoolsSecurityData.xml (original)
+++ ofbiz/branches/release10.04/framework/webtools/data/WebtoolsSecurityData.xml Sun May 9 13:20:18 2010
@@ -58,6 +58,11 @@ under the License.
<SecurityGroupPermission groupId="FLEXADMIN" permissionId="PERIOD_MAINT"/>
<SecurityGroupPermission groupId="BIZADMIN" permissionId="PERIOD_MAINT"/>
+ <!-- PortalPage Maintenance security -->
+ <SecurityPermission description="All Portal Page Maintenance pages." permissionId="PORTALPAGE_MAINT"/>
+ <SecurityGroupPermission groupId="FULLADMIN" permissionId="PORTALPAGE_MAINT"/>
+ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PORTALPAGE_MAINT"/>
+
<!-- Enum & Status Maintenance security -->
<SecurityPermission description="Use the Enum and Status Maintenance pages." permissionId="ENUM_STATUS_MAINT"/>
<SecurityGroupPermission groupId="FULLADMIN" permissionId="ENUM_STATUS_MAINT"/>
Modified: ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sun May 9 13:20:18 2010
@@ -519,6 +519,101 @@ under the License.
<response name="success" type="view" value="findTemporalExpression"/>
</request-map>
+ <!-- PortalPage administration -->
+ <request-map uri="FindPortalPage">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindPortalPage"/>
+ </request-map>
+ <request-map uri="EditPortalPage">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditPortalPage"/>
+ </request-map>
+ <request-map uri="ManagePortalPagesAdm">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditPortalPage"/>
+ </request-map>
+ <request-map uri="DuplicatePortalPage">
+ <security https="true" auth="true"/>
+ <event type="simple" invoke="duplicatePortalPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
+ <response name="success" type="view" value="EditPortalPage"/>
+ </request-map>
+ <request-map uri="NewPortalPage">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="CreatePortalPage"/>
+ </request-map>
+ <request-map uri="createPortalPageAdm">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPortalPage"/>
+ <response name="success" type="view" value="EditPortalPage"/>
+ <response name="error" type="view" value="CreatePortalPage"/>
+ </request-map>
+ <request-map uri="updatePortalPageAdm">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePortalPage"/>
+ <response name="success" type="view" value="EditPortalPage"/>
+ <response name="error" type="view" value="EditPortalPage"/>
+ </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="AddPortletAdm">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="AddPortletAdm"/>
+ </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"/>
+ <response name="success" type="view" value="EditPortalPage"/>
+ <response name="error" type="view" value="EditPortalPage"/>
+ </request-map>
+
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -606,5 +701,11 @@ under the License.
<view-map name="editTemporalExpression" type="screen" page="component://webtools/widget/TempExprScreens.xml#EditTemporalExpression"/>
<view-map name="findTemporalExpression" type="screen" page="component://webtools/widget/TempExprScreens.xml#FindTemporalExpression"/>
+ <!-- PortalPage administration -->
+ <view-map name="FindPortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#FindPortalPage"/>
+ <view-map name="CreatePortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#CreatePortalPage"/>
+ <view-map name="EditPortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#EditPortalPage"/>
+ <view-map name="AddPortletAdm" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#AddPortletAdm"/>
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/branches/release10.04/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/webapp/webtools/main.ftl?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/branches/release10.04/framework/webtools/webapp/webtools/main.ftl Sun May 9 13:20:18 2010
@@ -95,6 +95,9 @@ under the License.
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsWorkWithDataFiles}</a></li>
</#if>
<li><h3>${uiLabelMap.WebtoolsMiscSetupTools}</h3></li>
+ <#if security.hasPermission("PORTALPAGE_MAINT", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsAdminPortalPage}</a></li>
+ </#if>
<#if security.hasPermission("ENUM_STATUS_MAINT", session)>
<#--
<li><a href="<@o...@ofbizUrl>">Edit Enumerations</a></li>
Modified: ofbiz/branches/release10.04/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/widget/Menus.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/branches/release10.04/framework/webtools/widget/Menus.xml Sun May 9 13:20:18 2010
@@ -45,6 +45,10 @@ under the License.
<menu-item name="configuration" title="${uiLabelMap.WebtoolsConfiguration}">
<link target="myCertificates"/>
</menu-item>
+ <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}">
+ <condition><if-has-permission permission="PORTALPAGE_MAINT"/></condition>
+ <link target="FindPortalPage"/>
+ </menu-item>
<menu-item name="tests" title="Tests">
<link target="selenium"/>
</menu-item>
@@ -184,4 +188,19 @@ under the License.
</menu-item>
</menu>
+ <menu name="PortalPageAdmin">
+ <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}">
+ <link target="DuplicatePortalPage">
+ <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+ </link>
+ </menu-item>
+ <menu-item name="new" title="${uiLabelMap.CommonNew}">
+ <link target="NewPortalPage"/>
+ </menu-item>
+ <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}">
+ <link target="EditPortalPage">
+ <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+ </link>
+ </menu-item>
+ </menu>
</menus>
Modified: ofbiz/branches/release10.04/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/myportal/config/MyPortalUiLabels.xml Sun May 9 13:20:18 2010
@@ -39,14 +39,6 @@
<value xml:lang="en">Seq.</value>
<value xml:lang="fr">Seq.</value>
</property>
- <property key="MyPortalAddPortletToPage">
- <value xml:lang="en">Add a portlet to portal page</value>
- <value xml:lang="fr">Ajouter une portlet à la page</value>
- </property>
- <property key="MyPropalAdminPortalPage">
- <value xml:lang="en">Portal page Admin.</value>
- <value xml:lang="fr">Admin. Page portail</value>
- </property>
<property key="MyPortalAppBar">
<value xml:lang="en">My Page App Bar</value>
<value xml:lang="fr">Menu des applications</value>
Modified: ofbiz/branches/release10.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Sun May 9 13:20:18 2010
@@ -56,101 +56,6 @@
<response name="success" type="view" value="reloadCaptchaCode"/>
</request-map>
- <!-- PortalPage administration -->
- <request-map uri="FindPortalPage">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindPortalPage"/>
- </request-map>
- <request-map uri="EditPortalPage">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditPortalPage"/>
- </request-map>
- <request-map uri="ManagePortalPagesAdm">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditPortalPage"/>
- </request-map>
- <request-map uri="DuplicatePortalPage">
- <security https="true" auth="true"/>
- <event type="simple" invoke="duplicatePortalPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
- <response name="success" type="view" value="EditPortalPage"/>
- </request-map>
- <request-map uri="NewPortalPage">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="CreatePortalPage"/>
- </request-map>
- <request-map uri="createPortalPageAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="createPortalPage"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="CreatePortalPage"/>
- </request-map>
- <request-map uri="updatePortalPageAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="updatePortalPage"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </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="AddPortletAdm">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="AddPortletAdm"/>
- </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"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
-
<request-map uri="LookupUserLoginAndPartyDetails">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupUserLoginAndPartyDetails"/>
@@ -161,10 +66,6 @@
<view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/>
<view-map name="reloadCaptchaImage" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaImage"/>
<view-map name="reloadCaptchaCode" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaCode"/>
- <view-map name="FindPortalPage" type="screen" page="component://myportal/widget/MyPortalScreens.xml#FindPortalPage"/>
- <view-map name="CreatePortalPage" type="screen" page="component://myportal/widget/MyPortalScreens.xml#CreatePortalPage"/>
- <view-map name="EditPortalPage" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditPortalPage"/>
- <view-map name="AddPortletAdm" type="screen" page="component://myportal/widget/MyPortalScreens.xml#AddPortletAdm"/>
<view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/>
Modified: ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalForms.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalForms.xml Sun May 9 13:20:18 2010
@@ -43,63 +43,4 @@ under the License.
<field name="captchaCode"><hidden value="${parameters.ID_KEY}"/></field>
</form>
- <form name="FindPortalPages" type="single" target="FindPortalPage" default-entity-name="PortalPage">
- <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
- <field name="portalPageIdSearch" position="1" title="${uiLabelMap.CommonId}"><text-find/></field>
- <field name="originalPortalPageId" position="2"><text-find/></field>
- <field name="portalPageName" title="${uiLabelMap.CommonName}"><text-find/></field>
- <field name="parentPortalPageIdSearch" position="2" title="${uiLabelMap.FormFieldTitle_parentPortalPageId}"><text-find/></field>
- <field name="description"><text-find/></field>
- <field name="securityGroupId" position="2" title="${uiLabelMap.PartySecurityGroupId}"><text-find/></field>
- <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
-
- <form name="ListPortalPages" type="list" list-name="pagesList" paginate-target="FindPortalPage" separate-columns="true"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <field name="portalPageId" title="${uiLabelMap.CommonEdit}">
- <hyperlink description="${portalPageId}" target="EditPortalPage">
- <parameter param-name="portalPageId"/>
- </hyperlink>
- </field>
- <field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field>
- <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true">
- <display>
- <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
- <simple-editor/>
- <field-map field-name="portalPageId" from-field="portalPageId"/>
- </in-place-editor>
- </display>
- </field>
- <field name="description" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" widget-style="tabletext" sort-field="true"><display/></field>
- <field name="description" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" id-name="portalDescription" widget-style="tabletext" sort-field="true">
- <display>
- <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
- <simple-editor/>
- <field-map field-name="portalPageId" from-field="portalPageId"/>
- </in-place-editor>
- </display>
- </field>
- <field name="sequenceNum"><display/></field>
- <field name="originalPortalPageId"><display/></field>
- <field name="ownerUserLoginId"><display/></field>
- <field name="deleteLink" use-when="originalPortalPageId!=null" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" >
- <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonRevertPortalPage}">
- <parameter param-name="portalPageId"/>
- <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
- </hyperlink>
- </field>
- </form>
-
- <form name="EditPortalPage" type="single" target="${targetPortalPage}" default-map-name="portalPage">
- <field name="portalPageId" use-when="!"${portalPage.portalPageId}".equals("")" position="1"><display/></field>
- <field name="portalPageId" use-when=""${portalPage.portalPageId}".equals("")" position="1"><text/></field>
- <field name="originalPortalPageId" position="2"><text/></field>
- <field name="ownerUserLoginId" ><lookup target-form-name="LookupUserLoginAndPartyDetails"/></field>
- <field name="parentPortalPageId" position="2"><text/></field>
- <field name="portalPageName"><text/></field>
- <field name="description" position="2"><text size="60"/></field>
- <field name="sequenceNum"><text/></field>
- <field name="saveButton" position="2"><submit button-type="button"/></field>
- </form>
-
</forms>
Modified: ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/myportal/widget/MyPortalMenus.xml Sun May 9 13:20:18 2010
@@ -28,25 +28,6 @@ under the License.
<parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
</link>
</menu-item>
- <menu-item name="PortalPageAdminItem" title="${uiLabelMap.MyPropalAdminPortalPage}" align-style="opposed">
- <condition><if-has-permission permission="MYPORTALBASE" action="_ADMIN"/> </condition>
- <link target="FindPortalPage"/>
- </menu-item>
</menu>
- <menu name="CopyNewPortalPage">
- <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}">
- <link target="DuplicatePortalPage">
- <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
- </link>
- </menu-item>
- <menu-item name="new" title="${uiLabelMap.CommonNew}">
- <link target="NewPortalPage"/>
- </menu-item>
- <menu-item name="refresh" title="${uiLabelMap.MyPortalRefresh}">
- <link target="EditPortalPage">
- <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
- </link>
- </menu-item>
- </menu>
</menus>
\ No newline at end of file
Modified: ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl?rev=942534&r1=942533&r2=942534&view=diff
==============================================================================
--- ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl Sun May 9 13:20:18 2010
@@ -40,10 +40,10 @@ under the License.
</#if>
</#if>
-<#if parameters.portalPageId?exists && !appModelMenu.getModelMenuItemByName(headerItem)?exists && userLogin?exists>
+<#if parameters.portalPageId?has_content && !appModelMenu.getModelMenuItemByName(headerItem)?exists && userLogin?exists>
<#assign findMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("portalPageId", parameters.portalPageId)>
<#assign portalPage = delegator.findByPrimaryKeyCache("PortalPage", findMap)>
- <#if portalPage?exists>
+ <#if portalPage?has_content>
<div class="breadcrumbs-sep">
${portalPage.portalPageName?if_exists}
</div>