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/07 08:07:33 UTC
svn commit: r762631 - in /ofbiz/trunk: applications/workeffort/
applications/workeffort/config/ applications/workeffort/data/
applications/workeffort/webapp/workeffort/WEB-INF/
applications/workeffort/widget/ specialpurpose/myportal/config/
specialpurp...
Author: hansbak
Date: Tue Apr 7 06:07:32 2009
New Revision: 762631
URL: http://svn.apache.org/viewvc?rev=762631&view=rev
Log:
move company events from myportal to workeffort
Added:
ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml (with props)
Modified:
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/trunk/applications/workeffort/ofbiz-component.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Apr 7 06:07:32 2009
@@ -1558,6 +1558,12 @@
<value xml:lang="th">à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value>
<value xml:lang="zh">è¯è®º</value>
</property>
+ <property key="WorkEffortCompanyEvents">
+ <value xml:lang="en">Company events</value>
+ <value xml:lang="fr">Evènements de l'entreprise</value>
+ <value xml:lang="it">Eventi aziendali</value>
+ <value xml:lang="th">à¹à¸«à¸à¸¸à¸à¸²à¸£à¸à¹à¸à¸£à¸´à¸©à¸±à¸</value>
+ </property>
<property key="WorkEffortCompanyName">
<value xml:lang="en">OFBiz: WorkEffort Manager</value>
<value xml:lang="es">OFBiz: Administración de tareas</value>
Added: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml?rev=762631&view=auto
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml (added)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml Tue Apr 7 06:07:32 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<entity-engine-xml>
+ <!-- company events -->
+ <PortletCategory portletCategoryId="EVENTSTASKS" description="Events and Tasks"/>
+ <PortalPortlet portalPortletId="mycompanycomms"
+ portletName="My Company Comms"
+ screenName="MyCompanyComms"
+ screenLocation="component://workeffort/widget/WorkEffortScreens.xml"
+ description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
+ <PortletPortletCategory portalPortletId="mycompanycomms" portletCategoryId="EVENTSTASKS"/>
+
+</entity-engine-xml>
Propchange: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/ofbiz-component.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/workeffort/ofbiz-component.xml Tue Apr 7 06:07:32 2009
@@ -30,6 +30,7 @@
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortTypeData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortPortletData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/>
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Tue Apr 7 06:07:32 2009
@@ -660,6 +660,27 @@
<response name="success" type="view" value="ListWorkEffortEventReminders"/>
</request-map>
+ <!-- COMPANY Events -->
+ <request-map uri="myCompanyComms">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="myCompanyComms" save-current-view="true"/>
+ </request-map>
+ <request-map uri="newEvent">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="newEvent"/>
+ </request-map>
+ <request-map uri="createEvent">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createWorkEffort"/>
+ <response name="success" type="view-last" value="myCompanyComms"/>
+ <response name="error" type="view" value="newEvent"/>
+ </request-map>
+ <request-map uri="deleteEvent">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteWorkEffort"/>
+ <response name="success" type="view-last" value="myCompanyComms"/>
+ </request-map>
+
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -747,5 +768,7 @@
<view-map name="EditAgreementWorkEffortAppls" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditAgreementWorkEffortAppls"/>
<view-map name="LookupAgreement" page="component://accounting/widget/LookupScreens.xml#LookupAgreement" type="screen"/>
<view-map name="LookupAgreementItem" page="component://accounting/widget/LookupScreens.xml#LookupAgreementItem" type="screen"/>
+ <view-map name="myCompanyComms" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#MyCompanyComms"/>
+ <view-map name="newEvent" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#newCompanyEvent"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Apr 7 06:07:32 2009
@@ -1332,4 +1332,34 @@
<field name="recurrenceOffset"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
+ <form name="MyCompanyComms" type="list" list-name="events" target="deleteEvent" paginate-target="FindTask"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
+ <entity-condition entity-name="WorkEffort">
+ <condition-list combine="and">
+ <condition-expr field-name="workEffortTypeId" operator="equals" value="COMPANY_EVENT"/>
+ <condition-expr field-name="actualStartDate" operator="greater-equals" from-field="nowDate"/>
+ </condition-list>
+ <order-by field-name="actualStartDate"/>
+ </entity-condition>
+ </actions>
+ <field name="workEffortId"><hidden/></field>
+ <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
+ <field name="actualStartDate" title="${uiLabelMap.CommonActualStartDate}"><display type="date"/></field>
+ <field name="delete" title="${uiLabelMap.CommonDelete}"><submit button-type="text-link"/></field>
+ </form>
+
+ <form name="newEvent" type="single" target="createEvent">
+ <field name="portalPageId"><hidden/></field>
+ <field name="workEffortTypeId"><hidden value="COMPANY_EVENT"/></field>
+ <field name="currentStatusId"><hidden value="_NA_"/></field>
+ <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><text/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+ <field name="actualStartDate"><date-time type="date"/></field>
+ <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
+ </form>
+
</forms>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Tue Apr 7 06:07:32 2009
@@ -139,4 +139,10 @@
</link>
</menu-item>
</menu>
+ <menu name="MyCompanyCommsMenu">
+ <menu-item name="newEvent" title="${uiLabelMap.WorkEffortNewEvent}">
+ <link target="newEvent"/>
+ </menu-item>
+ </menu>
+
</menus>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Tue Apr 7 06:07:32 2009
@@ -940,5 +940,37 @@
</widgets>
</section>
</screen>
-
+ <screen name="newCompanyEvent">
+ <section>
+ <widgets>
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet>
+ <include-form name="newEvent"
+ location="component://workeffort/widget/WorkEffortForms.xml" />
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="MyCompanyComms">
+ <section>
+ <actions>
+ <set field="portalPageId" from-field="parameters.portalPageId"/>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.WorkEffortCompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
+ <include-menu name="MyCompanyCommsMenu" location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <include-form name="MyCompanyComms" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Tue Apr 7 06:07:32 2009
@@ -53,12 +53,6 @@
<value xml:lang="it">Comunicazioni aziendali</value>
<value xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸£à¸´à¸©à¸±à¸</value>
</property>
- <property key="MyPortalCompanyEvents">
- <value xml:lang="en">Company events</value>
- <value xml:lang="fr">Evènements de l'entreprise</value>
- <value xml:lang="it">Eventi aziendali</value>
- <value xml:lang="th">à¹à¸«à¸à¸¸à¸à¸²à¸£à¸à¹à¸à¸£à¸´à¸©à¸±à¸</value>
- </property>
<property key="MyPortalCompletedCustomerRequests">
<value xml:lang="en">My Completed Customer Requests</value>
<value xml:lang="fr">Mes demandes de clients achevées</value>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Apr 7 06:07:32 2009
@@ -74,8 +74,6 @@
<PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" />
- <PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
-
<PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
<PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
<PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/>
@@ -138,8 +136,6 @@
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListCustomerInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListCustomerProjects" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
- <PortletPortletCategory portalPortletId="mycompanycomms" portletCategoryId="COMMUNICATIONS"/>
-
<PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="LIST_CUSTOMER"/>
<PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="LIST_CUSTOMER"/>
Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Tue Apr 7 06:07:32 2009
@@ -27,6 +27,7 @@
<include location="component://party/webapp/partymgr/WEB-INF/controller.xml"/>
<include location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/>
<include location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/>
+ <include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>
<description>Show personal information in the system</description>
@@ -46,31 +47,8 @@
<response name="resultPage" type="view" value="newRegisterLogin"/>
</request-map>
- <!-- COMPANY Events -->
- <request-map uri="myCompanyComms">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="myCompanyComms"/>
- </request-map>
- <request-map uri="newEvent">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="newEvent"/>
- </request-map>
- <request-map uri="createEvent">
- <security https="true" auth="true"/>
- <event type="service" invoke="createWorkEffort"/>
- <response name="success" type="request" value="myCompanyComms"/>
- <response name="error" type="view" value="myCompanyComms"/>
- </request-map>
- <request-map uri="deleteEvent">
- <security https="true" auth="true"/>
- <event type="service" invoke="deleteWorkEffort"/>
- <response name="success" type="request" value="myCompanyComms"/>
- </request-map>
-
<view-map name="main" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
<view-map name="login" type="screen" page="component://myportal/widget/CommonScreens.xml#login"/>
<view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/>
- <view-map name="myCompanyComms" type="screen" page="component://myportal/widget/CommonScreens.xml#MyCompanyComms"/>
- <view-map name="newEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#newEvent"/>
</site-conf>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Tue Apr 7 06:07:32 2009
@@ -21,36 +21,6 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="MyCompanyComms" type="list" list-name="events" target="deleteEvent" paginate-target="FindTask"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <actions>
- <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
- <entity-condition entity-name="WorkEffort">
- <condition-list combine="and">
- <condition-expr field-name="workEffortTypeId" operator="equals" value="COMPANY_EVENT"/>
- <condition-expr field-name="actualStartDate" operator="greater-equals" from-field="nowDate"/>
- </condition-list>
- <order-by field-name="actualStartDate"/>
- </entity-condition>
- </actions>
- <alt-target use-when="!headerItem.equals("main")" target="deleteEvent"/>
- <field name="workEffortId"><hidden/></field>
- <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
- <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
- <field name="actualStartDate" title="${uiLabelMap.CommonActualStartDate}"><display type="date"/></field>
- <field name="delete" title="${uiLabelMap.CommonDelete}"><submit button-type="text-link"/></field>
- </form>
-
- <form name="newEvent" type="single" target="createEvent">
- <field name="portalPageId"><hidden/></field>
- <field name="workEffortTypeId"><hidden value="COMPANY_EVENT"/></field>
- <field name="currentStatusId"><hidden value="_NA_"/></field>
- <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><text/></field>
- <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
- <field name="actualStartDate"><date-time type="date"/></field>
- <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
- </form>
-
<form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
<field name="workEffortId">
<hyperlink target="/projectmgr/control/taskView" description="${workEffortName} [${workEffortId}]" target-type="inter-app">
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Tue Apr 7 06:07:32 2009
@@ -29,14 +29,7 @@
</link>
</menu-item>
</menu>
- <menu name="MyCompanyCommsMenu">
- <menu-item name="newEvent" title="${uiLabelMap.WorkEffortNewEvent}">
- <link target="newEvent">
- <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
- </link>
- </menu-item>
- </menu>
-
+
<menu name="MyTasksMenu" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="myTasks" title="${uiLabelMap.MyPortalMyTasks}"><link target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
</menu>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=762631&r1=762630&r2=762631&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Tue Apr 7 06:07:32 2009
@@ -20,42 +20,6 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
- <screen name="newEvent">
- <section>
- <actions>
- <set field="portalPageId" from-field="parameters.portalPageId" default-value="parameters.portalPageId"/>
- <set field="headerItem" from-field="parameters.portalPageId"/>
- </actions>
- <widgets>
- <section>
- <widgets>
- <decorator-screen name="main-decorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet>
- <include-form name="newEvent"
- location="component://myportal/widget/MyPortalForms.xml" />
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </widgets>
- </section>
- </screen>
- <screen name="MyCompanyComms">
- <section>
- <actions>
- <set field="portalPageId" from-field="parameters.portalPageId"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.MyPortalCompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
- <include-menu name="MyCompanyCommsMenu" location="component://myportal/widget/MyPortalMenus.xml"/>
- <include-form name="MyCompanyComms" location="component://myportal/widget/MyPortalForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
<screen name="CreateCustRequestNotification">
<section>
<actions>