Author: jacopoc
Date: Fri Mar 9 09:31:46 2007
New Revision: 516478
URL: http://svn.apache.org/viewvc?view=rev&rev=516478
Log:
Misc layout improvements by Adrian Crum (OFBIZ-787).
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified: ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl?view=diff&rev=516478&r1=516477&r2=516478
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl Fri
Mar 9 09:31:46 2007
@@ -37,6 +37,7 @@
<#if security.hasEntityPermission("SECURITY", "_VIEW", session)>
<li<#if selected == "security"> class="selected"</#if>><a
href="<@ofbizUrl>FindSecurityGroup</@ofbizUrl>">${uiLabelMap.CommonSecurity}</a></li>
</#if>
+ <li<#if selected == "addrmap"> class="selected"</#if>><a
href="<@ofbizUrl>addressMatchMap</@ofbizUrl>">${uiLabelMap.PageTitleAddressMatchMap}</a></li>
</ul>
<ul class="opposed">
<#if userLogin?has_content>
@@ -44,7 +45,6 @@
<#else>
<li><a
href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
</#if>
- <li<#if selected == "addrmap"> class="selected"</#if>><a
href="<@ofbizUrl>addressMatchMap</@ofbizUrl>">${uiLabelMap.PageTitleAddressMatchMap}</a></li>
</ul>
<br class="clear" />
</div>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=516478&r1=516477&r2=516478
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Fri Mar
9 09:31:46 2007
@@ -248,11 +248,11 @@
<a
href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
<#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "",
session)>
<a
href="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyRow.partyId
+ externalKeyParam}">${uiLabelMap.OrderOrders}</a>
- <a
href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId +
externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a>
+ <a
href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId +
externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a>
</#if>
<#if security.hasEntityPermission("ORDERMGR", "_CREATE",
session)>
<a
href="/ordermgr/control/checkinits?partyId=${partyRow.partyId +
externalKeyParam}">${uiLabelMap.OrderNewOrder}</a>
- <a
href="/ordermgr/control/EditQuote?partyId=${partyRow.partyId +
externalKeyParam}">${uiLabelMap.OrderNewQuote}</a>
+ <a
href="/ordermgr/control/EditQuote?partyId=${partyRow.partyId +
externalKeyParam}">${uiLabelMap.OrderNewQuote}</a>
</#if>
</td>
</tr>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?view=diff&rev=516478&r1=516477&r2=516478
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri Mar 9
09:31:46 2007
@@ -21,7 +21,7 @@
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
<menu name="ProfileTabBar" default-menu-item-name="viewprofile"
default-selected-style="selected"
- type="simple" menu-container-style="button-bar button-style-1">
+ type="simple" menu-container-style="button-bar tab-bar">
<menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}">
<link target="viewprofile?partyId=${partyId}"/>
</menu-item>
@@ -63,7 +63,7 @@
</menu-item>
</menu>
- <menu name="create-new-party" type="simple" menu-container-style="head1">
+ <menu name="create-new-party" type="simple"
menu-container-style="basic-nav">
<menu-item name="create-party-group"
title="${uiLabelMap.PartyCreateNewPartyGroup}">
<link target="editpartygroup?create_new=Y"/>
</menu-item>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?view=diff&rev=516478&r1=516477&r2=516478
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Mar 9
09:31:46 2007
@@ -533,13 +533,9 @@
<if-has-permission permission="PARTYMGR"
action="_CREATE"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-header">
- <label style="boxhead"
text="${uiLabelMap.PartyCreateNewParty}"/>
- </container>
- <container style="screenlet-body">
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="create-new-party"/>
- </container>
+ <label style="head1"
text="${uiLabelMap.PartyCreateNewParty}"/>
+ <container style="screenlet-body">
+ <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="create-new-party"/>
</container>
</widgets>
<fail-widgets>