[OFBiz] SVN: r4637 - in trunk/applications/party/webapp/partymgr:
WEB-INF/actions/communication WEB-INF/actions/party
WEB-INF/pagedefs/communication WEB-INF/pagedefs/party
communication party
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Wed Mar 9 12:34:30 EST 2005
Author: jonesde
Date: 2005-03-09 11:34:15 -0600 (Wed, 09 Mar 2005)
New Revision: 4637
Added:
trunk/applications/party/webapp/partymgr/party/ProfileTabBar.ftl
Modified:
trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/listCommunications.bsh
trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh
trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/communication/listCommunications.xml
trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/editShoppingList.xml
trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewprofile.xml
trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewroles.xml
trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewvendor.xml
trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl
trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
trunk/applications/party/webapp/partymgr/party/viewrelationships.jsp
trunk/applications/party/webapp/partymgr/party/viewroles.ftl
trunk/applications/party/webapp/partymgr/party/viewvendor.ftl
Log:
Separated profile tab bar into a separate file, added tab for shopping lists since there appear to not have been a link to those before, misc cleanups
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/listCommunications.bsh
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/listCommunications.bsh 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/listCommunications.bsh 2005-03-09 17:34:15 UTC (rev 4637)
@@ -28,6 +28,10 @@
import org.ofbiz.entity.*;
import org.ofbiz.entity.condition.*;
+externalLoginKey = request.getAttribute("externalLoginKey");
+externalKeyParam = (externalLoginKey == null) ? "" : ("&externalLoginKey=" + externalLoginKey);
+context.put("externalKeyParam", externalKeyParam);
+
delegator = request.getAttribute("delegator");
partyId = request.getParameter("party_id");
if (partyId == null) partyId = request.getParameter("partyId");
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh 2005-03-09 17:34:15 UTC (rev 4637)
@@ -31,9 +31,16 @@
import org.ofbiz.entity.condition.*;
import org.ofbiz.product.catalog.*;
+externalLoginKey = request.getAttribute("externalLoginKey");
+externalKeyParam = (externalLoginKey == null) ? "" : ("&externalLoginKey=" + externalLoginKey);
+context.put("externalKeyParam", externalKeyParam);
+
delegator = request.getAttribute("delegator");
dispatcher = request.getAttribute("dispatcher");
userLogin = session.getAttribute("userLogin");
+
+parameterMap = UtilHttp.getParameterMap(request);
+
prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
webSiteId = CatalogWorker.getWebSiteId(request);
@@ -46,7 +53,12 @@
partyId = request.getParameter("partyId");
if (partyId == null) partyId = (String) request.getAttribute("partyId");
-parameterMap = UtilHttp.getParameterMap(request);
+party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId));
+context.put("party", party);
+if (party != null) {
+ context.put("lookupPerson", party.getRelatedOne("Person"));
+ context.put("lookupGroup", party.getRelatedOne("PartyGroup"));
+}
shoppingListId = parameterMap.get("shoppingListId");
if (shoppingListId == null || shoppingListId.equals(""))
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/communication/listCommunications.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/communication/listCommunications.xml 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/communication/listCommunications.xml 2005-03-09 17:34:15 UTC (rev 4637)
@@ -4,5 +4,6 @@
<property name="title">List Communications</property>
<property name="title-property">PageTitleListCommunications</property>
<property name="headerItem">view</property>
+ <property name="tabButtonItem">listCommunications</property>
<page-action name="/communication/listCommunications.bsh"/>
</page>
\ No newline at end of file
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/editShoppingList.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/editShoppingList.xml 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/editShoppingList.xml 2005-03-09 17:34:15 UTC (rev 4637)
@@ -2,7 +2,8 @@
<page>
<template>main</template>
<property name="title">Shopping List</property>
- <property name="title-property">PageTitleShoppingList</property>
+ <property name="title-property">PageTitleShoppingList</property>
<property name="headerItem">Shopping List</property>
+ <property name="tabButtonItem">editShoppingList</property>
<page-action name="/party/editShoppingList.bsh"/>
</page>
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewprofile.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewprofile.xml 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewprofile.xml 2005-03-09 17:34:15 UTC (rev 4637)
@@ -4,5 +4,6 @@
<property name="title">View Party Profile</property>
<property name="title-property">PageTitleViewPartyProfile</property>
<property name="headerItem">view</property>
+ <property name="tabButtonItem">viewprofile</property>
<content-action name="/party/viewprofile.bsh"/>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewroles.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewroles.xml 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewroles.xml 2005-03-09 17:34:15 UTC (rev 4637)
@@ -4,5 +4,6 @@
<property name="title">View Party Roles</property>
<property name="title-property">PageTitleViewPartyRole</property>
<property name="headerItem">view</property>
+ <property name="tabButtonItem">viewroles</property>
<content-action name="/party/viewroles.bsh"/>
</page>
\ No newline at end of file
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewvendor.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewvendor.xml 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/pagedefs/party/viewvendor.xml 2005-03-09 17:34:15 UTC (rev 4637)
@@ -4,5 +4,6 @@
<property name="title">View Vendor Party Info</property>
<property name="title-property">PageTitleViewVendorParty</property>
<property name="headerItem">view</property>
+ <property name="tabButtonItem">viewvendor</property>
<content-action name="/party/viewvendor.bsh"/>
</page>
Modified: trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl 2005-03-09 17:34:15 UTC (rev 4637)
@@ -28,51 +28,16 @@
<#assign uiLabelMap = requestAttributes.uiLabelMap>
<#assign locale = requestAttributes.locale>
<#if security.hasEntityPermission("PARTYMGR", "_VIEW", session)>
+
<#-- Main Heading -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td align="left">
- <#if lookupPerson?has_content || lookupGroup?has_content>
- <div class="head1">${uiLabelMap.PartyCommunicationsWith}
- <#if lookupPerson?exists>
- ${lookupPerson.personalTitle?if_exists}
- ${lookupPerson.firstName?if_exists}
- ${lookupPerson.middleName?if_exists}
- ${lookupPerson.lastName?if_exists}
- ${lookupPerson.suffix?if_exists}
- <#else>
- <#if lookupGroup?exists>
- ${lookupGroup.groupName?default(uiLabelMap.PartyNoNameGroup)}
- <#else>
- "${uiLabelMap.PartyNewUser}"
- </#if>
- </#if>
- </div>
- <#else>
- <div class="head1">Pending Communications</div>
- </#if>
- </td>
- <#if lookupPerson?has_content || lookupGroup?has_content>
- <td align="right">
- <div class="tabContainer">
- <a href="<@ofbizUrl>/viewprofile?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyProfile}</a>
- <a href="<@ofbizUrl>/viewvendor?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyVendor}</a>
- <a href="<@ofbizUrl>/viewroles?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyRoles}</a>
- <a href="<@ofbizUrl>/viewrelationships?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyRelationships}</a>
- <a href="<@ofbizUrl>/viewcommunications?partyId=${partyId}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.PartyCommunications}</a>
- </div>
- </td>
- </#if>
- </tr>
- <#if partyId?exists>
- <tr>
- <td colspan="2" align="right" nowrap>
- <a href="<@ofbizUrl>/viewCommunicationEvent?partyIdFrom=${partyId}&partyId=${partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.PartyNewCommunication}]</a>
- </td>
- </tr>
- </#if>
-</table>
+<#include "../party/ProfileTabBar.ftl"/>
+<#if partyId?exists>
+<div style="text-align: right;">
+ <a href="<@ofbizUrl>/viewCommunicationEvent?partyIdFrom=${partyId}&partyId=${partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.PartyNewCommunication}]</a>
+</div>
+</#if>
+
<br>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<#assign target = requestAttributes.targetRequestUri>
Added: trunk/applications/party/webapp/partymgr/party/ProfileTabBar.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/ProfileTabBar.ftl 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/party/ProfileTabBar.ftl 2005-03-09 17:34:15 UTC (rev 4637)
@@ -0,0 +1,84 @@
+<#--
+ * Copyright (c) 2002-2004 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @author Johan Isacsson
+ * @author David E. Jones
+ * @author Andy Zeneski
+ * @created May 26 2003
+ *@author Olivier Heintz (olivier.heintz at nereide.biz)
+ * @version 1.0
+ */
+-->
+<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+
+<#assign unselectedClassName = "tabButton">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+
+<#if security.hasEntityPermission("PARTYMGR", "_VIEW", session)>
+<#if party?has_content>
+<#-- Main Heading -->
+<table width='100%' cellpadding='0' cellspacing='0' border='0'>
+ <tr>
+ <td align='left'>
+ <div class="head1">${uiLabelMap.PartyTheProfileOf}
+ <#if lookupPerson?has_content>
+ ${lookupPerson.personalTitle?if_exists}
+ ${lookupPerson.firstName?if_exists}
+ ${lookupPerson.middleName?if_exists}
+ ${lookupPerson.lastName?if_exists}
+ ${lookupPerson.suffix?if_exists}
+ <#elseif lookupGroup?has_content>
+ ${lookupGroup.groupName?default("${uiLabelMap.PartyNoNameGroup}")}
+ <#else>
+ ${uiLabelMap.PartyNewUser}
+ </#if>
+ </div>
+ </td>
+ <td align='right'>
+ <div class='tabContainer'>
+ <a href="<@ofbizUrl>/viewprofile?partyId=${party.partyId}</@ofbizUrl>" class="${selectedClassMap.viewprofile?default(unselectedClassName)}">${uiLabelMap.PartyProfile}</a>
+ <a href="<@ofbizUrl>/viewvendor?partyId=${party.partyId}</@ofbizUrl>" class="${selectedClassMap.viewvendor?default(unselectedClassName)}">${uiLabelMap.PartyVendor}</a>
+ <a href="<@ofbizUrl>/viewroles?partyId=${party.partyId}</@ofbizUrl>" class="${selectedClassMap.viewroles?default(unselectedClassName)}">${uiLabelMap.PartyRoles}</a>
+ <a href="<@ofbizUrl>/viewrelationships?partyId=${party.partyId}</@ofbizUrl>" class="${selectedClassMap.viewrelationships?default(unselectedClassName)}">${uiLabelMap.PartyRelationships}</a>
+ <a href="<@ofbizUrl>/viewcommunications?partyId=${party.partyId}</@ofbizUrl>" class="${selectedClassMap.listCommunications?default(unselectedClassName)}">${uiLabelMap.PartyCommunications}</a>
+ <a href="<@ofbizUrl>/editShoppingList?partyId=${party.partyId}</@ofbizUrl>" class="${selectedClassMap.editShoppingList?default(unselectedClassName)}">${uiLabelMap.PartyShoppingLists}</a>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="right" nowrap>
+ <a href="/accounting/control/FindBillingAccount?partyId=${partyId}${externalKeyParam}" class="buttontext">[${uiLabelMap.AccountingBillingAccount}]</a>
+ <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
+ <a href="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}${externalKeyParam}" class="buttontext">[${uiLabelMap.OrderOrders}]</a>
+ </#if>
+ <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
+ <a href="/ordermgr/control/orderentry?mode=SALES_ORDER&partyId=${partyId}${externalKeyParam}" class="buttontext">[${uiLabelMap.OrderNewOrder}]</a>
+ </#if>
+ </td>
+ </tr>
+</table>
+
+<#else>
+ ${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${partyId?if_exists}
+</#if>
+<#else>
+ <h3>${uiLabelMap.PartyMgrViewPermissionError}</h3>
+</#if>
Property changes on: trunk/applications/party/webapp/partymgr/party/ProfileTabBar.ftl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ 'Id Rev Date Author'
Name: svn:eol-style
+ native
Modified: trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl 2005-03-09 17:34:15 UTC (rev 4637)
@@ -1,5 +1,5 @@
<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -26,6 +26,8 @@
-->
<#assign uiLabelMap = requestAttributes.uiLabelMap>
+<#include "ProfileTabBar.ftl"/>
+
<TABLE border=0 width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
<TR>
<TD width='100%'>
@@ -35,8 +37,8 @@
<div class="boxhead"> ${uiLabelMap.PartyShoppingLists}</div>
</td>
<td valign="middle" align="right">
- <a href="<@ofbizUrl>/createEmptyShoppingList</@ofbizUrl>?partyId=${partyId?if_exists}" class="submenutext">${uiLabelMap.CommonCreateNew}</a>
- <a href="<@ofbizUrl>/viewprofile?partyId=${partyId?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.PartyProfile}</a>
+ <a href="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>?partyId=${partyId?if_exists}" class="submenutextright">${uiLabelMap.CommonCreateNew}</a>
+ <#-- <a href="<@ofbizUrl>viewprofile?partyId=${partyId?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.PartyProfile}</a> -->
</td>
</tr>
</table>
@@ -336,4 +338,4 @@
</tr>
</table>
-</#if>
\ No newline at end of file
+</#if>
Modified: trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/viewprofile.ftl 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/party/viewprofile.ftl 2005-03-09 17:34:15 UTC (rev 4637)
@@ -1,5 +1,5 @@
<#--
- * Copyright (c) 2002-2004 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2002-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -35,52 +35,17 @@
function setNowFromDate(formName) { eval('document.' + formName + '.fromDate.value="${nowStr}"'); }
</script>
-<#if party?has_content>
<#-- Main Heading -->
-<table width='100%' cellpadding='0' cellspacing='0' border='0'>
- <tr>
- <td align='left'>
- <div class="head1">${uiLabelMap.PartyTheProfileOf}
- <#if lookupPerson?has_content>
- ${lookupPerson.personalTitle?if_exists}
- ${lookupPerson.firstName?if_exists}
- ${lookupPerson.middleName?if_exists}
- ${lookupPerson.lastName?if_exists}
- ${lookupPerson.suffix?if_exists}
- <#elseif lookupGroup?has_content>
- ${lookupGroup.groupName?default("${uiLabelMap.PartyNoNameGroup}")}
- <#else>
- ${uiLabelMap.PartyNewUser}
- </#if>
- </div>
- </td>
- <td align='right'>
- <div class='tabContainer'>
- <a href="<@ofbizUrl>/viewprofile?partyId=${party.partyId}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.PartyProfile}</a>
- <a href="<@ofbizUrl>/viewvendor?partyId=${party.partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyVendor}</a>
- <a href="<@ofbizUrl>/viewroles?partyId=${party.partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyRoles}</a>
- <a href="<@ofbizUrl>/viewrelationships?partyId=${party.partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyRelationships}</a>
- <a href="<@ofbizUrl>/viewcommunications?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyCommunications}</a>
- </div>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="right" nowrap>
+<#include "ProfileTabBar.ftl"/>
+
+<#if party?has_content>
+<div style="text-align: right;">
<#if showOld>
<a href="<@ofbizUrl>/viewprofile?partyId=${party.partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.PartyHideOld}]</a>
<#else>
<a href="<@ofbizUrl>/viewprofile?partyId=${party.partyId}&SHOW_OLD=true</@ofbizUrl>" class="buttontext">[${uiLabelMap.PartyShowOld}]</a>
</#if>
- <a href="/accounting/control/FindBillingAccount?partyId=${partyId}${externalKeyParam}" class="buttontext">[${uiLabelMap.AccountingBillingAccount}]</a>
- <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
- <a href="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}${externalKeyParam}" class="buttontext">[${uiLabelMap.OrderOrders}]</a>
- </#if>
- <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
- <a href="/ordermgr/control/orderentry?mode=SALES_ORDER&partyId=${partyId}${externalKeyParam}" class="buttontext">[${uiLabelMap.OrderNewOrder}]</a>
- </#if>
- </td>
- </tr>
-</table>
+</div>
<br>
<TABLE border=0 width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
Modified: trunk/applications/party/webapp/partymgr/party/viewrelationships.jsp
===================================================================
--- trunk/applications/party/webapp/partymgr/party/viewrelationships.jsp 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/party/viewrelationships.jsp 2005-03-09 17:34:15 UTC (rev 4637)
@@ -87,6 +87,7 @@
<a href="<ofbiz:url>/viewroles?partyId=<%=partyId%></ofbiz:url>" class="tabButton">Role(s)</a>
<a href="<ofbiz:url>/viewrelationships?partyId=<%=partyId%></ofbiz:url>" class="tabButtonSelected">Relationships</a>
<a href="<ofbiz:url>/viewcommunications?partyId=<%=partyId%></ofbiz:url>" class="tabButton">Communications</a>
+ <a href="<ofbiz:url>/editShoppingList?partyId=<%=partyId%></ofbiz:url>" class="tabButton">Shopping Lists</a>
</div>
</td>
</tr>
Modified: trunk/applications/party/webapp/partymgr/party/viewroles.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/viewroles.ftl 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/party/viewroles.ftl 2005-03-09 17:34:15 UTC (rev 4637)
@@ -25,40 +25,11 @@
* @version 1.0
*/
-->
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
+<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#if hasViewPermission>
<#-- Main Heading -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td align="left">
- <div class="head1">${uiLabelMap.PartyTheProfileOf}
- <#if lookupPerson?exists>
- ${lookupPerson.personalTitle?if_exists}
- ${lookupPerson.firstName?if_exists}
- ${lookupPerson.middleName?if_exists}
- ${lookupPerson.lastName?if_exists}
- ${lookupPerson.suffix?if_exists}
- <#else>
- <#if lookupGroup?exists>
- ${lookupGroup.groupName?default(uiLabelMap.PartyNoNameGroup)}
- <#else>
- "${uiLabelMap.PartyNewUser}"
- </#if>
- </#if>
- </div>
- </td>
- <td align="right">
- <div class="tabContainer">
- <a href="<@ofbizUrl>/viewprofile?party_id=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyProfile}</a>
- <a href="<@ofbizUrl>/viewvendor?party_id=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyVendor}</a>
- <a href="<@ofbizUrl>/viewroles?party_id=${partyId}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.PartyRoles}</a>
- <a href="<@ofbizUrl>/viewrelationships?party_id=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyRelationships}</a>
- <a href="<@ofbizUrl>/viewcommunications?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyCommunications}</a>
- </div>
- </td>
- </tr>
-</table>
+<#include "ProfileTabBar.ftl"/>
<#-- Party Roles -->
<br>
Modified: trunk/applications/party/webapp/partymgr/party/viewvendor.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/viewvendor.ftl 2005-03-09 07:41:31 UTC (rev 4636)
+++ trunk/applications/party/webapp/partymgr/party/viewvendor.ftl 2005-03-09 17:34:15 UTC (rev 4637)
@@ -1,5 +1,5 @@
<#--
- * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2002-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -26,40 +26,11 @@
* since 2.2
*/
-->
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
+<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#if hasViewPermission>
<#-- Main Heading -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td align="left">
- <div class="head1">${uiLabelMap.PartyTheProfileOf}
- <#if lookupPerson?exists>
- ${lookupPerson.personalTitle?if_exists}
- ${lookupPerson.firstName?if_exists}
- ${lookupPerson.middleName?if_exists}
- ${lookupPerson.lastName?if_exists}
- ${lookupPerson.suffix?if_exists}
- <#else>
- <#if lookupGroup?exists>
- ${lookupGroup.groupName?default(uiLabelMap.PartyNoNameGroup)}
- <#else>
- "${uiLabelMap.PartyNewUser}"
- </#if>
- </#if>
- </div>
- </td>
- <td align="right">
- <div class="tabContainer">
- <a href="<@ofbizUrl>/viewprofile?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyProfile}</a>
- <a href="<@ofbizUrl>/viewvendor?partyId=${partyId}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.PartyVendor}</a>
- <a href="<@ofbizUrl>/viewroles?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyRoles}</a>
- <a href="<@ofbizUrl>/viewrelationships?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyRelationships}</a>
- <a href="<@ofbizUrl>/viewcommunications?partyId=${partyId}</@ofbizUrl>" class="tabButton">${uiLabelMap.PartyCommunications}</a>
- </div>
- </td>
- </tr>
-</table>
+<#include "ProfileTabBar.ftl"/>
<br>
<table border=0 width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
More information about the Svn
mailing list