svn commit: r640307 - in /ofbiz/trunk: applications/accounting/ applications/content/ applications/humanres/ applications/manufacturing/ applications/marketing/ applications/order/ applications/party/ applications/product/ applications/workeffort/ fram...

[jacopoc]

Author: jacopoc
Date: Sun Mar 23 21:07:34 2008
New Revision: 640307

URL: http://svn.apache.org/viewvc?rev=640307&view=rev
Log:
New attributes for the webapp element in the ofbiz-component.xml files: description, menu-name and position.
menu-name is used to separate the menu items in different menus, the position element che be used to sort them (alphanumerically) in the group.
There are now two menu groups: "main", for the main applications, in the top bar, and "secondary" for applications (specialized or not still 'mature'), in the footer.
Thanks to Bilgim Ibryam for the patch OFBIZ-1714, that I have committed with a few changes.

Modified:
    ofbiz/trunk/applications/accounting/ofbiz-component.xml
    ofbiz/trunk/applications/content/ofbiz-component.xml
    ofbiz/trunk/applications/humanres/ofbiz-component.xml
    ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
    ofbiz/trunk/applications/marketing/ofbiz-component.xml
    ofbiz/trunk/applications/order/ofbiz-component.xml
    ofbiz/trunk/applications/party/ofbiz-component.xml
    ofbiz/trunk/applications/product/ofbiz-component.xml
    ofbiz/trunk/applications/workeffort/ofbiz-component.xml
    ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
    ofbiz/trunk/framework/common/webcommon/includes/footer.ftl
    ofbiz/trunk/framework/example/ofbiz-component.xml
    ofbiz/trunk/framework/exampleext/ofbiz-component.xml
    ofbiz/trunk/framework/images/webapp/images/maincss.css
    ofbiz/trunk/framework/webtools/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/bi/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml

Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -74,6 +74,7 @@
 
     <webapp name="accounting"
         title="Accounting"
+        position="06"
         server="default-server"
         location="webapp/accounting"
         base-permission="OFBTOOLS,ACCOUNTING"

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -55,6 +55,7 @@
     <service-resource type="eca" loader="main" location="servicedef/secas.xml"/>
     <webapp name="content"
         title="Content"
+        position="10"
         server="default-server"
         location="webapp/content"
         base-permission="CONTENTMGR"

Modified: ofbiz/trunk/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/humanres/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -33,6 +33,7 @@
     
     <webapp name="humanres"
         title="HR"
+        menu-name="secondary"
         server="default-server"
         location="webapp/humanres"
         base-permission="OFBTOOLS,HUMANRES"

Modified: ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/manufacturing/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -53,6 +53,7 @@
     <!-- web applications; will be mounted when using the embedded Jetty container -->
     <webapp name="manufacturing"
         title="Manufacturing"
+        position="05"
         server="default-server"
         location="webapp/manufacturing"
         base-permission="OFBTOOLS,MANUFACTURING"

Modified: ofbiz/trunk/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/marketing/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -33,12 +33,14 @@
     <service-resource type="eca" loader="main" location="servicedef/secas.xml"/>
     <webapp name="marketing"
         title="Marketing"
+        position="07"
         server="default-server"
         location="webapp/marketing"
         base-permission="OFBTOOLS,MARKETING"
         mount-point="/marketing"/>
     <webapp name="SalesForceAutomation"
         title="SFA"
+        menu-name="secondary"
         server="default-server"
         location="webapp/sfa"
         base-permission="OFBTOOLS,MARKETING"

Modified: ofbiz/trunk/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -51,6 +51,7 @@
     
     <webapp name="order"
         title="Order"
+        position="03"
         server="default-server"
         location="webapp/ordermgr"
         base-permission="OFBTOOLS,ORDERMGR"

Modified: ofbiz/trunk/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/party/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -36,6 +36,7 @@
 
     <webapp name="party"
         title="Party"
