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/26 14:36:53 UTC

svn commit: r748144 - in /ofbiz/trunk: applications/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/applicationext/ applications/applicationext/widget/ applications/content/widget/ app...

Author: hansbak
Date: Thu Feb 26 13:36:51 2009
New Revision: 748144

URL: http://svn.apache.org/viewvc?rev=748144&view=rev
Log:
introduction of a common component for applications. moved the 2 lines containing party info to this component

Added:
    ofbiz/trunk/applications/applicationext/
    ofbiz/trunk/applications/applicationext/ofbiz-component.xml   (with props)
    ofbiz/trunk/applications/applicationext/widget/
    ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml   (with props)
Modified:
    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
    ofbiz/trunk/applications/component-load.xml
    ofbiz/trunk/applications/content/widget/CommonScreens.xml
    ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
    ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
    ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
    ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
    ofbiz/trunk/framework/common/webcommon/includes/header.ftl
    ofbiz/trunk/framework/common/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
    ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
    ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
    ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -41,7 +41,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.AccountingManagerApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -30,7 +30,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.AccountingApManagerApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -34,7 +34,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.AccountingArManagerApplication}" global="true"/>
             </actions>
            <widgets>
-               <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+               <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
            </widgets>
         </section>
     </screen>

Added: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/applicationext/ofbiz-component.xml?rev=748144&view=auto
==============================================================================
--- ofbiz/trunk/applications/applicationext/ofbiz-component.xml (added)
+++ ofbiz/trunk/applications/applicationext/ofbiz-component.xml Thu Feb 26 13:36:51 2009
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<ofbiz-component name="applicationext"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+
+</ofbiz-component>

Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml?rev=748144&view=auto
==============================================================================
--- ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml (added)
+++ ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -0,0 +1,54 @@
+<?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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    <screen name="ApplicationDecorator">
+        <section>
+            <actions>
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.MyPortalInformation" global="true"/>
+                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
+                <service service-name="getUserPreferenceGroup" result-map="prefResult">
+                    <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
+                </service>
+                <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
+                <entity-one entity-name="PartyNameView" value-field="partyNameView">
+                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
+                </entity-one>
+                <property-to-field resource="general" property="defaultOrganizationPartyId" field="defaultOrganizationPartyIdProperties"/>
+                <set field="defaultOrganizationPartyId" value="${bsh:&quot;DEFAULT&quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))?defaultOrganizationPartyIdProperties:userPreferences.get(&quot;ORGANIZATION_PARTY&quot;)}" global="true"/>
+                <property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/>
+                <entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
+                    <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
+                </entity-one>
+                <set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="defaultCurrencyUomId" global="true"/>
+                <set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
+                <set field="line.text" value="${uiLabelMap.CommonWelcome} ${person.firstName} ${person.middleName} ${person.lastName}"/>
+                <set field="line.urlText" value="[${userLogin.userLoginId}]"/>
+                <set field="line.url" value="/partymgr/control/viewprofile?partyId=${userLogin.partyId}"/>
+                <set field="layoutSettings.topLines[]" from-field="line" global="true"/>
+                <set field="layoutSettings.topLines[]" value="${uiLabelMap.CommonDefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName} [${defaultOrganizationPartyId}]" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+            </widgets>
+        </section>
+    </screen>
+</screens>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/component-load.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/component-load.xml (original)
+++ ofbiz/trunk/applications/component-load.xml Thu Feb 26 13:36:51 2009
@@ -20,6 +20,7 @@
 
 <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+    <load-component component-location="applicationext"/><!-- common component used by most other components -->
     <load-component component-location="party"/>
     <load-component component-location="securityext"/>
     <load-component component-location="content"/>

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -40,7 +40,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.ContentContentManagerApplication}"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -43,7 +43,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.HumanResManagerApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -45,7 +45,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.ManufacturingManagerApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -42,7 +42,7 @@
                 <set field="applicationMenuLocation" value="component://marketing/widget/MarketingMenus.xml" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -42,7 +42,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -50,7 +50,7 @@
                 <set field="customerDetailLink" value="/partymgr/control/viewprofile?partyId=" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -51,7 +51,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.PartyManagerApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -44,7 +44,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -43,7 +43,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.ProductFacilityManagerApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -46,7 +46,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.WorkEffortWorkEffortManagerApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Thu Feb 26 13:36:51 2009
@@ -102,15 +102,19 @@
             <a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>"/></a>
           </#if>
         </li>
-        <li>
-          <#if person?has_content>
-            ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
-          <#elseif partyGroup?has_content>
-            ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
-          <#else>
-            ${uiLabelMap.CommonWelcome}!
-          </#if>
-        </li>
+        <#if layoutSettings.topLines?has_content>
+            <#list layoutSettings.topLines as topLine>
+              <li>
+              <#if topLine.text?exists>
+                ${topLine.text}<a href="<@o...@ofbizUrl>">${topLine.urlText?if_exists}</a> 
+              <#else>
+                ${topLine?if_exists}
+              </#if>
+              </li>
+            </#list>
+        <#else>
+           <li>sss${userLogin.userLoginId}</li>
+        </#if>
         <li class="control-area">
           <p class="collapsed">
             <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a>&nbsp;&nbsp;
@@ -131,20 +135,22 @@
         <li class="control-area"<#if layoutSettings.headerRightBackgroundUrl?has_content> background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
           <#if userLogin?exists>
             <p class="expanded">
-              <#if person?has_content>
-                ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists}
-              <#elseif partyGroup?has_content>
-                ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists}
-              </#if>
-              [${userLogin.userLoginId}]
               <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a>&nbsp;&nbsp;
               <a href="setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&amp;userPrefTypeId=COMPACT_HEADER&amp;userPrefValue=Y">&nbsp;&nbsp;</a>
             </p>
-            <#if defaultOrganizationPartyId?exists><p>${uiLabelMap.CommonDefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p></#if>
+            <#if layoutSettings.topLines?has_content>
+              <#list layoutSettings.topLines as topLine>
+              <#if topLine.text?exists>
+                <p>${topLine.text}<a href="${topLine.url?if_exists}&externalLoginKey=${externalLoginKey}">${topLine.urlText?if_exists}</a></p> 
+              <#else>
+                <p>${topLine?if_exists}</p>
+              </#if>
+              </#list>
+            <#else>
+              <p>${userLogin.userLoginId}</p>
+            </#if>
           <#else/>
-            <p>
-            ${uiLabelMap.CommonWelcome}! <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a>
-            </p>
+            <p>${uiLabelMap.CommonWelcome}! <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></p>
           </#if>
           <ul id="preferences-menu">
             <!-- <li class="first"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> -->

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -135,14 +135,6 @@
                 <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/footer.ftl"/>
                 <set field="appbarTemplateLocation" from-field="layoutSettings.VT_NAV_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/appbar.ftl"/>
                 <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/>
