svn commit: r591041 - in /ofbiz/trunk/applications/content/widget: CommonScreens.xml content/DataResourceMenus.xml

[jacopoc]

Author: jacopoc
Date: Thu Nov  1 08:08:55 2007
New Revision: 591041

URL: http://svn.apache.org/viewvc?rev=591041&view=rev
Log:
Separated data resource contextual menu from generic data resource menu.

Modified:
    ofbiz/trunk/applications/content/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=591041&r1=591040&r2=591041&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu Nov  1 08:08:55 2007
@@ -176,12 +176,15 @@
                                     </condition>
                                     <widgets>
                                         <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.dataResourceName} [${currentValue.dataResourceId}]  ${uiLabelMap.${extraFunctionName}}"/>
+                                        <include-menu name="dataresourceTopMenu" location="component://content/widget/content/DataResourceMenus.xml"/>
+                                        <include-menu name="dataresource" location="component://content/widget/content/DataResourceMenus.xml"/>
                                     </widgets>
                                     <fail-widgets>
                                         <label style="head1" text="${uiLabelMap.${titleProperty}}"/>
+                                        <include-menu name="dataresourceTopMenu" location="component://content/widget/content/DataResourceMenus.xml"/>
                                     </fail-widgets>
                                 </section>
-                                <include-menu name="dataresource" location="component://content/widget/content/DataResourceMenus.xml"/>
+                                <link text="${uiLabelMap.CommonNew}" target="editDataResource" style="buttontext"/>
                                 <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=591041&r1=591040&r2=591041&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Thu Nov  1 08:08:55 2007
@@ -74,24 +74,20 @@
             <link target="EditDataResourceProductFeatures" name="EditDataResourceProductFeatures" target-window="_top" style="tabButton" />
         </menu-item>
     </menu>
-    <menu name="dataresource">
+    <menu name="dataresourceTopMenu">
         <menu-item name="findDataResource" title="${uiLabelMap.CommonFind}">
             <link target="findDataResource"/>
         </menu-item>
         <menu-item name="navigateDataResource" title="${uiLabelMap.ContentNavigate}">
             <link target="navigateDataResource"/>
         </menu-item>
+    </menu>
+    <menu name="dataresource">
         <menu-item name="editDataResource" title="${uiLabelMap.CommonEdit}">
             <condition>
                 <not><if-empty field-name="currentValue.dataResourceId"/></not>
             </condition>
             <link target="editDataResource?dataResourceId=${parameters.dataResourceId}"/>
-        </menu-item>
-        <menu-item name="newDataResource" title="${uiLabelMap.CommonNew}">
-            <condition>
-                <if-empty field-name="currentValue.dataResourceId"/>
-            </condition>
-            <link target="editDataResource"/>
         </menu-item>
         <menu-item name="editElectronicText" title="${uiLabelMap.ContentDataResourceText}" >
             <condition>