Author: adrianc
Date: Thu May 1 11:20:46 2008
New Revision: 652609
URL: http://svn.apache.org/viewvc?rev=652609&view=rev
Log:
IE7 and tab-bar style fixups for Party Manager component.
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl
ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css
ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/framework/images/webapp/images/maincss.css
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=652609&r1=652608&r2=652609&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
Thu May 1 11:20:46 2008
@@ -19,7 +19,7 @@
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd";>
<menu name="CommEventTabBar" default-selected-style="selected"
type="simple"
- menu-container-style="button-bar button-style-1"
selected-menuitem-context-field-name="subTabButtonItem">
+ menu-container-style="button-bar tab-bar"
selected-menuitem-context-field-name="subTabButtonItem">
<menu-item name="CommunicationEvent"
title="${uiLabelMap.PartyCommEvent}">
<link
target="EditCommunicationEvent?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</menu-item>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl?rev=652609&r1=652608&r2=652609&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
Thu May 1 11:20:46 2008
@@ -17,7 +17,6 @@
under the License.
-->
-<!-- begin SecurityGroupTabBar.ftl -->
<#if security.hasEntityPermission("PARTYMGR", "_VIEW", session)>
<#-- Main Heading -->
<#if partyClassificationGroup?has_content>
@@ -32,5 +31,5 @@
<br/>
</#if>
<#else>
- <h2">${uiLabelMap.PartyMgrViewPermissionError}</h2>
+ <h2>${uiLabelMap.PartyMgrViewPermissionError}</h2>
</#if>
\ No newline at end of file
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?rev=652609&r1=652608&r2=652609&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Thu May
1 11:20:46 2008
@@ -203,10 +203,10 @@
<#if hideFields != "Y">
<hr/>
</#if>
+ <div id="findPartyResults" class="screenlet-body">
+ <h2>${uiLabelMap.CommonSearchResults}</h2>
+ </div>
<#if partyList?has_content>
- <div id="findPartyResults" class="screenlet-body">
- <h2>${uiLabelMap.CommonSearchResults}</h2>
- </div>
<table class="basic-table hover-bar" cellspacing="0">
<tr class="header-row-2">
<td>${uiLabelMap.PartyPartyId}</td>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl?rev=652609&r1=652608&r2=652609&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl
Thu May 1 11:20:46 2008
@@ -18,7 +18,6 @@
-->
<#if groupId?has_content>
-<!-- begin SecurityGroupTabBar.ftl -->
<#assign selected = tabButtonItem?default("void")>
<div class="button-bar tab-bar">
<ul>
@@ -28,5 +27,4 @@
<br class="clear" />
</ul>
</div>
-<!-- end SecurityGroupTabBar.ftl -->
</#if>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css?rev=652609&r1=652608&r2=652609&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css Thu May
1 11:20:46 2008
@@ -23,3 +23,13 @@
width: auto;
margin-bottom: 1em;
}
+
+.profile-left {
+float: left;
+width: 47%;
+}
+
+.profile-right {
+float: right;
+width: 47%;
+}
Modified:
ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=652609&r1=652608&r2=652609&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
(original)
+++
ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
Thu May 1 11:20:46 2008
@@ -82,13 +82,19 @@
<entity-one entity-name="PartyClassificationGroup"
value-name="partyClassificationGroup"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
<section>
<widgets>
<platform-specific>
<html><html-template
location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html>
</platform-specific>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <widgets>
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
@@ -137,7 +143,7 @@
<entity-one entity-name="Party" value-name="party"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -175,13 +181,19 @@
<entity-one entity-name="PartyClassificationGroup"
value-name="partyClassificationGroup"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
<section>
<widgets>
<platform-specific>
<html><html-template
location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html>
</platform-specific>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <widgets>
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=652609&r1=652608&r2=652609&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Thu May 1
11:20:46 2008
@@ -86,25 +86,25 @@
</condition>
<widgets>
<container style="button-bar
button-style-2">
- <link
target="viewprofile?partyId=${party.partyId}" text="${uiLabelMap.PartyHideOld}"
style="smallSubmit"/>
+ <link
target="viewprofile?partyId=${party.partyId}"
text="${uiLabelMap.PartyHideOld}"/>
</container>
</widgets>
<fail-widgets>
<container style="button-bar
button-style-2">
- <link
target="viewprofile?partyId=${party.partyId}&SHOW_OLD=true"
text="${uiLabelMap.PartyShowOld}" style="smallSubmit"/>
+ <link
target="viewprofile?partyId=${party.partyId}&SHOW_OLD=true"
text="${uiLabelMap.PartyShowOld}"/>
</container>
</fail-widgets>
</section>
<section>
<widgets>
- <container style="lefthalf">
+ <container style="profile-left">
<include-screen name="Party"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="Contact"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen
name="LoyaltyPoints"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen
name="PaymentMethods"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="AvsSettings"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
</container>
- <container style="righthalf">
+ <container style="profile-right">
<include-screen name="FinAccounts"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="UserLogin"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="Attributes"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=652609&r1=652608&r2=652609&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Thu May 1 11:20:46
2008
@@ -897,7 +897,6 @@
}
#column-container {
-background-color: #FFFFFF;
margin: auto;
padding: 1em;
position: relative;
@@ -1264,6 +1263,7 @@
font-size: 1em;
font-weight: bold;
padding: 0.1em 0.5em 0.2em 0.5em;
+white-space: nowrap;
}
.screenlet-title-bar ul h1,