-                <property-to-field resource="general" property="defaultOrganizationPartyId" field="defaultOrganizationPartyIdProperties"/>
-                <set field="defaultOrganizationPartyId" value="${bsh:&quot;DEFAULT&quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))?defaultOrganizationPartyIdProperties:userPreferences.get(&quot;ORGANIZATION_PARTY&quot;)}" global="true"/>
-                <property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/>
-                <entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
-                    <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
-                </entity-one>
-                <set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="defaultCurrencyUomId" global="true"/>
-                <set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
             </actions>
             <widgets>
                 <!-- render header -->

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -41,7 +41,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.AssetMaintApplication}"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -41,7 +41,7 @@
                 <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Thu Feb 26 13:36:51 2009
@@ -36,7 +36,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.EbayApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Thu Feb 26 13:36:51 2009
@@ -37,7 +37,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.GoogleBaseApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -60,7 +60,7 @@
                     </actions>
                     <widgets/>
                 </section>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

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=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Thu Feb 26 13:36:51 2009
@@ -22,6 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>    
     <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>    
+    <include location="component://applicationext/application-controller.xml"/>    
     <include location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/>    
     <include location="component://party/webapp/partymgr/WEB-INF/controller.xml"/>    
     

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -40,13 +40,10 @@
                 <set field="applicationMenuLocation" value="component://myportal/widget/MyPortalMenus.xml" global="true"/>
                 <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" global="true"/>
                 <script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/>
-                <entity-one entity-name="PartyNameView" value-field="partyNameView">
-                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
-                </entity-one>
                 <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -34,7 +34,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.OagisApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -45,7 +45,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.ProjectMgrApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
@@ -37,7 +37,7 @@
                 <set field="appheaderTemplate" value="component://shark/webapp/shark/includes/appheader.ftl" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Re: svn commit: r748144 - in /ofbiz/trunk: applications/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/applicationext/ applications/applicationext/widget/ applications/content/widget/ app

Posted by David E Jones <da...@hotwaxmedia.com>.

Yeah, something like "appcommon" or "commonext" would be clear and  
consistent with stuff.

Thanks for getting this started Hans.

-David


On Feb 26, 2009, at 10:15 AM, Adrian Crum wrote:

