svn commit: r737492 - in /ofbiz/trunk/specialpurpose/googlebase/widget: GoogleBaseMenus.xml GoogleBaseScreens.xml

[bu...@apache.org]

Author: buscob
Date: Sun Jan 25 09:07:32 2009
New Revision: 737492

URL: http://svn.apache.org/viewvc?rev=737492&view=rev
Log:
- Extended Google Base AppBar from CommonAppBarMenu
- Removed redundand inclusion of StyleSheets and JavaScript (already done in GlobalDecorato). The explicit inclusion of the default maincss.css was the cause of the wrong rendering of the Menu with the new bluelight theme.

Modified:
    ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml
    ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml

Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml?rev=737492&r1=737491&r2=737492&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml Sun Jan 25 09:07:32 2009
@@ -18,17 +18,7 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="GoogleBaseAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.GoogleBaseApplication}"
-        default-selected-style="selected" selected-menuitem-context-field-name="headerItem">
+    <menu name="GoogleBaseAppBar" title="${uiLabelMap.GoogleBaseApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="googlebase" title="${uiLabelMap.GoogleBaseExportToGoogle}"><link target="advancedsearch"/></menu-item>
-
-        <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
-            <condition><not><if-empty field-name="userLogin"/></not></condition>
-            <link target="logout"/>
-        </menu-item>
-        <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
-            <condition><if-empty field-name="userLogin"/></condition>
-            <link target="${checkLoginUrl}"/>
-        </menu-item>
     </menu>
 </menus>

Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=737492&r1=737491&r2=737492&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Sun Jan 25 09:07:32 2009
@@ -30,15 +30,6 @@
                 <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="activeApp" value="googlebase" 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/selectall.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/images/calendar_date_select.js" global="true"/>
-
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.GoogleBaseCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.GoogleBaseApplication" global="true"/>
                 <set field="applicationMenuName" value="GoogleBaseAppBar" global="true"/>