svn commit: r604257 - in /ofbiz/trunk/specialpurpose/ebay/widget: EbayMenus.xml EbayScreens.xml

[adrianc]

Author: adrianc
Date: Fri Dec 14 10:55:02 2007
New Revision: 604257

URL: http://svn.apache.org/viewvc?rev=604257&view=rev
Log:
Minor UI fixups in the eBay component.

Modified:
    ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml
    ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml?rev=604257&r1=604256&r2=604257&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml Fri Dec 14 10:55:02 2007
@@ -22,11 +22,11 @@
         default-selected-style="selected" selected-menuitem-context-field-name="headerItem">
         <menu-item name="export" title="${uiLabelMap.EbayExportToEbay}"><link target="advancedsearch"/></menu-item>
         <menu-item name="importOrders" title="${uiLabelMap.EbayImportOrdersFromEbay}"><link target="ManageOrdersFromEbay"/></menu-item>
-        <menu-item name="Logout" title="Logout" align-style="col-right" selected-style="selected">
+        <menu-item name="Logout" title="Logout" align-style="opposed" selected-style="selected">
             <condition><not><if-empty field-name="userLogin"/></not></condition>
             <link target="logout"/>
         </menu-item>
-        <menu-item name="Login" title="Login" align-style="col-right" selected-style="selected">
+        <menu-item name="Login" title="Login" align-style="opposed" selected-style="selected">
             <condition><if-empty field-name="userLogin"/></condition>
             <link target="${checkLoginUrl}"/>
         </menu-item>

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=604257&r1=604256&r2=604257&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Fri Dec 14 10:55:02 2007
@@ -29,15 +29,6 @@
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="activeApp" value="ebay" global="true"/>
-
-                <!-- The two default (global) stylesheets are added to the list
-                     of stylesheets to the first and second position -->
-                <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/>
-                <!-- The default (global) java scripts -->
-                <set field="layoutSettings.javaScripts[]" value="/images/calendar1.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
-
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.EbayCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.EbayApplication" global="true"/>
                 <set field="applicationMenuName" value="EbayAppBar" global="true"/>
@@ -49,10 +40,9 @@
         </section>
     </screen>
 
-    <screen name="CommonFindDecorator">
+    <screen name="permission-decorator">
         <section>
             <actions>
-                <set field="headerItem" value="Ebay"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -78,7 +68,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleAdvancedSearch"/>
-
+                <set field="headerItem" value="export"/>
                 <entity-condition entity-name="ProductCategory" list-name="productCategories">
                     <condition-expr field-name="showInSelect" operator="not-equals" value="N"/>
                     <order-by field-name="description"/>
@@ -89,7 +79,7 @@
                 <script location="component://product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonFindDecorator">
+                <decorator-screen name="permission-decorator">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/catalog/find/advancedsearch.ftl"/></html>
@@ -104,10 +94,11 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleSearchResults"/>
+                <set field="headerItem" value="export"/>
                 <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonFindDecorator">
+                <decorator-screen name="permission-decorator">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/catalog/find/keywordsearch.ftl"/></html>
@@ -124,7 +115,7 @@
     <screen name="ProductsExportToEbay">
         <section>
             <actions>
-                <set field="headerItem" value="ebay"/>
+                <set field="headerItem" value="export"/>
                 <set field="titleProperty" value="PageTitleEbayProductsExportToEbay"/>
                 <set field="selectResult" from-field="parameters.selectResult"/>
                 <entity-condition entity-name="Geo" list-name="countries">
@@ -134,7 +125,7 @@
                 <script location="component://ebay/webapp/ebay/WEB-INF/actions/find/productsExportToEbay.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.PageTitleEbayProductsExportToEbay}</label>
@@ -150,10 +141,11 @@
         <section>
             <actions>
                 <set field="titleProperty" value="EbayImportOrdersFromEbay"/>
+                <set field="headerItem" value="importOrders"/>
                 <set field="orderList" from-field="parameters.orderList"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="permission-decorator">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.EbayImportOrdersSearchFromEbay}</label>