You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/04/29 23:06:03 UTC

svn commit: r652122 - in /ofbiz/trunk: applications/party/webapp/partymgr/party/ applications/party/widget/partymgr/ framework/common/config/ framework/common/webcommon/includes/ framework/common/widget/ framework/images/webapp/images/ framework/images...

Author: adrianc
Date: Tue Apr 29 14:06:03 2008
New Revision: 652122

URL: http://svn.apache.org/viewvc?rev=652122&view=rev
Log:
Fixes for some IE 7 layout issues - https://issues.apache.org/jira/browse/OFBIZ-1758. This commit also contains some examples in the Party Manager component. More work needs to be done on the screens that use the tab-bar style.

I also made the Find Party screen follow the layout guidelines proposed in https://issues.apache.org/jira/browse/OFBIZ-1635.

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
    ofbiz/trunk/framework/common/widget/CommonScreens.xml
    ofbiz/trunk/framework/images/webapp/images/maincss.css
    ofbiz/trunk/framework/images/webapp/images/rtl/main_sel_left.gif
    ofbiz/trunk/framework/images/webapp/images/rtl/main_sel_right.gif
    ofbiz/trunk/framework/images/webapp/images/rtl/main_uns_left.gif
    ofbiz/trunk/framework/images/webapp/images/rtl/main_uns_right.gif
    ofbiz/trunk/framework/images/webapp/images/tabs/main_sel_left.gif
    ofbiz/trunk/framework/images/webapp/images/tabs/main_sel_right.gif
    ofbiz/trunk/framework/images/webapp/images/tabs/main_uns_left.gif
    ofbiz/trunk/framework/images/webapp/images/tabs/main_uns_right.gif

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=652122&r1=652121&r2=652122&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Tue Apr 29 14:06:03 2008
@@ -27,21 +27,44 @@
 <#else>
   <#assign hideFields = "N">
 </#if>
-<div id="findPartyParameters" class="screenlet">
+<h1>${uiLabelMap.PartyFindParty}</h1>
+<#if (parameters.firstName?has_content || parameters.lastName?has_content)>
+    <#assign createUrl = "editperson?create_new=Y&lastName=${parameters.lastName?if_exists}&firstName=${parameters.firstName?if_exists}"/>
+<#elseif (parameters.groupName?has_content)>
+    <#assign createUrl = "editpartygroup?create_new=Y&groupName=${parameters.groupName?if_exists}"/>
+<#else>
+    <#assign createUrl = "createnew"/>
+</#if>
+<div class="button-bar"><a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCreateNew}</a></div>
+<div class="screenlet">
   <div class="screenlet-title-bar">
-    <ul>
-      <li class="h3">${uiLabelMap.PartyFindParty}</li>
-      <#if hideFields == "Y">
-        <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonShowLookupFields}</a></li>
-      <#else>
-        <#if partyList?has_content><li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonHideFields}</a></li></#if>
-        <li><a href="javascript:document.lookupparty.submit();">${uiLabelMap.PartyLookupParty}</a></li>
-      </#if>
-    </ul>
-    <br class="clear"/>
+    <#if partyList?has_content>
+      <ul>
+        <#if hideFields == "Y">
+          <li class="collapsed"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonShowLookupFields}">&nbsp</a></li>
+        <#else>
+          <li class="expanded"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonHideFields}">&nbsp</a></li>
+        </#if>
+        <#if (partyListSize > 0)>
+          <#if (partyListSize > highIndex)>
+            <li><a class="nav-next" href="<@o...@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>
+          <#else>
+            <li class="disabled">${uiLabelMap.CommonNext}</li>
+          </#if>
+          <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li>
+          <#if (viewIndex > 0)>
+            <li><a class="nav-previous" href="<@o...@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li>
+          <#else>
+            <li class="disabled">${uiLabelMap.CommonPrevious}</li>
+          </#if>
+        </#if>
+      </ul>
+      <br class="clear"/>
+    </#if>
   </div>
   <#if hideFields != "Y">
-    <div class="screenlet-body">
+    <div id="findPartyParameters" class="screenlet-body">
+      <h2>${uiLabelMap.CommonSearchOptions}</h2>
       <#-- NOTE: this form is setup to allow a search by partial partyId or userLoginId; to change it to go directly to 
           the viewprofile page when these are entered add the follow attribute to the form element:
            
