Thank you bruno for reporting: fixed in revision 928131.
On Fri, 2010-03-26 at 14:19 +0100, Bruno Busco wrote: > Hi, > this change breakes the example application screens. > > Please give a look at the following using the tomahawk theme: > > https://localhost:8443/example/control/main > the tab bar menu should only show the "example" tab and should have only the > last item yellow > > https://localhost:8443/example/control/ManagePortalPages > there is a runtime error. > > -Bruno > > 2010/3/24 <hans...@apache.org> > > > Author: hansbak > > Date: Wed Mar 24 02:59:07 2010 > > New Revision: 926908 > > > > URL: http://svn.apache.org/viewvc?rev=926908&view=rev > > Log: > > show portal page names correctly in tomahawk theme > > > > Modified: > > ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml > > ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml > > ofbiz/trunk/applications/party/data/PartyPortletData.xml > > ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml > > ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl > > ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl > > > > Modified: > > ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml > > URL: > > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml?rev=926908&r1=926907&r2=926908&view=diff > > > > ============================================================================== > > --- ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml > > (original) > > +++ ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml Wed > > Mar 24 02:59:07 2010 > > @@ -46,7 +46,7 @@ > > <PortletPortletCategory portalPortletId="ArPastDueInvoices" > > portletCategoryId="ACCOUNTING"/> > > <PortletPortletCategory portalPortletId="ArInvoicesDueSoon" > > portletCategoryId="ACCOUNTING"/> > > > > - <PortalPage portalPageId="ArPortalPage" sequenceNum="0" > > portalPageName="Portal Page in AR" description="Portal page for Past Due > > Invoices and Invoices Due Soon in AR" ownerUserLoginId="_NA_"/> > > + <PortalPage portalPageId="ArPortalPage" sequenceNum="0" > > portalPageName="Main" description="Portal page for Past Due Invoices and > > Invoices Due Soon in AR" ownerUserLoginId="_NA_"/> > > > > <PortalPageColumn portalPageId="ArPortalPage" columnSeqId="00001"/> > > > > @@ -62,7 +62,7 @@ > > <PortletPortletCategory portalPortletId="ApPastDueInvoices" > > portletCategoryId="ACCOUNTING"/> > > <PortletPortletCategory portalPortletId="ApInvoicesDueSoon" > > portletCategoryId="ACCOUNTING"/> > > > > - <PortalPage portalPageId="ApPortalPage" sequenceNum="0" > > portalPageName="Portal Page in AP" description="Portal page for Past Due > > Invoices and Invoices Due Soon in AP" ownerUserLoginId="_NA_"/> > > + <PortalPage portalPageId="ApPortalPage" sequenceNum="0" > > portalPageName="Main" description="Portal page for Past Due Invoices and > > Invoices Due Soon in AP" ownerUserLoginId="_NA_"/> > > > > <PortalPageColumn portalPageId="ApPortalPage" columnSeqId="00001"/> > > > > > > Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml > > URL: > > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=926908&r1=926907&r2=926908&view=diff > > > > ============================================================================== > > --- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml > > (original) > > +++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Wed Mar > > 24 02:59:07 2010 > > @@ -43,7 +43,7 @@ under the License. > > <screen name="main"> > > <section> > > <actions> > > - <set field="headerItem" value="main"/> > > + <set field="tabButtonItem" value="main"></set> > > <set field="parameters.portalPageId" value="ArPortalPage"/> > > <set field="invoiceTypeId" value="SALES_INVOICE"/> > > </actions> > > > > Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml > > URL: > > http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=926908&r1=926907&r2=926908&view=diff > > > > ============================================================================== > > --- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original) > > +++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Wed Mar 24 > > 02:59:07 2010 > > @@ -140,7 +140,7 @@ > > screenshot="/images/portlets/MyCommunications.png"/> > > <PortletPortletCategory portalPortletId="MyCommunications" > > portletCategoryId="COMMUNICATIONS"/> > > > > - <PortalPage portalPageId="PartyProfile" sequenceNum="0" > > portalPageName="Party Profile Portal Page" description="Party profile page > > using flexible Portal technology" ownerUserLoginId="_NA_"/> > > + <PortalPage portalPageId="PartyProfile" sequenceNum="0" > > portalPageName="Profile" description="Party profile page using flexible > > Portal technology" ownerUserLoginId="_NA_"/> > > <PortalPageColumn portalPageId="PartyProfile" columnSeqId="00001" > > columnWidthPercentage="50"/> > > <PortalPageColumn portalPageId="PartyProfile" columnSeqId="00002"/><!-- > > no width in pixels or percent, use the rest of the space available --> > > > > > > Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml > > URL: > > http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=926908&r1=926907&r2=926908&view=diff > > > > ============================================================================== > > --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml > > (original) > > +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Wed Mar > > 24 02:59:07 2010 > > @@ -62,7 +62,6 @@ under the License. > > <set field="parameters.portalPageId" value="PartyProfile"/> > > <set field="titleProperty" > > value="PageTitleViewPartyProfile"/> > > <set field="tabButtonItem" value="viewprofile"/> > > - <set field="headerItem" value="find"/> > > <set field="labelTitleProperty" value="PartyTaxAuthInfos"/> > > <set field="partyId" from-field="parameters.partyId"/> > > <set field="layoutSettings.javaScripts[]" > > value="/images/prototypejs/prototype.js" global="true"/> > > > > Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl > > URL: > > http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=926908&r1=926907&r2=926908&view=diff > > > > ============================================================================== > > --- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original) > > +++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Wed Mar 24 > > 02:59:07 2010 > > @@ -40,6 +40,16 @@ under the License. > > </#if> > > </#if> > > > > +<#if parameters.portalPageId?exists> > > + <#assign findMap = > > Static["org.ofbiz.base.util.UtilMisc"].toMap("portalPageId", > > parameters.portalPageId)> > > + <#assign portalPage = delegator.findByPrimaryKeyCache("PortalPage", > > findMap)> > > + <#if portalPage?exists> > > + <div class="breadcrumbs-sep"> > > + ${portalPage.portalPageName?if_exists} > > + </div> > > + </#if> > > +</#if> > > + > > <div id="control-area"> > > <ul id="preferences-menu"> > > <#if userLogin?exists> > > > > Modified: ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl > > URL: > > http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl?rev=926908&r1=926907&r2=926908&view=diff > > > > ============================================================================== > > --- ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl (original) > > +++ ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl Wed Mar 24 02:59:07 > > 2010 > > @@ -25,12 +25,16 @@ 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> > > - <#if headerItem!="main"> > > +<#if appModelMenu.getModelMenuItemByName(headerItem)?exists && > > !parameters.portalPageId?exists> > > + <#if headerItem!="main" && headerItem!="viewprofile"> > > <#assign show_last_menu = true> > > </#if> > > </#if> > > > > +<#if parameters.portalPageId?exists && > > !appModelMenu.getModelMenuItemByName(headerItem)?exists> > > + <#assign show_last_menu = true> > > +</#if> > > + > > <div class="tabbar"> > > <div class="breadcrumbs<#if show_last_menu?exists> menu_selected</#if>"> > > <#if userLogin?has_content> > > > > > > -- Ofbiz on twitter: http://twitter.com/apache_ofbiz Myself on twitter: http://twitter.com/hansbak Antwebsystems.com: Quality services for competitive rates.