+        position="02"
         server="default-server"
         location="webapp/partymgr"
         base-permission="OFBTOOLS,PARTYMGR"

Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -60,8 +60,8 @@
     <!-- test suite -->
     <test-suite loader="main" location="testdef/FacilityTest.xml"/>
     
-    <webapp name="catalog" title="Catalog" server="default-server" location="webapp/catalog"
+    <webapp name="catalog" title="Catalog" position="01" server="default-server" location="webapp/catalog"
         base-permission="OFBTOOLS,CATALOG" mount-point="/catalog"/>
-    <webapp name="facility" title="Facility" server="default-server" location="webapp/facility"
+    <webapp name="facility" title="Facility" position="04" server="default-server" location="webapp/facility"
         base-permission="OFBTOOLS,FACILITY" mount-point="/facility"/>
 </ofbiz-component>

Modified: ofbiz/trunk/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/workeffort/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -40,6 +40,7 @@
         
      <webapp name="workeffort"
         title="WorkEffort"
+        position="08"
         server="default-server"
         location="webapp/workeffort"
         base-permission="OFBTOOLS,WORKEFFORTMGR"

Modified: ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd (original)
+++ ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd Sun Mar 23 21:07:34 2008
@@ -175,6 +175,16 @@
     <xs:attributeGroup name="attlist.webapp">
         <xs:attribute type="xs:string" name="name" use="required"/>
         <xs:attribute type="xs:string" name="title"/>
+        <xs:attribute type="xs:string" name="description"/>
+        <xs:attribute name="menu-name" default="main">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="main"/>
+                    <xs:enumeration value="secondary"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute type="xs:string" name="position"/>
         <xs:attribute type="xs:string" name="server" use="required"/>
         <xs:attribute type="xs:string" name="location" use="required"/>
         <xs:attribute type="xs:string" name="mount-point"/>

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/component/ComponentConfig.java Sun Mar 23 21:07:34 2008
@@ -253,11 +253,15 @@
     }
 
     public static List getAppBarWebInfos(String serverName) {
-        return ComponentConfig.getAppBarWebInfos(serverName, null);
+        return ComponentConfig.getAppBarWebInfos(serverName, null, null);
     }