@@ -50,7 +73,7 @@
       <form method="post" name="lookupparty" action="<@o...@ofbizUrl>" class="basic-form">
         <input type="hidden" name="lookupFlag" value="Y"/>
         <input type="hidden" name="hideFields" value="Y"/>
-        <table cellspacing="0">
+        <table class="basic-table" cellspacing="0">
           <tr>
             <td class="label">${uiLabelMap.PartyContactInformation}</td>
             <td>
@@ -161,8 +184,7 @@
               <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td>
             </tr>
           </#if>
-          <tr><td colspan="3"><hr/></td></tr>
-          <tr align="center">
+          <tr>
             <td>&nbsp;</td>
             <td>
               <input type="submit" value="${uiLabelMap.PartyLookupParty}" onClick="javascript:document.lookupparty.submit();"/>
@@ -172,41 +194,21 @@
         </table>
       </form>
     </div>
+    <script language="JavaScript" type="text/javascript">
+      document.lookupparty.partyId.focus();
+    </script>
   </#if>
-</div>
 
-<#if hideFields != "Y">
-  <script language="JavaScript" type="text/javascript">
-    <!--//
-      document.lookupparty.partyId.focus();
-    //-->
-  </script>
-</#if>
-<#if partyList?exists>
-  <br/>
-  <div id="findPartyResults" class="screenlet">
-    <div class="screenlet-title-bar">
-      <ul>
-        <li class="h3">${uiLabelMap.PartyPartiesFound}</li>
-          <#if (partyListSize > 0)>
-            <#if (partyListSize > highIndex)>
-              <li><a class="nav-next" href="<@o...@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>
-            <#else>
-              <li class="disabled">${uiLabelMap.CommonNext}</li>
-            </#if>
-            <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li>
-            <#if (viewIndex > 0)>
-              <li><a class="nav-previous" href="<@o...@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li>
-            <#else>
-              <li class="disabled">${uiLabelMap.CommonPrevious}</li>
-            </#if>
-          </#if>
-      </ul>
-      <br class="clear"/>
-    </div>
+  <#if partyList?exists>
+    <#if hideFields != "Y">
+      <hr/>
+    </#if>
     <#if partyList?has_content>
-      <table class="basic-table" cellspacing="0">
-        <tr class="header-row">
+      <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>
           <td>${uiLabelMap.PartyUserLogin}</td>
           <td>${uiLabelMap.PartyName}</td>
@@ -286,7 +288,7 @@
               <td>${partyRow.softIdentifier?if_exists}</td>
             </#if>
             <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td>
-          <td class="button-col align-float">
+            <td class="button-col align-float">
               <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
               <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
                 <a href="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyRow.partyId + externalKeyParam}&amp;viewIndex=1&amp;viewSize=20">${uiLabelMap.OrderOrders}</a>
@@ -303,24 +305,12 @@
         </#list>
       </table>
     <#else>
-      <div class="screenlet-body">
-        <span class="h3">${uiLabelMap.PartyNoPartiesFound}</span>        
+      <div id="findPartyResults" class="screenlet-body">
+        <h3>${uiLabelMap.PartyNoPartiesFound}</h3>
       </div>
     </#if>
     <#if lookupErrorMessage?exists>
-      <div><h3>${lookupErrorMessage}</h3></div>
-    </#if>
-    <#if (parameters.firstName?has_content || parameters.lastName?has_content)>
-        <#assign createUrl = "editperson?create_new=Y&lastName=${parameters.lastName?if_exists}&firstName=${parameters.firstName?if_exists}"/>
-    <#elseif (parameters.groupName?has_content)>
-        <#assign createUrl = "editpartygroup?create_new=Y&groupName=${parameters.groupName?if_exists}"/>
-    <#else>
-        <#assign createUrl = "createnew"/>
+      <h3>${lookupErrorMessage}</h3>
     </#if>
-    
-    <div>&nbsp;</div>
-    <div align='right' valign="top"><a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCreateNew}</a></div>
-    <br/>
   </div>
 </#if>
