Author: hansbak
Date: Sat Mar 27 03:39:08 2010
New Revision: 928131
URL: http://svn.apache.org/viewvc?rev=928131&view=rev
Log:
if menu and portalpage options are mixed, tomahawk did not display correctly in
the example component and other places as reported by bruna in he mailing list.
should work now.
Modified:
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl
ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=928131&r1=928130&r2=928131&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Sat Mar 27
03:39:08 2010
@@ -43,7 +43,7 @@ under the License.
<screen name="main">
<section>
<actions>
- <set field="tabButtonItem" value="main"></set>
+ <set field="tabButtonItem" value="main"/>
<set field="parameters.portalPageId" value="ArPortalPage"/>
<set field="invoiceTypeId" value="SALES_INVOICE"/>
</actions>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=928131&r1=928130&r2=928131&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sat Mar 27
03:39:08 2010
@@ -23,9 +23,6 @@ under the License.
<screen name="showPortlet">
<section>
- <actions>
- <set field="headerItem" from-field="parameters.portletId" />
- </actions>
<widgets>
<section>
<actions>
@@ -61,9 +58,6 @@ under the License.
<screen name="showPortletSimpleDecorator">
<section>
- <actions>
- <set field="headerItem" from-field="parameters.portletId"/>
- </actions>
<widgets>
<decorator-screen name="SimpleDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
@@ -79,7 +73,6 @@ under the License.
<actions>
<set field="layoutSettings.javaScripts[]"
value="/images/myportal.js" global="true"/>
<set field="layoutSettings.styleSheets[+0]"
value="/images/myportal.css" global="true"/>
- <set field="headerItem" from-field="parameters.portalPageId"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -97,6 +90,7 @@ under the License.
<screen name="ManagePortalPages">
<section>
<actions>
+ <set field="headerItem" value="Dashboard"/>
<set field="layoutSettings.javaScripts[]"
value="/images/myportal.js" global="true"/>
<set field="layoutSettings.styleSheets[+0]"
value="/images/myportal.css" global="true"/>
<entity-one entity-name="PortalPage" value-field="portalPage"/>
Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=928131&r1=928130&r2=928131&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Sat Mar 27
03:39:08 2010
@@ -259,6 +259,7 @@ under the License.
the user. -->
<section>
<actions>
+ <set field="tabButtonItem" value="main"/>
<set field="parameters.portalPageId" value="EXAMPLE"/>
<entity-one entity-name="PortalPage" value-field="portalPage"/>
<get-related value-field="portalPage"
relation-name="PortalPageColumn" list="portalPageColumns"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=928131&r1=928130&r2=928131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sat Mar 27
03:39:08 2010
@@ -35,7 +35,6 @@ under the License.
<property-map resource="ProjectMgrUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="HumanResUiLabels"
map-name="uiLabelMap" global="true"/>
- <set field="headerItem"
value="${parameters._HOME_VIEW_PARAMS_.portalPageId}"/>
<set field="layoutSettings.companyName"
from-field="uiLabelMap.MyPortalInformation" global="true"/>
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
<set field="applicationMenuName" value="MyPortalAppBar"
global="true"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=928131&r1=928130&r2=928131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Sat Mar 27
03:39:08 2010
@@ -23,7 +23,7 @@ under the License.
<menu name="MyPortalAppBar" title="${uiLabelMap.PageTitleMyPortal}
${partyNameView.personalTitle} ${partyNameView.firstName}
${partyNameView.middleName} ${partyNameView.lastName}
${partyNameView.groupName}"
extends="CommonAppBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="main"
parent-portal-page-value="${parameters.parentPortalPageId}"/>
- <menu-item name="Preferences" title="${uiLabelMap.CommonPreferences}"
align-style="opposed">
+ <menu-item name="Dashboard" title="${uiLabelMap.CommonPreferences}"
align-style="opposed">
<link target="ManagePortalPages">
<parameter param-name="parentPortalPageId"
from-field="parameters.parentPortalPageId"/>
</link>
Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=928131&r1=928130&r2=928131&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Sat Mar 27 03:39:08
2010
@@ -40,7 +40,7 @@ under the License.
</#if>
</#if>
-<#if parameters.portalPageId?exists>
+<#if parameters.portalPageId?exists &&
!appModelMenu.getModelMenuItemByName(headerItem)?exists>
<#assign findMap =
Static["org.ofbiz.base.util.UtilMisc"].toMap("portalPageId",
parameters.portalPageId)>
<#assign portalPage = delegator.findByPrimaryKeyCache("PortalPage",
findMap)>
<#if portalPage?exists>
Modified: ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl?rev=928131&r1=928130&r2=928131&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl Sat Mar 27 03:39:08 2010
@@ -25,7 +25,7 @@ under the License.
<#assign displaySecondaryApps =
Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName,
"secondary")>
<#assign appModelMenu =
Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName,delegator,dispatcher)>
-<#if appModelMenu.getModelMenuItemByName(headerItem)?exists &&
!parameters.portalPageId?exists>
+<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
<#if headerItem!="main">
<#assign show_last_menu = true>
</#if>