> In previous discussions, appcommon was used.
>
> -Adrian
>
> Jacques Le Roux wrote:
>> I thought that, for the sake of consistency,  we will have used  
>> common for the name instead of applicationext, but this is very  
>> minor anyway
>> Jacques
>>> Author: hansbak
>>> Date: Thu Feb 26 13:36:51 2009
>>> New Revision: 748144
>>>
>>> URL: http://svn.apache.org/viewvc?rev=748144&view=rev
>>> Log:
>>> introduction of a common component for applications. moved the 2  
>>> lines containing party info to this component
>>>
>>> Added:
>>>   ofbiz/trunk/applications/applicationext/
>>>   ofbiz/trunk/applications/applicationext/ofbiz-component.xml    
>>> (with props)
>>>   ofbiz/trunk/applications/applicationext/widget/
>>>   ofbiz/trunk/applications/applicationext/widget/ 
>>> CommonScreens.xml   (with props)
>>> Modified:
>>>   ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
>>>   ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
>>>   ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
>>>   ofbiz/trunk/applications/component-load.xml
>>>   ofbiz/trunk/applications/content/widget/CommonScreens.xml
>>>   ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
>>>   ofbiz/trunk/applications/manufacturing/widget/manufacturing/ 
>>> CommonScreens.xml
>>>   ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
>>>   ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
>>>   ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
>>>   ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
>>>   ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
>>>   ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
>>>   ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
>>>   ofbiz/trunk/framework/common/webcommon/includes/header.ftl
>>>   ofbiz/trunk/framework/common/widget/CommonScreens.xml
>>>   ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
>>>   ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/ 
>>> CommonScreens.xml
>>>   ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
>>>   ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
>>>   ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
>>>   ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/ 
>>> controller.xml
>>>   ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
>>>   ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
>>>   ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
>>>   ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml
>>>
>>> Modified: ofbiz/trunk/applications/accounting/widget/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml  
>>> Thu Feb 26 13:36:51 2009
>>> @@ -41,7 +41,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.AccountingManagerApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/accounting/widget/ap/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/accounting/widget/ap/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/applications/accounting/widget/ap/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -30,7 +30,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.AccountingApManagerApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/accounting/widget/ar/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/accounting/widget/ar/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/applications/accounting/widget/ar/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -34,7 +34,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.AccountingArManagerApplication}" global="true"/>
>>>            </actions>
>>>           <widgets>
>>> -               <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +               <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>           </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Added: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/applicationext/ofbiz-component.xml?rev=748144&view=auto
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/applicationext/ofbiz-component.xml  
>>> (added)
>>> +++ ofbiz/trunk/applications/applicationext/ofbiz-component.xml  
>>> Thu Feb 26 13:36:51 2009
>>> @@ -0,0 +1,25 @@
>>> +<?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.
>>> +-->
>>> +
>>> +<ofbiz-component name="applicationext"
>>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> +        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd 
>>> ">
>>> +
>>> +</ofbiz-component>
>>>
>>> Propchange: ofbiz/trunk/applications/applicationext/ofbiz- 
>>> component.xml
>>> ------------------------------------------------------------------------------
>>>   svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/applicationext/ofbiz- 
>>> component.xml
>>> ------------------------------------------------------------------------------
>>>   svn:keywords = "Date Rev Author URL Id"
>>>
>>> Propchange: ofbiz/trunk/applications/applicationext/ofbiz- 
>>> component.xml
>>> ------------------------------------------------------------------------------
>>>   svn:mime-type = text/xml
>>>
>>> Added: ofbiz/trunk/applications/applicationext/widget/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml?rev=748144&view=auto
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/applicationext/widget/ 
>>> CommonScreens.xml (added)
>>> +++ ofbiz/trunk/applications/applicationext/widget/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -0,0 +1,54 @@
>>> +<?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.
>>> +-->
>>> +
>>> +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> +        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd 
>>> ">
>>> +    <screen name="ApplicationDecorator">
>>> +        <section>
>>> +            <actions>
>>> +                <set field="layoutSettings.companyName" from- 
>>> field="uiLabelMap.MyPortalInformation" global="true"/>
>>> +                <set field="layoutSettings.companySubtitle" from- 
>>> field="uiLabelMap.PartyCompanySubtitle" global="true"/>
>>> +                <service service-name="getUserPreferenceGroup"  
>>> result-map="prefResult">
>>> +                    <field-map field-name="userPrefGroupTypeId"  
>>> value="GLOBAL_PREFERENCES"/>
>>> +                </service>
>>> +                <set field="userPreferences" from- 
>>> field="prefResult.userPrefMap" global="true"/>
>>> +                <entity-one entity-name="PartyNameView" value- 
>>> field="partyNameView">
>>> +                    <field-map field-name="partyId" from- 
>>> field="userLogin.partyId"/>
>>> +                </entity-one>
>>> +                <property-to-field resource="general"  
>>> property="defaultOrganizationPartyId"  
>>> field="defaultOrganizationPartyIdProperties"/>
>>> +                <set field="defaultOrganizationPartyId" value="$ 
>>> {bsh 
>>> :&quot 
>>> ;DEFAULT 
>>> &quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))? 
>>> defaultOrganizationPartyIdProperties:userPreferences 
>>> .get(&quot;ORGANIZATION_PARTY&quot;)}" global="true"/>
>>> +                <property-to-field resource="general"  
>>> property="currency.uom.id.default" field="defaultCurrencyUomId"/>
>>> +                <entity-one entity-name="PartyAcctgPrefAndGroup"  
>>> value-field="orgParty">
>>> +                    <field-map field-name="partyId" from- 
>>> field="defaultOrganizationPartyId"/>
>>> +                </entity-one>
>>> +                <set  
>>> field="defaultOrganizationPartyCurrencyUomId" from- 
>>> field="orgParty.baseCurrencyUomId" default- 
>>> value="defaultCurrencyUomId" global="true"/>
>>> +                <set field="defaultOrganizationPartyGroupName"  
>>> from-field="orgParty.groupName" global="true"/>
>>> +                <set field="line.text" value="$ 
>>> {uiLabelMap.CommonWelcome} ${person.firstName} $ 
>>> {person.middleName} ${person.lastName}"/>
>>> +                <set field="line.urlText" value="[$ 
>>> {userLogin.userLoginId}]"/>
>>> +                <set field="line.url" value="/partymgr/control/ 
>>> viewprofile?partyId=${userLogin.partyId}"/>
>>> +                <set field="layoutSettings.topLines[]" from- 
>>> field="line" global="true"/>
>>> +                <set field="layoutSettings.topLines[]" value="$ 
>>> {uiLabelMap.CommonDefaultOrganizationPartyId} : $ 
>>> {defaultOrganizationPartyGroupName} [$ 
>>> {defaultOrganizationPartyId}]" global="true"/>
>>> +            </actions>
>>> +            <widgets>
>>> +                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +            </widgets>
>>> +        </section>
>>> +    </screen>
>>> +</screens>
>>> \ No newline at end of file
>>>
>>> Propchange: ofbiz/trunk/applications/applicationext/widget/ 
>>> CommonScreens.xml
>>> ------------------------------------------------------------------------------
>>>   svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/applications/applicationext/widget/ 
>>> CommonScreens.xml
>>> ------------------------------------------------------------------------------
>>>   svn:keywords = "Date Rev Author URL Id"
>>>
>>> Propchange: ofbiz/trunk/applications/applicationext/widget/ 
>>> CommonScreens.xml
>>> ------------------------------------------------------------------------------
>>>   svn:mime-type = text/xml
>>>
>>> Modified: ofbiz/trunk/applications/component-load.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/component-load.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/component-load.xml (original)
>>> +++ ofbiz/trunk/applications/component-load.xml Thu Feb 26  
>>> 13:36:51 2009
>>> @@ -20,6 +20,7 @@
>>>
>>> <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance 
>>> "
>>>        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd 
>>> ">
>>> +    <load-component component-location="applicationext"/><!--  
>>> common component used by most other components -->
>>>    <load-component component-location="party"/>
>>>    <load-component component-location="securityext"/>
>>>    <load-component component-location="content"/>
>>>
>>> Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/content/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu  
>>> Feb 26 13:36:51 2009
>>> @@ -40,7 +40,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.ContentContentManagerApplication}"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Thu  
>>> Feb 26 13:36:51 2009
>>> @@ -43,7 +43,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.HumanResManagerApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/manufacturing/widget/ 
>>> manufacturing/CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -45,7 +45,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.ManufacturingManagerApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/marketing/widget/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml  
>>> Thu Feb 26 13:36:51 2009
>>> @@ -42,7 +42,7 @@
>>>                <set field="applicationMenuLocation"  
>>> value="component://marketing/widget/MarketingMenus.xml"  
>>> global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/marketing/widget/sfa/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/marketing/widget/sfa/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/applications/marketing/widget/sfa/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -42,7 +42,7 @@
>>>                <set field="MainColumnStyle" value="leftonly"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/order/widget/ordermgr/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/applications/order/widget/ordermgr/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -50,7 +50,7 @@
>>>                <set field="customerDetailLink" value="/partymgr/ 
>>> control/viewprofile?partyId=" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/party/widget/partymgr/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/party/widget/partymgr/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/applications/party/widget/partymgr/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -51,7 +51,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.PartyManagerApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/product/widget/catalog/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/product/widget/catalog/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/applications/product/widget/catalog/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -44,7 +44,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/product/widget/facility/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/product/widget/facility/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/applications/product/widget/facility/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -43,7 +43,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.ProductFacilityManagerApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/applications/workeffort/widget/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml  
>>> Thu Feb 26 13:36:51 2009
>>> @@ -46,7 +46,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.WorkEffortWorkEffortManagerApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/framework/common/webcommon/includes/header.ftl  
>>> (original)
>>> +++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Thu  
>>> Feb 26 13:36:51 2009
>>> @@ -102,15 +102,19 @@
>>>            <a href="<@o...@ofbizUrl>"><img  
>>> src="<@o...@ofbizContentUrl>"/></a>
>>>          </#if>
>>>        </li>
>>> -        <li>
>>> -          <#if person?has_content>
>>> -            ${uiLabelMap.CommonWelcome} ${person.firstName? 
>>> if_exists} ${person.middleName?if_exists} ${person.lastName? 
>>> if_exists} [${userLogin.userLoginId}]
>>> -          <#elseif partyGroup?has_content>
>>> -            ${uiLabelMap.CommonWelcome} ${partyGroup.groupName? 
>>> if_exists} [${userLogin.userLoginId}]
>>> -          <#else>
>>> -            ${uiLabelMap.CommonWelcome}!
>>> -          </#if>
>>> -        </li>
>>> +        <#if layoutSettings.topLines?has_content>
>>> +            <#list layoutSettings.topLines as topLine>
>>> +              <li>
>>> +              <#if topLine.text?exists>
>>> +                ${topLine.text}<a href="<@ofbizUrl>${topLine.url? 
>>> if_exists}</...@ofbizUrl>">${topLine.urlText?if_exists}</a>
>>> +              <#else>
>>> +                ${topLine?if_exists}
>>> +              </#if>
>>> +              </li>
>>> +            </#list>
>>> +        <#else>
>>> +           <li>sss${userLogin.userLoginId}</li>
>>> +        </#if>
>>>        <li class="control-area">
>>>          <p class="collapsed">
>>>            <a href="<@o...@ofbizUrl>">$ 
>>> {uiLabelMap.CommonLogout}</a>&nbsp;&nbsp;
>>> @@ -131,20 +135,22 @@
>>>        <li class="control-area"<#if  
>>> layoutSettings.headerRightBackgroundUrl?has_content> background="$ 
>>> {layoutSettings.headerRightBackgroundUrl}"</#if>>
>>>          <#if userLogin?exists>
>>>            <p class="expanded">
>>> -              <#if person?has_content>
>>> -                ${uiLabelMap.CommonWelcome} ${person.firstName? 
>>> if_exists} ${person.lastName?if_exists}
>>> -              <#elseif partyGroup?has_content>
>>> -                ${uiLabelMap.CommonWelcome} $ 
>>> {partyGroup.groupName?if_exists}
>>> -              </#if>
>>> -              [${userLogin.userLoginId}]
>>>              <a href="<@o...@ofbizUrl>">$ 
>>> {uiLabelMap.CommonLogout}</a>&nbsp;&nbsp;
>>>              <a href="setUserPreference? 
>>> userPrefGroupTypeId 
>>> = 
>>> GLOBAL_PREFERENCES 
>>> &amp 
>>> ;userPrefTypeId=COMPACT_HEADER&amp;userPrefValue=Y">&nbsp;&nbsp;</a>
>>>            </p>
>>> -            <#if defaultOrganizationPartyId?exists><p>$ 
>>> {uiLabelMap.CommonDefaultOrganizationPartyId} : $ 
>>> {defaultOrganizationPartyGroupName?if_exists} [$ 
>>> {defaultOrganizationPartyId}]</p></#if>
>>> +            <#if layoutSettings.topLines?has_content>
>>> +              <#list layoutSettings.topLines as topLine>
>>> +              <#if topLine.text?exists>
>>> +                <p>${topLine.text}<a href="${topLine.url? 
>>> if_exists}&externalLoginKey=${externalLoginKey}">${topLine.urlText? 
>>> if_exists}</a></p>
>>> +              <#else>
>>> +                <p>${topLine?if_exists}</p>
>>> +              </#if>
>>> +              </#list>
>>> +            <#else>
>>> +              <p>${userLogin.userLoginId}</p>
>>> +            </#if>
>>>          <#else/>
>>> -            <p>
>>> -            ${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>$ 
>>> {checkLoginUrl}</...@ofbizUrl>">${uiLabelMap.CommonLogin}</a>
>>> -            </p>
>>> +            <p>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>$ 
>>> {checkLoginUrl}</...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></p>
>>>          </#if>
>>>          <ul id="preferences-menu">
>>>            <!-- <li class="first"><a href="<@ofbizUrl>Preferences</ 
>>> @ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> -->
>>>
>>> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
>>> +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Feb  
>>> 26 13:36:51 2009
>>> @@ -135,14 +135,6 @@
>>>                <set field="footerTemplateLocation" from- 
>>> field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default- 
>>> value="component://common/webcommon/includes/footer.ftl"/>
>>>                <set field="appbarTemplateLocation" from- 
>>> field="layoutSettings.VT_NAV_TMPLT_LOC[0]" default- 
>>> value="component://common/webcommon/includes/appbar.ftl"/>
>>>                <set field="messagesTemplateLocation" from- 
>>> field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default- 
>>> value="component://common/webcommon/includes/messages.ftl"/>
>>> -                <property-to-field resource="general"  
>>> property="defaultOrganizationPartyId"  
>>> field="defaultOrganizationPartyIdProperties"/>
>>> -                <set field="defaultOrganizationPartyId" value="$ 
>>> {bsh 
>>> :&quot 
>>> ;DEFAULT 
>>> &quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))? 
>>> defaultOrganizationPartyIdProperties:userPreferences 
>>> .get(&quot;ORGANIZATION_PARTY&quot;)}" global="true"/>
>>> -                <property-to-field resource="general"  
>>> property="currency.uom.id.default" field="defaultCurrencyUomId"/>
>>> -                <entity-one entity-name="PartyAcctgPrefAndGroup"  
>>> value-field="orgParty">
>>> -                    <field-map field-name="partyId" from- 
>>> field="defaultOrganizationPartyId"/>
>>> -                </entity-one>
>>> -                <set  
>>> field="defaultOrganizationPartyCurrencyUomId" from- 
>>> field="orgParty.baseCurrencyUomId" default- 
>>> value="defaultCurrencyUomId" global="true"/>
>>> -                <set field="defaultOrganizationPartyGroupName"  
>>> from-field="orgParty.groupName" global="true"/>
>>>            </actions>
>>>            <widgets>
>>>                <!-- render header -->
>>>
>>> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml  
>>> Thu Feb 26 13:36:51 2009
>>> @@ -41,7 +41,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.AssetMaintApplication}"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/ 
>>> CommonScreens.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/ 
>>> CommonScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -41,7 +41,7 @@
>>>                <!--<set field="layoutSettings.headerImageUrl"  
>>> value="/images/ofbiz_logo.jpg" global="true"/>-->
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Thu Feb  
>>> 26 13:36:51 2009
>>> @@ -36,7 +36,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.EbayApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/ 
>>> GoogleBaseScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/googlebase/widget/ 
>>> GoogleBaseScreens.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/googlebase/widget/ 
>>> GoogleBaseScreens.xml Thu Feb 26 13:36:51 2009
>>> @@ -37,7 +37,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.GoogleBaseApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Thu  
>>> Feb 26 13:36:51 2009
>>> @@ -60,7 +60,7 @@
>>>                    </actions>
>>>                    <widgets/>
>>>                </section>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> 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=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/ 
>>> controller.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/ 
>>> controller.xml Thu Feb 26 13:36:51 2009
>>> @@ -22,6 +22,7 @@
>>>        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd 
>>> ">
>>>    <include location="component://common/webcommon/WEB-INF/common- 
>>> controller.xml"/>
>>>    <include location="component://common/webcommon/WEB-INF/portal- 
>>> controller.xml"/>
>>> +    <include location="component://applicationext/application- 
>>> controller.xml"/>
>>>    <include location="component://projectmgr/webapp/projectmgr/WEB- 
>>> INF/controller.xml"/>
>>>    <include location="component://party/webapp/partymgr/WEB-INF/ 
>>> controller.xml"/>
>>>
>>>
>>> Modified: ofbiz/trunk/specialpurpose/myportal/widget/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml  
>>> Thu Feb 26 13:36:51 2009
>>> @@ -40,13 +40,10 @@
>>>                <set field="applicationMenuLocation"  
>>> value="component://myportal/widget/MyPortalMenus.xml"  
>>> global="true"/>
>>>                <set field="parameters.parentPortalPageId" from- 
>>> field="parameters.parentPortalPageId" default-value="MYPORTAL"  
>>> global="true"/>
>>>                <script location="component://common/webcommon/WEB- 
>>> INF/actions/includes/GetParentPortalPageId.groovy"/>
>>> -                <entity-one entity-name="PartyNameView" value- 
>>> field="partyNameView">
>>> -                    <field-map field-name="partyId" from- 
>>> field="userLogin.partyId"/>
>>> -                </entity-one>
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.PageTitleMyPortalForNoLogin}"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml Thu  
>>> Feb 26 13:36:51 2009
>>> @@ -34,7 +34,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.OagisApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ 
>>> CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml  
>>> Thu Feb 26 13:36:51 2009
>>> @@ -45,7 +45,7 @@
>>>                <set field="applicationTitle" value="$ 
>>> {uiLabelMap.ProjectMgrApplication}" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>> Modified: ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml  
>>> (original)
>>> +++ ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml Thu  
>>> Feb 26 13:36:51 2009
>>> @@ -37,7 +37,7 @@
>>>                <set field="appheaderTemplate" value="component:// 
>>> shark/webapp/shark/includes/appheader.ftl" global="true"/>
>>>            </actions>
>>>            <widgets>
>>> -                <include-screen name="GlobalDecorator"  
>>> location="component://common/widget/CommonScreens.xml"/>
>>> +                <include-screen name="ApplicationDecorator"  
>>> location="component://applicationext/widget/CommonScreens.xml"/>
>>>            </widgets>
>>>        </section>
>>>    </screen>
>>>
>>>