-<!-- end findParty.ftl -->
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Tue Apr 29 14:06:03 2008
@@ -62,6 +62,19 @@
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <condition>
+                                <and>
+                                    <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+                                    <not><if-empty field-name="partyId"/></not>
+                                </and>
+                            </condition>
+                            <widgets>
+                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -72,8 +85,6 @@
                                 <section>
                                     <condition><not><if-empty field-name="partyId"/></not></condition>
                                     <widgets>
-                                        <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
-                                        
                                         <container style="button-bar button-style-2">
                                             <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app" 
                                                 text="${uiLabelMap.AccountingBillingAccount}"/>
@@ -110,7 +121,7 @@
                                             </section>
                                         </container>
                                         
-                                        <container>
+                                        <container style="h1">
                                             <section>
                                                 <condition>
                                                     <or>
@@ -119,15 +130,12 @@
                                                     </or>
                                                 </condition>
                                                 <widgets>
-                                                    <label text="&amp;nbsp;&lt;br/&gt;"/>
-                                                    <label style="h1" text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName}"/>
+                                                    <label text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName} [${partyId}]"/>
                                                 </widgets>
                                                 <fail-widgets>
-                                                    <label style="h1" text="${uiLabelMap.PartyNewUser}"/>
+                                                    <label text="${uiLabelMap.PartyNewUser}"/>
                                                 </fail-widgets>
                                             </section>
-                                            
-                                            <label style="h1" text="[${partyId}]"/>
                                         </container>
                                     </widgets>
                                 </section>
@@ -150,20 +158,27 @@
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <condition>
+                                <and>
+                                    <if-has-permission permission="SECURITY" action="_VIEW"/>
+                                    <not><if-empty field-name="groupId"/></not>
+                                </and>
+                            </condition>
+                            <widgets>
+                                <platform-specific>
+                                    <html><html-template location="component://party/webapp/partymgr/security/SecurityGroupTabBar.ftl"/></html>
+                                </platform-specific>
+                            </widgets>
+                        </section>
+                    </decorator-section>
                     <decorator-section name="body">
                         <section>
                             <condition>
                                 <if-has-permission permission="SECURITY" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <section>
-                                    <condition><not><if-empty field-name="groupId"/></not></condition>
-                                    <widgets>
-                                        <platform-specific>
-                                            <html><html-template location="component://party/webapp/partymgr/security/SecurityGroupTabBar.ftl"/></html>
-                                        </platform-specific>
-                                    </widgets>
-                                </section>
                                 <container>
                                     <label style="h1" text="${uiLabelMap.${labelTitleProperty}} [${groupId}]"/>
                                 </container>
@@ -210,6 +225,19 @@
                     <widgets/>
                 </section>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <condition>
+                                <and>
+                                    <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+                                    <not><if-empty field-name="communicationEvent"/></not>
+                                </and>
+                            </condition>
+                            <widgets>
+                                <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommEventTabBar"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -221,7 +249,6 @@
                                         <not><if-empty field-name="partyId"/></not>
                                     </condition>
                                     <widgets>
-                                        <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
                                         <container style="button-bar button-style-2">
                                             <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app" 
                                                 text="${uiLabelMap.AccountingBillingAccount}"/>
@@ -252,14 +279,6 @@
                                     </widgets>
                                 </section>
                                 <section>
-                                    <condition>
-                                        <not><if-empty field-name="communicationEvent"/></not>
-                                    </condition>
-                                    <widgets>
-                                        <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommEventTabBar"/>
-                                    </widgets>
-                                </section>
-                                <section>
                                     <widgets>
                                         <decorator-section-include name="body"/>
                                     </widgets>
@@ -279,3 +298,7 @@
 
 
 
+
+
+
+

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Apr 29 14:06:03 2008
@@ -85,12 +85,12 @@
                                         <if-compare field-name="showOld" operator="equals" value="true" type="Boolean"/>
                                     </condition>
                                     <widgets>
-                                        <container>
+                                        <container style="button-bar button-style-2">
                                             <link target="viewprofile?partyId=${party.partyId}" text="${uiLabelMap.PartyHideOld}" style="smallSubmit"/>
                                         </container>
                                     </widgets>
                                     <fail-widgets>
