svn commit: r719681 - in /ofbiz/trunk/framework/webtools: webapp/webtools/service/serviceTabBar.ftl widget/Menus.xml widget/ServiceScreens.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r719681 - in /ofbiz/trunk/framework/webtools: webapp/webtools/service/serviceTabBar.ftl widget/Menus.xml widget/ServiceScreens.xml

jleroux@apache.org
Author: jleroux
Date: Fri Nov 21 11:25:24 2008
New Revision: 719681

URL: http://svn.apache.org/viewvc?rev=719681&view=rev
Log:
A patch from Bruno Busco "Replacing FTL TabBar with menu widgets in Webtools" (https://issues.apache.org/jira/browse/OFBIZ-2056) - OFBIZ-2056


Added:
    ofbiz/trunk/framework/webtools/widget/Menus.xml
Removed:
    ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceTabBar.ftl
Modified:
    ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml

Added: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=719681&view=auto
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (added)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Fri Nov 21 11:25:24 2008
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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="serviceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="page.tabButtonItem">
+        <menu-item name="ServiceList" title="${uiLabelMap.WebtoolsServiceList}">
+            <link target="serviceList"/>
+        </menu-item>
+        <menu-item name="JobList" title="${uiLabelMap.WebtoolsJobList}">
+            <link target="jobList"/>
+        </menu-item>
+        <menu-item name="ThreadList" title="${uiLabelMap.WebtoolsThreadList}">
+            <link target="threadList"/>
+        </menu-item>
+        <menu-item name="ScheduleJob" title="${uiLabelMap.WebtoolsScheduleJob}">
+            <link target="scheduleJob"/>
+        </menu-item>
+        <menu-item name="RunService" title="${uiLabelMap.PageTitleRunService}">
+            <link target="runService"/>
+        </menu-item>
+    </menu>
+
+</menus>

Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=719681&r1=719680&r2=719681&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Fri Nov 21 11:25:24 2008
@@ -35,9 +35,7 @@
                                 <if-has-permission permission="WEBTOOLS" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <platform-specific>
-                                    <html><html-template location="component://webtools/webapp/webtools/service/serviceTabBar.ftl"/></html>
-                                </platform-specific>
+                                <include-menu name="serviceTabBar" location="component://webtools/widget/Menus.xml"/>
                                 
                                 <decorator-section-include name="body"/>