Re: svn commit: r748144 - in /ofbiz/trunk: applications/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/applicationext/ applications/applicationext/widget/ applications/content/widget/ app

Posted by Adrian Crum <ad...@hlmksw.com>.

In previous discussions, appcommon was used.

-Adrian

Jacques Le Roux wrote:
> I thought that, for the sake of consistency,  we will have used common 
> for the name instead of applicationext, but this is very minor anyway
> 
> Jacques
> 
>> Author: hansbak
>> Date: Thu Feb 26 13:36:51 2009
>> New Revision: 748144
>>
>> URL: http://svn.apache.org/viewvc?rev=748144&view=rev
>> Log:
>> introduction of a common component for applications. moved the 2 lines 
>> containing party info to this component
>>
>> Added:
>>    ofbiz/trunk/applications/applicationext/
>>    ofbiz/trunk/applications/applicationext/ofbiz-component.xml   (with 
>> props)
>>    ofbiz/trunk/applications/applicationext/widget/
>>    ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml   
>> (with props)
>> Modified:
>>    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
>>    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
>>    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
>>    ofbiz/trunk/applications/component-load.xml
>>    ofbiz/trunk/applications/content/widget/CommonScreens.xml
>>    ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
>>    
>> ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml 
>>
>>    ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
>>    ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
>>    ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
>>    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
>>    ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
>>    ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
>>    ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
>>    ofbiz/trunk/framework/common/webcommon/includes/header.ftl
>>    ofbiz/trunk/framework/common/widget/CommonScreens.xml
>>    ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
>>    ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
>>    ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
>>    ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
>>    ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
>>    
>> ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml 
>>
>>    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
>>    ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
>>    ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
>>    ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml
>>
>> Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu 
>> Feb 26 13:36:51 2009
>> @@ -41,7 +41,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.AccountingManagerApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -30,7 +30,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.AccountingApManagerApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -34,7 +34,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.AccountingArManagerApplication}" global="true"/>
>>             </actions>
>>            <widgets>
>> -               <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +               <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>            </widgets>
>>         </section>
>>     </screen>
>>
>> Added: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/applicationext/ofbiz-component.xml?rev=748144&view=auto 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/applicationext/ofbiz-component.xml (added)
>> +++ ofbiz/trunk/applications/applicationext/ofbiz-component.xml Thu 
>> Feb 26 13:36:51 2009
>> @@ -0,0 +1,25 @@
>> +<?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.
>> +-->
>> +
>> +<ofbiz-component name="applicationext"
>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> +        
>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd"> 
>>
>> +
>> +</ofbiz-component>
>>
>> Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
>> ------------------------------------------------------------------------------ 
>>
>>    svn:eol-style = native
>>
>> Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
>> ------------------------------------------------------------------------------ 
>>
>>    svn:keywords = "Date Rev Author URL Id"
>>
>> Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
>> ------------------------------------------------------------------------------ 
>>
>>    svn:mime-type = text/xml
>>
>> Added: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml?rev=748144&view=auto 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml 
>> (added)
>> +++ ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -0,0 +1,54 @@
>> +<?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.
>> +-->
>> +
>> +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> +        
>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> 
>>
>> +    <screen name="ApplicationDecorator">
>> +        <section>
>> +            <actions>
>> +                <set field="layoutSettings.companyName" 
>> from-field="uiLabelMap.MyPortalInformation" global="true"/>
>> +                <set field="layoutSettings.companySubtitle" 
>> from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
>> +                <service service-name="getUserPreferenceGroup" 
>> result-map="prefResult">
>> +                    <field-map field-name="userPrefGroupTypeId" 
>> value="GLOBAL_PREFERENCES"/>
>> +                </service>
>> +                <set field="userPreferences" 
>> from-field="prefResult.userPrefMap" global="true"/>
>> +                <entity-one entity-name="PartyNameView" 
>> value-field="partyNameView">
>> +                    <field-map field-name="partyId" 
>> from-field="userLogin.partyId"/>
>> +                </entity-one>
>> +                <property-to-field resource="general" 
>> property="defaultOrganizationPartyId" 
>> field="defaultOrganizationPartyIdProperties"/>
>> +                <set field="defaultOrganizationPartyId" 
>> value="${bsh:&quot;DEFAULT&quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))?defaultOrganizationPartyIdProperties:userPreferences.get(&quot;ORGANIZATION_PARTY&quot;)}" 
>> global="true"/>
>> +                <property-to-field resource="general" 
>> property="currency.uom.id.default" field="defaultCurrencyUomId"/>
>> +                <entity-one entity-name="PartyAcctgPrefAndGroup" 
>> value-field="orgParty">
>> +                    <field-map field-name="partyId" 
>> from-field="defaultOrganizationPartyId"/>
>> +                </entity-one>
>> +                <set field="defaultOrganizationPartyCurrencyUomId" 
>> from-field="orgParty.baseCurrencyUomId" 
>> default-value="defaultCurrencyUomId" global="true"/>
>> +                <set field="defaultOrganizationPartyGroupName" 
>> from-field="orgParty.groupName" global="true"/>
>> +                <set field="line.text" 
>> value="${uiLabelMap.CommonWelcome} ${person.firstName} 
>> ${person.middleName} ${person.lastName}"/>
>> +                <set field="line.urlText" 
>> value="[${userLogin.userLoginId}]"/>
>> +                <set field="line.url" 
>> value="/partymgr/control/viewprofile?partyId=${userLogin.partyId}"/>
>> +                <set field="layoutSettings.topLines[]" 
>> from-field="line" global="true"/>
>> +                <set field="layoutSettings.topLines[]" 
>> value="${uiLabelMap.CommonDefaultOrganizationPartyId} : 
>> ${defaultOrganizationPartyGroupName} [${defaultOrganizationPartyId}]" 
>> global="true"/>
>> +            </actions>
>> +            <widgets>
>> +                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +            </widgets>
>> +        </section>
>> +    </screen>
>> +</screens>
>> \ No newline at end of file
>>
>> Propchange: 
>> ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
>> ------------------------------------------------------------------------------ 
>>
>>    svn:eol-style = native
>>
>> Propchange: 
>> ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
>> ------------------------------------------------------------------------------ 
>>
>>    svn:keywords = "Date Rev Author URL Id"
>>
>> Propchange: 
>> ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
>> ------------------------------------------------------------------------------ 
>>
>>    svn:mime-type = text/xml
>>
>> Modified: ofbiz/trunk/applications/component-load.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/component-load.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/component-load.xml (original)
>> +++ ofbiz/trunk/applications/component-load.xml Thu Feb 26 13:36:51 2009
>> @@ -20,6 +20,7 @@
>>
>> <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>         
>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd"> 
>>
>> +    <load-component component-location="applicationext"/><!-- common 
>> component used by most other components -->
>>     <load-component component-location="party"/>
>>     <load-component component-location="securityext"/>
>>     <load-component component-location="content"/>
>>
>> Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
>> +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu Feb 
>> 26 13:36:51 2009
>> @@ -40,7 +40,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.ContentContentManagerApplication}"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
>> +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Thu Feb 
>> 26 13:36:51 2009
>> @@ -43,7 +43,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.HumanResManagerApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: 
>> ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml 
>>
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- 
>> ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml 
>> (original)
>> +++ 
>> ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -45,7 +45,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.ManufacturingManagerApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Thu 
>> Feb 26 13:36:51 2009
>> @@ -42,7 +42,7 @@
>>                 <set field="applicationMenuLocation" 
>> value="component://marketing/widget/MarketingMenus.xml" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -42,7 +42,7 @@
>>                 <set field="MainColumnStyle" value="leftonly"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: 
>> ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -50,7 +50,7 @@
>>                 <set field="customerDetailLink" 
>> value="/partymgr/control/viewprofile?partyId=" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: 
>> ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -51,7 +51,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.PartyManagerApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: 
>> ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -44,7 +44,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: 
>> ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -43,7 +43,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.ProductFacilityManagerApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Thu 
>> Feb 26 13:36:51 2009
>> @@ -46,7 +46,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.WorkEffortWorkEffortManagerApplication}" 
>> global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
>> +++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Thu Feb 
>> 26 13:36:51 2009
>> @@ -102,15 +102,19 @@
>>             <a href="<@o...@ofbizUrl>"><img 
>> src="<@o...@ofbizContentUrl>"/></a>
>>           </#if>
>>         </li>
>> -        <li>
>> -          <#if person?has_content>
>> -            ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} 
>> ${person.middleName?if_exists} ${person.lastName?if_exists} 
>> [${userLogin.userLoginId}]
>> -          <#elseif partyGroup?has_content>
>> -            ${uiLabelMap.CommonWelcome} 
>> ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
>> -          <#else>
>> -            ${uiLabelMap.CommonWelcome}!
>> -          </#if>
>> -        </li>
>> +        <#if layoutSettings.topLines?has_content>
>> +            <#list layoutSettings.topLines as topLine>
>> +              <li>
>> +              <#if topLine.text?exists>
>> +                ${topLine.text}<a 
>> href="<@o...@ofbizUrl>">${topLine.urlText?if_exists}</a> 
>>
>> +              <#else>
>> +                ${topLine?if_exists}
>> +              </#if>
>> +              </li>
>> +            </#list>
>> +        <#else>
>> +           <li>sss${userLogin.userLoginId}</li>
>> +        </#if>
>>         <li class="control-area">
>>           <p class="collapsed">
>>             <a 
>> href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a>&nbsp;&nbsp; 
>>
>> @@ -131,20 +135,22 @@
>>         <li class="control-area"<#if 
>> layoutSettings.headerRightBackgroundUrl?has_content> 
>> background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
>>           <#if userLogin?exists>
>>             <p class="expanded">
>> -              <#if person?has_content>
>> -                ${uiLabelMap.CommonWelcome} 
>> ${person.firstName?if_exists} ${person.lastName?if_exists}
>> -              <#elseif partyGroup?has_content>
>> -                ${uiLabelMap.CommonWelcome} 
>> ${partyGroup.groupName?if_exists}
>> -              </#if>
>> -              [${userLogin.userLoginId}]
>>               <a 
>> href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a>&nbsp;&nbsp; 
>>
>>               <a 
>> href="setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&amp;userPrefTypeId=COMPACT_HEADER&amp;userPrefValue=Y">&nbsp;&nbsp;</a> 
>>
>>             </p>
>> -            <#if 
>> defaultOrganizationPartyId?exists><p>${uiLabelMap.CommonDefaultOrganizationPartyId} 
>> : ${defaultOrganizationPartyGroupName?if_exists} 
>> [${defaultOrganizationPartyId}]</p></#if>
>> +            <#if layoutSettings.topLines?has_content>
>> +              <#list layoutSettings.topLines as topLine>
>> +              <#if topLine.text?exists>
>> +                <p>${topLine.text}<a 
>> href="${topLine.url?if_exists}&externalLoginKey=${externalLoginKey}">${topLine.urlText?if_exists}</a></p> 
>>
>> +              <#else>
>> +                <p>${topLine?if_exists}</p>
>> +              </#if>
>> +              </#list>
>> +            <#else>
>> +              <p>${userLogin.userLoginId}</p>
>> +            </#if>
>>           <#else/>
>> -            <p>
>> -            ${uiLabelMap.CommonWelcome}! <a 
>> href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a> 
>>
>> -            </p>
>> +            <p>${uiLabelMap.CommonWelcome}! <a 
>> href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></p> 
>>
>>           </#if>
>>           <ul id="preferences-menu">
>>             <!-- <li class="first"><a 
>> href="<@o...@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> 
>> -->
>>
>> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
>> +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Feb 26 
>> 13:36:51 2009
>> @@ -135,14 +135,6 @@
>>                 <set field="footerTemplateLocation" 
>> from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" 
>> default-value="component://common/webcommon/includes/footer.ftl"/>
>>                 <set field="appbarTemplateLocation" 
>> from-field="layoutSettings.VT_NAV_TMPLT_LOC[0]" 
>> default-value="component://common/webcommon/includes/appbar.ftl"/>
>>                 <set field="messagesTemplateLocation" 
>> from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" 
>> default-value="component://common/webcommon/includes/messages.ftl"/>
>> -                <property-to-field resource="general" 
>> property="defaultOrganizationPartyId" 
>> field="defaultOrganizationPartyIdProperties"/>
>> -                <set field="defaultOrganizationPartyId" 
>> value="${bsh:&quot;DEFAULT&quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))?defaultOrganizationPartyIdProperties:userPreferences.get(&quot;ORGANIZATION_PARTY&quot;)}" 
>> global="true"/>
>> -                <property-to-field resource="general" 
>> property="currency.uom.id.default" field="defaultCurrencyUomId"/>
>> -                <entity-one entity-name="PartyAcctgPrefAndGroup" 
>> value-field="orgParty">
>> -                    <field-map field-name="partyId" 
>> from-field="defaultOrganizationPartyId"/>
>> -                </entity-one>
>> -                <set field="defaultOrganizationPartyCurrencyUomId" 
>> from-field="orgParty.baseCurrencyUomId" 
>> default-value="defaultCurrencyUomId" global="true"/>
>> -                <set field="defaultOrganizationPartyGroupName" 
>> from-field="orgParty.groupName" global="true"/>
>>             </actions>
>>             <widgets>
>>                 <!-- render header -->
>>
>> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Thu 
>> Feb 26 13:36:51 2009
>> @@ -41,7 +41,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.AssetMaintApplication}"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: 
>> ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- 
>> ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml 
>> (original)
>> +++ 
>> ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -41,7 +41,7 @@
>>                 <!--<set field="layoutSettings.headerImageUrl" 
>> value="/images/ofbiz_logo.jpg" global="true"/>-->
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
>> +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Thu Feb 26 
>> 13:36:51 2009
>> @@ -36,7 +36,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.EbayApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: 
>> ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml 
>> (original)
>> +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -37,7 +37,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.GoogleBaseApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
>> +++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Thu Feb 
>> 26 13:36:51 2009
>> @@ -60,7 +60,7 @@
>>                     </actions>
>>                     <widgets/>
>>                 </section>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> 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=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- 
>> ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml 
>> (original)
>> +++ 
>> ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml 
>> Thu Feb 26 13:36:51 2009
>> @@ -22,6 +22,7 @@
>>         
>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> 
>>
>>     <include 
>> location="component://common/webcommon/WEB-INF/common-controller.xml"/>
>>     <include 
>> location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
>> +    <include 
>> location="component://applicationext/application-controller.xml"/>
>>     <include 
>> location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/> 
>>
>>     <include 
>> location="component://party/webapp/partymgr/WEB-INF/controller.xml"/>
>>
>>
>> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Thu 
>> Feb 26 13:36:51 2009
>> @@ -40,13 +40,10 @@
>>                 <set field="applicationMenuLocation" 
>> value="component://myportal/widget/MyPortalMenus.xml" global="true"/>
>>                 <set field="parameters.parentPortalPageId" 
>> from-field="parameters.parentPortalPageId" default-value="MYPORTAL" 
>> global="true"/>
>>                 <script 
>> location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/> 
>>
>> -                <entity-one entity-name="PartyNameView" 
>> value-field="partyNameView">
>> -                    <field-map field-name="partyId" 
>> from-field="userLogin.partyId"/>
>> -                </entity-one>
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml (original)
>> +++ ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml Thu Feb 
>> 26 13:36:51 2009
>> @@ -34,7 +34,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.OagisApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml 
>> (original)
>> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Thu 
>> Feb 26 13:36:51 2009
>> @@ -45,7 +45,7 @@
>>                 <set field="applicationTitle" 
>> value="${uiLabelMap.ProjectMgrApplication}" global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>> Modified: ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff 
>>
>> ============================================================================== 
>>
>> --- ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml (original)
>> +++ ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml Thu Feb 
>> 26 13:36:51 2009
>> @@ -37,7 +37,7 @@
>>                 <set field="appheaderTemplate" 
>> value="component://shark/webapp/shark/includes/appheader.ftl" 
>> global="true"/>
>>             </actions>
>>             <widgets>
>> -                <include-screen name="GlobalDecorator" 
>> location="component://common/widget/CommonScreens.xml"/>
>> +                <include-screen name="ApplicationDecorator" 
>> location="component://applicationext/widget/CommonScreens.xml"/>
>>             </widgets>
>>         </section>
>>     </screen>
>>
>>
> 
> 
>