-
-    public static List<WebappInfo> getAppBarWebInfos(String serverName,  Comparator<? super String> comp) {
-        List<WebappInfo> webInfos = serverWebApps.get(serverName);
+    
+    public static List getAppBarWebInfos(String serverName, String menuName) {
+        return ComponentConfig.getAppBarWebInfos(serverName, null, menuName);
+    }
+    
+    public static List<WebappInfo> getAppBarWebInfos(String serverName, Comparator<? super String> comp, String menuName) {
+        List<WebappInfo> webInfos = serverWebApps.get(serverName + menuName);
         if (webInfos == null) {
             synchronized (ComponentConfig.class) {
                 if (webInfos == null) {
@@ -272,14 +276,21 @@
 
                     for (ComponentConfig cc: getAllComponents()) {
                         for (WebappInfo wInfo: cc.getWebappInfos()) {
+                            String key = UtilValidate.isNotEmpty(wInfo.position)? wInfo.position: wInfo.title;
                             if (serverName.equals(wInfo.server) && wInfo.appBarDisplay) {
-                                tm.put(wInfo.title, wInfo);
+                                if (UtilValidate.isNotEmpty(menuName)) {
+                                    if (menuName.equals(wInfo.menuName)) {
+                                        tm.put(key, wInfo);
+                                    }
+                                } else {
+                                    tm.put(key, wInfo);
+                                }
                             }
                         }
                     }
                     List<WebappInfo> webInfoList = FastList.newInstance();
                     webInfoList.addAll(tm.values());
-                    serverWebApps.put(serverName, webInfoList);
+                    serverWebApps.put(serverName + menuName, webInfoList);
                     return webInfoList;
                 }
             }
@@ -660,10 +671,13 @@
         public Map<String, String> initParameters;
         public String name;
         public String title;
+        public String description;
+        public String menuName;        
         public String server;
         public String mountPoint;
         public String location;
         public String[] basePermission;
+        public String position;        
         public boolean appBarDisplay;
 
         public WebappInfo(ComponentConfig componentConfig, Element element) {
@@ -672,6 +686,7 @@
             this.componentConfig = componentConfig;
             this.name = element.getAttribute("name");
             this.title = element.getAttribute("title");
+            this.description = element.getAttribute("description");            
             this.server = element.getAttribute("server");
             this.mountPoint = element.getAttribute("mount-point");
             this.location = element.getAttribute("location");
@@ -696,7 +711,20 @@
             if (UtilValidate.isEmpty(this.title)) {
                 this.title = Character.toUpperCase(name.charAt(0)) + name.substring(1).toLowerCase();
             }
-
+            
+            if (UtilValidate.isEmpty(this.description)) {
+                this.description = this.title;
+            }
+            
+            String menuNameStr = element.getAttribute("menu-name");
+            if (UtilValidate.isNotEmpty(menuNameStr)) {
+                this.menuName = menuNameStr;
+            } else {
+                this.menuName = "main";
+            }
+            
+            this.position = element.getAttribute("position");
+
             // default mount point is name if none specified
             if (UtilValidate.isEmpty(this.mountPoint)) {
                 this.mountPoint = this.name;
@@ -753,6 +781,10 @@
 
         public String getTitle() {
             return title;
+        }
+        
+        public String getDescription() {
+            return description;
         }
 
         public List<String> getVirtualHosts() {

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sun Mar 23 21:07:34 2008
@@ -6951,6 +6951,9 @@
         <value xml:lang="it">Risorse Umane</value>
         <value xml:lang="th">ฝ่ายบุคคล</value>
     </property>
+    <property key="HumanResourceApplication">
+        <value xml:lang="en">Human Resource Application</value>
+    </property>    
     <property key="Handheld Facility">
         <value xml:lang="en">Handheld Facility</value>
         <value xml:lang="it">Gestione Stabilimenti su Handheld</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=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl Sun Mar 23 21:07:34 2008
@@ -21,7 +21,7 @@
 <#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
 <#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
 <#assign contextPath = request.getContextPath()>
-<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName)>
+<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "main")>
 
 <#if userLogin?has_content>
   <div id="main-navigation">
@@ -45,7 +45,7 @@
           <#if thisApp != "/">
             <#assign thisURL = thisURL + "/control/main">
           </#if>
-          <li<#if selected> class="selected"</#if>><a href="${response.encodeURL(thisURL + externalKeyParam)}" title=""><#if uiLabelMap?exists>${uiLabelMap[display.title]}<#else>${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/webcommon/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/footer.ftl?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/footer.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/footer.ftl Sun Mar 23 21:07:34 2008
@@ -19,6 +19,42 @@
 
 <#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
 
+<#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
+<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
+<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
+<#assign contextPath = request.getContextPath()>
+<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "secondary")>
+
+<#if userLogin?has_content>
+  <div id="secondary-navigation">
+    <ul>
+      <#list displayApps as display>
+        <#assign thisApp = display.getContextRoot()>
+        <#assign permission = true>
+        <#assign selected = false>
+        <#assign permissions = display.getBasePermission()>
+        <#list permissions as perm>
+          <#if perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session)>
+            <#-- User must have ALL permissions in the base-permission list -->
+            <#assign permission = false>
+          </#if>
+        </#list>
+        <#if permission == true>
+          <#if thisApp == contextPath || contextPath + "/" == thisApp>
+            <#assign selected = true>
+          </#if>
+          <#assign thisURL = thisApp>
+          <#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>
+        </#if>
+      </#list>
+    </ul>
+    <br class="clear"/>
+  </div>
+</#if>
+
 <div id="footer">
     <p><a href="http://jigsaw.w3.org/css-validator/"><img src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/></a>
     <a href="http://validator.w3.org/check?uri=referer"><img src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>

Modified: ofbiz/trunk/framework/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/example/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -50,6 +50,8 @@
     <!-- web applications; will be mounted when using the embedded Jetty container -->
     <webapp name="example"
         title="Example"
+        menu-name="secondary"
+        position="95"
         server="default-server"
         location="webapp/example"
         base-permission="OFBTOOLS,EXAMPLE"

Modified: ofbiz/trunk/framework/exampleext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/exampleext/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/exampleext/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -23,6 +23,6 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
 
-    <webapp name="exampleext" title="ExampleExt" server="default-server" location="webapp/exampleext"
+    <webapp name="exampleext" title="ExampleExt" menu-name="secondary" position="99" server="default-server" location="webapp/exampleext"
         base-permission="OFBTOOLS,EXAMPLE" mount-point="/exampleext"/>
 </ofbiz-component>

Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Sun Mar 23 21:07:34 2008
@@ -1120,6 +1120,57 @@
 text-decoration: none;
 }
 
+/* ======================================================= */
+/* ===== Secondary Navigation (App Menu) Styles ========== */
+/* ======================================================= */
+
+#secondary-navigation {
+height: 1%; /* IE fix */
+margin:0 auto 0 auto;
+padding:0;
+width:50%;
+
+}
+
+#secondary-navigation ul {
+display: inline; /* IE Fix */
+}
+
+#secondary-navigation ul li {
+float: left;
+padding:0.5em;
+}
+
+#secondary-navigation ul a {
+display: block;
+font-size: 1em;
+padding: 0 1em 0 1em;
+border: 0.05em solid #000099;
+color: #ffff66;
+background-image: url(/images/gradient_sub_uns.gif);
+background-repeat: repeat-x;
+}
+
+#secondary-navigation ul .disabled {
+color: #D4D0C8;
+}
+
+#secondary-navigation ul .selected,
+#secondary-navigation ul li:hover {
+color: #ffffff;
+}
+
+#secondary-navigation ul a:hover,
+#secondary-navigation ul .selected a,
+#secondary-navigation ui .selected a:hover {
+background-color: #2626c1;
+background-image: url(/images/gradient_sub_sel.gif);
+background-repeat: repeat-x;
+border-bottom: 0.05em solid #2626c1;
+text-decoration: none;
+color: #ffffff;
+}
+
 /* ========================================================= */
 /* ===== Component Navigation (App Header) Styles ========== */
 /* ========================================================= */

