Return-Path: Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: (qmail 22658 invoked from network); 26 Feb 2009 13:37:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Feb 2009 13:37:22 -0000 Received: (qmail 90859 invoked by uid 500); 26 Feb 2009 13:37:22 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 90834 invoked by uid 500); 26 Feb 2009 13:37:21 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 90825 invoked by uid 99); 26 Feb 2009 13:37:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Feb 2009 05:37:21 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Feb 2009 13:37:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4DBF52388999; Thu, 26 Feb 2009 13:36:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Thu, 26 Feb 2009 13:36:53 -0000 To: commits@ofbiz.apache.org From: hansbak@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090226133656.4DBF52388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ + + + + + + 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 @@ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + \ 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 @@ + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ -
  • - <#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 layoutSettings.topLines?has_content> + <#list layoutSettings.topLines as topLine> +
  • + <#if topLine.text?exists> + ${topLine.text}${topLine.urlText?if_exists} + <#else> + ${topLine?if_exists} + +
    • + + <#else> +
  • sss${userLogin.userLoginId}
    • +
  • background="${layoutSettings.headerRightBackgroundUrl}"> <#if userLogin?exists>

    - <#if person?has_content> - ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists} - <#elseif partyGroup?has_content> - ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} - - [${userLogin.userLoginId}] ${uiLabelMap.CommonLogout}     

    - <#if defaultOrganizationPartyId?exists>

    ${uiLabelMap.CommonDefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]

    + <#if layoutSettings.topLines?has_content> + <#list layoutSettings.topLines as topLine> + <#if topLine.text?exists> +

    ${topLine.text}${topLine.urlText?if_exists}

    + <#else> +

    ${topLine?if_exists}

    + + + <#else> +

    ${userLogin.userLoginId}

    + <#else/> -

    - ${uiLabelMap.CommonWelcome}! ${uiLabelMap.CommonLogin} -

    +

    ${uiLabelMap.CommonWelcome}! ${uiLabelMap.CommonLogin}

      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 @@ - - - - - - - - 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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"> + 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 @@