-                                        <container>
+                                        <container style="button-bar button-style-2">
                                             <link target="viewprofile?partyId=${party.partyId}&amp;SHOW_OLD=true" text="${uiLabelMap.PartyShowOld}" style="smallSubmit"/>
                                         </container>
                                     </fail-widgets>
@@ -1030,4 +1030,4 @@
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Apr 29 14:06:03 2008
@@ -4757,6 +4757,12 @@
         <value xml:lang="zh_CN">搜索</value>
         <value xml:lang="zh">搜索</value>
     </property>
+    <property key="CommonSearchOptions">
+        <value xml:lang="en">Search Options</value>
+    </property>
+    <property key="CommonSearchResults">
+        <value xml:lang="en">Search Results</value>
+    </property>
     <property key="CommonSearchResultfor">
         <value xml:lang="ar">نتائج البحث ل</value>
         <value xml:lang="cs">Vyhledávání výsledků pro klíčové slovo</value>

Modified: ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl Tue Apr 29 14:06:03 2008
@@ -45,7 +45,7 @@
           <#if thisApp != "/">
             <#assign thisURL = thisURL + "/control/main">
           </#if>
-          <li<#if selected> class="selected"</#if>><a href="${response.encodeURL(thisURL + externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a></li>
+          <li<#if selected> class="selected"</#if>><a href="${response.encodeURL(thisURL + externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
         </#if>
       </#list>
     </ul>

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Apr 29 14:06:03 2008
@@ -126,6 +126,7 @@
                 </section>
                 <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
                 <container style="contentarea">
+                    <decorator-section-include name="pre-body"/>
                     <container id="column-container">
                         <!-- by default will render left-bar only if leftbarScreen value not empty -->
                         <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/>
@@ -317,6 +318,7 @@
             </widgets>
         </section>
     </screen>
+
     <screen name="EventMessages">
         <section>
             <actions>
@@ -328,4 +330,27 @@
         </section>
     </screen>
 
+    <screen name="FindScreenDecorator">
+        <section>
+            <widgets>
+                <container style="h1">
+                    <label text="${uiLabelMap.${titleProperty}}"/>
+                </container>
+                <decorator-section-include name="menu-bar"/>
+                <screenlet name="findScreenlet" collapsible="true" padded="false">
+                    <container style="screenlet-body">
+                        <label style="h2" text="${uiLabelMap.CommonSearchOptions}"/>
+                        <decorator-section-include name="search-options"/>
+                    </container>
+                </screenlet>
+                <container style="screenlet">
+                    <container style="screenlet-body">
+                        <label style="h2" text="${uiLabelMap.CommonSearchResults}"/>
+                    </container>
+                    <decorator-section-include name="search-results"/>
+                </container>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>

Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Tue Apr 29 14:06:03 2008
@@ -140,6 +140,16 @@
 color: #000000;
 }
 
+/* IE7 fix */
+table {
+font-size: 1em;
+}
+
+/* IE7 fix */
+table input {
+border: #999999 solid 0.1em;
+}
+
 textarea, .textAreaBox {
 /* textAreaBox is deprecated */
 background-color: #ffffff;
@@ -843,7 +853,6 @@
 background-color: #FFFFFF;
 border: solid #000000 0.1em;
 margin: 1em;
-padding: 1em;
 }
 
 DIV.endcolumns {
@@ -890,8 +899,13 @@
 #column-container {
 background-color: #FFFFFF;
 margin: auto;
+padding: 1em;
 position: relative;
-width: 100%;
+}
+
+#column-container h1,
+#column-container .h1 {
+margin-bottom: 0.5em;
 }
 
 #column-container .left {
@@ -1079,9 +1093,6 @@
 }
 
 #main-navigation ul li {
-background-image: url(/images/tabs/main_uns_right.gif);
-background-position: top right;
-background-repeat: no-repeat;
 float: left;
 }
 
@@ -1089,7 +1100,7 @@
 background-image: url(/images/tabs/main_uns_left.gif);
 background-position: top left;
 background-repeat: no-repeat;
-border-bottom: solid #989898 0.05em;
+border-bottom: solid #989898 0.01em;
 color: #000000;
 display: block;
 padding: 0.3em 0.6em 0.1em 0.6em;
@@ -1101,21 +1112,13 @@
 color: #D4D0C8;
 }
 
