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/02/08 09:33:37 UTC
svn commit: r742018 - in /ofbiz/trunk: framework/common/data/
framework/common/webcommon/WEB-INF/
framework/common/webcommon/WEB-INF/actions/includes/
framework/common/webcommon/portal/ framework/common/widget/
specialpurpose/myportal/data/ specialpurp...
Author: hansbak
Date: Sun Feb 8 08:33:36 2009
New Revision: 742018
URL: http://svn.apache.org/viewvc?rev=742018&view=rev
Log:
cleanup of the portal pages, reduced number of screens, changed employee myportal, new user without securitygroups now also have his portal page with a profile portlet. only thing is missing is the usage of the sequence number in the portal page and portalpageportlet entity, probably completed next week
Modified:
ofbiz/trunk/framework/common/data/PortalSeedData.xml
ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy
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/widget/PortalPageForms.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
Modified: ofbiz/trunk/framework/common/data/PortalSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/PortalSeedData.xml?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/PortalSeedData.xml (original)
+++ ofbiz/trunk/framework/common/data/PortalSeedData.xml Sun Feb 8 08:33:36 2009
@@ -20,7 +20,7 @@
<entity-engine-xml>
<!-- PortalPortlet Seed Data: system pages -->
- <PortalPage portalPageId="EXAMPLE" portalPageName="Example Portal Page" description="The default example OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="FULLADMIN"/>
+ <PortalPage portalPageId="EXAMPLE" portalPageName="Example Portal Page" description="The default example OFBiz portal page" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00001" columnWidthPercentage="50"/>
<PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available -->
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy Sun Feb 8 08:33:36 2009
@@ -34,10 +34,6 @@
userLoginSecurityGroupId = userLoginSecurityGroups.get(0).get("groupId");
}
- if(!userLoginSecurityGroupId){
- parameters.portalPageId = parameters.parentPortalPageId;
- }
-
//get the portal page
cond1 = EntityCondition.makeCondition([
EntityCondition.makeCondition("portalPageId", EntityOperator.LIKE, parameters.parentPortalPageId + "%"),
@@ -47,19 +43,15 @@
],EntityOperator.AND);
portalMainPages = delegator.findList("PortalPage", cond1, null, null, null, false);
if (portalMainPages) {
- parameters.portalPageId = portalMainPages.get(0).portalPageId;
+ parentPortalPageId = portalMainPages.get(0).portalPageId;
}
- if(!parameters.portalPageId){
- parameters.portalPageId = userLoginSecurityGroupId;
- }
-
ppCond =
EntityCondition.makeCondition([
EntityCondition.makeCondition([
- EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parameters.portalPageId),
- EntityCondition.makeCondition("portalPageId", EntityOperator.EQUALS, parameters.portalPageId),
- EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, parameters.portalPageId)
+ EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parentPortalPageId),
+ EntityCondition.makeCondition("portalPageId", EntityOperator.EQUALS, parentPortalPageId),
+ EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, parentPortalPageId)
],EntityOperator.OR),
EntityCondition.makeCondition([
EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId),
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=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Sun Feb 8 08:33:36 2009
@@ -28,13 +28,9 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="showPortalPage"/>
</request-map>
- <request-map uri="editPortalPage">
- <security https="true" auth="true"/>
- <event type="simple" invoke="copyIfRequiredSystemPage" path="org/ofbiz/common/PortalPageMethods.xml"/>
- <response name="success" type="view" value="editPortalPage"/>
- </request-map>
<request-map uri="ManagePortalPages">
<security https="true" auth="true"/>
+ <event type="simple" invoke="copyIfRequiredSystemPage" path="org/ofbiz/common/PortalPageMethods.xml"/>
<response name="success" type="view" value="ManagePortalPages"/>
</request-map>
<request-map uri="AddPortlet">
@@ -45,30 +41,29 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="EditPortlet" />
</request-map>
-
<request-map uri="createPortalPagePortlet">
<security https="true" auth="true"/>
<event type="service" invoke="createPortalPagePortlet"/>
- <response name="success" type="request" value="editPortalPage"/>
- <response name="error" type="request" value="editPortalPage"/>
+ <response name="success" type="request" value="ManagePortalPages"/>
+ <response name="error" type="request" value="ManagePortalPages"/>
</request-map>
<request-map uri="updatePortalPagePortlet">
<security https="true" auth="true"/>
<event type="service" invoke="updatePortalPagePortlet"/>
- <response name="success" type="request" value="editPortalPage"/>
- <response name="error" type="request" value="editPortalPage"/>
+ <response name="success" type="request" value="ManagePortalPages"/>
+ <response name="error" type="request" value="ManagePortalPages"/>
</request-map>
<request-map uri="deletePortalPagePortlet">
<security https="true" auth="true"/>
<event type="service" invoke="deletePortalPagePortlet"/>
- <response name="success" type="request" value="editPortalPage"/>
- <response name="error" type="request" value="editPortalPage"/>
+ <response name="success" type="request" value="ManagePortalPages"/>
+ <response name="error" type="request" value="ManagePortalPages"/>
</request-map>
<request-map uri="movePortletToPortalPage">
<security https="true" auth="true"/>
<event type="service" invoke="movePortletToPortalPage"/>
- <response name="success" type="request" value="editPortalPage"/>
- <response name="error" type="request" value="editPortalPage"/>
+ <response name="success" type="request" value="ManagePortalPages"/>
+ <response name="error" type="request" value="ManagePortalPages"/>
</request-map>
<request-map uri="createPortalPage">
<security https="true" auth="true"/>
@@ -97,25 +92,24 @@
<request-map uri="addPortalPageColumn">
<security https="true" auth="true"/>
<event type="service" invoke="addPortalPageColumn"/>
- <response name="success" type="request" value="editPortalPage"/>
- <response name="error" type="request" value="editPortalPage"/>
+ <response name="success" type="request" value="ManagePortalPages"/>
+ <response name="error" type="request" value="ManagePortalPages"/>
</request-map>
<request-map uri="updatePortalPageColumn">
<security https="true" auth="true"/>
<event type="service" invoke="updatePortalPageColumn"/>
- <response name="success" type="request" value="editPortalPage"/>
- <response name="error" type="request" value="editPortalPage"/>
+ <response name="success" type="request" value="ManagePortalPages"/>
+ <response name="error" type="request" value="ManagePortalPages"/>
</request-map>
<request-map uri="deletePortalPageColumn">
<security https="true" auth="true"/>
<event type="service" invoke="deletePortalPageColumn"/>
- <response name="success" type="request" value="editPortalPage"/>
- <response name="error" type="request" value="editPortalPage"/>
+ <response name="success" type="request" value="ManagePortalPages"/>
+ <response name="error" type="request" value="ManagePortalPages"/>
</request-map>
<!-- View Mappings -->
<view-map name="showPortalPage" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
- <view-map name="editPortalPage" type="screen" page="component://common/widget/PortalPageScreens.xml#editPortalPage"/>
<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="EditPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#EditPortlet"/>
Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Sun Feb 8 08:33:36 2009
@@ -23,21 +23,21 @@
<td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> ${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
<hr/>
<ul>
- <li id="delete-column"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></li>
- <li id="add-portlet"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddAPortlet}</a></li>
+ <li id="delete-column"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></li>
+ <li id="add-portlet"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddAPortlet}</a></li>
<li id="column-width">
<select name="setColWidth" onchange="window.location=this.value;">
<option value="">${uiLabelMap.CommonSetColumnWidth}</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 10> selected</#if> value="<@o...@ofbizUrl>">10%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 20> selected</#if> value="<@o...@ofbizUrl>">20%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 30> selected</#if> value="<@o...@ofbizUrl>">30%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 40> selected</#if> value="<@o...@ofbizUrl>">40%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 50> selected</#if> value="<@o...@ofbizUrl>">50%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 60> selected</#if> value="<@o...@ofbizUrl>">60%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 70> selected</#if> value="<@o...@ofbizUrl>">70%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 80> selected</#if> value="<@o...@ofbizUrl>">80%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 90> selected</#if> value="<@o...@ofbizUrl>">90%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 100> selected</#if> value="<@o...@ofbizUrl>">100%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 10> selected</#if> value="<@o...@ofbizUrl>">10%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 20> selected</#if> value="<@o...@ofbizUrl>">20%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 30> selected</#if> value="<@o...@ofbizUrl>">30%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 40> selected</#if> value="<@o...@ofbizUrl>">40%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 50> selected</#if> value="<@o...@ofbizUrl>">50%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 60> selected</#if> value="<@o...@ofbizUrl>">60%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 70> selected</#if> value="<@o...@ofbizUrl>">70%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 80> selected</#if> value="<@o...@ofbizUrl>">80%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 90> selected</#if> value="<@o...@ofbizUrl>">90%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 100> selected</#if> value="<@o...@ofbizUrl>">100%</option>
</select>
</li>
</ul>
@@ -54,7 +54,7 @@
<#list portalPagePortletViewList as portlet>
<#if (!portlet.columnSeqId?has_content && portalPageColumn_index == 0) || (portlet.columnSeqId?if_exists == portalPageColumn.columnSeqId)>
<#if portlet.screenName?has_content>
- <#assign portletUrlLink = "portalPageId="+portalPage.portalPageId+"&portalPortletId="+portlet.portalPortletId+"&portletSeqId="+portlet.portletSeqId+"&parentPortalPageId="+parentPortalPageId/>
+ <#assign portletUrlLink = "portalPageId="+portalPage.portalPageId+"&portalPortletId="+portlet.portalPortletId+"&portletSeqId="+portlet.portletSeqId+"&parentPortalPageId="+parameters.parentPortalPageId/>
<div class="portlet-config">
<div class="portlet-config-title-bar">
<ul>
Modified: ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl Sun Feb 8 08:33:36 2009
@@ -26,7 +26,7 @@
<div class="screenlet-title-bar">
<ul>
<li class="h3">Available portlets</li>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCancel}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCancel}</a></li>
</ul>
<br class="clear"/>
</div>
Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Sun Feb 8 08:33:36 2009
@@ -28,7 +28,7 @@
</actions>
<field name="portalPageId" title="${uiLabelMap.CommonEdit}">
- <hyperlink description="${uiLabelMap.CommonEdit}" target="editPortalPage?portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}"/>
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="ManagePortalPages?portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}"/>
</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">
@@ -53,7 +53,7 @@
<hyperlink target="deletePortalPage?portalPageId=${portalPageId}&parentPortalPageId=${parameters.portalPageId}" description="${uiLabelMap.CommonDelete}"/>
</field>
<field name="deleteLink" use-when="!ownerUserLoginId.equals("_NA_")&&originalPortalPageId!=null" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" >
- <hyperlink target="deletePortalPage?portalPageId=${portalPageId}&parentPortalPageId=${parameters.portalPageId}" description="${uiLabelMap.CommonRevertPortalPage}"/>
+ <hyperlink target="deletePortalPage?portalPageId=${parameters.portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}" description="${uiLabelMap.CommonRevertPortalPage}"/>
</field>
</form>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sun Feb 8 08:33:36 2009
@@ -37,23 +37,10 @@
</section>
</screen>
- <screen name="editPortalPage">
+ <screen name="ManagePortalPages">
<section>
<actions>
- <set field="headerItem" from-field="parameters.portalPageId"/>
- <entity-one entity-name="PortalPage" value-field="portalPage"/>
- <set field="portalPages[]" from-field="portalPage"/>
- <set field="portalPageId" from-field="portalPage.portalPageId"/>
- <set field="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
- <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/>
- <entity-condition entity-name="PortalPageColumn" list="portalPageColumnList">
- <condition-expr field-name="portalPageId" from-field="portalPageId"/>
- <order-by field-name="columnSeqId"/>
- </entity-condition>
- <entity-condition entity-name="PortalPagePortletView" list="portalPagePortletViewList">
- <condition-expr field-name="portalPageId" from-field="portalPageId"/>
- <order-by field-name="sequenceNum"/>
- </entity-condition>
+ <entity-one entity-name="PortalPage" value-field="portalPage"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -64,23 +51,28 @@
<screenlet title="Add a new portal Page">
<include-form name="NewPortalPage" location="component://common/widget/PortalPageForms.xml"/>
</screenlet>
- <screenlet title="Edit portal page: ${portalPage.portalPageName} [${parameters.portalPageId}]">
- <link target="addPortalPageColumn?portalPageId=${portalPage.portalPageId}&parentPortalPageId=${portalPage.parentPortalPageId}" text="${uiLabelMap.CommonAddColumn}" style="buttontext"/>
- <platform-specific><html><html-template location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="ManagePortalPages">
- <section>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-form name="ListPortalPages" location="component://common/widget/PortalPageForms.xml"/>
- <include-form name="NewPortalPage" location="component://common/widget/PortalPageForms.xml"/>
+ <section>
+ <condition>
+ <not><if-empty field="portalPage"/></not>
+ </condition>
+ <actions>
+ <set field="portalPages[]" from-field="portalPage"/>
+ <entity-condition entity-name="PortalPageColumn" list="portalPageColumnList">
+ <condition-expr field-name="portalPageId" from-field="portalPage.portalPageId"/>
+ <order-by field-name="columnSeqId"/>
+ </entity-condition>
+ <entity-condition entity-name="PortalPagePortletView" list="portalPagePortletViewList">
+ <condition-expr field-name="portalPageId" from-field="portalPage.portalPageId"/>
+ <order-by field-name="sequenceNum"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <screenlet title="Edit portal page: ${portalPage.portalPageName} [${parameters.portalPageId}]">
+ <link target="addPortalPageColumn?portalPageId=${portalPage.portalPageId}&parentPortalPageId=${portalPage.parentPortalPageId}" text="${uiLabelMap.CommonAddColumn}" style="buttontext"/>
+ <platform-specific><html><html-template location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific>
+ </screenlet>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Sun Feb 8 08:33:36 2009
@@ -32,19 +32,17 @@
<PortalPage portalPageId="MYPORTAL_EMPLOYEE" sequenceNum="00" portalPageName="Main" description="The OFBiz My Portal Main page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE" />
<PortalPage portalPageId="MYPORTAL_EMPLOYEE1" sequenceNum="01" portalPageName="My Profile" description="The OFBiz My Portal Profile page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="02" portalPageName="My Communications" description="The OFBiz My Portal commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE3" sequenceNum="03" portalPageName="Other Communications" description="The OFBiz My Portal other commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="04" portalPageName="Company communications" description="The OFBiz My Portal Company commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="05" portalPageName="My Time Sheets" description="The OFBiz My Portal Timesheet page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE6" sequenceNum="06" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="03" portalPageName="Other Communications" description="The OFBiz My Portal other commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE3" sequenceNum="04" portalPageName="Company communications" description="The OFBiz My Portal Company commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="05" portalPageName="My Time Sheets" description="The OFBiz My Portal Timesheet page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="06" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="00" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML" />
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML1" sequenceNum="01" portalPageName="My Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
- <PortalPage portalPageId="MYPORTAL_EMPL-NOEML2" sequenceNum="02" portalPageName="My Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
- <PortalPage portalPageId="MYPORTAL_EMPL-NOEML3" sequenceNum="03" portalPageName="Other Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
- <PortalPage portalPageId="MYPORTAL_EMPL-NOEML4" sequenceNum="04" portalPageName="Company communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
- <PortalPage portalPageId="MYPORTAL_EMPL-NOEML5" sequenceNum="05" portalPageName="My Time Sheets" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
- <PortalPage portalPageId="MYPORTAL_EMPL-NOEML6" sequenceNum="06" portalPageName="My Tasks" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+ <PortalPage portalPageId="MYPORTAL_EMPL-NOEML2" sequenceNum="03" portalPageName="Other Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+ <PortalPage portalPageId="MYPORTAL_EMPL-NOEML3" sequenceNum="04" portalPageName="Company communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+ <PortalPage portalPageId="MYPORTAL_EMPL-NOEML4" sequenceNum="05" portalPageName="My Time Sheets" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+ <PortalPage portalPageId="MYPORTAL_EMPL-NOEML5" sequenceNum="06" portalPageName="My Tasks" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_CUSTOMER" sequenceNum="00" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_CUSTOMER" />
<PortalPage portalPageId="MYPORTAL_CUSTOMER1" sequenceNum="01" portalPageName="My Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" />
@@ -60,7 +58,6 @@
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE3" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE4" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001" />
- <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE6" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00001" columnWidthPercentage="50" />
@@ -69,7 +66,6 @@
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML3" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML4" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML5" columnSeqId="00001" />
- <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML6" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_CUSTOMER" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00001" columnWidthPercentage="50" />
@@ -106,6 +102,7 @@
<PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" />
@@ -118,13 +115,13 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE3" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE6" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE3" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" />
@@ -137,11 +134,10 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" />
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML2" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML3" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML4" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML5" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" />
- <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML6" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML2" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML3" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" />
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" />
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequestsComp" portletSeqId="00001" columnSeqId="00001" />
Modified: ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl Sun Feb 8 08:33:36 2009
@@ -29,7 +29,7 @@
</#list>
</#if>
<li class="opposed"><a href="http://docs.ofbiz.org/display/OFBENDUSER/My+Portal?decorator=printable" url-mode="plain" target-window="new">${uiLabelMap.CommonHelp}</a></li>
- <li class="opposed"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li>
+ <li class="opposed"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li>
</ul>
</li>
</ul>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=742018&r1=742017&r2=742018&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Feb 8 08:33:36 2009
@@ -787,7 +787,7 @@
<widgets>
<section>
<condition>
- <!--not><if-empty field="custRequests"/></not-->
+ <not><if-empty field="custRequests"/></not>
</condition>
<widgets>
<screenlet title="${uiLabelMap.MyPortalIncomingCustRequests}" navigation-form-name="ListRequestList">