Re: svn commit: r748144 - in /ofbiz/trunk: applications/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/applicationext/ applications/applicationext/widget/ applications/content/widget/ app

Posted by Jacques Le Roux <ja...@les7arts.com>.

I thought that, for the sake of consistency,  we will have used common for the name instead of applicationext, but this is very 
minor anyway

Jacques

> Author: hansbak
> Date: Thu Feb 26 13:36:51 2009
> New Revision: 748144
>
> URL: http://svn.apache.org/viewvc?rev=748144&view=rev
> Log:
> introduction of a common component for applications. moved the 2 lines containing party info to this component
>
> Added:
>    ofbiz/trunk/applications/applicationext/
>    ofbiz/trunk/applications/applicationext/ofbiz-component.xml   (with props)
>    ofbiz/trunk/applications/applicationext/widget/
>    ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml   (with props)
> Modified:
>    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
>    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
>    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
>    ofbiz/trunk/applications/component-load.xml
>    ofbiz/trunk/applications/content/widget/CommonScreens.xml
>    ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
>    ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
>    ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
>    ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
>    ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
>    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
>    ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
>    ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
>    ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
>    ofbiz/trunk/framework/common/webcommon/includes/header.ftl
>    ofbiz/trunk/framework/common/widget/CommonScreens.xml
>    ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
>    ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
>    ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
>    ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
>    ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
>    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
>    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
>    ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
>    ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
>    ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml
>
> Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -41,7 +41,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.AccountingManagerApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -30,7 +30,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.AccountingApManagerApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -34,7 +34,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.AccountingArManagerApplication}" global="true"/>
>             </actions>
>            <widgets>
> -               <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +               <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>            </widgets>
>         </section>
>     </screen>
>
> Added: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/applicationext/ofbiz-component.xml?rev=748144&view=auto
> ==============================================================================
> --- ofbiz/trunk/applications/applicationext/ofbiz-component.xml (added)
> +++ ofbiz/trunk/applications/applicationext/ofbiz-component.xml Thu Feb 26 13:36:51 2009
> @@ -0,0 +1,25 @@
> +<?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.
> +-->
> +
> +<ofbiz-component name="applicationext"
> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> +        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
> +
> +</ofbiz-component>
>
> Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
> ------------------------------------------------------------------------------
>    svn:keywords = "Date Rev Author URL Id"
>
> Propchange: ofbiz/trunk/applications/applicationext/ofbiz-component.xml
> ------------------------------------------------------------------------------
>    svn:mime-type = text/xml
>
> Added: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml?rev=748144&view=auto
> ==============================================================================
> --- ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml (added)
> +++ ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -0,0 +1,54 @@
> +<?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.
> +-->
> +
> +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> +        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
> +    <screen name="ApplicationDecorator">
> +        <section>
> +            <actions>
> +                <set field="layoutSettings.companyName" from-field="uiLabelMap.MyPortalInformation" global="true"/>
> +                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
> +                <service service-name="getUserPreferenceGroup" result-map="prefResult">
> +                    <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
> +                </service>
> +                <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
> +                <entity-one entity-name="PartyNameView" value-field="partyNameView">
> +                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
> +                </entity-one>
> +                <property-to-field resource="general" property="defaultOrganizationPartyId" 
> field="defaultOrganizationPartyIdProperties"/>
> +                <set field="defaultOrganizationPartyId" 
> value="${bsh:&quot;DEFAULT&quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))?defaultOrganizationPartyIdProperties:userPreferences.get(&quot;ORGANIZATION_PARTY&quot;)}" 
> global="true"/>
> +                <property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/>
> +                <entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
> +                    <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
> +                </entity-one>
> +                <set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" 
> default-value="defaultCurrencyUomId" global="true"/>
> +                <set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
> +                <set field="line.text" value="${uiLabelMap.CommonWelcome} ${person.firstName} ${person.middleName} 
> ${person.lastName}"/>
> +                <set field="line.urlText" value="[${userLogin.userLoginId}]"/>
> +                <set field="line.url" value="/partymgr/control/viewprofile?partyId=${userLogin.partyId}"/>
> +                <set field="layoutSettings.topLines[]" from-field="line" global="true"/>
> +                <set field="layoutSettings.topLines[]" value="${uiLabelMap.CommonDefaultOrganizationPartyId} : 
> ${defaultOrganizationPartyGroupName} [${defaultOrganizationPartyId}]" global="true"/>
> +            </actions>
> +            <widgets>
> +                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +            </widgets>
> +        </section>
> +    </screen>
> +</screens>
> \ No newline at end of file
>
> Propchange: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Propchange: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
> ------------------------------------------------------------------------------
>    svn:keywords = "Date Rev Author URL Id"
>
> Propchange: ofbiz/trunk/applications/applicationext/widget/CommonScreens.xml
> ------------------------------------------------------------------------------
>    svn:mime-type = text/xml
>
> Modified: ofbiz/trunk/applications/component-load.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/component-load.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/component-load.xml (original)
> +++ ofbiz/trunk/applications/component-load.xml Thu Feb 26 13:36:51 2009
> @@ -20,6 +20,7 @@
>
> <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
> +    <load-component component-location="applicationext"/><!-- common component used by most other components -->
>     <load-component component-location="party"/>
>     <load-component component-location="securityext"/>
>     <load-component component-location="content"/>
>
> Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -40,7 +40,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.ContentContentManagerApplication}"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -43,7 +43,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.HumanResManagerApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -45,7 +45,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.ManufacturingManagerApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -42,7 +42,7 @@
>                 <set field="applicationMenuLocation" value="component://marketing/widget/MarketingMenus.xml" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -42,7 +42,7 @@
>                 <set field="MainColumnStyle" value="leftonly"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -50,7 +50,7 @@
>                 <set field="customerDetailLink" value="/partymgr/control/viewprofile?partyId=" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -51,7 +51,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.PartyManagerApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -44,7 +44,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -43,7 +43,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.ProductFacilityManagerApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -46,7 +46,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.WorkEffortWorkEffortManagerApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
> +++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Thu Feb 26 13:36:51 2009
> @@ -102,15 +102,19 @@
>             <a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>"/></a>
>           </#if>
>         </li>
> -        <li>
> -          <#if person?has_content>
> -            ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists} 
> [${userLogin.userLoginId}]
> -          <#elseif partyGroup?has_content>
> -            ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
> -          <#else>
> -            ${uiLabelMap.CommonWelcome}!
> -          </#if>
> -        </li>
> +        <#if layoutSettings.topLines?has_content>
> +            <#list layoutSettings.topLines as topLine>
> +              <li>
> +              <#if topLine.text?exists>
> +                ${topLine.text}<a href="<@o...@ofbizUrl>">${topLine.urlText?if_exists}</a>
> +              <#else>
> +                ${topLine?if_exists}
> +              </#if>
> +              </li>
> +            </#list>
> +        <#else>
> +           <li>sss${userLogin.userLoginId}</li>
> +        </#if>
>         <li class="control-area">
>           <p class="collapsed">
>             <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a>&nbsp;&nbsp;
> @@ -131,20 +135,22 @@
>         <li class="control-area"<#if layoutSettings.headerRightBackgroundUrl?has_content> 
> background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
>           <#if userLogin?exists>
>             <p class="expanded">
> -              <#if person?has_content>
> -                ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists}
> -              <#elseif partyGroup?has_content>
> -                ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists}
> -              </#if>
> -              [${userLogin.userLoginId}]
>               <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a>&nbsp;&nbsp;
>               <a 
> href="setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&amp;userPrefTypeId=COMPACT_HEADER&amp;userPrefValue=Y">&nbsp;&nbsp;</a>
>             </p>
> -            <#if defaultOrganizationPartyId?exists><p>${uiLabelMap.CommonDefaultOrganizationPartyId} : 
> ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p></#if>
> +            <#if layoutSettings.topLines?has_content>
> +              <#list layoutSettings.topLines as topLine>
> +              <#if topLine.text?exists>
> +                <p>${topLine.text}<a 
> href="${topLine.url?if_exists}&externalLoginKey=${externalLoginKey}">${topLine.urlText?if_exists}</a></p>
> +              <#else>
> +                <p>${topLine?if_exists}</p>
> +              </#if>
> +              </#list>
> +            <#else>
> +              <p>${userLogin.userLoginId}</p>
> +            </#if>
>           <#else/>
> -            <p>
> -            ${uiLabelMap.CommonWelcome}! <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a>
> -            </p>
> +            <p>${uiLabelMap.CommonWelcome}! <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></p>
>           </#if>
>           <ul id="preferences-menu">
>             <!-- <li class="first"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> -->
>
> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -135,14 +135,6 @@
>                 <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" 
> default-value="component://common/webcommon/includes/footer.ftl"/>
>                 <set field="appbarTemplateLocation" from-field="layoutSettings.VT_NAV_TMPLT_LOC[0]" 
> default-value="component://common/webcommon/includes/appbar.ftl"/>
>                 <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" 
> default-value="component://common/webcommon/includes/messages.ftl"/>
> -                <property-to-field resource="general" property="defaultOrganizationPartyId" 
> field="defaultOrganizationPartyIdProperties"/>
> -                <set field="defaultOrganizationPartyId" 
> value="${bsh:&quot;DEFAULT&quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))?defaultOrganizationPartyIdProperties:userPreferences.get(&quot;ORGANIZATION_PARTY&quot;)}" 
> global="true"/>
> -                <property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/>
> -                <entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
> -                    <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
> -                </entity-one>
> -                <set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" 
> default-value="defaultCurrencyUomId" global="true"/>
> -                <set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
>             </actions>
>             <widgets>
>                 <!-- render header -->
>
> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -41,7 +41,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.AssetMaintApplication}"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -41,7 +41,7 @@
>                 <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Thu Feb 26 13:36:51 2009
> @@ -36,7 +36,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.EbayApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Thu Feb 26 13:36:51 2009
> @@ -37,7 +37,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.GoogleBaseApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -60,7 +60,7 @@
>                     </actions>
>                     <widgets/>
>                 </section>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> 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=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Thu Feb 26 13:36:51 2009
> @@ -22,6 +22,7 @@
>         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
>     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
>     <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
> +    <include location="component://applicationext/application-controller.xml"/>
>     <include location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/>
>     <include location="component://party/webapp/partymgr/WEB-INF/controller.xml"/>
>
>
> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -40,13 +40,10 @@
>                 <set field="applicationMenuLocation" value="component://myportal/widget/MyPortalMenus.xml" global="true"/>
>                 <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" 
> global="true"/>
>                 <script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/>
> -                <entity-one entity-name="PartyNameView" value-field="partyNameView">
> -                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
> -                </entity-one>
>                 <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -34,7 +34,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.OagisApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -45,7 +45,7 @@
>                 <set field="applicationTitle" value="${uiLabelMap.ProjectMgrApplication}" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
> Modified: ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml?rev=748144&r1=748143&r2=748144&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml Thu Feb 26 13:36:51 2009
> @@ -37,7 +37,7 @@
>                 <set field="appheaderTemplate" value="component://shark/webapp/shark/includes/appheader.ftl" global="true"/>
>             </actions>
>             <widgets>
> -                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
> +                <include-screen name="ApplicationDecorator" location="component://applicationext/widget/CommonScreens.xml"/>
>             </widgets>
>         </section>
>     </screen>
>
>