Author: hansbak
Date: Mon Jan 12 21:55:01 2009
New Revision: 734046
URL: http://svn.apache.org/viewvc?rev=734046&view=rev
Log:
remove 'not logged in' redundant code and show portal title on loginscreen
Modified:
ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
Modified: ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl?rev=734046&r1=734045&r2=734046&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl Mon Jan 12
21:55:01 2009
@@ -19,23 +19,16 @@
<#assign selected = headerItem?default("void")>
<div id="app-navigation">
- <#if partyNameView?has_content>
- <h2>${uiLabelMap.TitlePageMyportal}
${partyNameView.personalTitle?if_exists} ${partyNameView.firstName?if_exists}
${partyNameView.middleName?if_exists} ${partyNameView.lastName?if_exists}
${partyNameView.groupName?if_exists}</h2>
- <#else><h2>${uiLabelMap.TitlePageMyportalForNoLogin}</h2>
- </#if>
+ <h2>${uiLabelMap.TitlePageMyportal} ${partyNameView.personalTitle?if_exists}
${partyNameView.firstName?if_exists} ${partyNameView.middleName?if_exists}
${partyNameView.lastName?if_exists} ${partyNameView.groupName?if_exists}</h2>
<ul>
- <#if userLogin?has_content>
- <#if portalPages?has_content>
- <#list portalPages as page>
- <li<#if selected = "${page.portalPageId}">
class="selected"</#if>><a
href="<@ofbizUrl>showPortalPage?portalPageId=${page.portalPageId}</@ofbizUrl>">${page.portalPageName}</a></li>
- </#list>
- </#if>
- <li class="opposed"><a
href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
- <li class="opposed"><a
href="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable";
url-mode="plain" target-window="new">${uiLabelMap.CommonHelp}</a></li>
- <li class="opposed"><a
href="<@ofbizUrl>ManagePortalPages?parentPortalPageId=MYPORTAL</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li>
- <#else>
- <li class="opposed"><a
href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
+ <#if portalPages?has_content>
+ <#list portalPages as page>
+ <li<#if selected = "${page.portalPageId}"> class="selected"</#if>><a
href="<@ofbizUrl>showPortalPage?portalPageId=${page.portalPageId}</@ofbizUrl>">${page.portalPageName}</a></li>
+ </#list>
</#if>
+ <li class="opposed"><a
href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+ <li class="opposed"><a
href="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable";
url-mode="plain" target-window="new">${uiLabelMap.CommonHelp}</a></li>
+ <li class="opposed"><a
href="<@ofbizUrl>ManagePortalPages?parentPortalPageId=MYPORTAL</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li>
</ul>
<br class="clear" />
</div>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=734046&r1=734045&r2=734046&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Mon Jan 12
21:55:01 2009
@@ -53,6 +53,7 @@
<entity-one entity-name="PartyNameView"
value-name="partyNameView">
<field-map field-name="partyId"
env-name="userLogin.partyId"/>
</entity-one>
+ <set field="applicationTitle"
value="${uiLabelMap.TitlePageMyportalForNoLogin}"/>
</actions>
<widgets>
<include-screen name="GlobalDecorator"
location="component://common/widget/CommonScreens.xml"/>