-#main-navigation ul .selected,
-#main-navigation ul li:hover {
-/* selected tab */
-background-image: url(/images/tabs/main_sel_right.gif);
-background-position: top right;
-background-repeat: no-repeat;
-}
-
 #main-navigation ul a:hover,
 #main-navigation ul .selected a,
 #main-navigation ui .selected a:hover {
 background-image: url(/images/tabs/main_sel_left.gif);
 background-position: top left;
 background-repeat: no-repeat;
-border-bottom: solid #D4D0C8 0.05em;
+border-bottom: solid #D4D0C8 0.01em;
 color: #000099;
 text-decoration: none;
 }
@@ -1252,6 +1255,7 @@
 background-repeat: repeat-x;
 color: #ffffff;
 height: 1%; /* IE fix */
+min-height: 1.5em;
 }
 
 .screenlet-title-bar .h1,
@@ -1315,6 +1319,10 @@
 display: block;
 }
 
+.screenlet-title-bar ul a:visited {
+color: #ffff66;
+}
+
 .screenlet-title-bar ul li:hover {
 background-color: #2626c1;
 background-image: url(/images/gradient_sub_sel.gif);
@@ -1333,7 +1341,7 @@
 .screenlet-title-bar ul .collapsed,
 .screenlet-title-bar ul .collapsed:hover {
 background: url(/images/expand.gif) no-repeat center center;
-border-left: none;
+/*border-left: none; */
 min-height: 1em;
 min-width: 1em;
 }
@@ -1341,7 +1349,7 @@
 .screenlet-title-bar ul .expanded,
 .screenlet-title-bar ul .expanded:hover {
 background: url(/images/collapse.gif) no-repeat center center;
-border-left: none;
+/*border-left: none; */
 min-height: 1em;
 min-width: 1em;
 }
@@ -1413,9 +1421,7 @@
 
 .button-bar {
 background-color: #ffffff;
-height: 1%; /* IE fix */
 margin-bottom: 1.0em;
-padding-top: 0.4em;
 }
 
 .button-bar ul,
@@ -1537,9 +1543,6 @@
 /* tab-bar decorator intended to be used at
 the top of the main content area */
 .tab-bar {
-margin-left: 0em;
-margin-top: 0em;
-padding: 0;
 }
 
 .tab-bar ul li {
@@ -1550,7 +1553,8 @@
 padding: 0;
 }
 
-.tab-bar ul a {
+.tab-bar ul a,
+.tab-bar ul a:visited {
 color: #ffffff;
 }
 
@@ -1675,6 +1679,17 @@
 visibility: collapse;
 }
 
+/* ===== Alternate table header style ===== */
+.basic-table .header-row-2 th,
+.basic-table .header-row-2 td {
+background-color: #999999;
+border-bottom: 0;
+border-left: 0.1em solid #cccccc;
+color: #ffffff;
+font-weight: bold;
+text-align: left;
+}
+
 /* ===== Table decorator - Hover bar ===== */
 
 .hover-bar tr:hover {
@@ -1699,7 +1714,9 @@
 border-top: 0.1em solid #000000;
 }
 
-.dark-grid td {
+.dark-grid td,
+.dark-grid .header-row-2 th,
+.dark-grid .header-row-2 td {
 border-bottom: 0.1em solid #000000;
 border-left: 0.1em solid #000000;
 }

Modified: ofbiz/trunk/framework/images/webapp/images/rtl/main_sel_left.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/rtl/main_sel_left.gif?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/framework/images/webapp/images/rtl/main_sel_right.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/rtl/main_sel_right.gif?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/framework/images/webapp/images/rtl/main_uns_left.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/rtl/main_uns_left.gif?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/framework/images/webapp/images/rtl/main_uns_right.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/rtl/main_uns_right.gif?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/framework/images/webapp/images/tabs/main_sel_left.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/tabs/main_sel_left.gif?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/framework/images/webapp/images/tabs/main_sel_right.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/tabs/main_sel_right.gif?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/framework/images/webapp/images/tabs/main_uns_left.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/tabs/main_uns_left.gif?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/framework/images/webapp/images/tabs/main_uns_right.gif
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/tabs/main_uns_right.gif?rev=652122&r1=652121&r2=652122&view=diff
==============================================================================
Binary files - no diff available.