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 2008/12/25 15:57:45 UTC
svn commit: r729426 -
/ofbiz/trunk/framework/common/webcommon/includes/header.ftl
Author: hansbak
Date: Thu Dec 25 06:57:44 2008
New Revision: 729426
URL: http://svn.apache.org/viewvc?rev=729426&view=rev
Log:
only show default organization when a user is logged in
Modified:
ofbiz/trunk/framework/common/webcommon/includes/header.ftl
Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=729426&r1=729425&r2=729426&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Thu Dec 25 06:57:44 2008
@@ -105,14 +105,13 @@
<li>
<#if person?has_content>
${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
+ <#if defaultOrganizationPartyId?exists>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</#if>
<#elseif partyGroup?has_content>
${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
+ <#if defaultOrganizationPartyId?exists>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</#if>
<#else>
${uiLabelMap.CommonWelcome}!
</#if>
- <#if defaultOrganizationPartyId?exists>
- ${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]
- </#if>
</li>
<li>${nowTimestamp?datetime?string.short}</li>
<li class="control-area">
@@ -139,15 +138,14 @@
<p>
<#if person?has_content>
${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
+ <#if defaultOrganizationPartyId?exists><p>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p></#if>
<#elseif partyGroup?has_content>
${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
+ <#if defaultOrganizationPartyId?exists><p>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p></#if>
<#else>
${uiLabelMap.CommonWelcome}!
</#if>
</p>
- <#if defaultOrganizationPartyId?exists>
- <p>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p>
- </#if>
<p>${nowTimestamp?datetime?string.short}</p>
<p>${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonChange}</a></p>
<p>${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonChange}</a></p>