Modified: ofbiz/trunk/framework/webtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/webtools/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -28,6 +28,7 @@
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <webapp name="webtools"
         title="WebTools"
+        position="20"
         server="default-server"
         location="webapp/webtools"
         base-permission="OFBTOOLS,WEBTOOLS"

Modified: ofbiz/trunk/specialpurpose/bi/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -36,6 +36,8 @@
 
     <webapp name="bi"
         title="Business Intelligence"
+        menu-name="secondary"
+        position="10"
         server="default-server"
         location="webapp/bi"
         base-permission="OFBTOOLS"

Modified: ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -31,6 +31,7 @@
     
     <webapp name="ebay"
         title="Ebay"
+        menu-name="secondary"
         server="default-server"
         location="webapp/ebay"
         base-permission="OFBTOOLS,EBAY"

Modified: ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -32,6 +32,7 @@
     
     <webapp name="googlebase"
         title="Google Base"
+        menu-name="secondary"
         server="default-server"
         location="webapp/googlebase"
         base-permission="OFBTOOLS,GOOGLEBASE"

Modified: ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -39,6 +39,7 @@
     <webapp name="oagis"
         title="Oagis"
         server="default-server"
+        menu-name="secondary"
         location="webapp/oagis"
         base-permission="OFBTOOLS,OAGIS"
         mount-point="/oagis"

Modified: ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml?rev=640307&r1=640306&r2=640307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml Sun Mar 23 21:07:34 2008
@@ -38,6 +38,7 @@
     
     <webapp name="projectmgr"
         title="Project"
+        menu-name="secondary"
         server="default-server"
         location="webapp/projectmgr"
         base-permission="PROJECTMGR"